eventespresso / event-espresso-core

admin_pages/registrations/templates/reg_status_change_buttons.template.php

Indentation +11 added lines, -11 removed lines

@@ -17,17 +17,17 @@ 
         <?php echo $nonce; ?>
         <?php echo $status_buttons; ?>
         <?php
-        if ($attendee instanceof EE_Attendee
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_send_message',
-                'registration_message_type'
-            )) : ?>
+		if ($attendee instanceof EE_Attendee
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_send_message',
+				'registration_message_type'
+			)) : ?>
             <span id="send-related-messages-dv">
                 <label for="txn-reg-status-send-notifications-inp" class="important-notice">
                 <?php _e(
-                    '...and send related messages ?',
-                    'event_espresso'
-                ); ?>
+					'...and send related messages ?',
+					'event_espresso'
+				); ?>
                 <input type="checkbox" value="1" id="txn-reg-status-send-notifications-inp"
                        name="txn_reg_status_change[send_notifications]">
                 </label>
@@ -36,9 +36,9 @@ 
             <br/>
             <p class="description">
                 <?php _e(
-                    'If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.',
-                    'event_espresso'
-                ); ?></p>
+					'If the "send related messages"checkbox is checked when changing status, then the related messages will be sent to the registrant.',
+					'event_espresso'
+				); ?></p>
         <?php endif; ?>
     </form>
 </div>

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_questions.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <div id="admin-primary-mbox-questions-dv" class="admin-primary-mbox-dv">
     <p>
         <?php _e(
-            'This displays the custom questions and answers for this registrant.  Please note that any answers to system questions have been saved with the contact record.  You can edit those answers via the "View/Edit this Contact" link in the Contact Details metabox in the sidebar.',
-            'event_espresso'
-        ); ?></p>
+			'This displays the custom questions and answers for this registrant.  Please note that any answers to system questions have been saved with the contact record.  You can edit those answers via the "View/Edit this Contact" link in the Contact Details metabox in the sidebar.',
+			'event_espresso'
+		); ?></p>
 
     <form name="reg-admin-attendee-questions-frm" id="reg-admin-attendee-questions-frm"
           action="<?php echo REG_ADMIN_URL; ?>" method="post">
@@ -20,9 +20,9 @@ 
         <?php else : ?>
             <p class="ee-attention">
                 <?php _e(
-                    'There were no custom questions asked for this registration.',
-                    'event_espresso'
-                ); ?></p>
+					'There were no custom questions asked for this registration.',
+					'event_espresso'
+				); ?></p>
         <?php endif; ?>
 
     </form>

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
 
     <form name="reg-admin-attendee-questions-frm" id="reg-admin-attendee-questions-frm"
           action="<?php echo REG_ADMIN_URL; ?>" method="post">
-        <?php wp_nonce_field($reg_questions_form_action . '_nonce', $reg_questions_form_action . '_nonce'); ?>
+        <?php wp_nonce_field($reg_questions_form_action.'_nonce', $reg_questions_form_action.'_nonce'); ?>
         <input type="hidden" name="page" value="<?php echo REG_PG_SLUG; ?>"/>
         <input type="hidden" name="action" value="<?php echo $reg_questions_form_action; ?>"/>
         <input type="hidden" name="_REG_ID" value="<?php echo $REG_ID; ?>"/>
         <input type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
         <input type="hidden" name="noheader" id="reg-admin-noheader-inp" value="true"/>
         <?php echo $att_questions; ?>
-        <?php if (! empty($att_questions)) : ?>
+        <?php if ( ! empty($att_questions)) : ?>
             <input id="reg-admin-attendee-questions-submit" class="button-primary" value="Update Registration Questions"
                    type="submit"/>
         <?php else : ?>

Braces +5 added lines, -2 removed lines

@@ -17,12 +17,15 @@
         <?php if (! empty($att_questions)) : ?>
             <input id="reg-admin-attendee-questions-submit" class="button-primary" value="Update Registration Questions"
                    type="submit"/>
