eventespresso / event-espresso-core

payment_methods/Bank/EE_PMT_Bank.pm.php

Indentation +95 added lines, -95 removed lines

@@ -14,99 +14,99 @@
 
 
 
-    /**
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Bank
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_pretty_name = __("Bank", 'event_espresso');
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url().'lib/bank-logo.png';
-        $this->_default_description = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
-    }
-
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        return new EE_Payment_Method_Form(array(
-            'extra_meta_inputs'=>array(
-                'page_title'=>new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default'=>  __("Electronic Funds Transfers", 'event_espresso')
-                )),
-                'payment_instructions'=>new EE_Text_Area_Input(array(
-                    'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
-                    'html_help_text' => __('Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso'),
-                    'default'=> sprintf(
-                        __('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
-                        "\n"
-                    ),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
-                )),
-            ),
-            'exclude'=>array('PMD_debug_mode')
-        ));
-    }
-
-
-
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                        'title' => __('Bank Draft Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_overview_bank_draft'
-                        ),
-        );
-    }
-
-
-
-    /**
-     * For adding any html output ab ove the payment overview.
-     * Many gateways won't want ot display anything, so this function just returns an empty string.
-     * Other gateways may want to override this, such as offline gateways.
-     * @return string
-     */
-    public function payment_overview_content(EE_Payment $payment)
-    {
-        $extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
-        $template_vars = array_merge(
-            array(
-                            'payment_method'=>$this->_pm_instance,
-                            'payment'=>$payment,
-                            'page_title'=>'',
-                            'payment_instructions'=>'',
-                            ),
-            $extra_meta_for_payment_method
-        );
-        return EEH_Template::locate_template(
-            'payment_methods/Bank/templates/bank_payment_details_content.template.php',
-            $template_vars
-        );
-    }
+	/**
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Bank
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_pretty_name = __("Bank", 'event_espresso');
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url().'lib/bank-logo.png';
+		$this->_default_description = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
+	}
+
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		return new EE_Payment_Method_Form(array(
+			'extra_meta_inputs'=>array(
+				'page_title'=>new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
+					'default'=>  __("Electronic Funds Transfers", 'event_espresso')
+				)),
+				'payment_instructions'=>new EE_Text_Area_Input(array(
+					'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
+					'html_help_text' => __('Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso'),
+					'default'=> sprintf(
+						__('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
+						"\n"
+					),
+					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+				)),
+			),
+			'exclude'=>array('PMD_debug_mode')
+		));
+	}
+
+
+
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+						'title' => __('Bank Draft Settings', 'event_espresso'),
+						'filename' => 'payment_methods_overview_bank_draft'
+						),
+		);
+	}
+
+
+
+	/**
+	 * For adding any html output ab ove the payment overview.
+	 * Many gateways won't want ot display anything, so this function just returns an empty string.
+	 * Other gateways may want to override this, such as offline gateways.
+	 * @return string
+	 */
+	public function payment_overview_content(EE_Payment $payment)
+	{
+		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
+		$template_vars = array_merge(
+			array(
+							'payment_method'=>$this->_pm_instance,
+							'payment'=>$payment,
+							'page_title'=>'',
+							'payment_instructions'=>'',
+							),
+			$extra_meta_for_payment_method
+		);
+		return EEH_Template::locate_template(
+			'payment_methods/Bank/templates/bank_payment_details_content.template.php',
+			$template_vars
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                         __('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
                         "\n"
                     ),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+                    'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
                 )),
             ),
             'exclude'=>array('PMD_debug_mode')

payment_methods/Check/EE_PMT_Check.pm.php

Indentation +105 added lines, -105 removed lines

@@ -13,121 +13,121 @@
 {
 
 
-    /**
-     * @param null $pm_instance
-     * @return EE_PMT_Check
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_pretty_name = __("Check", 'event_espresso');
-        $this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url().'lib/check-logo.png';
-    }
+	/**
+	 * @param null $pm_instance
+	 * @return EE_PMT_Check
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_pretty_name = __("Check", 'event_espresso');
+		$this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url().'lib/check-logo.png';
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
 
 
 
-    /**
-     * Overrides parent to dynamically set some defaults, but only when the form is requested
-     * @return EE_Form_Section_Proper
-     */
-    public function generate_new_settings_form()
-    {
-        if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
-            $organization = EE_Registry::instance()->CFG->organization;
-            $organization_name = $organization->get_pretty('name');
-            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
-            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
-            $default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
-            $default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
-            $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
-            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
-            $default_address .=  $state ? $state->name() . '<br />' : '';
-            $default_address .= $country ? $country->name(). '<br />' : '';
-            $default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
-        } else {
-            $default_address = 'unknown';
-            $organization_name = 'unknown';
-        }
-            return new EE_Payment_Method_Form(array(
-            'extra_meta_inputs'=>array(
-                'check_title'=> new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default'=>  __("Check/Money Order Payments", 'event_espresso'),
-                )),
-                'payment_instructions'=>new EE_Text_Area_Input(array(
-                    'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default'=> __("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
-                )),
-                'payable_to'=>new EE_Text_Input(array(
-                    'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default'=>$organization_name
-                )),
-                'address_to_send_payment'=>new EE_Text_Area_Input(array(
-                    'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
-                    'default'=>$default_address,
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
-                )),
-            ),
-            'exclude'=>array('PMD_debug_mode')
-            ));
-    }
+	/**
+	 * Overrides parent to dynamically set some defaults, but only when the form is requested
+	 * @return EE_Form_Section_Proper
+	 */
+	public function generate_new_settings_form()
+	{
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			$organization = EE_Registry::instance()->CFG->organization;
+			$organization_name = $organization->get_pretty('name');
+			$default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
+			$default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
+			$default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
+			$default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
+			$default_address .=  $state ? $state->name() . '<br />' : '';
+			$default_address .= $country ? $country->name(). '<br />' : '';
+			$default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
+		} else {
+			$default_address = 'unknown';
+			$organization_name = 'unknown';
+		}
+			return new EE_Payment_Method_Form(array(
+			'extra_meta_inputs'=>array(
+				'check_title'=> new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
+					'default'=>  __("Check/Money Order Payments", 'event_espresso'),
+				)),
+				'payment_instructions'=>new EE_Text_Area_Input(array(
+					'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
+					'default'=> __("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
+					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+				)),
+				'payable_to'=>new EE_Text_Input(array(
+					'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
+					'default'=>$organization_name
+				)),
+				'address_to_send_payment'=>new EE_Text_Area_Input(array(
+					'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
+					'default'=>$default_address,
+					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+				)),
+			),
+			'exclude'=>array('PMD_debug_mode')
+			));
+	}
 
 
 
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                        'title' => __('Check Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_overview_check'
-                        ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+						'title' => __('Check Settings', 'event_espresso'),
+						'filename' => 'payment_methods_overview_check'
+						),
+		);
+	}
 
 
 
-    /**
-     * For adding any html output ab ove the payment overview.
-     * Many gateways won't want ot display anything, so this function just returns an empty string.
-     * Other gateways may want to override this, such as offline gateways.
-     * @return string
-     */
-    public function payment_overview_content(EE_Payment $payment)
-    {
-        $extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
-        $template_vars = array_merge(
-            array(
-                            'payment_method'=>$this->_pm_instance,
-                            'payment'=>$payment,
-                            'check_title'=>'',
-                            'payment_instructions'=>'',
-                            'payable_to'=>'',
-                            'address_to_send_payment'=>'',
-                            ),
-            $extra_meta_for_payment_method
-        );
-        return EEH_Template::locate_template(
-            'payment_methods/Check/templates/check_payment_details_content.template.php',
-            $template_vars
-        );
-    }
+	/**
+	 * For adding any html output ab ove the payment overview.
+	 * Many gateways won't want ot display anything, so this function just returns an empty string.
+	 * Other gateways may want to override this, such as offline gateways.
+	 * @return string
+	 */
+	public function payment_overview_content(EE_Payment $payment)
+	{
+		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
+		$template_vars = array_merge(
+			array(
+							'payment_method'=>$this->_pm_instance,
+							'payment'=>$payment,
+							'check_title'=>'',
+							'payment_instructions'=>'',
+							'payable_to'=>'',
+							'address_to_send_payment'=>'',
+							),
+			$extra_meta_for_payment_method
+		);
+		return EEH_Template::locate_template(
+			'payment_methods/Check/templates/check_payment_details_content.template.php',
+			$template_vars
+		);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -48,14 +48,14 @@ 
         if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
             $organization = EE_Registry::instance()->CFG->organization;
             $organization_name = $organization->get_pretty('name');
-            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1') . '<br />' : '';
-            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2') . '<br />' : '';
+            $default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1').'<br />' : '';
+            $default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2').'<br />' : '';
             $default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
-            $default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+            $default_address .= ($organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
             $state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
-            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO) ;
-            $default_address .=  $state ? $state->name() . '<br />' : '';
-            $default_address .= $country ? $country->name(). '<br />' : '';
+            $country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO);
+            $default_address .= $state ? $state->name().'<br />' : '';
+            $default_address .= $country ? $country->name().'<br />' : '';
             $default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
         } else {
             $default_address = 'unknown';
@@ -70,7 +70,7 @@ 
                 'payment_instructions'=>new EE_Text_Area_Input(array(
                     'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
                     'default'=> __("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+                    'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
                 )),
                 'payable_to'=>new EE_Text_Input(array(
                     'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
@@ -79,7 +79,7 @@ 
                 'address_to_send_payment'=>new EE_Text_Area_Input(array(
                     'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
                     'default'=>$default_address,
-                    'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+                    'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
                 )),
             ),
             'exclude'=>array('PMD_debug_mode')

payment_methods/Paypal_Standard/EE_PMT_Paypal_Standard.pm.php

Indentation +101 added lines, -101 removed lines

@@ -13,105 +13,105 @@
 class EE_PMT_Paypal_Standard extends EE_PMT_Base
 {
 
-    const shipping_info_none = 1;
-    const shipping_info_optional = 0;
-    const shipping_info_required = 2;
-
-
-
-    /**
-     * @param null $pm_instance
-     * @return \EE_PMT_Paypal_Standard
-     * @throws \EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder().'EEG_Paypal_Standard.gateway.php');
-        $this->_gateway = new EEG_Paypal_Standard();
-        $this->_pretty_name = __("PayPal Standard", 'event_espresso');
-        $this->_default_description = sprintf(
-            __(
-                'Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s',
-                'event_espresso'
-            ),
-            '<strong>',
-            '</strong>'
-        );
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url().'lib/paypal-logo.png';
-    }
-
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     *
-     * @return EE_Payment_Method_Form
-     * @throws \EE_Error
-     */
-    public function generate_new_settings_form()
-    {
-        require_once($this->file_folder() . 'EE_Paypal_Standard_Form.form.php');
-        $form =  new EE_Paypal_Standard_Form($this);
-        $form->get_input('PMD_debug_mode')->set_html_label_text(
-            sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
-        );
-        $form->get_input('shipping_details')->set_html_label_text(
-            sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
-        );
-        return $form;
-    }
-
-
-
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title'=>  __("PayPal Standard Settings", 'event_espresso'),
-                'filename'=>'payment_methods_overview_paypalstandard'
-            )
-        );
-    }
-
-
-
-    /**
-     * Logic to be accomplished when the payment attempt is complete.
-     * Most payment methods don't need to do anything at this point; but some, like Mijireh, do.
-     * (Mijireh is an offsite gateway which doesn't send an IPN. So when the user returns to EE from
-     * mijireh, this method needs to be called so the Mijireh PM can ping Mijireh to know the status
-     * of the payment). Fed a transaction because it's always assumed to be the last payment that
-     *
-     * @param EE_Transaction $transaction
-     * @return EE_Payment
-     * @throws \EE_Error
-     */
-    public function finalize_payment_for($transaction)
-    {
-        // PayPal standard actually sends the IPN info along with the user when they return to our site
-        // so in case the IPN is arriving later, let's try to process an IPN!
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            return $this->handle_ipn($_POST, $transaction);
-        } else {
-            return parent::finalize_payment_for($transaction);
-        }
-    }
+	const shipping_info_none = 1;
+	const shipping_info_optional = 0;
+	const shipping_info_required = 2;
+
+
+
+	/**
+	 * @param null $pm_instance
+	 * @return \EE_PMT_Paypal_Standard
+	 * @throws \EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder().'EEG_Paypal_Standard.gateway.php');
+		$this->_gateway = new EEG_Paypal_Standard();
+		$this->_pretty_name = __("PayPal Standard", 'event_espresso');
+		$this->_default_description = sprintf(
+			__(
+				'Upon submitting this form, you will be forwarded to PayPal to make your payment. %1$sMake sure you return to this site in order to properly finalize your registration.%2$s',
+				'event_espresso'
+			),
+			'<strong>',
+			'</strong>'
+		);
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url().'lib/paypal-logo.png';
+	}
+
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws \EE_Error
+	 */
+	public function generate_new_settings_form()
+	{
+		require_once($this->file_folder() . 'EE_Paypal_Standard_Form.form.php');
+		$form =  new EE_Paypal_Standard_Form($this);
+		$form->get_input('PMD_debug_mode')->set_html_label_text(
+			sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
+		);
+		$form->get_input('shipping_details')->set_html_label_text(
+			sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
+		);
+		return $form;
+	}
+
+
+
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title'=>  __("PayPal Standard Settings", 'event_espresso'),
+				'filename'=>'payment_methods_overview_paypalstandard'
+			)
+		);
+	}
+
+
+
+	/**
+	 * Logic to be accomplished when the payment attempt is complete.
+	 * Most payment methods don't need to do anything at this point; but some, like Mijireh, do.
+	 * (Mijireh is an offsite gateway which doesn't send an IPN. So when the user returns to EE from
+	 * mijireh, this method needs to be called so the Mijireh PM can ping Mijireh to know the status
+	 * of the payment). Fed a transaction because it's always assumed to be the last payment that
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return EE_Payment
+	 * @throws \EE_Error
+	 */
+	public function finalize_payment_for($transaction)
+	{
+		// PayPal standard actually sends the IPN info along with the user when they return to our site
+		// so in case the IPN is arriving later, let's try to process an IPN!
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			return $this->handle_ipn($_POST, $transaction);
+		} else {
+			return parent::finalize_payment_for($transaction);
+		}
+	}
 }

