Changeset 2732620

Timestamp:

05/27/2022 12:05:31 PM (4 years ago)

Author:

co2ok

Message:

Updating 1.0.9.22 tag with more security and bug fixes

Location:

co2ok-for-woocommerce

Files:

• tags/1.0.9.22/Components/Admin/Co2ok-AdminOverview.php (modified) (4 diffs)
• trunk/Components/Admin/Co2ok-AdminOverview.php (modified) (4 diffs)

co2ok-for-woocommerce/tags/1.0.9.22/Components/Admin/Co2ok-AdminOverview.php

@@ -51 +51 @@
     {
       $returnValue = '';
-      if ($setting == 'co2ok_optout' || 'co2ok_cfp' || 'co2ok_gif_feature' || 'co2ok_ab_research' || 'co2ok_widgetmark_footer') {
+      if (in_array($setting, ['co2ok_optout', 'co2ok_cfp', 'co2ok_gif_feature', 'co2ok_ab_research', 'co2ok_widgetmark_footer'], true)) {
         if ($input == 'on' || $input == 'off') {
           $returnValue = $input; 
@@ -58 +58 @@
         }
       } else if ($setting == 'co2ok_checkout_placement') {
-        if ($input == 'after_order_notes' || 'before_checkout_form' || 'checkout_before_customer_details' || 'after_checkout_billing_form' || 'checkout_order_review') {
+        if (in_array($input, ['after_order_notes', 'before_checkout_form', 'checkout_before_customer_details', 'after_checkout_billing_form', 'checkout_order_review'], true)) {
           $returnValue = $input;
         } else {
@@ -64 +64 @@
         }
       } else if ($setting == 'co2ok_button_template') {
-        if ($input == 'co2ok_button_template_default' || 'co2ok_button_template_minimal') {
+        if (in_array($input, ['co2ok_button_template_default', 'co2ok_button_template_minimal'])) {
           $returnValue = $input;
         } else {
           $returnValue = 'co2ok_button_template_default';
+        }
+      } else if ($setting == 'co2ok_disable_button_on_cart') {
+        if ($input == 'true' || $input == 'false') {
+          $returnValue = $input;
+        } else {
+          $returnValue = 'false';
         }
       }
@@ -114 +120 @@
         if (isset($_GET['co2ok_disable_button_on_cart']))
         {
-            update_option('co2ok_disable_button_on_cart', $_GET['co2ok_disable_button_on_cart']);
+            update_option('co2ok_disable_button_on_cart', $this->validate_setting_input('co2ok_disable_button_on_cart', sanitize_key($_GET['co2ok_disable_button_on_cart'])));
         }
 

co2ok-for-woocommerce/trunk/Components/Admin/Co2ok-AdminOverview.php

@@ -51 +51 @@
     {
       $returnValue = '';
-      if ($setting == 'co2ok_optout' || 'co2ok_cfp' || 'co2ok_gif_feature' || 'co2ok_ab_research' || 'co2ok_widgetmark_footer') {
+      if (in_array($setting, ['co2ok_optout', 'co2ok_cfp', 'co2ok_gif_feature', 'co2ok_ab_research', 'co2ok_widgetmark_footer'], true)) {
         if ($input == 'on' || $input == 'off') {
           $returnValue = $input; 
@@ -58 +58 @@
         }
       } else if ($setting == 'co2ok_checkout_placement') {
-        if ($input == 'after_order_notes' || 'before_checkout_form' || 'checkout_before_customer_details' || 'after_checkout_billing_form' || 'checkout_order_review') {
+        if (in_array($input, ['after_order_notes', 'before_checkout_form', 'checkout_before_customer_details', 'after_checkout_billing_form', 'checkout_order_review'], true)) {
           $returnValue = $input;
         } else {
@@ -64 +64 @@
         }
       } else if ($setting == 'co2ok_button_template') {
-        if ($input == 'co2ok_button_template_default' || 'co2ok_button_template_minimal') {
+        if (in_array($input, ['co2ok_button_template_default', 'co2ok_button_template_minimal'])) {
           $returnValue = $input;
         } else {
           $returnValue = 'co2ok_button_template_default';
+        }
+      } else if ($setting == 'co2ok_disable_button_on_cart') {
+        if ($input == 'true' || $input == 'false') {
+          $returnValue = $input;
+        } else {
+          $returnValue = 'false';
         }
       }
@@ -114 +120 @@
         if (isset($_GET['co2ok_disable_button_on_cart']))
         {
-            update_option('co2ok_disable_button_on_cart', $_GET['co2ok_disable_button_on_cart']);
+            update_option('co2ok_disable_button_on_cart', $this->validate_setting_input('co2ok_disable_button_on_cart', sanitize_key($_GET['co2ok_disable_button_on_cart'])));
         }