-        <?php else : ?>
+        <?php else {
+	: ?>
             <p class="ee-attention">
                 <?php _e(
                     'There were no custom questions asked for this registration.',
                     'event_espresso'
-                ); ?></p>
+                );
+}
+?></p>
         <?php endif; ?>
 
     </form>

admin_pages/registrations/templates/attendee_details_main_meta_box.template.php

Indentation +15 added lines, -15 removed lines

@@ -23,16 +23,16 @@ 
             <td>
                 <div class="validation-notice-dv">
                     <?php _e(
-                        'The following is  a required field',
-                        'event_espresso'
-                    ); ?></div>
+						'The following is  a required field',
+						'event_espresso'
+					); ?></div>
                 <input class="regular-text required" type="text" id="ATT_fname" name="ATT_fname"
                        value="<?php echo $attendee->fname(); ?>"/><br/>
                 <p class="description">
                     <?php _e(
-                        'The registrant\'s given name. ( required value )',
-                        'event_espresso'
-                    ); ?></p>
+						'The registrant\'s given name. ( required value )',
+						'event_espresso'
+					); ?></p>
             </td>
         </tr>
 
@@ -44,16 +44,16 @@ 
             <td>
                 <div class="validation-notice-dv">
                     <?php _e(
-                        'The following is  a required field',
-                        'event_espresso'
-                    ); ?></div>
+						'The following is  a required field',
+						'event_espresso'
+					); ?></div>
                 <input class="regular-text required" type="text" id="ATT_lname" name="ATT_lname"
                        value="<?php echo $attendee->lname(); ?>"/><br/>
                 <p class="description">
                     <?php _e(
-                        'The registrant\'s family name. ( required value )',
-                        'event_espresso'
-                    ); ?></p>
+						'The registrant\'s family name. ( required value )',
+						'event_espresso'
+					); ?></p>
             </td>
         </tr>
 
@@ -65,9 +65,9 @@ 
             <td>
                 <div class="validation-notice-dv">
                     <?php _e(
-                        'The following is  a required field',
-                        'event_espresso'
-                    ); ?></div>
+						'The following is  a required field',
+						'event_espresso'
+					); ?></div>
                 <input class="regular-text required" type="text" id="ATT_email" name="ATT_email"
                        value="<?php $attendee->f('ATT_email'); ?>"/><br/>
                 <p class="description"><?php _e('( required value )', 'event_espresso'); ?></p>

admin_pages/registrations/templates/reg_admin_register_new_attendee.template.php

Indentation +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <h1><span class="small-text not-bold">
         <?php _e(
-            'Adding Registration For: ',
-            'event_espresso'
-        ); ?></span><?php echo $event_name; ?></h1>
+			'Adding Registration For: ',
+			'event_espresso'
+		); ?></span><?php echo $event_name; ?></h1>
 <?php echo $step_content;

admin_pages/registrations/templates/reg_admin_details_header.template.php

Indentation +11 added lines, -11 removed lines

@@ -1,23 +1,23 @@
 <div style="float:right">
     <?php printf(
-        __('View %1$sRegistrations%4$s /  %2$sTransactions%4$s for this %3$sevent%4$s.', 'event_espresso'),
-        '<a href="' . $filtered_registrations_link . '">',
-        '<a href="' . $filtered_transactions_link . '">',
-        '<a href="' . $event_link . '">',
-        '</a>'
-    ); ?>
+		__('View %1$sRegistrations%4$s /  %2$sTransactions%4$s for this %3$sevent%4$s.', 'event_espresso'),
+		'<a href="' . $filtered_registrations_link . '">',
+		'<a href="' . $filtered_transactions_link . '">',
+		'<a href="' . $event_link . '">',
+		'</a>'
+	); ?>
 </div>
 <h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo $previous_registration . '&nbsp;';
