Changeset 7399

Timestamp:

07/10/2018 04:29:18 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp Tickets: Update sandbox detection

Previously the sandbox detection function was checking the sandbox option for
every payment method, even if it wasn't currently enabled. Now, it only searches
through the options of enabled payment methods.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php (modified) (3 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/camptix-tweaks/camptix-tweaks.php

@@ -49 +49 @@
  * If they open ticket sales while in sandbox mode, then attendees will be confused, etc.
  *
- * @todo This should probably be moved to CampTix itself, except for the check for the 'wordcamp-sandbox' account,
- * which can stay here.
+ * @todo This should probably be moved to CampTix itself.
  */
 function show_sandbox_mode_warning() {
@@ -69 +68 @@
 
         if ( $camptix_post_type || $camptix_shortcode_page ) {
-                $sandbox = false;
-
-                // If any payment addons are in sandbox mode
-                foreach ( $camptix_options as $option_key => $option_value ) {
-                        if ( 'payment_options_' === substr( $option_key, 0, 16 ) ) {
-                                if ( isset( $option_value['sandbox'] ) && true === $option_value['sandbox'] ) {
-                                        $sandbox = true;
-                                }
-                        }
-                }
-
-                // If the WordCamp sandbox is picked from the predefs
-                if ( ! empty( $camptix_options['payment_options_paypal']['api_predef'] ) ) {
-                        if ( 'wordcamp-sandbox' == $camptix_options['payment_options_paypal']['api_predef'] ) {
-                                $sandbox = true;
-                        }
-                }
-
-                if ( ! empty( $camptix_options['payment_options_stripe']['api_predef'] ) ) {
-                        if ( 'wpcs-sandbox' == $camptix_options['payment_options_stripe']['api_predef'] ) {
-                                $sandbox = true;
-                        }
-                }
+                $sandboxed = is_sandboxed();
 
                 // And the event is not archived
-                if ( $sandbox && ! $camptix_options['archived'] ) {
+                if ( $sandboxed && ! $camptix_options['archived'] ) {
                         require_once( __DIR__ . '/views/notice-sandbox-mode.php' );
                 }
         }
+}
+
+/**
+ * Returns true if CampTix is running in sandbox mode.
+ *
+ * @todo This should probably be moved to CampTix itself, except for the check for the 'wordcamp-sandbox' account.
+ *
+ * @return bool
+ */
+function is_sandboxed() {
+        /** @var $camptix CampTix_Plugin */
+        global $camptix;
+        static $is_sandboxed = null;
+
+        if ( ! is_null( $is_sandboxed ) ) {
+                return $is_sandboxed;
+        }
+
+        $options      = $camptix->get_options();
+        $is_sandboxed = false;
+
+        $enabled_payment_methods = array_keys( $camptix->get_enabled_payment_methods() );
+
+        foreach ( $enabled_payment_methods as $method_id ) {
+                switch ( $method_id ) {
+                        case 'stripe':
+                                $sandbox_predef = 'wpcs-sandbox';
+                                break;
+                        case 'paypal':
+                                $sandbox_predef = 'wordcamp-sandbox';
+                                break;
+                        default:
+                                $sandbox_predef = false;
+                                break;
+                }
+
+                if ( $sandbox_predef && isset( $options[ 'payment_options_' . $method_id ]['api_predef'] ) && $sandbox_predef === $options[ 'payment_options_' . $method_id ]['api_predef'] ) {
+                        $is_sandboxed = true;
+                        break;
+                }
+
+                $not_predef = ! isset( $options[ 'payment_options_' . $method_id ]['api_predef'] ) || ! $options[ 'payment_options_' . $method_id ]['api_predef'];
+
+                if ( $not_predef && isset( $options[ 'payment_options_' . $method_id ]['sandbox'] ) && true === $options[ 'payment_options_' . $method_id ]['sandbox'] ) {
+                        $is_sandboxed = true;
+                        break;
+                }
+        }
+
+        return $is_sandboxed;
 }
 
@@ -344 +371 @@
 
 /**
- * Returns true if CampTix is running in sandbox mode.
- *
- * @return bool
- */
-function is_sandboxed() {
-        /** @var $camptix CampTix_Plugin */
-        global $camptix;
-        static $is_sandboxed = null;
-
-        if ( ! is_null( $is_sandboxed ) ) {
-                return $is_sandboxed;
-        }
-
-        $options      = $camptix->get_options();
-        $is_sandboxed = false;
-
-        // If the PayPal sandbox checkbox is set to true in manual settings
-        if ( isset( $options['payment_options_paypal']['sandbox'] ) && $options['payment_options_paypal']['sandbox'] ) {
-                $is_sandboxed = true;
-        }
-        if ( isset( $options['payment_options_stripe']['sandbox'] ) && $options['payment_options_stripe']['sandbox'] ) {
-                $is_sandboxed = true;
-        }
-
-        // If the WordCamp sandbox is picked from the predefs
-        if ( ! empty( $options['payment_options_paypal']['api_predef'] ) && 'wordcamp-sandbox' == $options['payment_options_paypal']['api_predef'] ) {
-                $is_sandboxed = true;
-        }
-        if ( ! empty( $options['payment_options_stripe']['api_predef'] ) && 'wpcs-sandbox' == $options['payment_options_stripe']['api_predef'] ) {
-                $is_sandboxed = true;
-        }
-
-        return $is_sandboxed;
-}
-
-/**
  * Assign the template with no sidebar to the Attendees page
  *