eventespresso / event-espresso-core

caffeinated/payment_methods/Paypal_Pro/templates/paypal_pro_intro.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@
 <?php printf(
-    esc_html__(
-        'PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">',
-    '</a>'
+	esc_html__(
+		'PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalpro/" target="_blank">',
+	'</a>'
 );

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
                 $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(
@@ -189,7 +189,7 @@ 
                             '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' )
+                                array('address2', 'phone', 'company', 'fax')
                             ),
                             'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
                         )
@@ -249,7 +249,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 +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/payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 
         <p>
             <?php _e(
-                'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
-                'event_espresso'
-            ); ?>
+				'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
+				'event_espresso'
+			); ?>
         </p>
 
         <p>

caffeinated/payment_methods/Aim/templates/aim_intro.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@
 <?php printf(
-    esc_html__(
-        'Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">',
-    '</a>'
+	esc_html__(
+		'Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">',
+	'</a>'
 );

core/admin/EE_Admin_Page_Init.core.php

Doc Comments +3 added lines, -1 removed lines

@@ -181,7 +181,6 @@ 
      *
      * @access  public
      * @uses    _initialize_admin_page()
-     * @param  string $dir_name directory name for specific admin_page being loaded.
      * @return void
      */
     public function initialize_admin_page()
@@ -196,6 +195,9 @@ 
     }
 
 
+    /**
+     * @param string $wp_page_slug
+     */
     public function set_page_dependencies($wp_page_slug)
     {
         if (! $this->_load_page) {

Indentation +420 added lines, -420 removed lines

@@ -13,424 +13,424 @@
 abstract class EE_Admin_Page_Init extends EE_Base
 {
 
-    // identity properties (set in _set_defaults and _set_init_properties)
-    public $label;
-
-    /**
-     * Menu map has a capability.  However, this allows admin pages to have separate capability requirements for menus
-     * and accessing pages.  If capability is NOT set, then it defaults to the menu_map capability.
-     *
-     * @var string
-     */
-    public $capability;
-
-
-    /**
-     * This holds the menu map object for this admin page.
-     *
-     * @var EE_Admin_Page_Menu_Map
-     */
-    protected $_menu_map;
-
-    /**
-     * deprecated
-     */
-    public $menu_label;
-    public $menu_slug;
-
-
-    // set in _set_defaults
-    protected $_folder_name;
-    protected $_folder_path;
-    protected $_file_name;
-    public $hook_file;
-    protected $_wp_page_slug;
-    protected $_routing;
-
-
-    // will hold page object.
-    protected $_loaded_page_object;
-
-
-    // for caf
-    protected $_files_hooked;
-    protected $_hook_paths;
-
-    // load_page?
-    private $_load_page;
-
-
-    /**
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        // set global defaults
-        $this->_set_defaults();
-        // set properties that are always available with objects.
-        $this->_set_init_properties();
-        // global styles/scripts across all wp admin pages
-        add_action('admin_enqueue_scripts', array($this, 'load_wp_global_scripts_styles'), 5);
-        // load initial stuff.
-        $this->_set_file_and_folder_name();
-        $this->_set_menu_map();
-        if (empty($this->_menu_map) || is_array($this->_menu_map)) {
-            EE_Error::doing_it_wrong(
-                get_class($this) . '::$_menu_map',
-                sprintf(
-                    __(
-                        'The EE4 addon with the class %s is setting up the _menu_map property incorrectly for this version of EE core.  Please see Admin_Page_Init class examples in core for the new way of setting this property up.',
-                        'event_espresso'
-                    ),
-                    get_class($this)
-                ),
-                '4.4.0'
-            );
-            return;
-        }
-        // set default capability
-        $this->_set_capability();
-    }
-
-
-    /**
-     * _set_init_properties
-     * Child classes use to set the following properties:
-     * $label
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _set_init_properties();
-
-
-    /**
-     * _set_menu_map is a function that child classes use to set the menu_map property (which should be an instance of
-     * EE_Admin_Page_Menu_Map.  Their menu can either be EE_Admin_Page_Main_Menu or EE_Admin_Page_Sub_Menu.
-     *
-     * @since 4.4.0
-     * @ return void.
-     */
-    protected function _set_menu_map()
-    {
-        return array();
-    }
-
-
-    /**
-     * returns the menu map for this admin page
-     *
-     * @since 4.4.0
-     * @return EE_Admin_Page_Menu_Map
-     */
-    public function get_menu_map()
-    {
-        return $this->_menu_map;
-    }
-
-
-    /**
-     * This loads scripts and styles for the EE_Admin system
-     * that must be available on ALL WP admin pages (i.e. EE_menu items)
-     *
-     * @return void
-     */
-    public function load_wp_global_scripts_styles()
-    {
-        wp_register_style(
-            'espresso_menu',
-            EE_ADMIN_URL . 'assets/admin-menu-styles.css',
-            array('dashicons'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso_menu');
-    }
-
-
-    /**
-     * this sets default properties (might be overridden in _set_init_properties);
-     *
-     * @access private
-     * @return  void
-     */
-    private function _set_defaults()
-    {
-        $this->_file_name = $this->_folder_name = $this->_wp_page_slug = $this->capability = null;
-        $this->_routing = true;
-        $this->_load_page = false;
-        $this->_files_hooked = $this->_hook_paths = array();
-        // menu_map
-        $this->_menu_map = $this->get_menu_map();
-    }
-
-
-    protected function _set_capability()
-    {
-        $capability = empty($this->capability) ? $this->_menu_map->capability : $this->capability;
-        $this->capability = apply_filters('FHEE_' . $this->_menu_map->menu_slug . '_capability', $capability);
-    }
-
-
-    /**
-     * initialize_admin_page
-     * This method is what executes the loading of the specific page class for the given dir_name as called by the
-     * EE_Admin_Init class.
-     *
-     * @access  public
-     * @uses    _initialize_admin_page()
-     * @param  string $dir_name directory name for specific admin_page being loaded.
-     * @return void
-     */
-    public function initialize_admin_page()
-    {
-        // let's check user access first
-        $this->_check_user_access();
-        if (! is_object($this->_loaded_page_object)) {
-            return;
-        }
-        $this->_loaded_page_object->route_admin_request();
-        return;
-    }
-
-
-    public function set_page_dependencies($wp_page_slug)
-    {
-        if (! $this->_load_page) {
-            return;
-        }
-        if (! is_object($this->_loaded_page_object)) {
-            $msg[] = __(
-                'We can\'t load the page because we\'re missing a valid page object that tells us what to load',
-                'event_espresso'
-            );
-            $msg[] = $msg[0] . "\r\n"
-                     . sprintf(
-                         __(
-                             'The custom slug you have set for this page is %s. This means we\'re looking for the class %s_Admin_Page (found in %s_Admin_Page.core.php) within your %s directory',
-                             'event_espresso'
-                         ),
-                         $this->_file_name,
-                         $this->_file_name,
-                         $this->_folder_path . $this->_file_name,
-                         $this->_menu_map->menu_slug
-                     );
-            throw new EE_Error(implode('||', $msg));
-        }
-        $this->_loaded_page_object->set_wp_page_slug($wp_page_slug);
-        $page_hook = 'load-' . $wp_page_slug;
-        // hook into page load hook so all page specific stuff get's loaded.
-        if (! empty($wp_page_slug)) {
-            add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies'));
-        }
-    }
-
-
-    /**
-     * This executes the intial page loads for EE_Admin pages to take care of any ajax or other code needing to run
-     * before the load-page... hook. Note, the page loads are happening around the wp_init hook.
-     *
-     * @return void
-     */
-    public function do_initial_loads()
-    {
-        // no loading or initializing if menu map is setup incorrectly.
-        if (empty($this->_menu_map) || is_array($this->_menu_map)) {
-            return;
-        }
-        $this->_initialize_admin_page();
-    }
-
-
-    /**
-     * all we're doing here is setting the $_file_name property for later use.
-     *
-     * @access private
-     * @return void
-     */
-    private function _set_file_and_folder_name()
-    {
-        $bt = debug_backtrace();
-        // for more reliable determination of folder name
-        // we're using this to get the actual folder name of the CALLING class (i.e. the child class that extends this).  Why?  Because $this->menu_slug may be different than the folder name (to avoid conflicts with other plugins)
-        $class = get_class($this);
-        foreach ($bt as $index => $values) {
-            if (isset($values['class']) && $values['class'] == $class) {
-                $file_index = $index - 1;
-                $this->_folder_name = basename(dirname($bt[ $file_index ]['file']));
-                if (! empty($this->_folder_name)) {
-                    break;
-                }
-            }
-        }
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
-        $this->_file_name = preg_replace('/^ee/', 'EE', $this->_folder_name);
-        $this->_file_name = ucwords(str_replace('_', ' ', $this->_file_name));
-        $this->_file_name = str_replace(' ', '_', $this->_file_name);
-    }
-
-
-    /**
-     * This automatically checks if we have a hook class in the loaded child directory.  If we DO then we will register
-     * it with the appropriate pages.  That way all we have to do is make sure the file is named correctly and
-     * "dropped" in. Example: if we wanted to set this up for Messages hooking into Events then we would do:
-     * events_Messages_Hooks.class.php
-     *
-     * @param bool $extend This indicates whether we're checking the extend directory for any register_hooks
-     *                     files/classes
-     * @return array
-     */
-    public function register_hooks($extend = false)
-    {
-
-        // get a list of files in the directory that have the "Hook" in their name an
-        // if this is an extended check (i.e. caf is active) then we will scan the caffeinated/extend directory first and any hook files that are found will be have their reference added to the $_files_hook array property.  Then, we make sure that when we loop through the core decaf directories to find hook files that we skip over any hooks files that have already been set by caf.
-        if ($extend) {
-            $hook_files_glob_path = apply_filters(
-                'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path__extend',
-                EE_CORE_CAF_ADMIN_EXTEND
-                . $this->_folder_name
-                . '/*'
-                . $this->_file_name
-                . '_Hooks_Extend.class.php'
-            );
-            $this->_hook_paths = $this->_register_hook_files($hook_files_glob_path, $extend);
-        }
-        // loop through decaf folders
-        $hook_files_glob_path = apply_filters(
-            'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path',
-            $this->_folder_path . '*' . $this->_file_name . '_Hooks.class.php'
-        );
-        $this->_hook_paths = array_merge(
-            $this->_register_hook_files($hook_files_glob_path),
-            $this->_hook_paths
-        );  // making sure any extended hook paths are later in the array than the core hook paths!
-        return $this->_hook_paths;
-    }
-
-
-    protected function _register_hook_files($hook_files_glob_path, $extend = false)
-    {
-        $hook_paths = array();
-        if ($hook_files = glob($hook_files_glob_path)) {
-            if (empty($hook_files)) {
-                return array();
-            }
-            foreach ($hook_files as $file) {
-                // lets get the linked admin.
-                $hook_file = $extend ? str_replace(EE_CORE_CAF_ADMIN_EXTEND . $this->_folder_name . '/', '', $file)
-                    : str_replace($this->_folder_path, '', $file);
-                $replace = $extend
-                    ? '_' . $this->_file_name . '_Hooks_Extend.class.php'
-                    : '_'
-                      . $this->_file_name
-                      . '_Hooks.class.php';
-                $rel_admin = str_replace($replace, '', $hook_file);
-                $rel_admin = strtolower($rel_admin);
-                $hook_paths[] = $file;
-                // make sure we haven't already got a hook setup for this page path
-                if (in_array($rel_admin, $this->_files_hooked)) {
-                    continue;
-                }
-                $this->hook_file = $hook_file;
-                $rel_admin_hook = 'FHEE_do_other_page_hooks_' . $rel_admin;
-                $filter = add_filter($rel_admin_hook, array($this, 'load_admin_hook'));
-                $this->_files_hooked[] = $rel_admin;
-            }
-        }
-        return $hook_paths;
-    }
-
-
-    public function load_admin_hook($registered_pages)
-    {
-        $this->hook_file;
-        $hook_file = (array) $this->hook_file;
-        return array_merge($hook_file, $registered_pages);
-    }
-
-
-    /**
-     * _initialize_admin_page
-     *
-     * @see  initialize_admin_page() for info
-     */
-    protected function _initialize_admin_page()
-    {
-
-        // JUST CHECK WE'RE ON RIGHT PAGE.
-        if ((! isset($_REQUEST['page']) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing) {
-            return;
-        } //not on the right page so let's get out.
-        $this->_load_page = true;
-
-        // we don't need to do a page_request check here because it's only called via WP menu system.
-        $admin_page = $this->_file_name . '_Admin_Page';
-        $hook_suffix = $this->_menu_map->menu_slug . '_' . $admin_page;
-        $admin_page = apply_filters(
-            "FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__{$hook_suffix}",
-            $admin_page
-        );
-        // define requested admin page class name then load the file and instantiate
-        $path_to_file = str_replace(array('\\', '/'), '/', $this->_folder_path . $admin_page . '.core.php');
-        $path_to_file = apply_filters(
-            "FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__{$hook_suffix}",
-            $path_to_file
-        );// so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
-        if (is_readable($path_to_file)) {
-            // This is a place where EE plugins can hook in to make sure their own files are required in the appropriate place
-            do_action('AHEE__EE_Admin_Page___initialize_admin_page__before_initialization');
-            do_action(
-                'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_' . $this->_menu_map->menu_slug
-            );
-            require_once($path_to_file);
-            $a = new ReflectionClass($admin_page);
-            $this->_loaded_page_object = $a->newInstance($this->_routing);
-        }
-        do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization');
-        do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_' . $this->_menu_map->menu_slug);
-    }
-
-
-    public function get_admin_page_name()
-    {
-        return $this->_file_name . '_Admin_Page';
-    }
-
-
-    /**
-     * @return mixed
-     */
-    public function loaded_page_object()
-    {
-        return $this->_loaded_page_object;
-    }
-
-
-    // public function set_autoloaders($className)
-    // {
-    //     $dir_ref = array(
-    //         $this->_folder_path => array('core', 'class'),
-    //     );
-    //     EEH_Autoloader::try_autoload($dir_ref, $className);
-    // }
-    /**
-     * _check_user_access
-     * verifies user access for this admin page.  If no user access is available then let's gracefully exit with a
-     * WordPress die message.
-     *
-     * @return bool|die true if pass (or admin) wp_die if fail
-     */
-    private function _check_user_access()
-    {
-        if (! EE_Registry::instance()->CAP->current_user_can(
-            $this->_menu_map->capability,
-            $this->_menu_map->menu_slug
-        )) {
-            wp_die(__('You don\'t have access to this page.', 'event_espresso'), '', array('back_link' => true));
-        }
-        return true;
-    }
+	// identity properties (set in _set_defaults and _set_init_properties)
+	public $label;
+
+	/**
+	 * Menu map has a capability.  However, this allows admin pages to have separate capability requirements for menus
+	 * and accessing pages.  If capability is NOT set, then it defaults to the menu_map capability.
+	 *
+	 * @var string
+	 */
+	public $capability;
+
+
+	/**
+	 * This holds the menu map object for this admin page.
+	 *
+	 * @var EE_Admin_Page_Menu_Map
+	 */
+	protected $_menu_map;
+
+	/**
+	 * deprecated
+	 */
+	public $menu_label;
+	public $menu_slug;
+
+
+	// set in _set_defaults
+	protected $_folder_name;
+	protected $_folder_path;
+	protected $_file_name;
+	public $hook_file;
+	protected $_wp_page_slug;
+	protected $_routing;
+
+
+	// will hold page object.
+	protected $_loaded_page_object;
+
+
+	// for caf
+	protected $_files_hooked;
+	protected $_hook_paths;
+
+	// load_page?
+	private $_load_page;
+
+
+	/**
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		// set global defaults
+		$this->_set_defaults();
+		// set properties that are always available with objects.
+		$this->_set_init_properties();
+		// global styles/scripts across all wp admin pages
+		add_action('admin_enqueue_scripts', array($this, 'load_wp_global_scripts_styles'), 5);
+		// load initial stuff.
+		$this->_set_file_and_folder_name();
+		$this->_set_menu_map();
+		if (empty($this->_menu_map) || is_array($this->_menu_map)) {
+			EE_Error::doing_it_wrong(
+				get_class($this) . '::$_menu_map',
+				sprintf(
+					__(
+						'The EE4 addon with the class %s is setting up the _menu_map property incorrectly for this version of EE core.  Please see Admin_Page_Init class examples in core for the new way of setting this property up.',
+						'event_espresso'
+					),
+					get_class($this)
+				),
+				'4.4.0'
+			);
+			return;
+		}
+		// set default capability
+		$this->_set_capability();
+	}
+
+
+	/**
+	 * _set_init_properties
+	 * Child classes use to set the following properties:
+	 * $label
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _set_init_properties();
+
+
+	/**
+	 * _set_menu_map is a function that child classes use to set the menu_map property (which should be an instance of
+	 * EE_Admin_Page_Menu_Map.  Their menu can either be EE_Admin_Page_Main_Menu or EE_Admin_Page_Sub_Menu.
+	 *
+	 * @since 4.4.0
+	 * @ return void.
+	 */
+	protected function _set_menu_map()
+	{
+		return array();
+	}
+
+
+	/**
+	 * returns the menu map for this admin page
+	 *
+	 * @since 4.4.0
+	 * @return EE_Admin_Page_Menu_Map
+	 */
+	public function get_menu_map()
+	{
+		return $this->_menu_map;
+	}
+
+
+	/**
+	 * This loads scripts and styles for the EE_Admin system
+	 * that must be available on ALL WP admin pages (i.e. EE_menu items)
+	 *
+	 * @return void
+	 */
+	public function load_wp_global_scripts_styles()
+	{
+		wp_register_style(
+			'espresso_menu',
+			EE_ADMIN_URL . 'assets/admin-menu-styles.css',
+			array('dashicons'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso_menu');
+	}
+
+
+	/**
+	 * this sets default properties (might be overridden in _set_init_properties);
+	 *
+	 * @access private
+	 * @return  void
+	 */
+	private function _set_defaults()
+	{
+		$this->_file_name = $this->_folder_name = $this->_wp_page_slug = $this->capability = null;
+		$this->_routing = true;
+		$this->_load_page = false;
+		$this->_files_hooked = $this->_hook_paths = array();
+		// menu_map
+		$this->_menu_map = $this->get_menu_map();
+	}
+
+
+	protected function _set_capability()
+	{
+		$capability = empty($this->capability) ? $this->_menu_map->capability : $this->capability;
+		$this->capability = apply_filters('FHEE_' . $this->_menu_map->menu_slug . '_capability', $capability);
+	}
+
+
+	/**
+	 * initialize_admin_page
+	 * This method is what executes the loading of the specific page class for the given dir_name as called by the
+	 * EE_Admin_Init class.
+	 *
+	 * @access  public
+	 * @uses    _initialize_admin_page()
+	 * @param  string $dir_name directory name for specific admin_page being loaded.
+	 * @return void
+	 */
+	public function initialize_admin_page()
+	{
+		// let's check user access first
+		$this->_check_user_access();
+		if (! is_object($this->_loaded_page_object)) {
+			return;
+		}
+		$this->_loaded_page_object->route_admin_request();
+		return;
+	}
+
+
+	public function set_page_dependencies($wp_page_slug)
+	{
+		if (! $this->_load_page) {
+			return;
+		}
+		if (! is_object($this->_loaded_page_object)) {
+			$msg[] = __(
+				'We can\'t load the page because we\'re missing a valid page object that tells us what to load',
+				'event_espresso'
+			);
+			$msg[] = $msg[0] . "\r\n"
+					 . sprintf(
+						 __(
+							 'The custom slug you have set for this page is %s. This means we\'re looking for the class %s_Admin_Page (found in %s_Admin_Page.core.php) within your %s directory',
+							 'event_espresso'
+						 ),
+						 $this->_file_name,
+						 $this->_file_name,
+						 $this->_folder_path . $this->_file_name,
+						 $this->_menu_map->menu_slug
+					 );
+			throw new EE_Error(implode('||', $msg));
+		}
+		$this->_loaded_page_object->set_wp_page_slug($wp_page_slug);
+		$page_hook = 'load-' . $wp_page_slug;
+		// hook into page load hook so all page specific stuff get's loaded.
+		if (! empty($wp_page_slug)) {
+			add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies'));
+		}
+	}
+
+
+	/**
+	 * This executes the intial page loads for EE_Admin pages to take care of any ajax or other code needing to run
+	 * before the load-page... hook. Note, the page loads are happening around the wp_init hook.
+	 *
+	 * @return void
+	 */
+	public function do_initial_loads()
+	{
+		// no loading or initializing if menu map is setup incorrectly.
+		if (empty($this->_menu_map) || is_array($this->_menu_map)) {
+			return;
+		}
+		$this->_initialize_admin_page();
+	}
+
+
+	/**
+	 * all we're doing here is setting the $_file_name property for later use.
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _set_file_and_folder_name()
+	{
+		$bt = debug_backtrace();
+		// for more reliable determination of folder name
+		// we're using this to get the actual folder name of the CALLING class (i.e. the child class that extends this).  Why?  Because $this->menu_slug may be different than the folder name (to avoid conflicts with other plugins)
+		$class = get_class($this);
+		foreach ($bt as $index => $values) {
+			if (isset($values['class']) && $values['class'] == $class) {
+				$file_index = $index - 1;
+				$this->_folder_name = basename(dirname($bt[ $file_index ]['file']));
+				if (! empty($this->_folder_name)) {
+					break;
+				}
+			}
+		}
+		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
+		$this->_file_name = preg_replace('/^ee/', 'EE', $this->_folder_name);
+		$this->_file_name = ucwords(str_replace('_', ' ', $this->_file_name));
+		$this->_file_name = str_replace(' ', '_', $this->_file_name);
+	}
+
+
+	/**
+	 * This automatically checks if we have a hook class in the loaded child directory.  If we DO then we will register
+	 * it with the appropriate pages.  That way all we have to do is make sure the file is named correctly and
+	 * "dropped" in. Example: if we wanted to set this up for Messages hooking into Events then we would do:
+	 * events_Messages_Hooks.class.php
+	 *
+	 * @param bool $extend This indicates whether we're checking the extend directory for any register_hooks
+	 *                     files/classes
+	 * @return array
+	 */
+	public function register_hooks($extend = false)
+	{
+
+		// get a list of files in the directory that have the "Hook" in their name an
+		// if this is an extended check (i.e. caf is active) then we will scan the caffeinated/extend directory first and any hook files that are found will be have their reference added to the $_files_hook array property.  Then, we make sure that when we loop through the core decaf directories to find hook files that we skip over any hooks files that have already been set by caf.
+		if ($extend) {
+			$hook_files_glob_path = apply_filters(
+				'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path__extend',
+				EE_CORE_CAF_ADMIN_EXTEND
+				. $this->_folder_name
+				. '/*'
+				. $this->_file_name
+				. '_Hooks_Extend.class.php'
+			);
+			$this->_hook_paths = $this->_register_hook_files($hook_files_glob_path, $extend);
+		}
+		// loop through decaf folders
+		$hook_files_glob_path = apply_filters(
+			'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path',
+			$this->_folder_path . '*' . $this->_file_name . '_Hooks.class.php'
+		);
+		$this->_hook_paths = array_merge(
+			$this->_register_hook_files($hook_files_glob_path),
+			$this->_hook_paths
+		);  // making sure any extended hook paths are later in the array than the core hook paths!
+		return $this->_hook_paths;
+	}
+
+
+	protected function _register_hook_files($hook_files_glob_path, $extend = false)
+	{
+		$hook_paths = array();
+		if ($hook_files = glob($hook_files_glob_path)) {
+			if (empty($hook_files)) {
+				return array();
+			}
+			foreach ($hook_files as $file) {
+				// lets get the linked admin.
+				$hook_file = $extend ? str_replace(EE_CORE_CAF_ADMIN_EXTEND . $this->_folder_name . '/', '', $file)
+					: str_replace($this->_folder_path, '', $file);
+				$replace = $extend
+					? '_' . $this->_file_name . '_Hooks_Extend.class.php'
+					: '_'
+					  . $this->_file_name
+					  . '_Hooks.class.php';
+				$rel_admin = str_replace($replace, '', $hook_file);
+				$rel_admin = strtolower($rel_admin);
+				$hook_paths[] = $file;
+				// make sure we haven't already got a hook setup for this page path
+				if (in_array($rel_admin, $this->_files_hooked)) {
+					continue;
+				}
+				$this->hook_file = $hook_file;
+				$rel_admin_hook = 'FHEE_do_other_page_hooks_' . $rel_admin;
+				$filter = add_filter($rel_admin_hook, array($this, 'load_admin_hook'));
+				$this->_files_hooked[] = $rel_admin;
+			}
+		}
+		return $hook_paths;
+	}
+
+
+	public function load_admin_hook($registered_pages)
+	{
+		$this->hook_file;
+		$hook_file = (array) $this->hook_file;
+		return array_merge($hook_file, $registered_pages);
+	}
+
+
+	/**
+	 * _initialize_admin_page
+	 *
+	 * @see  initialize_admin_page() for info
+	 */
+	protected function _initialize_admin_page()
+	{
+
+		// JUST CHECK WE'RE ON RIGHT PAGE.
+		if ((! isset($_REQUEST['page']) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing) {
+			return;
+		} //not on the right page so let's get out.
+		$this->_load_page = true;
+
+		// we don't need to do a page_request check here because it's only called via WP menu system.
+		$admin_page = $this->_file_name . '_Admin_Page';
+		$hook_suffix = $this->_menu_map->menu_slug . '_' . $admin_page;
+		$admin_page = apply_filters(
+			"FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__{$hook_suffix}",
+			$admin_page
+		);
+		// define requested admin page class name then load the file and instantiate
+		$path_to_file = str_replace(array('\\', '/'), '/', $this->_folder_path . $admin_page . '.core.php');
+		$path_to_file = apply_filters(
+			"FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__{$hook_suffix}",
+			$path_to_file
+		);// so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
+		if (is_readable($path_to_file)) {
+			// This is a place where EE plugins can hook in to make sure their own files are required in the appropriate place
+			do_action('AHEE__EE_Admin_Page___initialize_admin_page__before_initialization');
+			do_action(
+				'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_' . $this->_menu_map->menu_slug
+			);
+			require_once($path_to_file);
+			$a = new ReflectionClass($admin_page);
+			$this->_loaded_page_object = $a->newInstance($this->_routing);
+		}
+		do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization');
+		do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_' . $this->_menu_map->menu_slug);
+	}
+
+
+	public function get_admin_page_name()
+	{
+		return $this->_file_name . '_Admin_Page';
+	}
+
+
+	/**
+	 * @return mixed
+	 */
+	public function loaded_page_object()
+	{
+		return $this->_loaded_page_object;
+	}
+
+
+	// public function set_autoloaders($className)
+	// {
+	//     $dir_ref = array(
+	//         $this->_folder_path => array('core', 'class'),
+	//     );
+	//     EEH_Autoloader::try_autoload($dir_ref, $className);
+	// }
+	/**
+	 * _check_user_access
+	 * verifies user access for this admin page.  If no user access is available then let's gracefully exit with a
+	 * WordPress die message.
+	 *
+	 * @return bool|die true if pass (or admin) wp_die if fail
+	 */
+	private function _check_user_access()
+	{
+		if (! EE_Registry::instance()->CAP->current_user_can(
+			$this->_menu_map->capability,
+			$this->_menu_map->menu_slug
+		)) {
+			wp_die(__('You don\'t have access to this page.', 'event_espresso'), '', array('back_link' => true));
+		}
+		return true;
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -78,7 +78,7 @@ 
         $this->_set_menu_map();
         if (empty($this->_menu_map) || is_array($this->_menu_map)) {
             EE_Error::doing_it_wrong(
-                get_class($this) . '::$_menu_map',
+                get_class($this).'::$_menu_map',
                 sprintf(
                     __(
                         'The EE4 addon with the class %s is setting up the _menu_map property incorrectly for this version of EE core.  Please see Admin_Page_Init class examples in core for the new way of setting this property up.',
@@ -142,7 +142,7 @@ 
     {
         wp_register_style(
             'espresso_menu',
-            EE_ADMIN_URL . 'assets/admin-menu-styles.css',
+            EE_ADMIN_URL.'assets/admin-menu-styles.css',
             array('dashicons'),
             EVENT_ESPRESSO_VERSION
         );
@@ -170,7 +170,7 @@ 
     protected function _set_capability()
     {
         $capability = empty($this->capability) ? $this->_menu_map->capability : $this->capability;
-        $this->capability = apply_filters('FHEE_' . $this->_menu_map->menu_slug . '_capability', $capability);
+        $this->capability = apply_filters('FHEE_'.$this->_menu_map->menu_slug.'_capability', $capability);
     }
 
 
@@ -188,7 +188,7 @@ 
     {
         // let's check user access first
         $this->_check_user_access();
-        if (! is_object($this->_loaded_page_object)) {
+        if ( ! is_object($this->_loaded_page_object)) {
             return;
         }
         $this->_loaded_page_object->route_admin_request();
@@ -198,15 +198,15 @@ 
 
     public function set_page_dependencies($wp_page_slug)
     {
-        if (! $this->_load_page) {
+        if ( ! $this->_load_page) {
             return;
         }
-        if (! is_object($this->_loaded_page_object)) {
+        if ( ! is_object($this->_loaded_page_object)) {
             $msg[] = __(
                 'We can\'t load the page because we\'re missing a valid page object that tells us what to load',
                 'event_espresso'
             );
-            $msg[] = $msg[0] . "\r\n"
+            $msg[] = $msg[0]."\r\n"
                      . sprintf(
                          __(
                              'The custom slug you have set for this page is %s. This means we\'re looking for the class %s_Admin_Page (found in %s_Admin_Page.core.php) within your %s directory',
@@ -214,15 +214,15 @@ 
                          ),
                          $this->_file_name,
                          $this->_file_name,
-                         $this->_folder_path . $this->_file_name,
+                         $this->_folder_path.$this->_file_name,
                          $this->_menu_map->menu_slug
                      );
             throw new EE_Error(implode('||', $msg));
         }
         $this->_loaded_page_object->set_wp_page_slug($wp_page_slug);
-        $page_hook = 'load-' . $wp_page_slug;
+        $page_hook = 'load-'.$wp_page_slug;
         // hook into page load hook so all page specific stuff get's loaded.
-        if (! empty($wp_page_slug)) {
+        if ( ! empty($wp_page_slug)) {
             add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies'));
         }
     }
@@ -259,13 +259,13 @@ 
         foreach ($bt as $index => $values) {
             if (isset($values['class']) && $values['class'] == $class) {
                 $file_index = $index - 1;
-                $this->_folder_name = basename(dirname($bt[ $file_index ]['file']));
-                if (! empty($this->_folder_name)) {
+                $this->_folder_name = basename(dirname($bt[$file_index]['file']));
+                if ( ! empty($this->_folder_name)) {
                     break;
                 }
             }
         }
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
+        $this->_folder_path = EE_ADMIN_PAGES.$this->_folder_name.'/';
         $this->_file_name = preg_replace('/^ee/', 'EE', $this->_folder_name);
         $this->_file_name = ucwords(str_replace('_', ' ', $this->_file_name));
         $this->_file_name = str_replace(' ', '_', $this->_file_name);
@@ -301,12 +301,12 @@ 
         // loop through decaf folders
         $hook_files_glob_path = apply_filters(
             'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path',
-            $this->_folder_path . '*' . $this->_file_name . '_Hooks.class.php'
+            $this->_folder_path.'*'.$this->_file_name.'_Hooks.class.php'
         );
         $this->_hook_paths = array_merge(
             $this->_register_hook_files($hook_files_glob_path),
             $this->_hook_paths
-        );  // making sure any extended hook paths are later in the array than the core hook paths!
+        ); // making sure any extended hook paths are later in the array than the core hook paths!
         return $this->_hook_paths;
     }
 
@@ -320,10 +320,10 @@ 
             }
             foreach ($hook_files as $file) {
                 // lets get the linked admin.
-                $hook_file = $extend ? str_replace(EE_CORE_CAF_ADMIN_EXTEND . $this->_folder_name . '/', '', $file)
+                $hook_file = $extend ? str_replace(EE_CORE_CAF_ADMIN_EXTEND.$this->_folder_name.'/', '', $file)
                     : str_replace($this->_folder_path, '', $file);
                 $replace = $extend
-                    ? '_' . $this->_file_name . '_Hooks_Extend.class.php'
+                    ? '_'.$this->_file_name.'_Hooks_Extend.class.php'
                     : '_'
                       . $this->_file_name
                       . '_Hooks.class.php';
@@ -335,7 +335,7 @@ 
                     continue;
                 }
                 $this->hook_file = $hook_file;
-                $rel_admin_hook = 'FHEE_do_other_page_hooks_' . $rel_admin;
+                $rel_admin_hook = 'FHEE_do_other_page_hooks_'.$rel_admin;
                 $filter = add_filter($rel_admin_hook, array($this, 'load_admin_hook'));
                 $this->_files_hooked[] = $rel_admin;
             }
@@ -361,42 +361,42 @@ 
     {
 
         // JUST CHECK WE'RE ON RIGHT PAGE.
-        if ((! isset($_REQUEST['page']) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing) {
+        if (( ! isset($_REQUEST['page']) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing) {
             return;
         } //not on the right page so let's get out.
         $this->_load_page = true;
 
         // we don't need to do a page_request check here because it's only called via WP menu system.
-        $admin_page = $this->_file_name . '_Admin_Page';
-        $hook_suffix = $this->_menu_map->menu_slug . '_' . $admin_page;
+        $admin_page = $this->_file_name.'_Admin_Page';
+        $hook_suffix = $this->_menu_map->menu_slug.'_'.$admin_page;
         $admin_page = apply_filters(
             "FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__{$hook_suffix}",
             $admin_page
         );
         // define requested admin page class name then load the file and instantiate
-        $path_to_file = str_replace(array('\\', '/'), '/', $this->_folder_path . $admin_page . '.core.php');
+        $path_to_file = str_replace(array('\\', '/'), '/', $this->_folder_path.$admin_page.'.core.php');
         $path_to_file = apply_filters(
             "FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__{$hook_suffix}",
             $path_to_file
-        );// so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
+        ); // so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
         if (is_readable($path_to_file)) {
             // This is a place where EE plugins can hook in to make sure their own files are required in the appropriate place
             do_action('AHEE__EE_Admin_Page___initialize_admin_page__before_initialization');
             do_action(
-                'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_' . $this->_menu_map->menu_slug
+                'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_'.$this->_menu_map->menu_slug
             );
             require_once($path_to_file);
             $a = new ReflectionClass($admin_page);
             $this->_loaded_page_object = $a->newInstance($this->_routing);
         }
         do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization');
-        do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_' . $this->_menu_map->menu_slug);
+        do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_'.$this->_menu_map->menu_slug);
     }
 
 
     public function get_admin_page_name()
     {
-        return $this->_file_name . '_Admin_Page';
+        return $this->_file_name.'_Admin_Page';
     }
 
 
@@ -425,7 +425,7 @@ 
      */
     private function _check_user_access()
     {
-        if (! EE_Registry::instance()->CAP->current_user_can(
+        if ( ! EE_Registry::instance()->CAP->current_user_can(
             $this->_menu_map->capability,
             $this->_menu_map->menu_slug
         )) {

core/libraries/messages/defaults/default/html_receipt_ticket_line_item_pms.template.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 <tr class="item">
     <td>[LINE_ITEM_NAME][LINE_ITEM_TAXABLE_*]</td>
     <td colspan="2">[LINE_ITEM_DESCRIPTION]
-        <p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), '[TKT_USES_* schema=' . __('any', 'event_espresso') . ']'); ?></p>
+        <p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), '[TKT_USES_* schema='.__('any', 'event_espresso').']'); ?></p>
     </td>
     <td class="item_c">[LINE_ITEM_QUANTITY]</td>
     <td class="item_c">[LINE_ITEM_AMOUNT]</td>

core/services/collections/CollectionInterface.php

Indentation +155 added lines, -155 removed lines

@@ -16,159 +16,159 @@
 interface CollectionInterface extends Countable, Iterator, Serializable, ArrayAccess
 {
 
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function add($object, $identifier = null);
-
-    /**
-     * setIdentifier
-     * Sets the data associated with an object in the Collection
-     * if no $identifier is supplied, then the spl_object_hash() is used
-     *
-     * @access public
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function setIdentifier($object, $identifier = null);
-
-    /**
-     * get
-     * finds and returns an object in the Collection based on the identifier that was set using addObject()
-     * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
-     *
-     * @access public
-     * @param mixed $identifier
-     * @return mixed
-     */
-    public function get($identifier);
-
-    /**
-     * has
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier
-     *
-     * @access public
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function has($identifier);
-
-    /**
-     * hasObject
-     * returns TRUE or FALSE depending on whether the supplied object is within the Collection
-     *
-     * @access public
-     * @param $object
-     * @return bool
-     */
-    public function hasObject($object);
-
-    /**
-     * remove
-     * detaches an object from the Collection
-     *
-     * @access public
-     * @param $object
-     * @return bool
-     */
-    public function remove($object);
-
-    /**
-     * setCurrent
-     * advances pointer to the object whose identifier matches that which was provided
-     *
-     * @access public
-     * @param mixed $identifier
-     * @return boolean
-     */
-    public function setCurrent($identifier);
-
-    /**
-     * setCurrentUsingObject
-     * advances pointer to the provided object
-     *
-     * @access public
-     * @param $object
-     * @return boolean
-     */
-    public function setCurrentUsingObject($object);
-
-    /**
-     * Returns the object occupying the index before the current object,
-     * unless this is already the first object, in which case it just returns the first object
-     *
-     * @return mixed
-     */
-    public function previous();
-
-        /**
-     * Returns the index of a given object, or false if not found
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param $object
-     * @return boolean|int|string
-     */
-    public function indexOf($object);
-
-
-    /**
-     * Returns the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param $index
-     * @return mixed
-     */
-    public function objectAtIndex($index);
-
-    /**
-     * Returns the sequence of objects as specified by the offset and length
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $offset
-     * @param int $length
-     * @return array
-     */
-    public function slice($offset, $length);
-
-    /**
-     * Inserts an object (or an array of objects) at a certain point
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param mixed   $objects A single object or an array of objects
-     * @param integer $index
-     */
-    public function insertAt($objects, $index);
-
-    /**
-     * Removes the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param integer $index
-     */
-    public function removeAt($index);
-
-
-
-    /**
-     * detaches ALL objects from the Collection
-     */
-    public function detachAll();
-
-
-
-    /**
-     * unsets and detaches ALL objects from the Collection
-     */
-    public function trashAndDetachAll();
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function add($object, $identifier = null);
+
+	/**
+	 * setIdentifier
+	 * Sets the data associated with an object in the Collection
+	 * if no $identifier is supplied, then the spl_object_hash() is used
+	 *
+	 * @access public
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function setIdentifier($object, $identifier = null);
+
+	/**
+	 * get
+	 * finds and returns an object in the Collection based on the identifier that was set using addObject()
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
+	 *
+	 * @access public
+	 * @param mixed $identifier
+	 * @return mixed
+	 */
+	public function get($identifier);
+
+	/**
+	 * has
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @access public
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function has($identifier);
+
+	/**
+	 * hasObject
+	 * returns TRUE or FALSE depending on whether the supplied object is within the Collection
+	 *
+	 * @access public
+	 * @param $object
+	 * @return bool
+	 */
+	public function hasObject($object);
+
+	/**
+	 * remove
+	 * detaches an object from the Collection
+	 *
+	 * @access public
+	 * @param $object
+	 * @return bool
+	 */
+	public function remove($object);
+
+	/**
+	 * setCurrent
+	 * advances pointer to the object whose identifier matches that which was provided
+	 *
+	 * @access public
+	 * @param mixed $identifier
+	 * @return boolean
+	 */
+	public function setCurrent($identifier);
+
+	/**
+	 * setCurrentUsingObject
+	 * advances pointer to the provided object
+	 *
+	 * @access public
+	 * @param $object
+	 * @return boolean
+	 */
+	public function setCurrentUsingObject($object);
+
+	/**
+	 * Returns the object occupying the index before the current object,
+	 * unless this is already the first object, in which case it just returns the first object
+	 *
+	 * @return mixed
+	 */
+	public function previous();
+
+		/**
+		 * Returns the index of a given object, or false if not found
+		 *
+		 * @see http://stackoverflow.com/a/8736013
+		 * @param $object
+		 * @return boolean|int|string
+		 */
+	public function indexOf($object);
+
+
+	/**
+	 * Returns the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param $index
+	 * @return mixed
+	 */
+	public function objectAtIndex($index);
+
+	/**
+	 * Returns the sequence of objects as specified by the offset and length
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $offset
+	 * @param int $length
+	 * @return array
+	 */
+	public function slice($offset, $length);
+
+	/**
+	 * Inserts an object (or an array of objects) at a certain point
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param mixed   $objects A single object or an array of objects
+	 * @param integer $index
+	 */
+	public function insertAt($objects, $index);
+
+	/**
+	 * Removes the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param integer $index
+	 */
+	public function removeAt($index);
+
+
+
+	/**
+	 * detaches ALL objects from the Collection
+	 */
+	public function detachAll();
+
+
+
+	/**
+	 * unsets and detaches ALL objects from the Collection
+	 */
+	public function trashAndDetachAll();
 }

core/domain/services/admin/privacy/policy/PrivacyPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         }
         $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
         return (string) EEH_Template::display_template(
-            __DIR__ . '/privacy_policy.template.php',
+            __DIR__.'/privacy_policy.template.php',
             array(
                 'active_onsite_payment_methods' => $active_onsite_pms,
                 'active_offsite_payment_methods' => $active_offsite_pms,

Indentation +68 added lines, -68 removed lines

@@ -20,80 +20,80 @@
 class PrivacyPolicy implements PrivacyPolicyInterface
 {
 
-    /**
-     * @var EEM_Payment_Method
-     */
-    protected $payment_method_model;
+	/**
+	 * @var EEM_Payment_Method
+	 */
+	protected $payment_method_model;
 
-    /**
-     * @var SessionLifespan
-     */
-    protected $session_lifespan;
+	/**
+	 * @var SessionLifespan
+	 */
+	protected $session_lifespan;
 
-    /**
-     * PrivacyPolicy constructor.
-     *
-     * @param EEM_Payment_Method $payment_method_model
-     * @param SessionLifespan    $session_lifespan
-     */
-    public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
-    {
-        $this->payment_method_model = $payment_method_model;
-        $this->session_lifespan = $session_lifespan;
-    }
+	/**
+	 * PrivacyPolicy constructor.
+	 *
+	 * @param EEM_Payment_Method $payment_method_model
+	 * @param SessionLifespan    $session_lifespan
+	 */
+	public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
+	{
+		$this->payment_method_model = $payment_method_model;
+		$this->session_lifespan = $session_lifespan;
+	}
 
 
-    /**
-     * Returns the name of the plugin and will be shown in the privacy policy's postbox header
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return esc_html__('Event Espresso', 'event_espresso');
-    }
+	/**
+	 * Returns the name of the plugin and will be shown in the privacy policy's postbox header
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return esc_html__('Event Espresso', 'event_espresso');
+	}
 
 
-    /**
-     * Gets the HTML for the privacy policy. May be dynamic
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        // do they have any offsite payment methods? or onsite payment methods?
-        $active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
-        $active_onsite_pms = array();
-        $active_offsite_pms = array();
-        foreach ($active_payment_methods as $payment_method) {
-            if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
-                if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
-                    $active_onsite_pms[] = $payment_method->name();
-                } elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
-                    $active_offsite_pms[] = $payment_method->name();
-                }
-            }
-        }
-        $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
-        return (string) EEH_Template::display_template(
-            __DIR__ . '/privacy_policy.template.php',
-            array(
-                'active_onsite_payment_methods' => $active_onsite_pms,
-                'active_offsite_payment_methods' => $active_offsite_pms,
-                'session_lifespan' => sprintf(
-                    _nx(
-                        '%1$s hour',
-                        '%1$s hours',
-                        $session_lifespan_in_hours,
-                        '2 hours',
-                        'event_espresso'
-                    ),
-                    $session_lifespan_in_hours
-                )
-            ),
-            true
-        );
-    }
+	/**
+	 * Gets the HTML for the privacy policy. May be dynamic
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		// do they have any offsite payment methods? or onsite payment methods?
+		$active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
+		$active_onsite_pms = array();
+		$active_offsite_pms = array();
+		foreach ($active_payment_methods as $payment_method) {
+			if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
+				if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
+					$active_onsite_pms[] = $payment_method->name();
+				} elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
+					$active_offsite_pms[] = $payment_method->name();
+				}
+			}
+		}
+		$session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
+		return (string) EEH_Template::display_template(
+			__DIR__ . '/privacy_policy.template.php',
+			array(
+				'active_onsite_payment_methods' => $active_onsite_pms,
+				'active_offsite_payment_methods' => $active_offsite_pms,
+				'session_lifespan' => sprintf(
+					_nx(
+						'%1$s hour',
+						'%1$s hours',
+						$session_lifespan_in_hours,
+						'2 hours',
+						'event_espresso'
+					),
+					$session_lifespan_in_hours
+				)
+			),
+			true
+		);
+	}
 }
 // End of file PrivacyPolicy.php
 // Location: EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy.php

core/services/assets/BlockAssetManagerCollection.php

Indentation +37 added lines, -37 removed lines

@@ -16,41 +16,41 @@
 class BlockAssetManagerCollection extends Collection
 {
 
-    /**
-     * Collection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function addAssets()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->addAssets();
-            $this->next();
-        }
-        $this->rewind();
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->enqueueAssets();
-            $this->next();
-        }
-        $this->rewind();
-    }
+	/**
+	 * Collection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function addAssets()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->addAssets();
+			$this->next();
+		}
+		$this->rewind();
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->enqueueAssets();
+			$this->next();
+		}
+		$this->rewind();
+	}
 }