-    echo __('Registration # ', 'event_espresso') . $reg_nmbr['value'];
-    echo '&nbsp;' . $next_registration; ?></h3>
+	echo __('Registration # ', 'event_espresso') . $reg_nmbr['value'];
+	echo '&nbsp;' . $next_registration; ?></h3>
 <h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value']; ?></h2>
 
 <?php if ($registration->group_size() > 1) : ?>
     <a id="scroll-to-other-attendees" class="scroll-to" href="#other-attendees">
         <?php echo __(
-            'Scroll to Other Registrations in the Same Transaction',
-            'event_espresso'
-        ); ?></a>
+			'Scroll to Other Registrations in the Same Transaction',
+			'event_espresso'
+		); ?></a>
 <?php endif; ?>
 
 <?php do_action('AHEE__reg_status_change_buttons__after_header', $REG_ID); ?>

Spacing +6 added lines, -6 removed lines

@@ -1,15 +1,15 @@
 <div style="float:right">
     <?php printf(
         __('View %1$sRegistrations%4$s /  %2$sTransactions%4$s for this %3$sevent%4$s.', 'event_espresso'),
-        '<a href="' . $filtered_registrations_link . '">',
-        '<a href="' . $filtered_transactions_link . '">',
-        '<a href="' . $event_link . '">',
+        '<a href="'.$filtered_registrations_link.'">',
+        '<a href="'.$filtered_transactions_link.'">',
+        '<a href="'.$event_link.'">',
         '</a>'
     ); ?>
 </div>
-<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo $previous_registration . '&nbsp;';
-    echo __('Registration # ', 'event_espresso') . $reg_nmbr['value'];
-    echo '&nbsp;' . $next_registration; ?></h3>
+<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo $previous_registration.'&nbsp;';
+    echo __('Registration # ', 'event_espresso').$reg_nmbr['value'];
+    echo '&nbsp;'.$next_registration; ?></h3>
 <h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value']; ?></h2>
 
 <?php if ($registration->group_size() > 1) : ?>

admin_pages/registrations/templates/attendee_registrations_main_meta_box.template.php

Indentation +48 added lines, -48 removed lines

@@ -17,62 +17,62 @@
                 <tr>
                     <td class="jst-left">
                         <?php
-                        $event_url = add_query_arg(
-                            array('action' => 'edit', 'post' => $registration->event_ID()),
-                            admin_url('admin.php?page=espresso_events')
-                        );
-                        echo EE_Registry::instance()->CAP->current_user_can(
-                            'ee_edit_event',
-                            'espresso_events_edit',
-                            $registration->event_ID()
-                        ) ? '<a href="' . $event_url . '"  title="'
-                            . esc_attr__(
-                                'Edit Event',
-                                'event_espresso'
-                            ) . '">' . $registration->event_name() . '</a>' : $registration->event_name();
-                        ?>
+						$event_url = add_query_arg(
+							array('action' => 'edit', 'post' => $registration->event_ID()),
+							admin_url('admin.php?page=espresso_events')
+						);
+						echo EE_Registry::instance()->CAP->current_user_can(
+							'ee_edit_event',
+							'espresso_events_edit',
+							$registration->event_ID()
+						) ? '<a href="' . $event_url . '"  title="'
+							. esc_attr__(
+								'Edit Event',
+								'event_espresso'
+							) . '">' . $registration->event_name() . '</a>' : $registration->event_name();
+						?>
                     </td>
                     <td class="jst-left">
                         <?php
-                        $reg_url = EE_Admin_Page::add_query_args_and_nonce(
-                            array('action' => 'view_registration', '_REG_ID' => $registration->ID()),
-                            REG_ADMIN_URL
-                        );
-                        echo EE_Registry::instance()->CAP->current_user_can(
-                            'ee_read_registration',
-                            'espresso_registrations_view_registration',
-                            $registration->ID()
-                        ) ? '
+						$reg_url = EE_Admin_Page::add_query_args_and_nonce(
+							array('action' => 'view_registration', '_REG_ID' => $registration->ID()),
+							REG_ADMIN_URL
+						);
+						echo EE_Registry::instance()->CAP->current_user_can(
+							'ee_read_registration',
+							'espresso_registrations_view_registration',
+							$registration->ID()
+						) ? '
 							<a href="' . $reg_url . '" title="'
