eventespresso / event-espresso-core

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Contacts_incoming_data.class.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 
         // validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
         $ctc_chk = reset($data);
-        if (! $ctc_chk instanceof EE_Attendee) {
+        if ( ! $ctc_chk instanceof EE_Attendee) {
             throw new EE_Error(esc_html__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
         }
 
@@ -43,7 +43,7 @@ 
     {
         $attendee_ids = array_filter(
             array_map(
-                function ($attendee) {
+                function($attendee) {
                     if ($attendee instanceof EE_Attendee) {
                         return $attendee->ID();
                     }
@@ -68,7 +68,7 @@ 
         $attendee_ids = (array) $attendee_ids;
         $attendees = EEM_Attendee::instance()->get_all(
             array(
-              array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+              array('ATT_ID' => array('IN', $attendee_ids))
             )
         );
         return $attendees;
@@ -98,7 +98,7 @@ 
         $this->payment = null;
         $this->billing = array();
         $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer = $this->registrations = array();
         $this->total_ticket_count = 0;
         $this->primary_attendee_data = array(
             'registration_id' => 0,
@@ -111,11 +111,11 @@ 
         foreach ($this->_data as $contact) {
             $id = $contact->ID();
             $reg = $contact->get_first_related('Registration');
-            $this->attendees[ $id ]['att_obj'] = $contact;
-            $this->attendees[ $id ]['reg_objs'][ $reg->ID() ] = $reg;
-            $this->attendees[ $id ]['attendee_email'] = $contact->email();
-            $this->attendees[ $id ]['tkt_objs'] = array();
-            $this->attendees[ $id ]['evt_objs'] = array();
+            $this->attendees[$id]['att_obj'] = $contact;
+            $this->attendees[$id]['reg_objs'][$reg->ID()] = $reg;
+            $this->attendees[$id]['attendee_email'] = $contact->email();
+            $this->attendees[$id]['tkt_objs'] = array();
+            $this->attendees[$id]['evt_objs'] = array();
         }
     }
 }

Indentation +91 added lines, -91 removed lines

@@ -11,109 +11,109 @@
  */
 class EE_Messages_Contacts_incoming_data extends EE_Messages_incoming_data
 {
-    /**
-     * Constructor.
-     *
-     * @since    4.3.0
-     * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
-     * @throws EE_Error
-     * @access protected
-     */
-    public function __construct($data = array())
-    {
+	/**
+	 * Constructor.
+	 *
+	 * @since    4.3.0
+	 * @param  EE_Attendee[]     $data expecting an array of EE_Attendee objects.
+	 * @throws EE_Error
+	 * @access protected
+	 */
+	public function __construct($data = array())
+	{
 
-        // validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-        $ctc_chk = reset($data);
-        if (! $ctc_chk instanceof EE_Attendee) {
-            throw new EE_Error(esc_html__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
-        }
+		// validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
+		$ctc_chk = reset($data);
+		if (! $ctc_chk instanceof EE_Attendee) {
+			throw new EE_Error(esc_html__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
+		}
 
-        parent::__construct($data);
-    }
+		parent::__construct($data);
+	}
 
 
-    /**
-     * @see parent class for phpdocs.
-     * @param array $attendees
-     * @return array
-     */
-    public static function convert_data_for_persistent_storage($attendees)
-    {
-        $attendee_ids = array_filter(
-            array_map(
-                function ($attendee) {
-                    if ($attendee instanceof EE_Attendee) {
-                        return $attendee->ID();
-                    }
-                    return false;
-                },
-                $attendees
-            )
-        );
-        return $attendee_ids;
-    }
+	/**
+	 * @see parent class for phpdocs.
+	 * @param array $attendees
+	 * @return array
+	 */
+	public static function convert_data_for_persistent_storage($attendees)
+	{
+		$attendee_ids = array_filter(
+			array_map(
+				function ($attendee) {
+					if ($attendee instanceof EE_Attendee) {
+						return $attendee->ID();
+					}
+					return false;
+				},
+				$attendees
+			)
+		);
+		return $attendee_ids;
+	}
 
 
 
 
-    /**
-     * @see parent class for phpdocs
-     * @param array $attendee_ids
-     * @return EE_Attendee[]
-     */
-    public static function convert_data_from_persistent_storage($attendee_ids)
-    {
-        $attendee_ids = (array) $attendee_ids;
-        $attendees = EEM_Attendee::instance()->get_all(
-            array(
-              array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
-            )
-        );
-        return $attendees;
-    }
+	/**
+	 * @see parent class for phpdocs
+	 * @param array $attendee_ids
+	 * @return EE_Attendee[]
+	 */
+	public static function convert_data_from_persistent_storage($attendee_ids)
+	{
+		$attendee_ids = (array) $attendee_ids;
+		$attendees = EEM_Attendee::instance()->get_all(
+			array(
+			  array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+			)
+		);
+		return $attendees;
+	}
 
 
 
 
-    /**
-     * setup the data.
-     *
-     * Sets up the expected data object for the messages prep using incoming registration objects.
-     *
-     * @since   4.3.0
-     *
-     * @return void
-     * @access protected
-     */
-    protected function _setup_data()
-    {
+	/**
+	 * setup the data.
+	 *
+	 * Sets up the expected data object for the messages prep using incoming registration objects.
+	 *
+	 * @since   4.3.0
+	 *
+	 * @return void
+	 * @access protected
+	 */
+	protected function _setup_data()
+	{
 
-        // we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
-        $this->txn = null;
-        $this->taxes = null;
-        $this->grand_total_price_object = '';
-        $this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
-        $this->payment = null;
-        $this->billing = array();
-        $this->reg_objs = array();
-        $this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
-        $this->total_ticket_count = 0;
-        $this->primary_attendee_data = array(
-            'registration_id' => 0,
-            'att_obj' => null,
-            'reg_obj' => null,
-            'primary_att_obj' => null,
-            'primary_reg_obj' => null
-            );
+		// we'll loop through each contact and setup the data needed.  Note that many properties will just be set as empty because the contacts data handler is for a very specific set of data (i.e. just what's related to the contact).
+		$this->txn = null;
+		$this->taxes = null;
+		$this->grand_total_price_object = '';
+		$this->user_id = $this->ip_address = $this->user_agent = $this->init_access = '';
+		$this->payment = null;
+		$this->billing = array();
+		$this->reg_objs = array();
+		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+		$this->total_ticket_count = 0;
+		$this->primary_attendee_data = array(
+			'registration_id' => 0,
+			'att_obj' => null,
+			'reg_obj' => null,
+			'primary_att_obj' => null,
+			'primary_reg_obj' => null
+			);
 
-        foreach ($this->_data as $contact) {
-            $id = $contact->ID();
-            $reg = $contact->get_first_related('Registration');
-            $this->attendees[ $id ]['att_obj'] = $contact;
-            $this->attendees[ $id ]['reg_objs'][ $reg->ID() ] = $reg;
-            $this->attendees[ $id ]['attendee_email'] = $contact->email();
-            $this->attendees[ $id ]['tkt_objs'] = array();
-            $this->attendees[ $id ]['evt_objs'] = array();
-        }
-    }
+		foreach ($this->_data as $contact) {
+			$id = $contact->ID();
+			$reg = $contact->get_first_related('Registration');
+			$this->attendees[ $id ]['att_obj'] = $contact;
+			$this->attendees[ $id ]['reg_objs'][ $reg->ID() ] = $reg;
+			$this->attendees[ $id ]['attendee_email'] = $contact->email();
+			$this->attendees[ $id ]['tkt_objs'] = array();
+			$this->attendees[ $id ]['evt_objs'] = array();
+		}
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_reminder/EE_Payment_Reminder_message_type.class.php

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
 class EE_Payment_Reminder_message_type extends EE_Payment_Base_message_type
 {
 
-    public function __construct()
-    {
-
-        // setup type details for reference
-        $this->name = 'payment_reminder';
-        $this->description = esc_html__('This message type is used for all payment reminder messages.  These are triggered when an offline gateway registration is completed or when manually triggered via event administrators via the transaction admin page(s).', 'event_espresso');
-        $this->label = array(
-            'singular' => esc_html__('payment reminder', 'event_espresso'),
-            'plural' => esc_html__('payment reminders', 'event_espresso')
-            );
-        $this->_master_templates = array(
-            'email' => 'payment'
-            );
-
-        parent::__construct();
-    }
-
-
-
-    /**
-     * _set_contexts
-     * This sets up the contexts associated with the message_type
-     *
-     * @access  protected
-     * @return  void
-     */
-    protected function _set_contexts()
-    {
-        $this->_context_label = array(
-            'label' => esc_html__('recipient', 'event_espresso'),
-            'plural' => esc_html__('recipients', 'event_espresso'),
-            'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
-            );
-
-        $this->_contexts = array(
-            'admin' => array(
-                'label' => esc_html__('Event Admin', 'event_espresso'),
-                'description' => esc_html__('This template is what event administrators will receive on a successful payment', 'event_espresso')
-                ),
-            'primary_attendee' => array(
-                'label' => esc_html__('Primary Registrant', 'event_espresso'),
-                'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive on successful payment', 'event_espresso')
-                )
-            );
-    }
+	public function __construct()
+	{
+
+		// setup type details for reference
+		$this->name = 'payment_reminder';
+		$this->description = esc_html__('This message type is used for all payment reminder messages.  These are triggered when an offline gateway registration is completed or when manually triggered via event administrators via the transaction admin page(s).', 'event_espresso');
+		$this->label = array(
+			'singular' => esc_html__('payment reminder', 'event_espresso'),
+			'plural' => esc_html__('payment reminders', 'event_espresso')
+			);
+		$this->_master_templates = array(
+			'email' => 'payment'
+			);
+
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * _set_contexts
+	 * This sets up the contexts associated with the message_type
+	 *
+	 * @access  protected
+	 * @return  void
+	 */
+	protected function _set_contexts()
+	{
+		$this->_context_label = array(
+			'label' => esc_html__('recipient', 'event_espresso'),
+			'plural' => esc_html__('recipients', 'event_espresso'),
+			'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
+			);
+
+		$this->_contexts = array(
+			'admin' => array(
+				'label' => esc_html__('Event Admin', 'event_espresso'),
+				'description' => esc_html__('This template is what event administrators will receive on a successful payment', 'event_espresso')
+				),
+			'primary_attendee' => array(
+				'label' => esc_html__('Primary Registrant', 'event_espresso'),
+				'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive on successful payment', 'event_espresso')
+				)
+			);
+	}
 }

caffeinated/core/libraries/messages/message_type/payment_declined/EE_Payment_Declined_message_type.class.php

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
 class EE_Payment_Declined_message_type extends EE_Payment_Base_message_type
 {
 
-    public function __construct()
-    {
-
-        // setup type details for reference
-        $this->name = 'payment_declined';
-        $this->description = esc_html__('This message type is used for all declined payment notification messages that go out including any manual payments entered by an event administrator.', 'event_espresso');
-        $this->label = array(
-            'singular' => esc_html__('payment declined', 'event_espresso'),
-            'plural' => esc_html__('payments declined', 'event_espresso')
-            );
-
-        $this->_master_templates = array(
-            'email' => 'payment'
-            );
-
-        parent::__construct();
-    }
-
-
-    /**
-     * _set_contexts
-     * This sets up the contexts associated with the message_type
-     *
-     * @access  protected
-     * @return  void
-     */
-    protected function _set_contexts()
-    {
-        $this->_context_label = array(
-            'label' => esc_html__('recipient', 'event_espresso'),
-            'plural' => esc_html__('recipients', 'event_espresso'),
-            'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
-            );
-
-        $this->_contexts = array(
-            'admin' => array(
-                'label' => esc_html__('Event Admin', 'event_espresso'),
-                'description' => esc_html__('This template is what event administrators will receive when payment is declined', 'event_espresso')
-                ),
-            'primary_attendee' => array(
-                'label' => esc_html__('Primary Registrant', 'event_espresso'),
-                'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive when the payment is declined', 'event_espresso')
-                )
-            );
-    }
+	public function __construct()
+	{
+
+		// setup type details for reference
+		$this->name = 'payment_declined';
+		$this->description = esc_html__('This message type is used for all declined payment notification messages that go out including any manual payments entered by an event administrator.', 'event_espresso');
+		$this->label = array(
+			'singular' => esc_html__('payment declined', 'event_espresso'),
+			'plural' => esc_html__('payments declined', 'event_espresso')
+			);
+
+		$this->_master_templates = array(
+			'email' => 'payment'
+			);
+
+		parent::__construct();
+	}
+
+
+	/**
+	 * _set_contexts
+	 * This sets up the contexts associated with the message_type
+	 *
+	 * @access  protected
+	 * @return  void
+	 */
+	protected function _set_contexts()
+	{
+		$this->_context_label = array(
+			'label' => esc_html__('recipient', 'event_espresso'),
+			'plural' => esc_html__('recipients', 'event_espresso'),
+			'description' => esc_html__('Recipient\'s are who will receive the template.  You may want different payment details sent out depending on who the recipient is', 'event_espresso')
+			);
+
+		$this->_contexts = array(
+			'admin' => array(
+				'label' => esc_html__('Event Admin', 'event_espresso'),
+				'description' => esc_html__('This template is what event administrators will receive when payment is declined', 'event_espresso')
+				),
+			'primary_attendee' => array(
+				'label' => esc_html__('Primary Registrant', 'event_espresso'),
+				'description' => esc_html__('This template is what the primary registrant (the person who made the main registration) will receive when the payment is declined', 'event_espresso')
+				)
+			);
+	}
 }

caffeinated/payment_methods/Paypal_Pro/forms/PayPalProSettingsForm.php

Indentation +24 added lines, -24 removed lines

@@ -18,30 +18,30 @@
  */
 class PayPalProSettingsForm extends PayPalSettingsForm
 {
-    /**
-     * SettingsForm constructor.
-     *
-     * @param array $options_array
-     * @param string $help_tab_link
-     */
-    public function __construct(array $options_array = array(), $help_tab_link = '')
-    {
-        $options_array = array_replace_recursive(
-            array(
-                'extra_meta_inputs' => array(
-                    'credit_card_types' => new EE_Checkbox_Multi_Input(
-                        EE_PMT_Paypal_Pro::card_types_supported(),
-                        array(
-                            'html_label_text' => esc_html__('Card Types Supported', 'event_espresso'),
-                            'required' => true
-                        )
-                    ),
-                )
-            ),
-            $options_array
-        );
-        parent::__construct($options_array, $help_tab_link);
-    }
+	/**
+	 * SettingsForm constructor.
+	 *
+	 * @param array $options_array
+	 * @param string $help_tab_link
+	 */
+	public function __construct(array $options_array = array(), $help_tab_link = '')
+	{
+		$options_array = array_replace_recursive(
+			array(
+				'extra_meta_inputs' => array(
+					'credit_card_types' => new EE_Checkbox_Multi_Input(
+						EE_PMT_Paypal_Pro::card_types_supported(),
+						array(
+							'html_label_text' => esc_html__('Card Types Supported', 'event_espresso'),
+							'required' => true
+						)
+					),
+				)
+			),
+			$options_array
+		);
+		parent::__construct($options_array, $help_tab_link);
+	}
 }
 // End of file SettingsForm.php
 // Location: EventEspresso/caffeinated/payment_methods/PayPal_Pro/forms/PayPalProSettingsForm.php

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      */
     protected function _setup_properties()
     {
-        require_once($this->file_folder() . 'EEG_Aim.gateway.php');
+        require_once($this->file_folder().'EEG_Aim.gateway.php');
         $this->_gateway = new EEG_Aim();
         $this->_pretty_name = esc_html__("Authorize.net AIM", 'event_espresso');
         $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
@@ -128,13 +128,13 @@ 
                 $billing_form->get_input('cvv')->set_default('123');
             }
             $billing_form->add_subsections(
-                array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+                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'
+                        __DIR__.'/templates/authorize_net_aim_debug_info.template.php'
                     )
                 ),
                 'first_name'
@@ -189,7 +189,7 @@ 
                             'html_label_text' => sprintf(esc_html__("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' )
+                                array('address2', 'phone', 'company', 'fax')
                             ),
                             'html_help_text' => esc_html__('Note: if fields are excluded they cannot be required.', 'event_espresso')
                         )
@@ -234,7 +234,7 @@ 
     {
         $all_billing_values_empty = array();
         foreach (array_keys($this->billing_input_names()) as $input_name) {
-            $all_billing_values_empty[ $input_name ] = '';
+            $all_billing_values_empty[$input_name] = '';
         }
         return array_merge(
             $all_billing_values_empty,

Indentation +245 added lines, -245 removed lines

@@ -10,266 +10,266 @@
  */
 class EE_PMT_Aim extends EE_PMT_Base
 {
-    /**
-     * @param EE_Payment_Method|null $pm_instance
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_setup_properties();
-        parent::__construct($pm_instance);
-    }
+	/**
+	 * @param EE_Payment_Method|null $pm_instance
+	 * @throws ReflectionException
+	 * @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 = esc_html__("Authorize.net AIM", 'event_espresso');
-        $this->_default_description = esc_html__('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 = esc_html__("Authorize.net AIM", 'event_espresso');
+		$this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
+		$this->_requires_https = true;
+	}
 
 
 
-    /**
-     * Creates the billing form for this payment method type
-     *
-     * @param EE_Transaction|null $transaction
-     * @return EE_Billing_Info_Form|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    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' => esc_html__('Card Number', 'event_espresso')
-                )),
-                'exp_month' => new EE_Credit_Card_Month_Input(true, array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('Expiry Month', 'event_espresso')
-                )),
-                'exp_year' => new EE_Credit_Card_Year_Input(array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('Expiry Year', 'event_espresso')
-                )),
-                'cvv' => new EE_CVV_Input(array(
-                    'required' => true,
-                    'html_label_text' => esc_html__('CVV', 'event_espresso') )),
-            )
-        ));
-        $billing_form->add_subsections(array(
-            'company' => new EE_Text_Input(array(
-                'html_label_text' => esc_html__('Company', 'event_espresso')
-            ))
-        ), 'email', false);
-        $billing_form->add_subsections(
-            array(
-                    'fax' => new EE_Text_Input(array(
-                        'html_label_text' => esc_html__('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|null $transaction
+	 * @return EE_Billing_Info_Form|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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' => esc_html__('Card Number', 'event_espresso')
+				)),
+				'exp_month' => new EE_Credit_Card_Month_Input(true, array(
+					'required' => true,
+					'html_label_text' => esc_html__('Expiry Month', 'event_espresso')
+				)),
+				'exp_year' => new EE_Credit_Card_Year_Input(array(
+					'required' => true,
+					'html_label_text' => esc_html__('Expiry Year', 'event_espresso')
+				)),
+				'cvv' => new EE_CVV_Input(array(
+					'required' => true,
+					'html_label_text' => esc_html__('CVV', 'event_espresso') )),
+			)
+		));
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
+				'html_label_text' => esc_html__('Company', 'event_espresso')
+			))
+		), 'email', false);
+		$billing_form->add_subsections(
+			array(
+					'fax' => new EE_Text_Input(array(
+						'html_label_text' => esc_html__('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|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    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|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    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(esc_html__("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(esc_html__("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(esc_html__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
-                            'html_help_text' =>  esc_html__("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(esc_html__("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(esc_html__("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' => esc_html__('Note: if fields are excluded they cannot be required.', 'event_espresso')
-                        )
-                    ),
-                )
-            )
-        );
-    }
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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(esc_html__("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(esc_html__("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(esc_html__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
+							'html_help_text' =>  esc_html__("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(esc_html__("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(esc_html__("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' => esc_html__('Note: if fields are excluded they cannot be required.', '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' => esc_html__('First Name', 'event_espresso'),
-            'last_name' => esc_html__('Last Name', 'event_espresso'),
-            'email' => esc_html__('Email', 'event_espresso'),
-            'company' => esc_html__('Company', 'event_espresso'),
-            'address' => esc_html__('Address', 'event_espresso'),
-            'address2' => esc_html__('Address2', 'event_espresso'),
-            'city' => esc_html__('City', 'event_espresso'),
-            'state' => esc_html__('State', 'event_espresso'),
-            'country' => esc_html__('Country', 'event_espresso'),
-            'zip' =>  esc_html__('Zip', 'event_espresso'),
-            'phone' => esc_html__('Phone', 'event_espresso'),
-            'fax' => esc_html__('Fax', 'event_espresso'),
-            'cvv' => esc_html__('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' => esc_html__('First Name', 'event_espresso'),
+			'last_name' => esc_html__('Last Name', 'event_espresso'),
+			'email' => esc_html__('Email', 'event_espresso'),
+			'company' => esc_html__('Company', 'event_espresso'),
+			'address' => esc_html__('Address', 'event_espresso'),
+			'address2' => esc_html__('Address2', 'event_espresso'),
+			'city' => esc_html__('City', 'event_espresso'),
+			'state' => esc_html__('State', 'event_espresso'),
+			'country' => esc_html__('Country', 'event_espresso'),
+			'zip' =>  esc_html__('Zip', 'event_espresso'),
+			'phone' => esc_html__('Phone', 'event_espresso'),
+			'fax' => esc_html__('Fax', 'event_espresso'),
+			'cvv' => esc_html__('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|null $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|null $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
-     *
-     * @return array
-     * @see EE_PMT_Base::help_tabs_config()
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title' => esc_html__('Authorize.net AIM Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_aim'
-            ),
-        );
-    }
+	/**
+	 * Adds the help tab
+	 *
+	 * @return array
+	 * @see EE_PMT_Base::help_tabs_config()
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title' => esc_html__('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.
+	}
 }

modules/feeds/templates/espresso_events_feed.template.php

Spacing +9 added lines, -9 removed lines

@@ -16,17 +16,17 @@
 
 ?>
 <p>
-    <?php esc_html_e('Event Organizer: ', 'event_espresso') . espresso_organization_name($EVT_ID); ?>
+    <?php esc_html_e('Event Organizer: ', 'event_espresso').espresso_organization_name($EVT_ID); ?>
     <br/>
-    <?php esc_html_e('Organizer Email: ', 'event_espresso') . espresso_organization_email($EVT_ID); ?>
+    <?php esc_html_e('Organizer Email: ', 'event_espresso').espresso_organization_email($EVT_ID); ?>
     <br/>
-    <?php esc_html_e('Event Phone: ', 'event_espresso') . espresso_event_phone($EVT_ID); ?>
+    <?php esc_html_e('Event Phone: ', 'event_espresso').espresso_event_phone($EVT_ID); ?>
 </p>
-<p><?php esc_html_e('Event Status: ', 'event_espresso') . espresso_event_status($EVT_ID); ?></p>
-<p><?php esc_html_e('Categories: ', 'event_espresso') . espresso_event_categories($EVT_ID); ?></p>
-<?php esc_html_e('Dates and Times: ', 'event_espresso') . espresso_list_of_event_dates($EVT_ID); ?>
-<?php esc_html_e('Available Tickets: ', 'event_espresso') . espresso_event_tickets_available($EVT_ID); ?>
-<p><?php esc_html_e('Event Venue: ', 'event_espresso') . espresso_venue_name(null, false); ?></p>
-<p><?php esc_html_e('Description: ', 'event_espresso') . $event_description; ?></p>
+<p><?php esc_html_e('Event Status: ', 'event_espresso').espresso_event_status($EVT_ID); ?></p>
+<p><?php esc_html_e('Categories: ', 'event_espresso').espresso_event_categories($EVT_ID); ?></p>
+<?php esc_html_e('Dates and Times: ', 'event_espresso').espresso_list_of_event_dates($EVT_ID); ?>
+<?php esc_html_e('Available Tickets: ', 'event_espresso').espresso_event_tickets_available($EVT_ID); ?>
+<p><?php esc_html_e('Event Venue: ', 'event_espresso').espresso_venue_name(null, false); ?></p>
+<p><?php esc_html_e('Description: ', 'event_espresso').$event_description; ?></p>
 <br/>
  
\ No newline at end of file

modules/feeds/templates/espresso_venues_feed.template.php

Spacing +7 added lines, -7 removed lines

@@ -16,15 +16,15 @@
 
 ?>
 <p>
-    <?php esc_html_e('Organizer Name: ', 'event_espresso') . espresso_organization_name($VNU_ID); ?>
+    <?php esc_html_e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?>
     <br/>
-    <?php esc_html_e('Organizer Email: ', 'event_espresso') . espresso_organization_email($VNU_ID); ?>
+    <?php esc_html_e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?>
     <br/>
-    <?php esc_html_e('Venue Phone: ', 'event_espresso') . espresso_venue_phone($VNU_ID); ?>
+    <?php esc_html_e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?>
 </p>
-<p><?php esc_html_e('Categories: ', 'event_espresso') . espresso_venue_categories($VNU_ID); ?></p>
-<p><?php esc_html_e('Address: ', 'event_espresso') . espresso_venue_address($VNU_ID); ?></p>
-<p><?php esc_html_e('Website: ', 'event_espresso') . espresso_venue_website($VNU_ID); ?></p>
-<p><?php esc_html_e('Description: ', 'event_espresso') . $venue_description; ?></p>
+<p><?php esc_html_e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php esc_html_e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php esc_html_e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php esc_html_e('Description: ', 'event_espresso').$venue_description; ?></p>
 <br/>
  
\ No newline at end of file

modules/gateways/Invoice/lib/templates/invoice_header.template.php

Indentation +3 added lines, -3 removed lines

@@ -10,9 +10,9 @@
 <head>
     <title>[organization]<?php esc_html__(' Invoice #', 'event_espresso'); ?>[registration_code]
         <?php esc_html__(
-            ' for ',
-            'event_espresso'
-        ); ?>[name]</title>
+			' for ',
+			'event_espresso'
+		); ?>[name]</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!-- Base Stylesheet do not change or remove -->
     <link rel="stylesheet" type="text/css" href="[base_url]base.css" media="screen"/>

modules/invoice/EED_Invoice.module.php

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
      */
     public function run($WP)
     {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+        if (is_readable(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php')) {
+            require_once(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php');
         } else {
             $msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);

Indentation +77 added lines, -77 removed lines

@@ -10,91 +10,91 @@
  */
 class EED_Invoice extends EED_Module
 {
-    /**
-     * @return EED_Invoice|EED_Module
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Invoice|EED_Module
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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()
-    {
-        EE_Config::register_route('download_invoice', 'EED_Invoice', 'download_invoice');
-        EE_Config::register_route('launch_invoice', 'EED_Invoice', 'launch_invoice');
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		EE_Config::register_route('download_invoice', 'EED_Invoice', 'download_invoice');
+		EE_Config::register_route('launch_invoice', 'EED_Invoice', 'launch_invoice');
+	}
 
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
 
 
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
-        } else {
-            $msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-    }
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+		if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
+			require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+		} else {
+			$msg = esc_html__('The Invoice.class.php file could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+	}
 
 
-    /**
-     *    invoice_launch
-     *
-     * @access    public
-     * @return    void
-     */
-    public function launch_invoice()
-    {
-        $this->run(null);
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('id')) {
-            $id = $request->getRequestParam('id', '', 'key');
-            $invoice = new Invoice($id);
-            $invoice->send_invoice();
-        }
-    }
+	/**
+	 *    invoice_launch
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function launch_invoice()
+	{
+		$this->run(null);
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('id')) {
+			$id = $request->getRequestParam('id', '', 'key');
+			$invoice = new Invoice($id);
+			$invoice->send_invoice();
+		}
+	}
 
 
-    /**
-     *    download_invoice
-     *
-     * @access    public
-     * @return    void
-     */
-    public function download_invoice()
-    {
-        $this->run(null);
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('id')) {
-            $id = $request->getRequestParam('id', '', 'key');
-            $invoice = new Invoice($id);
-            // send invoice but force download
-            $invoice->send_invoice(true);
-        }
-    }
+	/**
+	 *    download_invoice
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function download_invoice()
+	{
+		$this->run(null);
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('id')) {
+			$id = $request->getRequestParam('id', '', 'key');
+			$invoice = new Invoice($id);
+			// send invoice but force download
+			$invoice->send_invoice(true);
+		}
+	}
 }