caffeinated/payment_methods/Mijireh/EE_PMT_Mijireh.pm.php

Indentation +94 added lines, -94 removed lines

@@ -14,98 +14,98 @@
 
 
 
-    /**
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Mijireh
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder().'EEG_Mijireh.gateway.php');
-        $this->_gateway = new EEG_Mijireh();
-        $this->_pretty_name = __("Mijireh", 'event_espresso');
-        $this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso');
-        parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url() . 'lib/mijireh-checkout-logo.png';
-    }
-
-
-
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                        'title' => __('Mijireh Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_overview_mijireh'
-                        ),
-        );
-    }
-
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        $form = new EE_Payment_Method_Form(
-            array(
-                'extra_meta_inputs' => array(
-                    'access_key' => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                __("Mijireh Access Key %s", 'event_espresso'),
-                                $this->get_help_tab_link()
-                            ),
-                            'required'        => true
-                        )
-                    ),
-                ),
-                'exclude'           => array( 'PMD_debug_mode' ),
-            )
-        );
-        $form->add_subsections(
-            array(
-                'slurper_area' => new EE_Form_Section_HTML_From_Template(
-                    $this->file_folder() . '/templates/mijireh_settings_after_form.template.php'
-                )
-            ),
-            null, // no specific subsection targeted
-            false // add to end
-        );
-        return $form;
-    }
-
-
-
-    /**
-     * Creates the billing form for this payment method type
-     * @param \EE_Transaction $transaction
-     * @return NULL
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        return null;
-    }
-
-
-
-    /**
-     *
-     * mijireh doesn't send an IPN in the usual sense
-     * they just send the user back to our thank you page
-     * and then we need to directly query them for the payment's status
-     * @param EE_Transaction $transaction
-     * @return \EE_Payment
-     */
-    public function finalize_payment_for($transaction)
-    {
-        return $this->handle_ipn($_REQUEST, $transaction);
-    }
+	/**
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Mijireh
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder().'EEG_Mijireh.gateway.php');
+		$this->_gateway = new EEG_Mijireh();
+		$this->_pretty_name = __("Mijireh", 'event_espresso');
+		$this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso');
+		parent::__construct($pm_instance);
+		$this->_default_button_url = $this->file_url() . 'lib/mijireh-checkout-logo.png';
+	}
+
+
+
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+						'title' => __('Mijireh Settings', 'event_espresso'),
+						'filename' => 'payment_methods_overview_mijireh'
+						),
+		);
+	}
+
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		$form = new EE_Payment_Method_Form(
+			array(
+				'extra_meta_inputs' => array(
+					'access_key' => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								__("Mijireh Access Key %s", 'event_espresso'),
+								$this->get_help_tab_link()
+							),
+							'required'        => true
+						)
+					),
+				),
+				'exclude'           => array( 'PMD_debug_mode' ),
+			)
+		);
+		$form->add_subsections(
+			array(
+				'slurper_area' => new EE_Form_Section_HTML_From_Template(
+					$this->file_folder() . '/templates/mijireh_settings_after_form.template.php'
+				)
+			),
+			null, // no specific subsection targeted
+			false // add to end
+		);
+		return $form;
+	}
+
+
+
+	/**
+	 * Creates the billing form for this payment method type
+	 * @param \EE_Transaction $transaction
+	 * @return NULL
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		return null;
+	}
+
+
+
+	/**
+	 *
+	 * mijireh doesn't send an IPN in the usual sense
+	 * they just send the user back to our thank you page
+	 * and then we need to directly query them for the payment's status
+	 * @param EE_Transaction $transaction
+	 * @return \EE_Payment
+	 */
+	public function finalize_payment_for($transaction)
+	{
+		return $this->handle_ipn($_REQUEST, $transaction);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
         $this->_pretty_name = __("Mijireh", 'event_espresso');
         $this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso');
         parent::__construct($pm_instance);
-        $this->_default_button_url = $this->file_url() . 'lib/mijireh-checkout-logo.png';
+        $this->_default_button_url = $this->file_url().'lib/mijireh-checkout-logo.png';
     }
 
 
@@ -67,13 +67,13 @@ 
                         )
                     ),
                 ),
-                'exclude'           => array( 'PMD_debug_mode' ),
+                'exclude'           => array('PMD_debug_mode'),
             )
         );
         $form->add_subsections(
             array(
                 'slurper_area' => new EE_Form_Section_HTML_From_Template(
-                    $this->file_folder() . '/templates/mijireh_settings_after_form.template.php'
+                    $this->file_folder().'/templates/mijireh_settings_after_form.template.php'
                 )
             ),
             null, // no specific subsection targeted

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Indentation +252 added lines, -252 removed lines

@@ -12,275 +12,275 @@
 {
 
 
-    /**
-     * @param EE_Payment_Method $pm_instance
-     * @return EE_PMT_Aim
-     * @throws \EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_setup_properties();
-        parent::__construct($pm_instance);
-    }
+	/**
+	 * @param EE_Payment_Method $pm_instance
+	 * @return EE_PMT_Aim
+	 * @throws \EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_setup_properties();
+		parent::__construct($pm_instance);
+	}
     
-    /**
-     * Sets up payment method type properties for this gateway, which is normally
-     * done in the constructor, but we want this to be easy for similar gateways to override
-     * while still calling the parent constructor.
-     * So children should override this method instead of __construct
-     */
-    protected function _setup_properties()
-    {
-        require_once($this->file_folder().'EEG_Aim.gateway.php');
-        $this->_gateway = new EEG_Aim();
-        $this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
-        $this->_default_description = __('Please provide the following billing information.', 'event_espresso');
-        $this->_requires_https = true;
-    }
+	/**
+	 * Sets up payment method type properties for this gateway, which is normally
+	 * done in the constructor, but we want this to be easy for similar gateways to override
+	 * while still calling the parent constructor.
+	 * So children should override this method instead of __construct
+	 */
+	protected function _setup_properties()
+	{
+		require_once($this->file_folder().'EEG_Aim.gateway.php');
+		$this->_gateway = new EEG_Aim();
+		$this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
+		$this->_requires_https = true;
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     *
-     * @param \EE_Transaction $transaction
-     * @return EE_Billing_Info_Form
-     * @throws \EE_Error
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        $billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
-            'name'=>'AIM_Form',
-            'subsections'=>array(
-                'credit_card'=>new EE_Credit_Card_Input(array(
-                    'required'=>true,
-                    'html_label_text' => __('Card Number', 'event_espresso')
-                )),
-                'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
-                    'required'=>true,
-                    'html_label_text' => __('Expiry Month', 'event_espresso')
-                )),
-                'exp_year'=>new EE_Credit_Card_Year_Input(array(
-                    'required'=>true,
-                    'html_label_text' => __('Expiry Year', 'event_espresso')
-                )),
-                'cvv'=>new EE_CVV_Input(array(
-                    'required'=>true,
-                    'html_label_text' => __('CVV', 'event_espresso') )),
-            )
-        ));
-        $billing_form->add_subsections(array(
-            'company' => new EE_Text_Input(array(
-                'html_label_text' => __('Company', 'event_espresso')
-            ))
-        ), 'email', false);
-        $billing_form->add_subsections(
-            array(
-                    'fax' => new EE_Text_Input(array(
-                        'html_label_text' => __('Fax', 'event_espresso')
-                    ))
-                ),
-            'phone',
-            false
-        );
-        $settings_form = $this->settings_form();
-        if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
-                $billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
-        }
-        if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
-            $required_inputs = $settings_form->get_input('required_billing_inputs')->normalized_value();
-            // only change the requirement of inputs which are allowed to be changed
-            /** @var EE_Form_Input_Base[] $inputs_to_evaluate */
-            $inputs_to_evaluate = array_intersect_key(
-                $billing_form->inputs(),
-                $this->billing_input_names()
-            );
-            foreach ($inputs_to_evaluate as $input_name => $input) {
-                if (in_array($input_name, $required_inputs)) {
-                    $input->set_required(true);
-                } else {
-                    $input->set_required(false);
-                }
-            }
-        }
-        return $this->apply_billing_form_debug_settings($billing_form);
-    }
+	/**
+	 * Creates the billing form for this payment method type
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return EE_Billing_Info_Form
+	 * @throws \EE_Error
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
+			'name'=>'AIM_Form',
+			'subsections'=>array(
+				'credit_card'=>new EE_Credit_Card_Input(array(
+					'required'=>true,
+					'html_label_text' => __('Card Number', 'event_espresso')
+				)),
+				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
+					'required'=>true,
+					'html_label_text' => __('Expiry Month', 'event_espresso')
+				)),
+				'exp_year'=>new EE_Credit_Card_Year_Input(array(
+					'required'=>true,
+					'html_label_text' => __('Expiry Year', 'event_espresso')
+				)),
+				'cvv'=>new EE_CVV_Input(array(
+					'required'=>true,
+					'html_label_text' => __('CVV', 'event_espresso') )),
+			)
+		));
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
+				'html_label_text' => __('Company', 'event_espresso')
+			))
+		), 'email', false);
+		$billing_form->add_subsections(
+			array(
+					'fax' => new EE_Text_Input(array(
+						'html_label_text' => __('Fax', 'event_espresso')
+					))
+				),
+			'phone',
+			false
+		);
+		$settings_form = $this->settings_form();
+		if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+				$billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
+		}
+		if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+			$required_inputs = $settings_form->get_input('required_billing_inputs')->normalized_value();
+			// only change the requirement of inputs which are allowed to be changed
+			/** @var EE_Form_Input_Base[] $inputs_to_evaluate */
+			$inputs_to_evaluate = array_intersect_key(
+				$billing_form->inputs(),
+				$this->billing_input_names()
+			);
+			foreach ($inputs_to_evaluate as $input_name => $input) {
+				if (in_array($input_name, $required_inputs)) {
+					$input->set_required(true);
+				} else {
+					$input->set_required(false);
+				}
+			}
+		}
+		return $this->apply_billing_form_debug_settings($billing_form);
+	}
 
 
 