-                            . esc_attr__(
-                                'View Registration Details',
-                                'event_espresso'
-                            ) . '">' .
-                            esc_html__('View Registration', 'event_espresso') .
-                            '</a>' : $registration->ID();
-                        ?>
+							. esc_attr__(
+								'View Registration Details',
+								'event_espresso'
+							) . '">' .
+							esc_html__('View Registration', 'event_espresso') .
+							'</a>' : $registration->ID();
+						?>
                     </td>
                     <td class="jst-left">
                         <?php
-                        $txn_url = EE_Admin_Page::add_query_args_and_nonce(
-                            array('action' => 'view_transaction', 'TXN_ID' => $registration->transaction_ID()),
-                            TXN_ADMIN_URL
-                        );
-                        echo EE_Registry::instance()->CAP->current_user_can(
-                            'ee_read_transaction',
-                            'espresso_transactions_view_transaction'
-                        ) ? '
+						$txn_url = EE_Admin_Page::add_query_args_and_nonce(
+							array('action' => 'view_transaction', 'TXN_ID' => $registration->transaction_ID()),
+							TXN_ADMIN_URL
+						);
+						echo EE_Registry::instance()->CAP->current_user_can(
+							'ee_read_transaction',
+							'espresso_transactions_view_transaction'
+						) ? '
 						<a href="' . $txn_url . '" title="'
-                            . esc_attr__(
-                                'View Transaction Details',
-                                'event_espresso'
-                            ) . '">' .
-                            sprintf(
-                                esc_html__('View Transaction %d', 'event_espresso'),
-                                $registration->transaction_ID()
-                            ) .
-                            '</a>' : $registration->transaction_ID();
-                        ?>
+							. esc_attr__(
+								'View Transaction Details',
+								'event_espresso'
+							) . '">' .
+							sprintf(
+								esc_html__('View Transaction %d', 'event_espresso'),
+								$registration->transaction_ID()
+							) .
+							'</a>' : $registration->transaction_ID();
+						?>
                     </td>
                     <td class="jst-left"><?php echo $registration->reg_code(); ?></td>
                     <td class="jst-rght"><?php echo EEH_Template::format_currency($registration->final_price()); ?></td>

Spacing +8 added lines, -8 removed lines

@@ -25,11 +25,11 @@ 
                             'ee_edit_event',
                             'espresso_events_edit',
                             $registration->event_ID()
-                        ) ? '<a href="' . $event_url . '"  title="'
+                        ) ? '<a href="'.$event_url.'"  title="'
                             . esc_attr__(
                                 'Edit Event',
                                 'event_espresso'
-                            ) . '">' . $registration->event_name() . '</a>' : $registration->event_name();
+                            ).'">'.$registration->event_name().'</a>' : $registration->event_name();
                         ?>
                     </td>
                     <td class="jst-left">
@@ -43,12 +43,12 @@ 
                             'espresso_registrations_view_registration',
                             $registration->ID()
                         ) ? '
-							<a href="' . $reg_url . '" title="'
+							<a href="' . $reg_url.'" title="'
                             . esc_attr__(
                                 'View Registration Details',
                                 'event_espresso'
-                            ) . '">' .
-                            esc_html__('View Registration', 'event_espresso') .
+                            ).'">'.
+                            esc_html__('View Registration', 'event_espresso').
                             '</a>' : $registration->ID();
                         ?>
                     </td>
@@ -62,15 +62,15 @@ 
                             'ee_read_transaction',
                             'espresso_transactions_view_transaction'
                         ) ? '
