From 3e73ed733bb6a753005e368c9fe238e749772982 Mon Sep 17 00:00:00 2001
From: Marc Michalsky <michalsky@forumzfd.de>
Date: Fri, 17 Dec 2021 12:13:13 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20improve=20hex=20color=20validation?=
 =?UTF-8?q?=20#4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CRM/TwingleCampaign/BAO/TwingleProject.php | 34 +++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/CRM/TwingleCampaign/BAO/TwingleProject.php b/CRM/TwingleCampaign/BAO/TwingleProject.php
index 8f509c0..fc3f779 100644
--- a/CRM/TwingleCampaign/BAO/TwingleProject.php
+++ b/CRM/TwingleCampaign/BAO/TwingleProject.php
@@ -31,6 +31,13 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
     'one_time',
   ];
 
+  // All fields for hex color codes
+  const colorFields = [
+    'design_background_color',
+    'design_primary_color',
+    'design_font_color',
+  ];
+
   /**
    * ## TwingleProject constructor
    *
@@ -143,11 +150,13 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
    */
   private function strToInt(array &$values) {
     foreach ($values as $key => $value) {
-      if (ctype_digit($value)) {
-        $values[$key] = intval($value);
-      }
-      elseif (is_array($value)) {
-        $this->strToInt($values[$key]);
+      if (!in_array($key, self::colorFields)) {
+        if (ctype_digit($value)) {
+          $values[$key] = intval($value);
+        }
+        elseif (is_array($value)) {
+          $this->strToInt($values[$key]);
+        }
       }
     }
   }
@@ -298,21 +307,18 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
     }
 
     // Validate hexadecimal color fields
-    $colorFields =
-      [
-        'design_background_color',
-        'design_primary_color',
-        'design_font_color',
-      ];
-    foreach ($colorFields as $colorField) {
+    foreach (self::colorFields as $colorField) {
       if (
-        !empty($this->values['project_options'][$colorField]) &&
+        (
+          !empty($this->values['project_options'][$colorField]) ||
+          $this->values['project_options'][$colorField] === "0"
+        ) &&
         (
           !(
             ctype_xdigit($this->values['project_options'][$colorField]) ||
             is_integer($this->values['project_options'][$colorField])
           ) ||
-          strlen((string) $this->values['project_options'][$colorField]) > 6
+          strlen((string) $this->values['project_options'][$colorField]) != 6
         )
       ) {
         $valid = FALSE;