-    /**
-     * apply_billing_form_debug_settings
-     * applies debug data to the form
-     *
-     * @param \EE_Billing_Info_Form $billing_form
-     * @return \EE_Billing_Info_Form
-     * @throws \EE_Error
-     */
-    public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
-    {
-        if ($this->_pm_instance->debug_mode()
-            || $this->_pm_instance->get_extra_meta('test_transactions', true, false)
-        ) {
-            $billing_form->get_input('credit_card')->set_default('4007000000027');
-            $billing_form->get_input('exp_year')->set_default('2020');
-            if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
-                $billing_form->get_input('cvv')->set_default('123');
-            }
-            $billing_form->add_subsections(
-                array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
-                'credit_card'
-            );
-            $billing_form->add_subsections(
-                array(
-                    'debug_content' => new EE_Form_Section_HTML_From_Template(
-                        __DIR__.'/templates/authorize_net_aim_debug_info.template.php'
-                    )
-                ),
-                'first_name'
-            );
-        }
-        return $billing_form;
-    }
+	/**
+	 * apply_billing_form_debug_settings
+	 * applies debug data to the form
+	 *
+	 * @param \EE_Billing_Info_Form $billing_form
+	 * @return \EE_Billing_Info_Form
+	 * @throws \EE_Error
+	 */
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form)
+	{
+		if ($this->_pm_instance->debug_mode()
+			|| $this->_pm_instance->get_extra_meta('test_transactions', true, false)
+		) {
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
+			$billing_form->get_input('exp_year')->set_default('2020');
+			if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
+				$billing_form->get_input('cvv')->set_default('123');
+			}
+			$billing_form->add_subsections(
+				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				'credit_card'
+			);
+			$billing_form->add_subsections(
+				array(
+					'debug_content' => new EE_Form_Section_HTML_From_Template(
+						__DIR__.'/templates/authorize_net_aim_debug_info.template.php'
+					)
+				),
+				'first_name'
+			);
+		}
+		return $billing_form;
+	}
 
 
 
-    /**
-     * Gets the form for all the settings related to this payment method type
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        $billing_input_names = $this->billing_input_names();
-        return new EE_Payment_Method_Form(
-            array(
-                'extra_meta_inputs'=>array(
-                    'login_id'=>new EE_Text_Input(
-                        array(
-                            'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
-                            'required' => true )
-                    ),
-                    'transaction_key'=>new EE_Text_Input(
-                        array(
-                            'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
-                            'required' => true )
-                    ),
-                    'test_transactions'=>new EE_Yes_No_Input(
-                        array(
-                            'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
-                            'default' => false,
-                            'required' => true
-                        )
-                    ),
-                    'excluded_billing_inputs' => new EE_Checkbox_Multi_Input(
-                        $billing_input_names,
-                        array(
-                        'html_label_text' => sprintf(__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
-                        'default' => array(
-                            'company',
-                            'fax',
-                        )
-                        )
-                    ),
-                    'required_billing_inputs' => new EE_Checkbox_Multi_Input(
-                        $billing_input_names,
-                        array(
-                            'html_label_text' => sprintf(__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'default' => array_diff(
-                                array_keys($billing_input_names),
-                                array( 'address2', 'phone', 'company', 'fax' )
-                            ),
-                            'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
-                        )
-                    ),
-                    'server' => new EE_Select_Input(
-                        apply_filters(
-                            'FHEE__EE_PMT_Aim__generate_new_settings_form__server_select_input__options',
-                            array(
-                                'akamai' => __('Authorize.net/Akamai (default)', 'event_espresso'),
-                                'authorize.net' => __('Authorize.net (deprecated)', 'event_espresso'),
-                            ),
-                            $this
-                        ),
-                        array(
-                            'html_label_text' => __('Server', 'event_espresso'),
-                            'html_help_text' => __('The Gateway Server where payment requests will be sent', 'event_espresso')
-                        )
-                    )
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		$billing_input_names = $this->billing_input_names();
+		return new EE_Payment_Method_Form(
+			array(
+				'extra_meta_inputs'=>array(
+					'login_id'=>new EE_Text_Input(
+						array(
+							'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
+							'required' => true )
+					),
+					'transaction_key'=>new EE_Text_Input(
+						array(
+							'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
+							'required' => true )
+					),
+					'test_transactions'=>new EE_Yes_No_Input(
+						array(
+							'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
+							'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
+							'default' => false,
+							'required' => true
+						)
+					),
+					'excluded_billing_inputs' => new EE_Checkbox_Multi_Input(
+						$billing_input_names,
+						array(
+						'html_label_text' => sprintf(__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
+						'default' => array(
+							'company',
+							'fax',
+						)
+						)
+					),
+					'required_billing_inputs' => new EE_Checkbox_Multi_Input(
+						$billing_input_names,
+						array(
+							'html_label_text' => sprintf(__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
+							'default' => array_diff(
+								array_keys($billing_input_names),
+								array( 'address2', 'phone', 'company', 'fax' )
+							),
+							'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
+						)
+					),
+					'server' => new EE_Select_Input(
+						apply_filters(
+							'FHEE__EE_PMT_Aim__generate_new_settings_form__server_select_input__options',
+							array(
+								'akamai' => __('Authorize.net/Akamai (default)', 'event_espresso'),
+								'authorize.net' => __('Authorize.net (deprecated)', 'event_espresso'),
+							),
+							$this
+						),
+						array(
+							'html_label_text' => __('Server', 'event_espresso'),
+							'html_help_text' => __('The Gateway Server where payment requests will be sent', 'event_espresso')
+						)
+					)
                         
-                )
-            )
-        );
-    }
+				)
+			)
+		);
+	}
     
-    /**
-     * Returns an array where keys are the slugs for billing inputs, and values
-     * are their i18n names
-     * @return array
-     */
-    public function billing_input_names()
-    {
-        return array(
-            'first_name' => __('First Name', 'event_espresso'),
-            'last_name' => __('Last Name', 'event_espresso'),
-            'email' => __('Email', 'event_espresso'),
-            'company' => __('Company', 'event_espresso'),
-            'address' => __('Address', 'event_espresso'),
-            'address2' => __('Address2', 'event_espresso'),
-            'city' => __('City', 'event_espresso'),
-            'state' => __('State', 'event_espresso'),
-            'country' => __('Country', 'event_espresso'),
-            'zip' =>  __('Zip', 'event_espresso'),
-            'phone' => __('Phone', 'event_espresso'),
-            'fax' => __('Fax', 'event_espresso'),
-            'cvv' => __('CVV', 'event_espresso')
-        );
-    }
+	/**
+	 * Returns an array where keys are the slugs for billing inputs, and values
+	 * are their i18n names
+	 * @return array
+	 */
+	public function billing_input_names()
+	{
+		return array(
+			'first_name' => __('First Name', 'event_espresso'),
+			'last_name' => __('Last Name', 'event_espresso'),
+			'email' => __('Email', 'event_espresso'),
+			'company' => __('Company', 'event_espresso'),
+			'address' => __('Address', 'event_espresso'),
+			'address2' => __('Address2', 'event_espresso'),
+			'city' => __('City', 'event_espresso'),
+			'state' => __('State', 'event_espresso'),
+			'country' => __('Country', 'event_espresso'),
+			'zip' =>  __('Zip', 'event_espresso'),
+			'phone' => __('Phone', 'event_espresso'),
+			'fax' => __('Fax', 'event_espresso'),
+			'cvv' => __('CVV', 'event_espresso')
+		);
+	}
     
-    /**
-     * Overrides parent so we always have all billing inputs in the returned array,
-     * not just the ones included at the time. This helps simplify the gateway code
-     *
-     * @param EE_Billing_Info_Form $billing_form
-     * @return array
-     */
-    protected function _get_billing_values_from_form($billing_form)
-    {
-        $all_billing_values_empty = array();
-        foreach (array_keys($this->billing_input_names()) as $input_name) {
-            $all_billing_values_empty[ $input_name ] = '';
-        }
-        return array_merge(
-            $all_billing_values_empty,
-            parent::_get_billing_values_from_form($billing_form)
-        );
-    }
+	/**
+	 * Overrides parent so we always have all billing inputs in the returned array,
+	 * not just the ones included at the time. This helps simplify the gateway code
+	 *
+	 * @param EE_Billing_Info_Form $billing_form
+	 * @return array
+	 */
+	protected function _get_billing_values_from_form($billing_form)
+	{
+		$all_billing_values_empty = array();
+		foreach (array_keys($this->billing_input_names()) as $input_name) {
+			$all_billing_values_empty[ $input_name ] = '';
+		}
+		return array_merge(
+			$all_billing_values_empty,
+			parent::_get_billing_values_from_form($billing_form)
+		);
+	}
 
 
 
-    /**
-     * Adds the help tab
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title' => __('Authorize.net AIM Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_aim'
-            ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title' => __('Authorize.net AIM Settings', 'event_espresso'),
+				'filename' => 'payment_methods_overview_aim'
+			),
+		);
+	}
 
 
 
-    /**
-     * Gets a list of instructions and/or information regarding how the payment is to be completed
-     * @return string
-     */
-    public function payment_information()
-    {
-        // TODO: Implement payment_information() method.
-    }
+	/**
+	 * Gets a list of instructions and/or information regarding how the payment is to be completed
+	 * @return string
+	 */
+	public function payment_information()
+	{
+		// TODO: Implement payment_information() method.
+	}
 }