-						<a href="' . $txn_url . '" title="'
+						<a href="' . $txn_url.'" title="'
                             . esc_attr__(
                                 'View Transaction Details',
                                 'event_espresso'
-                            ) . '">' .
+                            ).'">'.
                             sprintf(
                                 esc_html__('View Transaction %d', 'event_espresso'),
                                 $registration->transaction_ID()
-                            ) .
+                            ).
                             '</a>' : $registration->transaction_ID();
                         ?>
                     </td>

admin_pages/payments/Payments_Admin_Page_Init.core.php

Indentation +138 added lines, -138 removed lines

@@ -15,144 +15,144 @@
 class Payments_Admin_Page_Init extends EE_Admin_Page_Init
 {
 
-    /**
-     * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * Payments_Admin_Page_Init constructor.
-     */
-    public function __construct()
-    {
-        // define some page related constants
-        define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
-        define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
-        define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS);
-        define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS);
-        define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
-        $this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
-        // check that there are active gateways on all admin page loads. but dont do it just yet
-        add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
-
-        // Show/hide PP Standard along side PP Express.
-        add_filter(
-            'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
-            array($this, 'unset_pp_standard')
-        );
-
-        parent::__construct();
-    }
-
-    protected function _set_init_properties()
-    {
-        $this->label = __('Payment Methods', 'event_espresso');
-    }
-
-
-    /**
-     * _set_menu_map
-     *
-     * @return void
-     */
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'settings',
-                'menu_order'      => 30,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_PAYMENTS_PG_SLUG,
-                'menu_label'      => __('Payment Methods', 'event_espresso'),
-                'capability'      => 'ee_manage_gateways',
-                'admin_init_page' => $this,
-            )
-        );
-    }
-
-
-    /**
-     * Checks that there is at least one active gateway. If not, add a notice
-     *
-     * @throws \EE_Error
-     */
-    public function check_payment_gateway_setup()
-    {
-        // ONLY do this check if models can query
-        // and avoid a bug where when we nuke EE4's data that this causes a fatal error
-        // because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
-        if (! EE_Maintenance_Mode::instance()->models_can_query()
-            || ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
-        ) {
-            return;
-        }
-
-
-        // ensure Payment_Method model is loaded
-        EE_Registry::instance()->load_model('Payment_Method');
-        $actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
-        if ($actives < 1) {
-            $url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
-            echo '<div class="error">
+	/**
+	 * @var \EventEspresso\core\services\database\TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * Payments_Admin_Page_Init constructor.
+	 */
+	public function __construct()
+	{
+		// define some page related constants
+		define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
+		define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
+		define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS);
+		define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS);
+		define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
+		// check that there are active gateways on all admin page loads. but dont do it just yet
+		add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
+
+		// Show/hide PP Standard along side PP Express.
+		add_filter(
+			'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
+			array($this, 'unset_pp_standard')
+		);
+
+		parent::__construct();
+	}
+
+	protected function _set_init_properties()
+	{
+		$this->label = __('Payment Methods', 'event_espresso');
+	}
+
+
+	/**
+	 * _set_menu_map
+	 *
+	 * @return void
+	 */
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'settings',
+				'menu_order'      => 30,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_PAYMENTS_PG_SLUG,
+				'menu_label'      => __('Payment Methods', 'event_espresso'),
+				'capability'      => 'ee_manage_gateways',
+				'admin_init_page' => $this,
+			)
+		);
+	}
+
+
+	/**
+	 * Checks that there is at least one active gateway. If not, add a notice
+	 *
+	 * @throws \EE_Error
+	 */
+	public function check_payment_gateway_setup()
+	{
+		// ONLY do this check if models can query
+		// and avoid a bug where when we nuke EE4's data that this causes a fatal error
+		// because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
+		if (! EE_Maintenance_Mode::instance()->models_can_query()
+			|| ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
+		) {
+			return;
+		}
+
+
+		// ensure Payment_Method model is loaded
+		EE_Registry::instance()->load_model('Payment_Method');
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		if ($actives < 1) {
+			$url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
+			echo '<div class="error">
 				 <p>'
-                 . sprintf(
-                     __(
-                         "There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s",
-                         "event_espresso"
-                     ),
-                     "<a href='$url'>",
-                     "</a>"
-                 ) . '</p>
+				 . sprintf(
+					 __(
+						 "There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s",
+						 "event_espresso"
+					 ),
+					 "<a href='$url'>",
+					 "</a>"
+				 ) . '</p>
 			 </div>';
-        }
-    }
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Hide PayPal Standard for "new" users.
-     */
-    public static function unset_pp_standard($payment_method_types)
-    {
-        $pps = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
-        $ppstandard_active = (! empty($pps)) ? $pps->active() : false;
-        $ppstandard_active_before = false;
-        if ($pps) {
-            // PP Standard used before ?
-            $paypal_id = $pps->get_extra_meta('paypal_id', true);
-            if ($paypal_id && ! empty($paypal_id)) {
-                $ppstandard_active_before = true;
-            }
-        }
-
-        // Not using PP Standard? Then display only PayPal Express, do not show PayPal Standard.
-        if (apply_filters(
-            'FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard',
-            ! $ppstandard_active && ! $ppstandard_active_before
-        )) {
-            unset($payment_method_types['paypal_standard']);
-        }
-        return $payment_method_types;
-    }
+		}
+	}
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Hide PayPal Standard for "new" users.
+	 */
+	public static function unset_pp_standard($payment_method_types)
+	{
+		$pps = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
+		$ppstandard_active = (! empty($pps)) ? $pps->active() : false;
+		$ppstandard_active_before = false;
+		if ($pps) {
+			// PP Standard used before ?
+			$paypal_id = $pps->get_extra_meta('paypal_id', true);
+			if ($paypal_id && ! empty($paypal_id)) {
+				$ppstandard_active_before = true;
+			}
+		}
+
+		// Not using PP Standard? Then display only PayPal Express, do not show PayPal Standard.
+		if (apply_filters(
+			'FHEE__EE_PMT_Paypal_Express__register_payment_methods__hide_paypal_standard',
+			! $ppstandard_active && ! $ppstandard_active_before
+		)) {
+			unset($payment_method_types['paypal_standard']);
+		}
+		return $payment_method_types;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -28,10 +28,10 @@ 
     {
         // define some page related constants
         define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
-        define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page=' . EE_PAYMENTS_PG_SLUG));
-        define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS);
-        define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS);
-        define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/');
+        define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
+        define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments'.DS);
+        define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates'.DS);
+        define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
         $this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
         // check that there are active gateways on all admin page loads. but dont do it just yet
         add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
@@ -83,7 +83,7 @@ 
         // ONLY do this check if models can query
         // and avoid a bug where when we nuke EE4's data that this causes a fatal error
         // because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
-        if (! EE_Maintenance_Mode::instance()->models_can_query()
+        if ( ! EE_Maintenance_Mode::instance()->models_can_query()
             || ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
         ) {
             return;
@@ -104,7 +104,7 @@ 
                      ),
                      "<a href='$url'>",
                      "</a>"
-                 ) . '</p>
+                 ).'</p>
 			 </div>';
         }
     }
@@ -136,7 +136,7 @@ 
     public static function unset_pp_standard($payment_method_types)
     {
         $pps = EEM_Payment_Method::instance()->get_one_of_type('Paypal_Standard');
-        $ppstandard_active = (! empty($pps)) ? $pps->active() : false;
+        $ppstandard_active = ( ! empty($pps)) ? $pps->active() : false;
         $ppstandard_active_before = false;
         if ($pps) {
             // PP Standard used before ?

admin_pages/payments/help_tabs/payment_methods_overview.help_tab.php

Indentation +35 added lines, -35 removed lines

@@ -7,80 +7,80 @@
     <li>
         <strong><?php _e('Name', 'event_espresso'); ?></strong><br>
         <?php _e(
-            'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.',
-            'event_espresso'
-        ); ?>
+			'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Description', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.',
-            'event_espresso'
-        ); ?>
+			'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.',
+			'event_espresso'
+		); ?>
     </li>
     <li><strong><?php _e('Admin-Only Name', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'The name of the payment method as seen internally by site administrators and staff.',
-            'event_espresso'
-        ); ?>
+			'The name of the payment method as seen internally by site administrators and staff.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Admin-Only Description', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'The description of the payment method as seen internally by site administrators and staff.',
-            'event_espresso'
-        ); ?>
+			'The description of the payment method as seen internally by site administrators and staff.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Debug (sandbox) Mode', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.',
-            'event_espresso'
-        ); ?>
+			'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Open by Default', 'event_espresso'); ?></strong><br/>
         <?php _e(
-            'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)',
-            'event_espresso'
-        ); ?>
+			'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php _e('Button URL', 'event_espresso'); ?></strong><br/>
         <?php printf(
-            __(
-                'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
-                'event_espresso'
-            ),
-            '<img src="' . admin_url('images/media-button-image.gif') . '">'
-        ); ?>
+			__(
+				'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
+				'event_espresso'
+			),
+			'<img src="' . admin_url('images/media-button-image.gif') . '">'
+		); ?>
     </li>
     <li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/>
         <?php _e('Where this payment method can be used from.', 'event_espresso'); ?>
         <ul>
             <li>
                 <?php _e(
-                    'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.',
-                    'event_espresso'
-                ); ?></li>
+					'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.',
+					'event_espresso'
+				); ?></li>
             <li>
                 <?php _e(
-                    'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.',
-                    'event_espresso'
-                ); ?></li>
+					'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.',
+					'event_espresso'
+				); ?></li>
         </ul>
     </li>
 </ul>
 <strong><?php _e('Recommendations', 'event_espresso'); ?></strong><br/>
 <?php _e(
-    'Want to see a tour of this screen? Click on the Payment Methods Overview Tour button which appears on the right side of the page. <br />To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
-    'event_espresso'
+	'Want to see a tour of this screen? Click on the Payment Methods Overview Tour button which appears on the right side of the page. <br />To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
+	'event_espresso'
 ); ?>
 </p>
 <p>
     <strong><?php _e('Screen Options', 'event_espresso'); ?></strong><br/>
     <?php _e(
-        'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
-        'event_espresso'
-    ); ?>
+		'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
+		'event_espresso'
+	); ?>
 </p>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
                 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
                 'event_espresso'
             ),