caffeinated/modules/recaptcha_invisible/EED_Recaptcha_Invisible.module.php

Indentation +328 added lines, -328 removed lines

@@ -18,332 +18,332 @@
 class EED_Recaptcha_Invisible extends EED_Module
 {
 
-    /**
-     * @var EE_Registration_Config $config
-     */
-    private static $config;
-
-
-    /**
-     * @return EED_Module|EED_Recaptcha
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function set_hooks()
-    {
-        EED_Recaptcha_Invisible::setProperties();
-        if (EED_Recaptcha_Invisible::useInvisibleRecaptcha()) {
-            if (EED_Recaptcha_Invisible::protectForm('ticket_selector')) {
-                // ticket selection
-                add_filter(
-                    'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-                    array('EED_Recaptcha_Invisible', 'ticketSelectorForm'),
-                    10,
-                    3
-                );
-                add_action(
-                    'EED_Ticket_Selector__process_ticket_selections__before',
-                    array('EED_Recaptcha_Invisible', 'processTicketSelectorForm')
-                );
-            }
-            if (EED_Recaptcha_Invisible::protectForm('registration_form')) {
-                // checkout
-                add_action(
-                    'AHEE__EE_SPCO_Reg_Step__display_reg_form__reg_form',
-                    array('EED_Recaptcha_Invisible', 'spcoRegStepForm')
-                );
-                add_filter(
-                    'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data',
-                    array('EED_Recaptcha_Invisible', 'receiveSpcoRegStepForm'),
-                    10,
-                    2
-                );
-            }
-            add_action('loop_end', array('EED_Recaptcha_Invisible', 'localizeScriptVars'));
-        }
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function set_hooks_admin()
-    {
-        EED_Recaptcha_Invisible::setProperties();
-        if (EED_Recaptcha_Invisible::protectForm('ticket_selector')) {
-            add_action(
-                'EED_Ticket_Selector__process_ticket_selections__before',
-                array('EED_Recaptcha_Invisible', 'processTicketSelectorForm')
-            );
-        }
-        if (EED_Recaptcha_Invisible::protectForm('registration_form')) {
-            add_filter(
-                'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data',
-                array('EED_Recaptcha_Invisible', 'receiveSpcoRegStepForm'),
-                10,
-                2
-            );
-        }
-        // admin settings
-        add_action(
-            'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-            array('EED_Recaptcha_Invisible', 'adminSettings')
-        );
-        add_filter(
-            'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-            array('EED_Recaptcha_Invisible', 'updateAdminSettings')
-        );
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function setProperties()
-    {
-
-        EED_Recaptcha_Invisible::$config = EE_Registry::instance()->CFG->registration;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public static function useInvisibleRecaptcha()
-    {
-        return EED_Recaptcha_Invisible::$config->use_captcha
-               && EED_Recaptcha_Invisible::$config->recaptcha_theme === 'invisible';
-    }
-
-
-    /**
-     * @param string $form
-     * @return boolean
-     */
-    public static function protectForm($form)
-    {
-        return is_array(EED_Recaptcha_Invisible::$config->recaptcha_protected_forms)
-               && in_array($form, EED_Recaptcha_Invisible::$config->recaptcha_protected_forms, true);
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function localizeScriptVars()
-    {
-        /** @var \EventEspresso\core\services\request\Request $request */
-        $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
-        // Invisible Recaptcha is ONLY ever required for the frontend and admin
-        // so we don't need to load any JS assets for other types of requests (like AJAX or API).
-        if (! ($request->isAdmin() || $request->isFrontend())) {
-            return;
-        }
-        wp_localize_script(
-            EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA,
-            'eeRecaptcha',
-            RecaptchaFactory::create()->getLocalizedVars()
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    public static function assetsUrl()
-    {
-        return plugin_dir_url(__FILE__) . 'assets/';
-    }
-
-
-    /**
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws RuntimeException
-     */
-    public static function verifyToken(RequestInterface $request)
-    {
-        return RecaptchaFactory::create()->verifyToken($request);
-    }
-
-
-    /**
-     * @param EE_Form_Section_Proper $reg_form
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public static function spcoRegStepForm(EE_Form_Section_Proper $reg_form)
-    {
-        // do nothing if form isn't for a reg step or test has already been passed
-        if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
-            return;
-        }
-        $default_hidden_inputs = $reg_form->get_subsection('default_hidden_inputs');
-        if ($default_hidden_inputs instanceof EE_Form_Section_Proper) {
-            $invisible_recaptcha = RecaptchaFactory::create();
-            $invisible_recaptcha->addToFormSection($default_hidden_inputs);
-        }
-    }
-
-
-    /**
-     * @param EE_Form_Section_Proper $reg_form
-     * @return bool
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    public static function processSpcoRegStepForm(EE_Form_Section_Proper $reg_form)
-    {
-        return strpos($reg_form->name(), 'reg-step-form') !== false
-               && ! RecaptchaFactory::create()->recaptchaPassed();
-    }
-
-
-    /**
-     * @param array|null             $req_data
-     * @param EE_Form_Section_Proper $reg_form
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws RuntimeException
-     */
-    public static function receiveSpcoRegStepForm($req_data = array(), EE_Form_Section_Proper $reg_form)
-    {
-        // do nothing if form isn't for a reg step or test has already been passed
-        if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
-            return $req_data;
-        }
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-        if (! EED_Recaptcha_Invisible::verifyToken($request)) {
-            if ($request->isAjax()) {
-                $json_response = new EE_SPCO_JSON_Response();
-                $json_response->echoAndExit();
-            }
-            EEH_URL::safeRedirectAndExit(
-                EE_Registry::instance()->CFG->core->reg_page_url()
-            );
-        }
-        return $req_data;
-    }
-
-
-    /**
-     * @param string   $html
-     * @param EE_Event $event
-     * @param bool     $iframe
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws DomainException
-     */
-    public static function ticketSelectorForm($html = '', EE_Event $event, $iframe = false)
-    {
-        $recaptcha = RecaptchaFactory::create();
-        // do nothing if test has  already  been passed
-        if ($recaptcha->recaptchaPassed()) {
-            return $html;
-        }
-        $html .= $recaptcha->getInputHtml(
-            array(
-                'recaptcha_id'   => $event->ID(),
-                'iframe'         => $iframe,
-                'localized_vars' => $recaptcha->getLocalizedVars(),
-            )
-        );
-        return $html;
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws RuntimeException
-     */
-    public static function processTicketSelectorForm()
-    {
-        // do nothing if test has  already  been passed
-        if (RecaptchaFactory::create()->recaptchaPassed()) {
-            return;
-        }
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-        if (! EED_Recaptcha_Invisible::verifyToken($request)) {
-            $event_id = $request->getRequestParam('tkt-slctr-event-id');
-            $return_url = $request->requestParamIsSet("tkt-slctr-return-url-{$event_id}")
-                ? $request->getRequestParam("tkt-slctr-return-url-{$event_id}")
-                : get_permalink($event_id);
-            EEH_URL::safeRedirectAndExit($return_url);
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function adminSettings()
-    {
-        RecaptchaFactory::getAdminModule()->adminSettings();
-    }
-
-
-    /**
-     * @param EE_Registration_Config $EE_Registration_Config
-     * @return EE_Registration_Config
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public static function updateAdminSettings(EE_Registration_Config $EE_Registration_Config)
-    {
-        return RecaptchaFactory::getAdminModule()->updateAdminSettings($EE_Registration_Config);
-    }
+	/**
+	 * @var EE_Registration_Config $config
+	 */
+	private static $config;
+
+
+	/**
+	 * @return EED_Module|EED_Recaptcha
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function set_hooks()
+	{
+		EED_Recaptcha_Invisible::setProperties();
+		if (EED_Recaptcha_Invisible::useInvisibleRecaptcha()) {
+			if (EED_Recaptcha_Invisible::protectForm('ticket_selector')) {
+				// ticket selection
+				add_filter(
+					'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
+					array('EED_Recaptcha_Invisible', 'ticketSelectorForm'),
+					10,
+					3
+				);
+				add_action(
+					'EED_Ticket_Selector__process_ticket_selections__before',
+					array('EED_Recaptcha_Invisible', 'processTicketSelectorForm')
+				);
+			}
+			if (EED_Recaptcha_Invisible::protectForm('registration_form')) {
+				// checkout
+				add_action(
+					'AHEE__EE_SPCO_Reg_Step__display_reg_form__reg_form',
+					array('EED_Recaptcha_Invisible', 'spcoRegStepForm')
+				);
+				add_filter(
+					'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data',
+					array('EED_Recaptcha_Invisible', 'receiveSpcoRegStepForm'),
+					10,
+					2
+				);
+			}
+			add_action('loop_end', array('EED_Recaptcha_Invisible', 'localizeScriptVars'));
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function set_hooks_admin()
+	{
+		EED_Recaptcha_Invisible::setProperties();
+		if (EED_Recaptcha_Invisible::protectForm('ticket_selector')) {
+			add_action(
+				'EED_Ticket_Selector__process_ticket_selections__before',
+				array('EED_Recaptcha_Invisible', 'processTicketSelectorForm')
+			);
+		}
+		if (EED_Recaptcha_Invisible::protectForm('registration_form')) {
+			add_filter(
+				'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data',
+				array('EED_Recaptcha_Invisible', 'receiveSpcoRegStepForm'),
+				10,
+				2
+			);
+		}
+		// admin settings
+		add_action(
+			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
+			array('EED_Recaptcha_Invisible', 'adminSettings')
+		);
+		add_filter(
+			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
+			array('EED_Recaptcha_Invisible', 'updateAdminSettings')
+		);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function setProperties()
+	{
+
+		EED_Recaptcha_Invisible::$config = EE_Registry::instance()->CFG->registration;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public static function useInvisibleRecaptcha()
+	{
+		return EED_Recaptcha_Invisible::$config->use_captcha
+			   && EED_Recaptcha_Invisible::$config->recaptcha_theme === 'invisible';
+	}
+
+
+	/**
+	 * @param string $form
+	 * @return boolean
+	 */
+	public static function protectForm($form)
+	{
+		return is_array(EED_Recaptcha_Invisible::$config->recaptcha_protected_forms)
+			   && in_array($form, EED_Recaptcha_Invisible::$config->recaptcha_protected_forms, true);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function localizeScriptVars()
+	{
+		/** @var \EventEspresso\core\services\request\Request $request */
+		$request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
+		// Invisible Recaptcha is ONLY ever required for the frontend and admin
+		// so we don't need to load any JS assets for other types of requests (like AJAX or API).
+		if (! ($request->isAdmin() || $request->isFrontend())) {
+			return;
+		}
+		wp_localize_script(
+			EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA,
+			'eeRecaptcha',
+			RecaptchaFactory::create()->getLocalizedVars()
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public static function assetsUrl()
+	{
+		return plugin_dir_url(__FILE__) . 'assets/';
+	}
+
+
+	/**
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws RuntimeException
+	 */
+	public static function verifyToken(RequestInterface $request)
+	{
+		return RecaptchaFactory::create()->verifyToken($request);
+	}
+
+
+	/**
+	 * @param EE_Form_Section_Proper $reg_form
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public static function spcoRegStepForm(EE_Form_Section_Proper $reg_form)
+	{
+		// do nothing if form isn't for a reg step or test has already been passed
+		if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
+			return;
+		}
+		$default_hidden_inputs = $reg_form->get_subsection('default_hidden_inputs');
+		if ($default_hidden_inputs instanceof EE_Form_Section_Proper) {
+			$invisible_recaptcha = RecaptchaFactory::create();
+			$invisible_recaptcha->addToFormSection($default_hidden_inputs);
+		}
+	}
+
+
+	/**
+	 * @param EE_Form_Section_Proper $reg_form
+	 * @return bool
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	public static function processSpcoRegStepForm(EE_Form_Section_Proper $reg_form)
+	{
+		return strpos($reg_form->name(), 'reg-step-form') !== false
+			   && ! RecaptchaFactory::create()->recaptchaPassed();
+	}
+
+
+	/**
+	 * @param array|null             $req_data
+	 * @param EE_Form_Section_Proper $reg_form
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws RuntimeException
+	 */
+	public static function receiveSpcoRegStepForm($req_data = array(), EE_Form_Section_Proper $reg_form)
+	{
+		// do nothing if form isn't for a reg step or test has already been passed
+		if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
+			return $req_data;
+		}
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
+		if (! EED_Recaptcha_Invisible::verifyToken($request)) {
+			if ($request->isAjax()) {
+				$json_response = new EE_SPCO_JSON_Response();
+				$json_response->echoAndExit();
+			}
+			EEH_URL::safeRedirectAndExit(
+				EE_Registry::instance()->CFG->core->reg_page_url()
+			);
+		}
+		return $req_data;
+	}
+
+
+	/**
+	 * @param string   $html
+	 * @param EE_Event $event
+	 * @param bool     $iframe
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws DomainException
+	 */
+	public static function ticketSelectorForm($html = '', EE_Event $event, $iframe = false)
+	{
+		$recaptcha = RecaptchaFactory::create();
+		// do nothing if test has  already  been passed
+		if ($recaptcha->recaptchaPassed()) {
+			return $html;
+		}
+		$html .= $recaptcha->getInputHtml(
+			array(
+				'recaptcha_id'   => $event->ID(),
+				'iframe'         => $iframe,
+				'localized_vars' => $recaptcha->getLocalizedVars(),
+			)
+		);
+		return $html;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws RuntimeException
+	 */
+	public static function processTicketSelectorForm()
+	{
+		// do nothing if test has  already  been passed
+		if (RecaptchaFactory::create()->recaptchaPassed()) {
+			return;
+		}
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
+		if (! EED_Recaptcha_Invisible::verifyToken($request)) {
+			$event_id = $request->getRequestParam('tkt-slctr-event-id');
+			$return_url = $request->requestParamIsSet("tkt-slctr-return-url-{$event_id}")
+				? $request->getRequestParam("tkt-slctr-return-url-{$event_id}")
+				: get_permalink($event_id);
+			EEH_URL::safeRedirectAndExit($return_url);
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function adminSettings()
+	{
+		RecaptchaFactory::getAdminModule()->adminSettings();
+	}
+
+
+	/**
+	 * @param EE_Registration_Config $EE_Registration_Config
+	 * @return EE_Registration_Config
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public static function updateAdminSettings(EE_Registration_Config $EE_Registration_Config)
+	{
+		return RecaptchaFactory::getAdminModule()->updateAdminSettings($EE_Registration_Config);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -155,7 +155,7 @@ 
         $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
         // Invisible Recaptcha is ONLY ever required for the frontend and admin
         // so we don't need to load any JS assets for other types of requests (like AJAX or API).
-        if (! ($request->isAdmin() || $request->isFrontend())) {
+        if ( ! ($request->isAdmin() || $request->isFrontend())) {
             return;
         }
         wp_localize_script(
@@ -171,7 +171,7 @@ 
      */
     public static function assetsUrl()
     {
-        return plugin_dir_url(__FILE__) . 'assets/';
+        return plugin_dir_url(__FILE__).'assets/';
     }
 
 
@@ -209,7 +209,7 @@ 
     public static function spcoRegStepForm(EE_Form_Section_Proper $reg_form)
     {
         // do nothing if form isn't for a reg step or test has already been passed
-        if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
+        if ( ! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
             return;
         }
         $default_hidden_inputs = $reg_form->get_subsection('default_hidden_inputs');
@@ -248,12 +248,12 @@ 
     public static function receiveSpcoRegStepForm($req_data = array(), EE_Form_Section_Proper $reg_form)
     {
         // do nothing if form isn't for a reg step or test has already been passed
-        if (! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
+        if ( ! EED_Recaptcha_Invisible::processSpcoRegStepForm($reg_form)) {
             return $req_data;
         }
         /** @var RequestInterface $request */
         $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-        if (! EED_Recaptcha_Invisible::verifyToken($request)) {
+        if ( ! EED_Recaptcha_Invisible::verifyToken($request)) {
             if ($request->isAjax()) {
                 $json_response = new EE_SPCO_JSON_Response();
                 $json_response->echoAndExit();
@@ -311,7 +311,7 @@ 
         }
         /** @var RequestInterface $request */
         $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-        if (! EED_Recaptcha_Invisible::verifyToken($request)) {
+        if ( ! EED_Recaptcha_Invisible::verifyToken($request)) {
             $event_id = $request->getRequestParam('tkt-slctr-event-id');
             $return_url = $request->requestParamIsSet("tkt-slctr-return-url-{$event_id}")
                 ? $request->getRequestParam("tkt-slctr-return-url-{$event_id}")

caffeinated/modules/recaptcha/EED_Recaptcha.module.php

Indentation +376 added lines, -376 removed lines

@@ -18,380 +18,380 @@
 class EED_Recaptcha extends EED_Module
 {
 
-    /**
-     * @var EE_Registration_Config $config
-     */
-    private static $config;
-
-    /**
-     * @type bool $_not_a_robot
-     */
-    private static $_not_a_robot;
-
-    /**
-     * @type string $_recaptcha_response
-     */
-    private static $_recaptcha_response;
-
-
-    /**
-     * @return EED_Module|EED_Recaptcha
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function set_hooks()
-    {
-        EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
-        // use_captcha ?
-        if (EED_Recaptcha::useRecaptcha()
-            && EED_Recaptcha::notPaymentOptionsRevisit()
-        ) {
-            EED_Recaptcha::set_definitions();
-            EED_Recaptcha::enqueue_styles_and_scripts();
-            add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
-            add_action(
-                'AHEE__before_spco_whats_next_buttons',
-                array('EED_Recaptcha', 'display_recaptcha'),
-                10,
-                0
-            );
-            add_filter(
-                'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-                array('EED_Recaptcha', 'recaptcha_response')
-            );
-            add_filter(
-                'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-                array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method')
-            );
-        }
-    }
-
-
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function set_hooks_admin()
-    {
-        EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
-        EED_Recaptcha::set_definitions();
-        // use_captcha ?
-        if (EED_Recaptcha::useRecaptcha()
-            && EED_Recaptcha::notPaymentOptionsRevisit()
-            && EE_Registry::instance()->REQ->get('step', '') !== ''
-        ) {
-            EED_Recaptcha::enqueue_styles_and_scripts();
-            add_filter(
-                'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-                array('EED_Recaptcha', 'recaptcha_response')
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function set_definitions()
-    {
-        if (is_user_logged_in()) {
-            EED_Recaptcha::$_not_a_robot = true;
-        }
-        define(
-            'RECAPTCHA_BASE_PATH',
-            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
-        );
-        define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function set_late_hooks()
-    {
-        add_filter(
-            'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
-            array('EED_Recaptcha', 'not_a_robot')
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public static function useRecaptcha()
-    {
-        return EED_Recaptcha::$config->use_captcha
-               && EED_Recaptcha::$config->recaptcha_theme !== 'invisible';
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function notPaymentOptionsRevisit()
-    {
-        return ! (
-            EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
-            && (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
-        );
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_script(
-            'espresso_recaptcha',
-            RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
-            array('single_page_checkout'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_script(
-            'google_recaptcha',
-            'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
-            array('espresso_recaptcha'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        EE_Registry::$i18n_js_strings['no_SPCO_error'] = __(
-            'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __(
-            'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['recaptcha_fail'] = __(
-            'Please complete the anti-spam test before proceeding.',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function not_a_robot()
-    {
-        $not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot)
-            ? EED_Recaptcha::$_not_a_robot
-            : EED_Recaptcha::recaptcha_passed();
-        return $not_a_robot;
-    }
-
-
-    /**
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function display_recaptcha()
-    {
-        // logged in means you have already passed a turing test of sorts
-        if (is_user_logged_in()) {
-            return;
-        }
-        // don't display if not using recaptcha or user is logged in
-        if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
-            // only display if they have NOT passed the test yet
-            EEH_Template::display_template(
-                RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
-                array(
-                    'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
-                    'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
-                    'recaptcha_type'      => EED_Recaptcha::$config->recaptcha_type,
-                )
-            );
-            wp_enqueue_script('google_recaptcha');
-        }
-    }
-
-
-    /**
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function bypass_recaptcha_for_spco_load_payment_method()
-    {
-        return array(
-            'EESID'  => EE_Registry::instance()->SSN->id(),
-            'step'   => 'payment_options',
-            'action' => 'switch_spco_billing_form',
-        );
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function recaptcha_passed()
-    {
-        // logged in means you have already passed a turing test of sorts
-        if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
-            return true;
-        }
-        // was test already passed?
-        $recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
-        $recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
-        // verify recaptcha
-        EED_Recaptcha::_get_recaptcha_response();
-        if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
-            $recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
-            EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
-        }
-        EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
-        return $recaptcha_passed;
-    }
-
-
-    /**
-     * @param array $recaptcha_response
-     * @return array
-     */
-    public static function recaptcha_response($recaptcha_response = array())
-    {
-        if (EED_Recaptcha::_bypass_recaptcha()) {
-            $recaptcha_response['bypass_recaptcha'] = true;
-            $recaptcha_response['recaptcha_passed'] = true;
-        } else {
-            $recaptcha_response['recaptcha_passed'] = EED_Recaptcha::$_not_a_robot;
-        }
-        return $recaptcha_response;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private static function _bypass_recaptcha()
-    {
-        // an array of key value pairs that must match exactly with the incoming request,
-        // in order to bypass recaptcha for the current request ONLY
-        $bypass_request_params_array = (array) apply_filters(
-            'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-            array()
-        );
-        // does $bypass_request_params_array have any values ?
-        if (empty($bypass_request_params_array)) {
-            return false;
-        }
-        // initially set bypass to TRUE
-        $bypass_recaptcha = true;
-        foreach ($bypass_request_params_array as $key => $value) {
-            // if $key is not found or value doesn't match exactly, then toggle bypass to FALSE,
-            // otherwise carry over it's value. This way, one missed setting results in no bypass
-            $bypass_recaptcha = isset($_REQUEST[ $key ]) && $_REQUEST[ $key ] === $value
-                ? $bypass_recaptcha
-                : false;
-        }
-        return $bypass_recaptcha;
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    private static function _get_recaptcha_response()
-    {
-        EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get(
-            'g-recaptcha-response',
-            false
-        );
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    private static function _process_recaptcha_response()
-    {
-        // verify library is loaded
-        if (! class_exists('\ReCaptcha\ReCaptcha')) {
-            require_once RECAPTCHA_BASE_PATH . '/autoload.php';
-        }
-        // The response from reCAPTCHA
-        EED_Recaptcha::_get_recaptcha_response();
-        $recaptcha_response = EED_Recaptcha::$_recaptcha_response;
-        // Was there a reCAPTCHA response?
-        if ($recaptcha_response) {
-            // if allow_url_fopen is Off, then set a different request method
-            $request_method = ! ini_get('allow_url_fopen') ? new SocketPost() : null;
-            $recaptcha = new ReCaptcha(
-                EED_Recaptcha::$config->recaptcha_privatekey,
-                $request_method
-            );
-            $recaptcha_response = $recaptcha->verify(
-                EED_Recaptcha::$_recaptcha_response,
-                $_SERVER['REMOTE_ADDR']
-            );
-        }
-        return $recaptcha_response instanceof Response && $recaptcha_response->isSuccess();
-    }
+	/**
+	 * @var EE_Registration_Config $config
+	 */
+	private static $config;
+
+	/**
+	 * @type bool $_not_a_robot
+	 */
+	private static $_not_a_robot;
+
+	/**
+	 * @type string $_recaptcha_response
+	 */
+	private static $_recaptcha_response;
+
+
+	/**
+	 * @return EED_Module|EED_Recaptcha
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function set_hooks()
+	{
+		EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
+		// use_captcha ?
+		if (EED_Recaptcha::useRecaptcha()
+			&& EED_Recaptcha::notPaymentOptionsRevisit()
+		) {
+			EED_Recaptcha::set_definitions();
+			EED_Recaptcha::enqueue_styles_and_scripts();
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
+			add_action(
+				'AHEE__before_spco_whats_next_buttons',
+				array('EED_Recaptcha', 'display_recaptcha'),
+				10,
+				0
+			);
+			add_filter(
+				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
+				array('EED_Recaptcha', 'recaptcha_response')
+			);
+			add_filter(
+				'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
+				array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method')
+			);
+		}
+	}
+
+
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function set_hooks_admin()
+	{
+		EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
+		EED_Recaptcha::set_definitions();
+		// use_captcha ?
+		if (EED_Recaptcha::useRecaptcha()
+			&& EED_Recaptcha::notPaymentOptionsRevisit()
+			&& EE_Registry::instance()->REQ->get('step', '') !== ''
+		) {
+			EED_Recaptcha::enqueue_styles_and_scripts();
+			add_filter(
+				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
+				array('EED_Recaptcha', 'recaptcha_response')
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function set_definitions()
+	{
+		if (is_user_logged_in()) {
+			EED_Recaptcha::$_not_a_robot = true;
+		}
+		define(
+			'RECAPTCHA_BASE_PATH',
+			rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
+		);
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function set_late_hooks()
+	{
+		add_filter(
+			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
+			array('EED_Recaptcha', 'not_a_robot')
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public static function useRecaptcha()
+	{
+		return EED_Recaptcha::$config->use_captcha
+			   && EED_Recaptcha::$config->recaptcha_theme !== 'invisible';
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function notPaymentOptionsRevisit()
+	{
+		return ! (
+			EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
+			&& (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
+		);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_script(
+			'espresso_recaptcha',
+			RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
+			array('single_page_checkout'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_script(
+			'google_recaptcha',
+			'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
+			array('espresso_recaptcha'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __(
+			'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __(
+			'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __(
+			'Please complete the anti-spam test before proceeding.',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function not_a_robot()
+	{
+		$not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot)
+			? EED_Recaptcha::$_not_a_robot
+			: EED_Recaptcha::recaptcha_passed();
+		return $not_a_robot;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function display_recaptcha()
+	{
+		// logged in means you have already passed a turing test of sorts
+		if (is_user_logged_in()) {
+			return;
+		}
+		// don't display if not using recaptcha or user is logged in
+		if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
+			// only display if they have NOT passed the test yet
+			EEH_Template::display_template(
+				RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
+				array(
+					'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
+					'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
+					'recaptcha_type'      => EED_Recaptcha::$config->recaptcha_type,
+				)
+			);
+			wp_enqueue_script('google_recaptcha');
+		}
+	}
+
+
+	/**
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function bypass_recaptcha_for_spco_load_payment_method()
+	{
+		return array(
+			'EESID'  => EE_Registry::instance()->SSN->id(),
+			'step'   => 'payment_options',
+			'action' => 'switch_spco_billing_form',
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function recaptcha_passed()
+	{
+		// logged in means you have already passed a turing test of sorts
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
+			return true;
+		}
+		// was test already passed?
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
+		// verify recaptcha
+		EED_Recaptcha::_get_recaptcha_response();
+		if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
+			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
+		}
+		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
+		return $recaptcha_passed;
+	}
+
+
+	/**
+	 * @param array $recaptcha_response
+	 * @return array
+	 */
+	public static function recaptcha_response($recaptcha_response = array())
+	{
+		if (EED_Recaptcha::_bypass_recaptcha()) {
+			$recaptcha_response['bypass_recaptcha'] = true;
+			$recaptcha_response['recaptcha_passed'] = true;
+		} else {
+			$recaptcha_response['recaptcha_passed'] = EED_Recaptcha::$_not_a_robot;
+		}
+		return $recaptcha_response;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private static function _bypass_recaptcha()
+	{
+		// an array of key value pairs that must match exactly with the incoming request,
+		// in order to bypass recaptcha for the current request ONLY
+		$bypass_request_params_array = (array) apply_filters(
+			'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
+			array()
+		);
+		// does $bypass_request_params_array have any values ?
+		if (empty($bypass_request_params_array)) {
+			return false;
+		}
+		// initially set bypass to TRUE
+		$bypass_recaptcha = true;
+		foreach ($bypass_request_params_array as $key => $value) {
+			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE,
+			// otherwise carry over it's value. This way, one missed setting results in no bypass
+			$bypass_recaptcha = isset($_REQUEST[ $key ]) && $_REQUEST[ $key ] === $value
+				? $bypass_recaptcha
+				: false;
+		}
+		return $bypass_recaptcha;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	private static function _get_recaptcha_response()
+	{
+		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get(
+			'g-recaptcha-response',
+			false
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	private static function _process_recaptcha_response()
+	{
+		// verify library is loaded
+		if (! class_exists('\ReCaptcha\ReCaptcha')) {
+			require_once RECAPTCHA_BASE_PATH . '/autoload.php';
+		}
+		// The response from reCAPTCHA
+		EED_Recaptcha::_get_recaptcha_response();
+		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
+		// Was there a reCAPTCHA response?
+		if ($recaptcha_response) {
+			// if allow_url_fopen is Off, then set a different request method
+			$request_method = ! ini_get('allow_url_fopen') ? new SocketPost() : null;
+			$recaptcha = new ReCaptcha(
+				EED_Recaptcha::$config->recaptcha_privatekey,
+				$request_method
+			);
+			$recaptcha_response = $recaptcha->verify(
+				EED_Recaptcha::$_recaptcha_response,
+				$_SERVER['REMOTE_ADDR']
+			);
+		}
+		return $recaptcha_response instanceof Response && $recaptcha_response->isSuccess();
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -131,7 +131,7 @@ 
         }
         define(
             'RECAPTCHA_BASE_PATH',
-            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
+            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/').'/'
         );
         define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
     }
@@ -184,14 +184,14 @@ 
     {
         wp_register_script(
             'espresso_recaptcha',
-            RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
+            RECAPTCHA_BASE_URL.'scripts/espresso_recaptcha.js',
             array('single_page_checkout'),
             EVENT_ESPRESSO_VERSION,
             true
         );
         wp_register_script(
             'google_recaptcha',
-            'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
+            'https://www.google.com/recaptcha/api.js?hl='.EED_Recaptcha::$config->recaptcha_language,
             array('espresso_recaptcha'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -251,7 +251,7 @@ 
         if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
             // only display if they have NOT passed the test yet
             EEH_Template::display_template(
-                RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
+                RECAPTCHA_BASE_PATH.'/templates/recaptcha.template.php',
                 array(
                     'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
                     'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
@@ -296,7 +296,7 @@ 
         $recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
         // verify recaptcha
         EED_Recaptcha::_get_recaptcha_response();
-        if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
+        if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
             $recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
             EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
         }
@@ -341,7 +341,7 @@ 
         foreach ($bypass_request_params_array as $key => $value) {
             // if $key is not found or value doesn't match exactly, then toggle bypass to FALSE,
             // otherwise carry over it's value. This way, one missed setting results in no bypass
-            $bypass_recaptcha = isset($_REQUEST[ $key ]) && $_REQUEST[ $key ] === $value
+            $bypass_recaptcha = isset($_REQUEST[$key]) && $_REQUEST[$key] === $value
                 ? $bypass_recaptcha
                 : false;
         }
@@ -373,8 +373,8 @@ 
     private static function _process_recaptcha_response()
     {
         // verify library is loaded
-        if (! class_exists('\ReCaptcha\ReCaptcha')) {
-            require_once RECAPTCHA_BASE_PATH . '/autoload.php';
+        if ( ! class_exists('\ReCaptcha\ReCaptcha')) {
+            require_once RECAPTCHA_BASE_PATH.'/autoload.php';
         }
         // The response from reCAPTCHA
         EED_Recaptcha::_get_recaptcha_response();

caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php

Indentation +224 added lines, -224 removed lines

@@ -25,228 +25,228 @@
 {
 
 
-    /**
-     * @return EED_Event_Single_Caff
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        self::setDefinitions();
-        add_action(
-            'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
-            array('EED_Event_Single_Caff', 'load_scripts_styles'),
-            10
-        );
-        add_action(
-            'AHEE__template_settings__template__before_settings_form',
-            array('EED_Event_Single_Caff', 'template_settings_form'),
-            10
-        );
-        add_filter(
-            'FHEE__General_Settings_Admin_Page__update_template_settings__data',
-            array('EED_Event_Single_Caff', 'update_template_settings'),
-            10,
-            2
-        );
-        // AJAX
-        add_action(
-            'wp_ajax_espresso_update_event_single_order',
-            array('EED_Event_Single_Caff', 'update_event_single_order')
-        );
-        add_action(
-            'wp_ajax_nopriv_espresso_update_event_single_order',
-            array('EED_Event_Single_Caff', 'update_event_single_order')
-        );
-    }
-
-
-    public static function load_scripts_styles()
-    {
-        add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
-    }
-
-
-    public static function enqueue_scripts_styles()
-    {
-        wp_register_style(
-            'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
-            array(),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('eed-event-single-sortable');
-        wp_register_script(
-            'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
-            array('jquery-ui-sortable'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('eed-event-single-sortable');
-    }
-
-
-    /**
-     * Set constants only if they haven't been set yet.
-     */
-    public static function setDefinitions()
-    {
-        if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
-            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        }
-    }
-
-
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function template_settings_form()
-    {
-        $config = EE_Registry::instance()->CFG->template_settings;
-        $config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config
-            ? $config->EED_Event_Single : new EE_Event_Single_Config();
-        $config->use_sortable_display_order = isset($config->use_sortable_display_order)
-            ? $config->use_sortable_display_order : false;
-        $config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
-
-        $event_single_order_array = array();
-        $event_single_order_array[ $config->display_order_tickets ] = 'tickets';
-        $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-        $event_single_order_array[ $config->display_order_event ] = 'event';
-        $event_single_order_array[ $config->display_order_venue ] = 'venue';
-        // get template parts
-        $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
-        // convert to array so that we can add more properties
-        $config = get_object_vars($config);
-        $config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
-            'event-single-sortable-js',
-            '',
-            'single-sortable-li single-sortable-js'
-        );
-        EEH_Template::display_template(
-            EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
-            $config
-        );
-    }
-
-
-    /**
-     * update_template_settings
-     *
-     * @param EE_Template_Config $CFG
-     * @param array              $REQ
-     * @return EE_Template_Config
-     */
-    public static function update_template_settings(EE_Template_Config $CFG, $REQ)
-    {
-        if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
-            $CFG->EED_Event_Single = new EE_Event_Single_Config();
-        }
-        $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
-            ? $CFG->EED_Event_Single->display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
-        $display_order_datetimes = $CFG->EED_Event_Single->display_order_datetimes !== null
-            ? $CFG->EED_Event_Single->display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
-        $display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
-            ? $CFG->EED_Event_Single->display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
-        $display_order_venue = $CFG->EED_Event_Single->display_order_venue !== null
-            ? $CFG->EED_Event_Single->display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
-        $CFG->EED_Event_Single = new EE_Event_Single_Config();
-        $CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single'])
-                                                               && $REQ['display_status_banner_single'];
-        $CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'];
-        $CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order'])
-            ? absint($REQ['EED_Events_Single_use_sortable_display_order'])
-            : 0;
-        $CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
-        $CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
-        $CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
-        $CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
-        do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
-        return $CFG;
-    }
-
-
-    /**
-     * update_event_single_order
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function update_event_single_order()
-    {
-        $config_saved = false;
-        $template_parts = sanitize_text_field($_POST['elements']);
-        if (! empty($template_parts)) {
-            $template_parts = explode(',', trim($template_parts, ','));
-            foreach ($template_parts as $key => $template_part) {
-                $template_part = "display_order_$template_part";
-                $priority = ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
-                EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
-                do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
-            }
-            $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
-        }
-        if ($config_saved) {
-            EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
-        } else {
-            EE_Error::add_error(
-                __('Display Order was not updated.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        echo wp_json_encode(EE_Error::get_notices(false));
-        exit();
-    }
-
-
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @param WP $WP
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
+	/**
+	 * @return EED_Event_Single_Caff
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		self::setDefinitions();
+		add_action(
+			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
+			array('EED_Event_Single_Caff', 'load_scripts_styles'),
+			10
+		);
+		add_action(
+			'AHEE__template_settings__template__before_settings_form',
+			array('EED_Event_Single_Caff', 'template_settings_form'),
+			10
+		);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page__update_template_settings__data',
+			array('EED_Event_Single_Caff', 'update_template_settings'),
+			10,
+			2
+		);
+		// AJAX
+		add_action(
+			'wp_ajax_espresso_update_event_single_order',
+			array('EED_Event_Single_Caff', 'update_event_single_order')
+		);
+		add_action(
+			'wp_ajax_nopriv_espresso_update_event_single_order',
+			array('EED_Event_Single_Caff', 'update_event_single_order')
+		);
+	}
+
+
+	public static function load_scripts_styles()
+	{
+		add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
+	}
+
+
+	public static function enqueue_scripts_styles()
+	{
+		wp_register_style(
+			'eed-event-single-sortable',
+			EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
+			array(),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('eed-event-single-sortable');
+		wp_register_script(
+			'eed-event-single-sortable',
+			EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
+			array('jquery-ui-sortable'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('eed-event-single-sortable');
+	}
+
+
+	/**
+	 * Set constants only if they haven't been set yet.
+	 */
+	public static function setDefinitions()
+	{
+		if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
+			define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
+			define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		}
+	}
+
+
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function template_settings_form()
+	{
+		$config = EE_Registry::instance()->CFG->template_settings;
+		$config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config
+			? $config->EED_Event_Single : new EE_Event_Single_Config();
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order)
+			? $config->use_sortable_display_order : false;
+		$config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
+
+		$event_single_order_array = array();
+		$event_single_order_array[ $config->display_order_tickets ] = 'tickets';
+		$event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
+		$event_single_order_array[ $config->display_order_event ] = 'event';
+		$event_single_order_array[ $config->display_order_venue ] = 'venue';
+		// get template parts
+		$template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
+		// convert to array so that we can add more properties
+		$config = get_object_vars($config);
+		$config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
+			'event-single-sortable-js',
+			'',
+			'single-sortable-li single-sortable-js'
+		);
+		EEH_Template::display_template(
+			EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
+			$config
+		);
+	}
+
+
+	/**
+	 * update_template_settings
+	 *
+	 * @param EE_Template_Config $CFG
+	 * @param array              $REQ
+	 * @return EE_Template_Config
+	 */
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ)
+	{
+		if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
+			$CFG->EED_Event_Single = new EE_Event_Single_Config();
+		}
+		$display_order_event = $CFG->EED_Event_Single->display_order_event !== null
+			? $CFG->EED_Event_Single->display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
+		$display_order_datetimes = $CFG->EED_Event_Single->display_order_datetimes !== null
+			? $CFG->EED_Event_Single->display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+		$display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
+			? $CFG->EED_Event_Single->display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
+		$display_order_venue = $CFG->EED_Event_Single->display_order_venue !== null
+			? $CFG->EED_Event_Single->display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
+		$CFG->EED_Event_Single = new EE_Event_Single_Config();
+		$CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single'])
+															   && $REQ['display_status_banner_single'];
+		$CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'];
+		$CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order'])
+			? absint($REQ['EED_Events_Single_use_sortable_display_order'])
+			: 0;
+		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
+		$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+		$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
+		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
+		do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
+		return $CFG;
+	}
+
+
+	/**
+	 * update_event_single_order
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function update_event_single_order()
+	{
+		$config_saved = false;
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if (! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
+				$template_part = "display_order_$template_part";
+				$priority = ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
+				EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
+				do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
+			}
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
+		}
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
+		} else {
+			EE_Error::add_error(
+				__('Display Order was not updated.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		echo wp_json_encode(EE_Error::get_notices(false));
+		exit();
+	}
+
+
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -91,14 +91,14 @@ 
     {
         wp_register_style(
             'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
+            EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css',
             array(),
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('eed-event-single-sortable');
         wp_register_script(
             'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
+            EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js',
             array('jquery-ui-sortable'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -112,9 +112,9 @@ 
      */
     public static function setDefinitions()
     {
-        if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
-            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+        if ( ! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
+            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates/');
+            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
         }
     }
 
@@ -136,10 +136,10 @@ 
         $config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
 
         $event_single_order_array = array();
-        $event_single_order_array[ $config->display_order_tickets ] = 'tickets';
-        $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-        $event_single_order_array[ $config->display_order_event ] = 'event';
-        $event_single_order_array[ $config->display_order_venue ] = 'venue';
+        $event_single_order_array[$config->display_order_tickets] = 'tickets';
+        $event_single_order_array[$config->display_order_datetimes] = 'datetimes';
+        $event_single_order_array[$config->display_order_event] = 'event';
+        $event_single_order_array[$config->display_order_venue] = 'venue';
         // get template parts
         $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
         // convert to array so that we can add more properties
@@ -150,7 +150,7 @@ 
             'single-sortable-li single-sortable-js'
         );
         EEH_Template::display_template(
-            EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
+            EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php',
             $config
         );
     }
@@ -165,7 +165,7 @@ 
      */
     public static function update_template_settings(EE_Template_Config $CFG, $REQ)
     {
-        if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
+        if ( ! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
             $CFG->EED_Event_Single = new EE_Event_Single_Config();
         }
         $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
@@ -214,7 +214,7 @@ 
     {
         $config_saved = false;
         $template_parts = sanitize_text_field($_POST['elements']);
-        if (! empty($template_parts)) {
+        if ( ! empty($template_parts)) {
             $template_parts = explode(',', trim($template_parts, ','));
             foreach ($template_parts as $key => $template_part) {
                 $template_part = "display_order_$template_part";

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Indentation +293 added lines, -293 removed lines

@@ -17,318 +17,318 @@
 {
 
 
-    /**
-     * @return EED_Module|EED_Ticket_Selector_Caff
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Module|EED_Ticket_Selector_Caff
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
 
 
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        add_action(
-            'AHEE__ticket_selector_chart_template__ticket_details__after_description',
-            array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
-            10,
-            3
-        );
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		add_action(
+			'AHEE__ticket_selector_chart_template__ticket_details__after_description',
+			array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
+			10,
+			3
+		);
+	}
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        define(
-            'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
-        );
-        add_action(
-            'AHEE__template_settings__template__before_settings_form',
-            array('EED_Ticket_Selector_Caff', 'template_settings_form'),
-            10
-        );
-        add_filter(
-            'FHEE__General_Settings_Admin_Page__update_template_settings__data',
-            array('EED_Ticket_Selector_Caff', 'update_template_settings'),
-            10,
-            2
-        );
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		define(
+			'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
+			str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+		);
+		add_action(
+			'AHEE__template_settings__template__before_settings_form',
+			array('EED_Ticket_Selector_Caff', 'template_settings_form'),
+			10
+		);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page__update_template_settings__data',
+			array('EED_Ticket_Selector_Caff', 'update_template_settings'),
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-        $this->set_config();
-    }
+	/**
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+		$this->set_config();
+	}
 
 
-    /**
-     * @static
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function template_settings_form()
-    {
-        echo EED_Ticket_Selector_Caff::_ticket_selector_settings_form()->get_html();
-    }
+	/**
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function template_settings_form()
+	{
+		echo EED_Ticket_Selector_Caff::_ticket_selector_settings_form()->get_html();
+	}
 
 
-    /**
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public static function _ticket_selector_settings_form()
-    {
+	/**
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public static function _ticket_selector_settings_form()
+	{
 
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'ticket_selector_settings_form',
-                'html_id'         => 'ticket_selector_settings_form',
-                'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
-                    array(
-                        'appearance_settings_hdr' => new EE_Form_Section_HTML(
-                            EEH_HTML::br(2) .
-                            EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
-                        ),
-                        'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
-                    )
-                ),
-            )
-        );
-    }
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'ticket_selector_settings_form',
+				'html_id'         => 'ticket_selector_settings_form',
+				'layout_strategy' => new EE_Div_Per_Section_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
+					array(
+						'appearance_settings_hdr' => new EE_Form_Section_HTML(
+							EEH_HTML::br(2) .
+							EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
+						),
+						'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
+					)
+				),
+			)
+		);
+	}
 
 
-    /**
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public static function _ticket_selector_appearance_settings()
-    {
-        if (! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
-        ) {
-            EED_Ticket_Selector::instance()->set_config();
-            EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = EED_Ticket_Selector::instance()
-                                                                                                      ->config();
-        }
-        $EE_Ticket_Selector_Config = EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector;
-        // get option for whether to show datetime selector in TS
-        $show_datetime_selector = $EE_Ticket_Selector_Config->getShowDatetimeSelector();
-        // and option for how may datetimes must exist if display is conditional
-        $datetime_selector_threshold = $EE_Ticket_Selector_Config->getDatetimeSelectorThreshold();
+	/**
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public static function _ticket_selector_appearance_settings()
+	{
+		if (! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
+		) {
+			EED_Ticket_Selector::instance()->set_config();
+			EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = EED_Ticket_Selector::instance()
+																									  ->config();
+		}
+		$EE_Ticket_Selector_Config = EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector;
+		// get option for whether to show datetime selector in TS
+		$show_datetime_selector = $EE_Ticket_Selector_Config->getShowDatetimeSelector();
+		// and option for how may datetimes must exist if display is conditional
+		$datetime_selector_threshold = $EE_Ticket_Selector_Config->getDatetimeSelectorThreshold();
 
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'ticket_selector_settings_tbl',
-                'html_id'         => 'ticket_selector_settings_tbl',
-                'html_class'      => 'form-table',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections',
-                    array(
-                        'show_ticket_details'         => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Ticket Details?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'This lets you choose whether the extra ticket details section is displayed with the ticket selector.',
-                                    'event_espresso'
-                                ),
-                                'default'                 => isset($EE_Ticket_Selector_Config->show_ticket_details)
-                                    ? $EE_Ticket_Selector_Config->show_ticket_details
-                                    : true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_ticket_sale_columns'    => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Ticket Sale Info?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.',
-                                    'event_espresso'
-                                ),
-                                'default'                 => isset($EE_Ticket_Selector_Config->show_ticket_sale_columns)
-                                    ? $EE_Ticket_Selector_Config->show_ticket_sale_columns
-                                    : true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_expired_tickets'        => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Expired Tickets?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'Indicate whether to show expired tickets in the ticket selector',
-                                    'event_espresso'
-                                ),
-                                'default'                 => isset($EE_Ticket_Selector_Config->show_expired_tickets)
-                                    ? $EE_Ticket_Selector_Config->show_expired_tickets
-                                    : true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_datetime_selector'      => new EE_Select_Input(
-                            $EE_Ticket_Selector_Config->getShowDatetimeSelectorOptions(false),
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Date & Time Filter?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => sprintf(
-                                    esc_html__(
-                                        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s   this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s   this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
-                                        'event_espresso'
-                                    ),
-                                    '<br>',
-                                    '<strong>',
-                                    '</strong>'
-                                ),
-                                'default'                 => ! empty($show_datetime_selector)
-                                    ? $show_datetime_selector
-                                    : EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'datetime_selector_threshold' => new EE_Select_Input(
-                            array_combine($r = range(1, 10), $r),
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Date & Time Filter Threshold',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'The number of unique dates an event has to have before conditionally displaying a date & time filter',
-                                    'event_espresso'
-                                ),
-                                'default'                 => ! empty($datetime_selector_threshold)
-                                    ? $datetime_selector_threshold
-                                    : 3,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'datetime_selector_max_checked' => new EE_Integer_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Date & Time Filter Max Checked',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => sprintf(
-                                    esc_html__(
-                                        'Determines the maximum number of dates that will be checked upon initial loading for a Date and Time Filter.%1$sIf set to zero or left blank, then ALL dates will be checked upon initial loading.',
-                                        'event_espresso'
-                                    ),
-                                    '<br>'
-                                ),
-                                'default'                 => $EE_Ticket_Selector_Config->getDatetimeSelectorMaxChecked(),
-                                'display_html_label_text' => false,
-                                'min_value'               => 0,
-                            )
-                        ),
-                    )
-                ),
-            )
-        );
-    }
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'ticket_selector_settings_tbl',
+				'html_id'         => 'ticket_selector_settings_tbl',
+				'html_class'      => 'form-table',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections',
+					array(
+						'show_ticket_details'         => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Ticket Details?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'This lets you choose whether the extra ticket details section is displayed with the ticket selector.',
+									'event_espresso'
+								),
+								'default'                 => isset($EE_Ticket_Selector_Config->show_ticket_details)
+									? $EE_Ticket_Selector_Config->show_ticket_details
+									: true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_ticket_sale_columns'    => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Ticket Sale Info?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.',
+									'event_espresso'
+								),
+								'default'                 => isset($EE_Ticket_Selector_Config->show_ticket_sale_columns)
+									? $EE_Ticket_Selector_Config->show_ticket_sale_columns
+									: true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_expired_tickets'        => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Expired Tickets?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'Indicate whether to show expired tickets in the ticket selector',
+									'event_espresso'
+								),
+								'default'                 => isset($EE_Ticket_Selector_Config->show_expired_tickets)
+									? $EE_Ticket_Selector_Config->show_expired_tickets
+									: true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_datetime_selector'      => new EE_Select_Input(
+							$EE_Ticket_Selector_Config->getShowDatetimeSelectorOptions(false),
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Date & Time Filter?',
+									'event_espresso'
+								),
+								'html_help_text'          => sprintf(
+									esc_html__(
+										'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
+										'event_espresso'
+									),
+									'<br>',
+									'<strong>',
+									'</strong>'
+								),
+								'default'                 => ! empty($show_datetime_selector)
+									? $show_datetime_selector
+									: EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
+								'display_html_label_text' => false,
+							)
+						),
+						'datetime_selector_threshold' => new EE_Select_Input(
+							array_combine($r = range(1, 10), $r),
+							array(
+								'html_label_text'         => esc_html__(
+									'Date & Time Filter Threshold',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'The number of unique dates an event has to have before conditionally displaying a date & time filter',
+									'event_espresso'
+								),
+								'default'                 => ! empty($datetime_selector_threshold)
+									? $datetime_selector_threshold
+									: 3,
+								'display_html_label_text' => false,
+							)
+						),
+						'datetime_selector_max_checked' => new EE_Integer_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Date & Time Filter Max Checked',
+									'event_espresso'
+								),
+								'html_help_text'          => sprintf(
+									esc_html__(
+										'Determines the maximum number of dates that will be checked upon initial loading for a Date and Time Filter.%1$sIf set to zero or left blank, then ALL dates will be checked upon initial loading.',
+										'event_espresso'
+									),
+									'<br>'
+								),
+								'default'                 => $EE_Ticket_Selector_Config->getDatetimeSelectorMaxChecked(),
+								'display_html_label_text' => false,
+								'min_value'               => 0,
+							)
+						),
+					)
+				),
+			)
+		);
+	}
 
 
-    /**
-     * callback for updating template settings
-     *
-     * @since 4.6.18.rc.006
-     * @param EE_Template_Config $CFG
-     * @param array              $REQ incoming request
-     * @return EE_Template_Config
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function update_template_settings(EE_Template_Config $CFG, $REQ)
-    {
-        if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
-            EED_Ticket_Selector::instance()->set_config();
-            $CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
-        }
-        try {
-            $ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
+	/**
+	 * callback for updating template settings
+	 *
+	 * @since 4.6.18.rc.006
+	 * @param EE_Template_Config $CFG
+	 * @param array              $REQ incoming request
+	 * @return EE_Template_Config
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ)
+	{
+		if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
+			EED_Ticket_Selector::instance()->set_config();
+			$CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
+		}
+		try {
+			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
-            // check for form submission
-            if ($ticket_selector_form->was_submitted()) {
-                // capture form data
-                $ticket_selector_form->receive_form_submission();
+			// check for form submission
+			if ($ticket_selector_form->was_submitted()) {
+				// capture form data
+				$ticket_selector_form->receive_form_submission();
 
-                // validate form data
-                if ($ticket_selector_form->is_valid()) {
-                    // grab validated data from form
-                    $valid_data = $ticket_selector_form->valid_data();
+				// validate form data
+				if ($ticket_selector_form->is_valid()) {
+					// grab validated data from form
+					$valid_data = $ticket_selector_form->valid_data();
 
-                    // set data on config
-                    $CFG->EED_Ticket_Selector->show_ticket_sale_columns = $valid_data['appearance_settings']['show_ticket_sale_columns'];
-                    $CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
-                    $CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
-                    $CFG->EED_Ticket_Selector->setShowDatetimeSelector(
-                        $valid_data['appearance_settings']['show_datetime_selector']
-                    );
-                    $CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
-                        $valid_data['appearance_settings']['datetime_selector_threshold']
-                    );
-                    $CFG->EED_Ticket_Selector->setDatetimeSelectorMaxChecked(
-                        $valid_data['appearance_settings']['datetime_selector_max_checked']
-                    );
-                } else {
-                    if ($ticket_selector_form->submission_error_message() !== '') {
-                        EE_Error::add_error(
-                            $ticket_selector_form->submission_error_message(),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                    }
-                }
-            }
-        } catch (EE_Error $e) {
-            $e->get_error();
-        }
+					// set data on config
+					$CFG->EED_Ticket_Selector->show_ticket_sale_columns = $valid_data['appearance_settings']['show_ticket_sale_columns'];
+					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
+					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
+					$CFG->EED_Ticket_Selector->setShowDatetimeSelector(
+						$valid_data['appearance_settings']['show_datetime_selector']
+					);
+					$CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
+						$valid_data['appearance_settings']['datetime_selector_threshold']
+					);
+					$CFG->EED_Ticket_Selector->setDatetimeSelectorMaxChecked(
+						$valid_data['appearance_settings']['datetime_selector_max_checked']
+					);
+				} else {
+					if ($ticket_selector_form->submission_error_message() !== '') {
+						EE_Error::add_error(
+							$ticket_selector_form->submission_error_message(),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+					}
+				}
+			}
+		} catch (EE_Error $e) {
+			$e->get_error();
+		}
 
-        return $CFG;
-    }
+		return $CFG;
+	}
 
 
-    /**
-     * @param \EE_Ticket $ticket
-     * @param int        $ticket_price
-     * @param bool       $display_ticket_price
-     */
-    public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false)
-    {
-        require str_replace('\\', '/', plugin_dir_path(__FILE__))
-                . 'templates/ticket_selector_price_details.template.php';
-    }
+	/**
+	 * @param \EE_Ticket $ticket
+	 * @param int        $ticket_price
+	 * @param bool       $display_ticket_price
+	 */
+	public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false)
+	{
+		require str_replace('\\', '/', plugin_dir_path(__FILE__))
+				. 'templates/ticket_selector_price_details.template.php';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
     {
         define(
             'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+            str_replace('\\', '/', plugin_dir_path(__FILE__)).'templates/'
         );
         add_action(
             'AHEE__template_settings__template__before_settings_form',
@@ -107,7 +107,7 @@ 
                     'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
                     array(
                         'appearance_settings_hdr' => new EE_Form_Section_HTML(
-                            EEH_HTML::br(2) .
+                            EEH_HTML::br(2).
                             EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
                         ),
                         'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
@@ -124,7 +124,7 @@ 
      */
     public static function _ticket_selector_appearance_settings()
     {
-        if (! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
+        if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
         ) {
             EED_Ticket_Selector::instance()->set_config();
             EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = EED_Ticket_Selector::instance()
@@ -272,7 +272,7 @@ 
      */
     public static function update_template_settings(EE_Template_Config $CFG, $REQ)
     {
-        if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
+        if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             EED_Ticket_Selector::instance()->set_config();
             $CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
         }