-            '<img src="' . admin_url('images/media-button-image.gif') . '">'
+            '<img src="'.admin_url('images/media-button-image.gif').'">'
         ); ?>
     </li>
     <li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/>

admin_pages/payments/templates/payment_log_details.template.php

Indentation +8 added lines, -8 removed lines

@@ -36,11 +36,11 @@ 
                 </th>
                 <td>
                     <?php echo $payment_method
-                        ? $payment_method->admin_name()
-                        : __(
-                            "No Longer Exists",
-                            'event_espresso'
-                        ) ?>
+						? $payment_method->admin_name()
+						: __(
+							"No Longer Exists",
+							'event_espresso'
+						) ?>
 
                 </td>
             </tr>
@@ -63,9 +63,9 @@ 
                 </th>
                 <td>
                     <?php echo $payment_log->e(
-                        'LOG_message',
-                        'as_table'
-                    );// EEH_Template::layout_array_as_table($payment_log->content())?>
+						'LOG_message',
+						'as_table'
+					);// EEH_Template::layout_array_as_table($payment_log->content())?>
                 </td>
             </tr>
             </tbody>

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
                     <?php echo $payment_log->e(
                         'LOG_message',
                         'as_table'
-                    );// EEH_Template::layout_array_as_table($payment_log->content())?>
+                    ); // EEH_Template::layout_array_as_table($payment_log->content())?>
                 </td>
             </tr>
             </tbody>