eventespresso / event-espresso-core

caffeinated/core/libraries/shortcodes/EE_Question_List_Shortcodes.lib.php

Spacing +3 added lines, -3 removed lines

@@ -83,12 +83,12 @@
         $template = empty($template) && isset($this->_extra_data['template']['question_list'])
             ? $this->_extra_data['template']['question_list'] : $template;
         $ans_result = '';
-        $answers = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
-            ? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'] : array();
+        $answers = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'])
+            ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
         $questions = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
         foreach ($answers as $answer) {
             // first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+            $question = isset($questions[$answer->ID()]) ? $questions[$answer->ID()] : null;
             $question = ! $question instanceof EE_Question ? $answer->question() : $question;
             if ($question instanceof EE_Question and $question->admin_only()) {
                 continue;

Indentation +83 added lines, -83 removed lines

@@ -16,96 +16,96 @@
 class EE_Question_List_Shortcodes extends EE_Shortcodes
 {
 
-    protected function _init_props()
-    {
-        $this->label = __('Questions and Answers Shortcodes', 'event_espresso');
-        $this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
-        $this->_shortcodes = array(
-            '[QUESTION_LIST]' => __(
-                'This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
-                'event_espresso'
-            ),
-        );
-    }
+	protected function _init_props()
+	{
+		$this->label = __('Questions and Answers Shortcodes', 'event_espresso');
+		$this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
+		$this->_shortcodes = array(
+			'[QUESTION_LIST]' => __(
+				'This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
+				'event_espresso'
+			),
+		);
+	}
 
 
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[QUESTION_LIST]':
-                return $this->_get_question_list();
-                break;
-        }
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[QUESTION_LIST]':
+				return $this->_get_question_list();
+				break;
+		}
 
-        return '';
-    }
+		return '';
+	}
 
 
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_question_list()
-    {
-        $this->_validate_list_requirements();
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_question_list()
+	{
+		$this->_validate_list_requirements();
 
-        if ($this->_data['data'] instanceof EE_Registration) {
-            // for when [QUESTION_LIST] is used in the [attendee_list] field.
-            return $this->_get_question_answer_list_for_attendee();
-        } elseif (
-            $this->_data['data'] instanceof EE_Messages_Addressee
-            && $this->_data['data']->reg_obj instanceof EE_Registration
-        ) {
-            // for when [QUESTION_LIST] is used in the main content field.
-            return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
-        }
-        return '';
-    }
+		if ($this->_data['data'] instanceof EE_Registration) {
+			// for when [QUESTION_LIST] is used in the [attendee_list] field.
+			return $this->_get_question_answer_list_for_attendee();
+		} elseif (
+			$this->_data['data'] instanceof EE_Messages_Addressee
+			&& $this->_data['data']->reg_obj instanceof EE_Registration
+		) {
+			// for when [QUESTION_LIST] is used in the main content field.
+			return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
+		}
+		return '';
+	}
 
 
-    /**
-     * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
-     * answers for that attendee since that is what we really need (we can derive the questions from the answers);
-     *
-     * @param null $reg_obj
-     * @return string parsed template.
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_question_answer_list_for_attendee($reg_obj = null)
-    {
-        $valid_shortcodes = array('question');
-        $reg_obj = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
-        $template = is_array($this->_data['template']) && isset($this->_data['template']['question_list'])
-            ? $this->_data['template']['question_list'] : '';
-        $template = empty($template) && isset($this->_extra_data['template']['question_list'])
-            ? $this->_extra_data['template']['question_list'] : $template;
-        $ans_result = '';
-        $answers = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
-            ? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'] : array();
-        $questions = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
-        foreach ($answers as $answer) {
-            // first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
-            $question = ! $question instanceof EE_Question ? $answer->question() : $question;
-            if ($question instanceof EE_Question and $question->admin_only()) {
-                continue;
-            }
-            $ans_result .= $this->_shortcode_helper->parse_question_list_template(
-                $template,
-                $answer,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
+	/**
+	 * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
+	 * answers for that attendee since that is what we really need (we can derive the questions from the answers);
+	 *
+	 * @param null $reg_obj
+	 * @return string parsed template.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_question_answer_list_for_attendee($reg_obj = null)
+	{
+		$valid_shortcodes = array('question');
+		$reg_obj = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['question_list'])
+			? $this->_data['template']['question_list'] : '';
+		$template = empty($template) && isset($this->_extra_data['template']['question_list'])
+			? $this->_extra_data['template']['question_list'] : $template;
+		$ans_result = '';
+		$answers = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
+			? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'] : array();
+		$questions = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
+		foreach ($answers as $answer) {
+			// first see if the question is in our $questions array.  If not then try to get from answer object
+			$question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+			$question = ! $question instanceof EE_Question ? $answer->question() : $question;
+			if ($question instanceof EE_Question and $question->admin_only()) {
+				continue;
+			}
+			$ans_result .= $this->_shortcode_helper->parse_question_list_template(
+				$template,
+				$answer,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
 
-        return $ans_result;
-    }
+		return $ans_result;
+	}
 }

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
             </label>
         </th>
         <td>
-            <p><?php echo site_url() . '/ '
+            <p><?php echo site_url().'/ '
                           . EEH_Form_Fields::text(
                               'not_used',
                               EE_Registry::instance()->CFG->core->event_cpt_slug,

Indentation +108 added lines, -108 removed lines

@@ -2,18 +2,18 @@ 
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => __('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => __('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => __('No', 'event_espresso')),
+	)
 );
 
 $description = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 0, 'text' => __('none', 'event_espresso')),
-        array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
-        array('id' => 2, 'text' => __('full description', 'event_espresso')),
-    )
+	array(
+		array('id' => 0, 'text' => __('none', 'event_espresso')),
+		array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
+		array('id' => 2, 'text' => __('full description', 'event_espresso')),
+	)
 );
 
 ?>
@@ -32,14 +32,14 @@ 
         <th>
             <label for="event_listings_url">
                 <?php _e('Event Listings URL', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'event_listings_url_info'
-                ); ?>
+					'event_listings_url_info'
+				); ?>
             </label>
         </th>
         <td>
             <a id="event_listings_url" class="ee-admin-settings-hdr-lnk small-text"
                href="<?php echo EEH_Event_View::event_archive_url(); ?>"><?php
-                echo EEH_Event_View::event_archive_url(); ?></a>
+				echo EEH_Event_View::event_archive_url(); ?></a>
         </td>
     </tr>
 
@@ -51,30 +51,30 @@ 
         </th>
         <td>
             <p><?php echo site_url() . '/ '
-                          . EEH_Form_Fields::text(
-                              'not_used',
-                              EE_Registry::instance()->CFG->core->event_cpt_slug,
-                              'event_cpt_slug',
-                              'event_cpt_slug',
-                              'regular'
-                          ); ?></p>
+						  . EEH_Form_Fields::text(
+							  'not_used',
+							  EE_Registry::instance()->CFG->core->event_cpt_slug,
+							  'event_cpt_slug',
+							  'event_cpt_slug',
+							  'regular'
+						  ); ?></p>
             <p class="description"><?php
-                _e(
-                    'This allows you to configure what slug is used for the url of all event pages.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'This allows you to configure what slug is used for the url of all event pages.',
+					'event_espresso'
+				); ?></p>
             <?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
                 <p class="important-notice">
                     <?php
-                    sprintf(
-                        __(
-                            'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
-                            'event_espresso'
-                        ),
-                        '<code>',
-                        '</code>'
-                    );
-                    ?>
+					sprintf(
+						__(
+							'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
+							'event_espresso'
+						),
+						'<code>',
+						'</code>'
+					);
+					?>
                 </p>
             <?php endif; ?>
         </td>
@@ -88,17 +88,17 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_status_banner',
-                $display_status_banner,
-                $values,
-                'EED_Events_Archive_display_status_banner',
-                'EED_Events_Archive_display_status_banner'
-            ); ?>
+				'display_status_banner',
+				$display_status_banner,
+				$values,
+				'EED_Events_Archive_display_status_banner',
+				'EED_Events_Archive_display_status_banner'
+			); ?>
             <p class="description"><?php
-                _e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -106,18 +106,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_description">
                 <?php _e('Display Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_description_info'
-                ); ?>
+					'display_description_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'description',
-                $display_description,
-                $description,
-                'EED_Events_Archive_display_description',
-                'EED_Events_Archive_display_description'
-            ); ?>
+				'description',
+				$display_description,
+				$description,
+				'EED_Events_Archive_display_description',
+				'EED_Events_Archive_display_description'
+			); ?>
         </td>
     </tr>
 
@@ -125,18 +125,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_ticket_selector">
                 <?php _e('Display Ticket Selector', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_ticket_selector_info'
-                ); ?>
+					'display_ticket_selector_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'ticket_selector',
-                $display_ticket_selector,
-                $values,
-                'EED_Events_Archive_display_ticket_selector',
-                'EED_Events_Archive_display_ticket_selector'
-            ); ?>
+				'ticket_selector',
+				$display_ticket_selector,
+				$values,
+				'EED_Events_Archive_display_ticket_selector',
+				'EED_Events_Archive_display_ticket_selector'
+			); ?>
         </td>
     </tr>
 
@@ -144,18 +144,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_datetimes">
                 <?php _e('Display Datetimes', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_datetimes_info'
-                ); ?>
+					'display_datetimes_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'venue_details',
-                $display_datetimes,
-                $values,
-                'EED_Events_Archive_display_datetimes',
-                'EED_Events_Archive_display_datetimes'
-            ); ?>
+				'venue_details',
+				$display_datetimes,
+				$values,
+				'EED_Events_Archive_display_datetimes',
+				'EED_Events_Archive_display_datetimes'
+			); ?>
         </td>
     </tr>
 
@@ -163,18 +163,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_venue">
                 <?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_venue_details_info'
-                ); ?>
+					'display_venue_details_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_venue',
-                $display_venue,
-                $values,
-                'EED_Events_Archive_display_venue',
-                'EED_Events_Archive_display_venue'
-            ); ?>
+				'display_venue',
+				$display_venue,
+				$values,
+				'EED_Events_Archive_display_venue',
+				'EED_Events_Archive_display_venue'
+			); ?>
         </td>
     </tr>
 
@@ -182,18 +182,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_expired_events">
                 <?php _e('Display Expired Events', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_expired_events_info'
-                ); ?>
+					'display_expired_events_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'expired_events',
-                $display_expired_events,
-                $values,
-                'EED_Events_Archive_display_expired_events',
-                'EED_Events_Archive_display_expired_events'
-            ); ?>
+				'expired_events',
+				$display_expired_events,
+				$values,
+				'EED_Events_Archive_display_expired_events',
+				'EED_Events_Archive_display_expired_events'
+			); ?>
         </td>
     </tr>
 
@@ -201,43 +201,43 @@ 
         <th>
             <label for="EED_Events_Archive_use_sortable_display_order">
                 <?php _e(
-                    'Use Custom Display Order?',
-                    'event_espresso'
-                ); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
+					'Use Custom Display Order?',
+					'event_espresso'
+				); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'use_sortable_display_order',
-                $use_sortable_display_order,
-                $values,
-                'EED_Events_Archive_use_sortable_display_order',
-                'EED_Events_Archive_use_sortable_display_order'
-            ); ?>
+				'use_sortable_display_order',
+				$use_sortable_display_order,
+				$values,
+				'EED_Events_Archive_use_sortable_display_order',
+				'EED_Events_Archive_use_sortable_display_order'
+			); ?>
         </td>
     </tr>
 
     <tr>
         <th>
             <?php _e(
-                'Display Order',
-                'event_espresso'
-            ); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
+				'Display Order',
+				'event_espresso'
+			); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_archive_order',
-                'espresso_update_event_archive_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_archive_order',
+				'espresso_update_event_archive_order_nonce',
+				false
+			); ?>
             <?php echo $event_archive_display_order; ?>
 
             <p class="description"><?php
-                _e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
-                    'event_espresso'
-                ); ?></p>
+				_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>
@@ -250,12 +250,12 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'reset_event_list_settings',
-                0,
-                $values,
-                'EED_Events_Archive_reset_event_list_settings',
-                'EED_Events_Archive_reset_event_list_settings'
-            ); ?>
+				'reset_event_list_settings',
+				0,
+				$values,
+				'EED_Events_Archive_reset_event_list_settings',
+				'EED_Events_Archive_reset_event_list_settings'
+			); ?>
         </td>
     </tr>
 

caffeinated/modules/recaptcha/templates/recaptcha.template.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /** @type string $recaptcha_language */
 /** @type string $recaptcha_publickey */

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /** @type string $recaptcha_language */

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Spacing +29 added lines, -29 removed lines

@@ -77,13 +77,13 @@ 
     public function do_direct_payment($payment, $billing_info = null)
     {
         $transaction = $payment->transaction();
-        if (! $transaction instanceof EEI_Transaction) {
+        if ( ! $transaction instanceof EEI_Transaction) {
             throw new EE_Error(
                 esc_html__('No transaction for payment while paying with PayPal Pro.', 'event_espresso')
             );
         }
         $primary_registrant = $transaction->primary_registration();
-        if (! $primary_registrant instanceof EEI_Registration) {
+        if ( ! $primary_registrant instanceof EEI_Registration) {
             throw new EE_Error(
                 esc_html__(
                     'No primary registration on transaction while paying with PayPal Pro.',
@@ -92,7 +92,7 @@ 
             );
         }
         $attendee = $primary_registrant->attendee();
-        if (! $attendee instanceof EEI_Attendee) {
+        if ( ! $attendee instanceof EEI_Attendee) {
             throw new EE_Error(
                 esc_html__(
                     'No attendee on primary registration while paying with PayPal Pro.',
@@ -189,7 +189,7 @@ 
             // Required.  Credit card number.  No spaces or punctuation.
             'acct'           => $billing_info['credit_card'],
             // Required.  Credit card expiration date.  Format is MMYYYY
-            'expdate'        => $billing_info['exp_month'] . $billing_info['exp_year'],
+            'expdate'        => $billing_info['exp_month'].$billing_info['exp_year'],
             // Requirements determined by your PayPal account settings.  Security digits for credit card.
             'cvv2'           => $billing_info['cvv'],
         );
@@ -241,7 +241,7 @@ 
         $ShippingAddress = array(
             'shiptoname'     => substr($use_registration_address_info
                 ? $attendee->full_name()
-                : $billing_info['first_name'] . ' ' . $billing_info['last_name'], 0, 32),
+                : $billing_info['first_name'].' '.$billing_info['last_name'], 0, 32),
             'shiptostreet'   => substr($use_registration_address_info
                 ? $attendee->address()
                 : $billing_info['address'], 0, 100),
@@ -270,7 +270,7 @@ 
             'currencycode' => $payment->currency_code(),
             // Required if you include itemized cart details. (L_AMTn, etc.)
             // Subtotal of items not including S&H, or tax.
-            'itemamt'      => $gateway_formatter->formatCurrency($item_amount),//
+            'itemamt'      => $gateway_formatter->formatCurrency($item_amount), //
             // Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
             'shippingamt'  => '',
             // Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -283,10 +283,10 @@ 
             // Free-form field for your own use.  256 char max.
             'custom'       => $primary_registrant ? $primary_registrant->ID() : '',
             // Your own invoice or tracking number
-            'invnum'       => wp_generate_password(12, false),// $transaction->ID(),
+            'invnum'       => wp_generate_password(12, false), // $transaction->ID(),
             // URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
             'notifyurl'    => '',
-            'buttonsource' => 'EventEspresso_SP',// EE will blow up if you change this
+            'buttonsource' => 'EventEspresso_SP', // EE will blow up if you change this
         );
         // Wrap all data arrays into a single, "master" array which will be passed into the class function.
         $PayPalRequestData = array(
@@ -396,52 +396,52 @@ 
         // DP Fields
         $DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
         foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
-            $DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+            $DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
         }
         // CC Details Fields
         $CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
         foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
-            $CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+            $CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
         }
         // PayerInfo Type Fields
         $PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
         foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
-            $PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+            $PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
         }
         // Payer Name Fields
         $PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
         foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
-            $PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+            $PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
         }
         // Address Fields (Billing)
         $BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
         foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
-            $BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+            $BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
         }
         // Payment Details Type Fields
         $PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
         foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
-            $PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+            $PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
         }
         // Payment Details Item Type Fields
         $OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
         $n = 0;
         foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
-            $CurrentItem = $OrderItems[ $OrderItemsVar ];
+            $CurrentItem = $OrderItems[$OrderItemsVar];
             foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
-                $OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+                $OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
             }
             $n++;
         }
         // Ship To Address Fields
         $ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
         foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
-            $ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+            $ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
         }
         // 3D Secure Fields
         $Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
         foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
-            $Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+            $Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
         }
         // Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
         $NVPRequest = 'USER='
@@ -512,7 +512,7 @@ 
             $valuepos = strpos($NVPString, '&') ? strpos($NVPString, '&') : strlen($NVPString);
             $valval = substr($NVPString, $keypos + 1, $valuepos - $keypos - 1);
             // decoding the response
-            $proArray[ $keyval ] = urldecode($valval);
+            $proArray[$keyval] = urldecode($valval);
             $NVPString = substr($NVPString, $valuepos + 1, strlen($NVPString));
         }
         return $proArray;
@@ -545,16 +545,16 @@ 
     {
         $Errors = array();
         $n = 0;
-        while (isset($DataArray[ 'L_ERRORCODE' . $n . '' ])) {
-            $LErrorCode = isset($DataArray[ 'L_ERRORCODE' . $n . '' ]) ? $DataArray[ 'L_ERRORCODE' . $n . '' ] : '';
-            $LShortMessage = isset($DataArray[ 'L_SHORTMESSAGE' . $n . '' ])
-                ? $DataArray[ 'L_SHORTMESSAGE' . $n . '' ]
+        while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+            $LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+            $LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.''])
+                ? $DataArray['L_SHORTMESSAGE'.$n.'']
                 : '';
-            $LLongMessage = isset($DataArray[ 'L_LONGMESSAGE' . $n . '' ])
-                ? $DataArray[ 'L_LONGMESSAGE' . $n . '' ]
+            $LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.''])
+                ? $DataArray['L_LONGMESSAGE'.$n.'']
                 : '';
-            $LSeverityCode = isset($DataArray[ 'L_SEVERITYCODE' . $n . '' ])
-                ? $DataArray[ 'L_SEVERITYCODE' . $n . '' ]
+            $LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.''])
+                ? $DataArray['L_SEVERITYCODE'.$n.'']
                 : '';
             $CurrentItem = array(
                 'L_ERRORCODE'    => $LErrorCode,
@@ -581,7 +581,7 @@ 
     {
         $error = '';
         foreach ($Errors as $ErrorVar => $ErrorVal) {
-            $CurrentError = $Errors[ $ErrorVar ];
+            $CurrentError = $Errors[$ErrorVar];
             foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
                 $CurrentVarName = '';
                 if ($CurrentErrorVar == 'L_ERRORCODE') {
@@ -593,7 +593,7 @@ 
                 } elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
                     $CurrentVarName = 'Severity Code';
                 }
-                $error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+                $error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
             }
         }
         return $error;

Indentation +602 added lines, -602 removed lines

@@ -11,606 +11,606 @@
 class EEG_Paypal_Pro extends EE_Onsite_Gateway
 {
 
-    /**
-     * @var $_paypal_api_username string
-     */
-    protected $_api_username = null;
-
-    /**
-     * @var $_api_password string
-     */
-    protected $_api_password = null;
-
-    /**
-     * @var $_api_signature string
-     */
-    protected $_api_signature = null;
-
-    /**
-     * @var $_credit_card_types array with the keys for credit card types accepted on this account
-     */
-    protected $_credit_card_types    = null;
-
-    protected $_currencies_supported = array(
-        'USD',
-        'GBP',
-        'CAD',
-        'AUD',
-        'BRL',
-        'CHF',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MXN',
-        'MYR',
-        'NOK',
-        'NZD',
-        'PHP',
-        'PLN',
-        'SEK',
-        'SGD',
-        'THB',
-        'TRY',
-        'TWD',
-        'RUB',
-        'INR',
-    );
-
-
-
-    /**
-     * @param EEI_Payment $payment
-     * @param array       $billing_info {
-     * @type string $credit_card
-     * @type string $credit_card_type
-     * @type string $exp_month always 2 characters
-     * @type string $exp_year always 4 characters
-     * @type string $cvv
-     * }
-     * @see      parent::do_direct_payment for more info
-     * @return EE_Payment|EEI_Payment
-     * @throws EE_Error
-     */
-    public function do_direct_payment($payment, $billing_info = null)
-    {
-        $transaction = $payment->transaction();
-        if (! $transaction instanceof EEI_Transaction) {
-            throw new EE_Error(
-                esc_html__('No transaction for payment while paying with PayPal Pro.', 'event_espresso')
-            );
-        }
-        $primary_registrant = $transaction->primary_registration();
-        if (! $primary_registrant instanceof EEI_Registration) {
-            throw new EE_Error(
-                esc_html__(
-                    'No primary registration on transaction while paying with PayPal Pro.',
-                    'event_espresso'
-                )
-            );
-        }
-        $attendee = $primary_registrant->attendee();
-        if (! $attendee instanceof EEI_Attendee) {
-            throw new EE_Error(
-                esc_html__(
-                    'No attendee on primary registration while paying with PayPal Pro.',
-                    'event_espresso'
-                )
-            );
-        }
-        $gateway_formatter = $this->_get_gateway_formatter();
-        $order_description = substr($gateway_formatter->formatOrderDescription($payment), 0, 127);
-        // charge for the full amount. Show itemized list
-        if ($this->_money->compare_floats($payment->amount(), $transaction->total(), '==')) {
-            $item_num = 1;
-            $total_line_item = $transaction->total_line_item();
-            $order_items = array();
-            foreach ($total_line_item->get_items() as $line_item) {
-                // ignore line items with a quantity of 0
-                if ($line_item->quantity() == 0) {
-                    continue;
-                }
-                // For percent items, whose unit_price is 0, use the total instead.
-                if ($line_item->is_percent()) {
-                    $unit_price = $line_item->total();
-                    $line_item_quantity = 1;
-                } else {
-                    $unit_price = $line_item->unit_price();
-                    $line_item_quantity = $line_item->quantity();
-                }
-                $item = array(
-                    // Item Name.  127 char max.
-                    'l_name'                 => substr(
-                        $gateway_formatter->formatLineItemName($line_item, $payment),
-                        0,
-                        127
-                    ),
-                    // Item description.  127 char max.
-                    'l_desc'                 => substr(
-                        $gateway_formatter->formatLineItemDesc($line_item, $payment),
-                        0,
-                        127
-                    ),
-                    // Cost of individual item.
-                    'l_amt'                  => $unit_price,
-                    // Item Number.  127 char max.
-                    'l_number'               => $item_num++,
-                    // Item quantity.  Must be any positive integer.
-                    'l_qty'                  => $line_item_quantity,
-                    // Item's sales tax amount.
-                    'l_taxamt'               => '',
-                    // eBay auction number of item.
-                    'l_ebayitemnumber'       => '',
-                    // eBay transaction ID of purchased item.
-                    'l_ebayitemauctiontxnid' => '',
-                    // eBay order ID for the item.
-                    'l_ebayitemorderid'      => '',
-                );
-                // add to array of all items
-                array_push($order_items, $item);
-            }
-            $item_amount = $total_line_item->get_items_total();
-            $tax_amount = $total_line_item->get_total_tax();
-        } else {
-            $order_items = array();
-            $item_amount = $payment->amount();
-            $tax_amount = 0;
-            array_push($order_items, array(
-                // Item Name.  127 char max.
-                'l_name'   => substr(
-                    $gateway_formatter->formatPartialPaymentLineItemName($payment),
-                    0,
-                    127
-                ),
-                // Item description.  127 char max.
-                'l_desc'   => substr(
-                    $gateway_formatter->formatPartialPaymentLineItemDesc($payment),
-                    0,
-                    127
-                ),
-                // Cost of individual item.
-                'l_amt'    => $payment->amount(),
-                // Item Number.  127 char max.
-                'l_number' => 1,
-                // Item quantity.  Must be any positive integer.
-                'l_qty'    => 1,
-            ));
-        }
-        // Populate data arrays with order data.
-        $DPFields = array(
-            // How you want to obtain payment ?
-            // Authorization indicates the payment is a basic auth subject to settlement with Auth & Capture.
-            // Sale indicates that this is a final sale for which you are requesting payment.  Default is Sale.
-            'paymentaction'    => 'Sale',
-            // Required.  IP address of the payer's browser.
-            'ipaddress'        => $_SERVER['REMOTE_ADDR'],
-            // Flag to determine whether you want the results returned by FMF.  1 or 0.  Default is 0.
-            'returnfmfdetails' => '1',
-        );
-        $CCDetails = array(
-            // Required. Type of credit card.  Visa, MasterCard, Discover, Amex, Maestro, Solo.
-            // If Maestro or Solo, the currency code must be GBP.
-            //  In addition, either start date or issue number must be specified.
-            'creditcardtype' => $billing_info['credit_card_type'],
-            // Required.  Credit card number.  No spaces or punctuation.
-            'acct'           => $billing_info['credit_card'],
-            // Required.  Credit card expiration date.  Format is MMYYYY
-            'expdate'        => $billing_info['exp_month'] . $billing_info['exp_year'],
-            // Requirements determined by your PayPal account settings.  Security digits for credit card.
-            'cvv2'           => $billing_info['cvv'],
-        );
-        $PayerInfo = array(
-            // Email address of payer.
-            'email'       => $billing_info['email'],
-            // Unique PayPal customer ID for payer.
-            'payerid'     => '',
-            // Status of payer.  Values are verified or unverified
-            'payerstatus' => '',
-            // Payer's business name.
-            'business'    => '',
-        );
-        $PayerName = array(
-            // Payer's salutation.  20 char max.
-            'salutation' => '',
-            // Payer's first name.  25 char max.
-            'firstname'  => substr($billing_info['first_name'], 0, 25),
-            // Payer's middle name.  25 char max.
-            'middlename' => '',
-            // Payer's last name.  25 char max.
-            'lastname'   => substr($billing_info['last_name'], 0, 25),
-            // Payer's suffix.  12 char max.
-            'suffix'     => '',
-        );
-        $BillingAddress = array(
-            // Required.  First street address.
-            'street'      => $billing_info['address'],
-            // Second street address.
-            'street2'     => $billing_info['address2'],
-            // Required.  Name of City.
-            'city'        => $billing_info['city'],
-            // Required. Name of State or Province.
-            'state'       => substr($billing_info['state'], 0, 40),
-            // Required.  Country code.
-            'countrycode' => $billing_info['country'],
-            // Required.  Postal code of payer.
-            'zip'         => $billing_info['zip'],
-        );
-        // check if the registration info contains the needed fields for paypal pro
-        // (see https://developer.paypal.com/docs/classic/api/merchant/DoDirectPayment_API_Operation_NVP/)
-        if ($attendee->address() && $attendee->city() && $attendee->country_ID()) {
-            $use_registration_address_info = true;
-        } else {
-            $use_registration_address_info = false;
-        }
-        // so if the attendee has enough data to fill out PayPal Pro's shipping info, use it.
-        // If not, use the billing info again
-        $ShippingAddress = array(
-            'shiptoname'     => substr($use_registration_address_info
-                ? $attendee->full_name()
-                : $billing_info['first_name'] . ' ' . $billing_info['last_name'], 0, 32),
-            'shiptostreet'   => substr($use_registration_address_info
-                ? $attendee->address()
-                : $billing_info['address'], 0, 100),
-            'shiptostreet2'  => substr($use_registration_address_info
-                ? $attendee->address2() : $billing_info['address2'], 0, 100),
-            'shiptocity'     => substr($use_registration_address_info
-                ? $attendee->city()
-                : $billing_info['city'], 0, 40),
-            'shiptostate'          => substr($use_registration_address_info
-                ? $attendee->state_name()
-                : $billing_info['state'], 0, 40),
-            'shiptocountry'  => $use_registration_address_info
-                ? $attendee->country_ID()
-                : $billing_info['country'],
-            'shiptozip'      => substr($use_registration_address_info
-                ? $attendee->zip()
-                : $billing_info['zip'], 0, 20),
-            'shiptophonenum' => substr($use_registration_address_info
-                ? $attendee->phone()
-                : $billing_info['phone'], 0, 20),
-        );
-        $PaymentDetails = array(
-            // Required.  Total amount of order, including shipping, handling, and tax.
-            'amt'          => $gateway_formatter->formatCurrency($payment->amount()),
-            // Required.  Three-letter currency code.  Default is USD.
-            'currencycode' => $payment->currency_code(),
-            // Required if you include itemized cart details. (L_AMTn, etc.)
-            // Subtotal of items not including S&H, or tax.
-            'itemamt'      => $gateway_formatter->formatCurrency($item_amount),//
-            // Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
-            'shippingamt'  => '',
-            // Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
-            'handlingamt'  => '',
-            // Required if you specify itemized cart tax details.
-            // Sum of tax for all items on the order.  Total sales tax.
-            'taxamt'       => $gateway_formatter->formatCurrency($tax_amount),
-            // Description of the order the customer is purchasing.  127 char max.
-            'desc'         => $order_description,
-            // Free-form field for your own use.  256 char max.
-            'custom'       => $primary_registrant ? $primary_registrant->ID() : '',
-            // Your own invoice or tracking number
-            'invnum'       => wp_generate_password(12, false),// $transaction->ID(),
-            // URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
-            'notifyurl'    => '',
-            'buttonsource' => 'EventEspresso_SP',// EE will blow up if you change this
-        );
-        // Wrap all data arrays into a single, "master" array which will be passed into the class function.
-        $PayPalRequestData = array(
-            'DPFields'        => $DPFields,
-            'CCDetails'       => $CCDetails,
-            'PayerInfo'       => $PayerInfo,
-            'PayerName'       => $PayerName,
-            'BillingAddress'  => $BillingAddress,
-            'ShippingAddress' => $ShippingAddress,
-            'PaymentDetails'  => $PaymentDetails,
-            'OrderItems'      => $order_items,
-        );
-        $this->_log_clean_request($PayPalRequestData, $payment);
-        try {
-            $PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
-            // remove PCI-sensitive data so it doesn't get stored
-            $PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
-            if (isset($PayPalResult['L_ERRORCODE0']) && $PayPalResult['L_ERRORCODE0'] === '10002') {
-                $message = esc_html__('PayPal did not accept your API username, password, or signature. Please double-check these credentials and if debug mode is on.', 'event_espresso');
-            } elseif (isset($PayPalResult['L_LONGMESSAGE0'])) {
-                $message = $PayPalResult['L_LONGMESSAGE0'];
-            } else {
-                $message = $PayPalResult['ACK'];
-            }
-            if (empty($PayPalResult['RAWRESPONSE'])) {
-                $payment->set_status($this->_pay_model->failed_status());
-                $payment->set_gateway_response(esc_html__('No response received from Paypal Pro', 'event_espresso'));
-                $payment->set_details($PayPalResult);
-            } else {
-                if ($this->_APICallSuccessful($PayPalResult)) {
-                    $payment->set_status($this->_pay_model->approved_status());
-                } else {
-                    $payment->set_status($this->_pay_model->declined_status());
-                }
-                // make sure we interpret the AMT as a float, not an international string
-                // (where periods are thousand separators)
-                $payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
-                $payment->set_gateway_response($message);
-                $payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID'])
-                    ? $PayPalResult['TRANSACTIONID']
-                    : null);
-                $primary_registration_code = $primary_registrant instanceof EE_Registration
-                    ? $primary_registrant->reg_code()
-                    : '';
-                $payment->set_extra_accntng($primary_registration_code);
-                $payment->set_details($PayPalResult);
-            }
-        } catch (Exception $e) {
-            $payment->set_status($this->_pay_model->failed_status());
-            $payment->set_gateway_response($e->getMessage());
-        }
-        // $payment->set_status( $this->_pay_model->declined_status() );
-        // $payment->set_gateway_response( '' );
-        return $payment;
-    }
-
-
-
-    /**
-     * CLeans out sensitive CC data and then logs it, and returns the cleaned request
-     *
-     * @param array       $request
-     * @param EEI_Payment $payment
-     * @return void
-     */
-    private function _log_clean_request($request, $payment)
-    {
-        $cleaned_request_data = $request;
-        unset($cleaned_request_data['CCDetails']['acct']);
-        unset($cleaned_request_data['CCDetails']['cvv2']);
-        unset($cleaned_request_data['CCDetails']['expdate']);
-        $this->log(array('Paypal Request' => $cleaned_request_data), $payment);
-    }
-
-
-
-    /**
-     * Cleans the response, logs it, and returns it
-     *
-     * @param array       $response
-     * @param EEI_Payment $payment
-     * @return array cleaned
-     */
-    private function _log_clean_response($response, $payment)
-    {
-        unset($response['REQUESTDATA']['CREDITCARDTYPE']);
-        unset($response['REQUESTDATA']['ACCT']);
-        unset($response['REQUESTDATA']['EXPDATE']);
-        unset($response['REQUESTDATA']['CVV2']);
-        unset($response['RAWREQUEST']);
-        $this->log(array('Paypal Response' => $response), $payment);
-        return $response;
-    }
-
-
-
-    /**
-     * @param $DataArray
-     * @return array
-     */
-    private function prep_and_curl_request($DataArray)
-    {
-        // Create empty holders for each portion of the NVP string
-        $DPFieldsNVP = '&METHOD=DoDirectPayment&BUTTONSOURCE=AngellEYE_PHP_Class_DDP';
-        $CCDetailsNVP = '';
-        $PayerInfoNVP = '';
-        $PayerNameNVP = '';
-        $BillingAddressNVP = '';
-        $ShippingAddressNVP = '';
-        $PaymentDetailsNVP = '';
-        $OrderItemsNVP = '';
-        $Secure3DNVP = '';
-        // DP Fields
-        $DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
-        foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
-            $DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
-        }
-        // CC Details Fields
-        $CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
-        foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
-            $CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
-        }
-        // PayerInfo Type Fields
-        $PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
-        foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
-            $PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
-        }
-        // Payer Name Fields
-        $PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
-        foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
-            $PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
-        }
-        // Address Fields (Billing)
-        $BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
-        foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
-            $BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
-        }
-        // Payment Details Type Fields
-        $PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
-        foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
-            $PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
-        }
-        // Payment Details Item Type Fields
-        $OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
-        $n = 0;
-        foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
-            $CurrentItem = $OrderItems[ $OrderItemsVar ];
-            foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
-                $OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
-            }
-            $n++;
-        }
-        // Ship To Address Fields
-        $ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
-        foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
-            $ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
-        }
-        // 3D Secure Fields
-        $Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
-        foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
-            $Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
-        }
-        // Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-        $NVPRequest = 'USER='
-                      . $this->_api_username
-                      . '&PWD='
-                      . $this->_api_password
-                      . '&VERSION=64.0'
-                      . '&SIGNATURE='
-                      . $this->_api_signature
-                      . $DPFieldsNVP
-                      . $CCDetailsNVP
-                      . $PayerInfoNVP
-                      . $PayerNameNVP
-                      . $BillingAddressNVP
-                      . $PaymentDetailsNVP
-                      . $OrderItemsNVP
-                      . $ShippingAddressNVP
-                      . $Secure3DNVP;
-        $NVPResponse = $this->_CURLRequest($NVPRequest);
-        $NVPRequestArray = $this->_NVPToArray($NVPRequest);
-        $NVPResponseArray = $this->_NVPToArray($NVPResponse);
-        $Errors = $this->_GetErrors($NVPResponseArray);
-        $NVPResponseArray['ERRORS'] = $Errors;
-        $NVPResponseArray['REQUESTDATA'] = $NVPRequestArray;
-        $NVPResponseArray['RAWREQUEST'] = $NVPRequest;
-        $NVPResponseArray['RAWRESPONSE'] = $NVPResponse;
-        return $NVPResponseArray;
-    }
-
-
-
-    /**
-     * @param $Request
-     * @return mixed
-     */
-    private function _CURLRequest($Request)
-    {
-        $EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', true));
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_TIMEOUT, 60);
-        curl_setopt($curl, CURLOPT_URL, $EndPointURL);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $Request);
-        curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        // execute the curl POST
-        $Response = curl_exec($curl);
-        curl_close($curl);
-        return $Response;
-    }
-
-
-
-    /**
-     * @param $NVPString
-     * @return array
-     */
-    private function _NVPToArray($NVPString)
-    {
-        // prepare responses into array
-        $proArray = array();
-        while (strlen($NVPString)) {
-            // name
-            $keypos = strpos($NVPString, '=');
-            $keyval = substr($NVPString, 0, $keypos);
-            // value
-            $valuepos = strpos($NVPString, '&') ? strpos($NVPString, '&') : strlen($NVPString);
-            $valval = substr($NVPString, $keypos + 1, $valuepos - $keypos - 1);
-            // decoding the response
-            $proArray[ $keyval ] = urldecode($valval);
-            $NVPString = substr($NVPString, $valuepos + 1, strlen($NVPString));
-        }
-        return $proArray;
-    }
-
-
-
-    /**
-     * @param array $PayPalResult
-     * @return bool
-     */
-    private function _APICallSuccessful($PayPalResult)
-    {
-        $approved = false;
-        // check main response message from PayPal
-        if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
-            $ack = strtoupper($PayPalResult['ACK']);
-            $approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
-        }
-        return $approved;
-    }
-
-
-
-    /**
-     * @param $DataArray
-     * @return array
-     */
-    private function _GetErrors($DataArray)
-    {
-        $Errors = array();
-        $n = 0;
-        while (isset($DataArray[ 'L_ERRORCODE' . $n . '' ])) {
-            $LErrorCode = isset($DataArray[ 'L_ERRORCODE' . $n . '' ]) ? $DataArray[ 'L_ERRORCODE' . $n . '' ] : '';
-            $LShortMessage = isset($DataArray[ 'L_SHORTMESSAGE' . $n . '' ])
-                ? $DataArray[ 'L_SHORTMESSAGE' . $n . '' ]
-                : '';
-            $LLongMessage = isset($DataArray[ 'L_LONGMESSAGE' . $n . '' ])
-                ? $DataArray[ 'L_LONGMESSAGE' . $n . '' ]
-                : '';
-            $LSeverityCode = isset($DataArray[ 'L_SEVERITYCODE' . $n . '' ])
-                ? $DataArray[ 'L_SEVERITYCODE' . $n . '' ]
-                : '';
-            $CurrentItem = array(
-                'L_ERRORCODE'    => $LErrorCode,
-                'L_SHORTMESSAGE' => $LShortMessage,
-                'L_LONGMESSAGE'  => $LLongMessage,
-                'L_SEVERITYCODE' => $LSeverityCode,
-            );
-            array_push($Errors, $CurrentItem);
-            $n++;
-        }
-        return $Errors;
-    }
-
-
-
-    /**
-     *        nothing to see here...  move along....
-     *
-     * @access protected
-     * @param $Errors
-     * @return string
-     */
-    private function _DisplayErrors($Errors)
-    {
-        $error = '';
-        foreach ($Errors as $ErrorVar => $ErrorVal) {
-            $CurrentError = $Errors[ $ErrorVar ];
-            foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
-                $CurrentVarName = '';
-                if ($CurrentErrorVar == 'L_ERRORCODE') {
-                    $CurrentVarName = 'Error Code';
-                } elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
-                    $CurrentVarName = 'Short Message';
-                } elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
-                    $CurrentVarName = 'Long Message';
-                } elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
-                    $CurrentVarName = 'Severity Code';
-                }
-                $error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
-            }
-        }
-        return $error;
-    }
+	/**
+	 * @var $_paypal_api_username string
+	 */
+	protected $_api_username = null;
+
+	/**
+	 * @var $_api_password string
+	 */
+	protected $_api_password = null;
+
+	/**
+	 * @var $_api_signature string
+	 */
+	protected $_api_signature = null;
+
+	/**
+	 * @var $_credit_card_types array with the keys for credit card types accepted on this account
+	 */
+	protected $_credit_card_types    = null;
+
+	protected $_currencies_supported = array(
+		'USD',
+		'GBP',
+		'CAD',
+		'AUD',
+		'BRL',
+		'CHF',
+		'CZK',
+		'DKK',
+		'EUR',
+		'HKD',
+		'HUF',
+		'ILS',
+		'JPY',
+		'MXN',
+		'MYR',
+		'NOK',
+		'NZD',
+		'PHP',
+		'PLN',
+		'SEK',
+		'SGD',
+		'THB',
+		'TRY',
+		'TWD',
+		'RUB',
+		'INR',
+	);
+
+
+
+	/**
+	 * @param EEI_Payment $payment
+	 * @param array       $billing_info {
+	 * @type string $credit_card
+	 * @type string $credit_card_type
+	 * @type string $exp_month always 2 characters
+	 * @type string $exp_year always 4 characters
+	 * @type string $cvv
+	 * }
+	 * @see      parent::do_direct_payment for more info
+	 * @return EE_Payment|EEI_Payment
+	 * @throws EE_Error
+	 */
+	public function do_direct_payment($payment, $billing_info = null)
+	{
+		$transaction = $payment->transaction();
+		if (! $transaction instanceof EEI_Transaction) {
+			throw new EE_Error(
+				esc_html__('No transaction for payment while paying with PayPal Pro.', 'event_espresso')
+			);
+		}
+		$primary_registrant = $transaction->primary_registration();
+		if (! $primary_registrant instanceof EEI_Registration) {
+			throw new EE_Error(
+				esc_html__(
+					'No primary registration on transaction while paying with PayPal Pro.',
+					'event_espresso'
+				)
+			);
+		}
+		$attendee = $primary_registrant->attendee();
+		if (! $attendee instanceof EEI_Attendee) {
+			throw new EE_Error(
+				esc_html__(
+					'No attendee on primary registration while paying with PayPal Pro.',
+					'event_espresso'
+				)
+			);
+		}
+		$gateway_formatter = $this->_get_gateway_formatter();
+		$order_description = substr($gateway_formatter->formatOrderDescription($payment), 0, 127);
+		// charge for the full amount. Show itemized list
+		if ($this->_money->compare_floats($payment->amount(), $transaction->total(), '==')) {
+			$item_num = 1;
+			$total_line_item = $transaction->total_line_item();
+			$order_items = array();
+			foreach ($total_line_item->get_items() as $line_item) {
+				// ignore line items with a quantity of 0
+				if ($line_item->quantity() == 0) {
+					continue;
+				}
+				// For percent items, whose unit_price is 0, use the total instead.
+				if ($line_item->is_percent()) {
+					$unit_price = $line_item->total();
+					$line_item_quantity = 1;
+				} else {
+					$unit_price = $line_item->unit_price();
+					$line_item_quantity = $line_item->quantity();
+				}
+				$item = array(
+					// Item Name.  127 char max.
+					'l_name'                 => substr(
+						$gateway_formatter->formatLineItemName($line_item, $payment),
+						0,
+						127
+					),
+					// Item description.  127 char max.
+					'l_desc'                 => substr(
+						$gateway_formatter->formatLineItemDesc($line_item, $payment),
+						0,
+						127
+					),
+					// Cost of individual item.
+					'l_amt'                  => $unit_price,
+					// Item Number.  127 char max.
+					'l_number'               => $item_num++,
+					// Item quantity.  Must be any positive integer.
+					'l_qty'                  => $line_item_quantity,
+					// Item's sales tax amount.
+					'l_taxamt'               => '',
+					// eBay auction number of item.
+					'l_ebayitemnumber'       => '',
+					// eBay transaction ID of purchased item.
+					'l_ebayitemauctiontxnid' => '',
+					// eBay order ID for the item.
+					'l_ebayitemorderid'      => '',
+				);
+				// add to array of all items
+				array_push($order_items, $item);
+			}
+			$item_amount = $total_line_item->get_items_total();
+			$tax_amount = $total_line_item->get_total_tax();
+		} else {
+			$order_items = array();
+			$item_amount = $payment->amount();
+			$tax_amount = 0;
+			array_push($order_items, array(
+				// Item Name.  127 char max.
+				'l_name'   => substr(
+					$gateway_formatter->formatPartialPaymentLineItemName($payment),
+					0,
+					127
+				),
+				// Item description.  127 char max.
+				'l_desc'   => substr(
+					$gateway_formatter->formatPartialPaymentLineItemDesc($payment),
+					0,
+					127
+				),
+				// Cost of individual item.
+				'l_amt'    => $payment->amount(),
+				// Item Number.  127 char max.
+				'l_number' => 1,
+				// Item quantity.  Must be any positive integer.
+				'l_qty'    => 1,
+			));
+		}
+		// Populate data arrays with order data.
+		$DPFields = array(
+			// How you want to obtain payment ?
+			// Authorization indicates the payment is a basic auth subject to settlement with Auth & Capture.
+			// Sale indicates that this is a final sale for which you are requesting payment.  Default is Sale.
+			'paymentaction'    => 'Sale',
+			// Required.  IP address of the payer's browser.
+			'ipaddress'        => $_SERVER['REMOTE_ADDR'],
+			// Flag to determine whether you want the results returned by FMF.  1 or 0.  Default is 0.
+			'returnfmfdetails' => '1',
+		);
+		$CCDetails = array(
+			// Required. Type of credit card.  Visa, MasterCard, Discover, Amex, Maestro, Solo.
+			// If Maestro or Solo, the currency code must be GBP.
+			//  In addition, either start date or issue number must be specified.
+			'creditcardtype' => $billing_info['credit_card_type'],
+			// Required.  Credit card number.  No spaces or punctuation.
+			'acct'           => $billing_info['credit_card'],
+			// Required.  Credit card expiration date.  Format is MMYYYY
+			'expdate'        => $billing_info['exp_month'] . $billing_info['exp_year'],
+			// Requirements determined by your PayPal account settings.  Security digits for credit card.
+			'cvv2'           => $billing_info['cvv'],
+		);
+		$PayerInfo = array(
+			// Email address of payer.
+			'email'       => $billing_info['email'],
+			// Unique PayPal customer ID for payer.
+			'payerid'     => '',
+			// Status of payer.  Values are verified or unverified
+			'payerstatus' => '',
+			// Payer's business name.
+			'business'    => '',
+		);
+		$PayerName = array(
+			// Payer's salutation.  20 char max.
+			'salutation' => '',
+			// Payer's first name.  25 char max.
+			'firstname'  => substr($billing_info['first_name'], 0, 25),
+			// Payer's middle name.  25 char max.
+			'middlename' => '',
+			// Payer's last name.  25 char max.
+			'lastname'   => substr($billing_info['last_name'], 0, 25),
+			// Payer's suffix.  12 char max.
+			'suffix'     => '',
+		);
+		$BillingAddress = array(
+			// Required.  First street address.
+			'street'      => $billing_info['address'],
+			// Second street address.
+			'street2'     => $billing_info['address2'],
+			// Required.  Name of City.
+			'city'        => $billing_info['city'],
+			// Required. Name of State or Province.
+			'state'       => substr($billing_info['state'], 0, 40),
+			// Required.  Country code.
+			'countrycode' => $billing_info['country'],
+			// Required.  Postal code of payer.
+			'zip'         => $billing_info['zip'],
+		);
+		// check if the registration info contains the needed fields for paypal pro
+		// (see https://developer.paypal.com/docs/classic/api/merchant/DoDirectPayment_API_Operation_NVP/)
+		if ($attendee->address() && $attendee->city() && $attendee->country_ID()) {
+			$use_registration_address_info = true;
+		} else {
+			$use_registration_address_info = false;
+		}
+		// so if the attendee has enough data to fill out PayPal Pro's shipping info, use it.
+		// If not, use the billing info again
+		$ShippingAddress = array(
+			'shiptoname'     => substr($use_registration_address_info
+				? $attendee->full_name()
+				: $billing_info['first_name'] . ' ' . $billing_info['last_name'], 0, 32),
+			'shiptostreet'   => substr($use_registration_address_info
+				? $attendee->address()
+				: $billing_info['address'], 0, 100),
+			'shiptostreet2'  => substr($use_registration_address_info
+				? $attendee->address2() : $billing_info['address2'], 0, 100),
+			'shiptocity'     => substr($use_registration_address_info
+				? $attendee->city()
+				: $billing_info['city'], 0, 40),
+			'shiptostate'          => substr($use_registration_address_info
+				? $attendee->state_name()
+				: $billing_info['state'], 0, 40),
+			'shiptocountry'  => $use_registration_address_info
+				? $attendee->country_ID()
+				: $billing_info['country'],
+			'shiptozip'      => substr($use_registration_address_info
+				? $attendee->zip()
+				: $billing_info['zip'], 0, 20),
+			'shiptophonenum' => substr($use_registration_address_info
+				? $attendee->phone()
+				: $billing_info['phone'], 0, 20),
+		);
+		$PaymentDetails = array(
+			// Required.  Total amount of order, including shipping, handling, and tax.
+			'amt'          => $gateway_formatter->formatCurrency($payment->amount()),
+			// Required.  Three-letter currency code.  Default is USD.
+			'currencycode' => $payment->currency_code(),
+			// Required if you include itemized cart details. (L_AMTn, etc.)
+			// Subtotal of items not including S&H, or tax.
+			'itemamt'      => $gateway_formatter->formatCurrency($item_amount),//
+			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
+			'shippingamt'  => '',
+			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
+			'handlingamt'  => '',
+			// Required if you specify itemized cart tax details.
+			// Sum of tax for all items on the order.  Total sales tax.
+			'taxamt'       => $gateway_formatter->formatCurrency($tax_amount),
+			// Description of the order the customer is purchasing.  127 char max.
+			'desc'         => $order_description,
+			// Free-form field for your own use.  256 char max.
+			'custom'       => $primary_registrant ? $primary_registrant->ID() : '',
+			// Your own invoice or tracking number
+			'invnum'       => wp_generate_password(12, false),// $transaction->ID(),
+			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
+			'notifyurl'    => '',
+			'buttonsource' => 'EventEspresso_SP',// EE will blow up if you change this
+		);
+		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
+		$PayPalRequestData = array(
+			'DPFields'        => $DPFields,
+			'CCDetails'       => $CCDetails,
+			'PayerInfo'       => $PayerInfo,
+			'PayerName'       => $PayerName,
+			'BillingAddress'  => $BillingAddress,
+			'ShippingAddress' => $ShippingAddress,
+			'PaymentDetails'  => $PaymentDetails,
+			'OrderItems'      => $order_items,
+		);
+		$this->_log_clean_request($PayPalRequestData, $payment);
+		try {
+			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
+			// remove PCI-sensitive data so it doesn't get stored
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
+			if (isset($PayPalResult['L_ERRORCODE0']) && $PayPalResult['L_ERRORCODE0'] === '10002') {
+				$message = esc_html__('PayPal did not accept your API username, password, or signature. Please double-check these credentials and if debug mode is on.', 'event_espresso');
+			} elseif (isset($PayPalResult['L_LONGMESSAGE0'])) {
+				$message = $PayPalResult['L_LONGMESSAGE0'];
+			} else {
+				$message = $PayPalResult['ACK'];
+			}
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(esc_html__('No response received from Paypal Pro', 'event_espresso'));
+				$payment->set_details($PayPalResult);
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
+					$payment->set_status($this->_pay_model->approved_status());
+				} else {
+					$payment->set_status($this->_pay_model->declined_status());
+				}
+				// make sure we interpret the AMT as a float, not an international string
+				// (where periods are thousand separators)
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
+				$payment->set_gateway_response($message);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID'])
+					? $PayPalResult['TRANSACTIONID']
+					: null);
+				$primary_registration_code = $primary_registrant instanceof EE_Registration
+					? $primary_registrant->reg_code()
+					: '';
+				$payment->set_extra_accntng($primary_registration_code);
+				$payment->set_details($PayPalResult);
+			}
+		} catch (Exception $e) {
+			$payment->set_status($this->_pay_model->failed_status());
+			$payment->set_gateway_response($e->getMessage());
+		}
+		// $payment->set_status( $this->_pay_model->declined_status() );
+		// $payment->set_gateway_response( '' );
+		return $payment;
+	}
+
+
+
+	/**
+	 * CLeans out sensitive CC data and then logs it, and returns the cleaned request
+	 *
+	 * @param array       $request
+	 * @param EEI_Payment $payment
+	 * @return void
+	 */
+	private function _log_clean_request($request, $payment)
+	{
+		$cleaned_request_data = $request;
+		unset($cleaned_request_data['CCDetails']['acct']);
+		unset($cleaned_request_data['CCDetails']['cvv2']);
+		unset($cleaned_request_data['CCDetails']['expdate']);
+		$this->log(array('Paypal Request' => $cleaned_request_data), $payment);
+	}
+
+
+
+	/**
+	 * Cleans the response, logs it, and returns it
+	 *
+	 * @param array       $response
+	 * @param EEI_Payment $payment
+	 * @return array cleaned
+	 */
+	private function _log_clean_response($response, $payment)
+	{
+		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
+		unset($response['REQUESTDATA']['ACCT']);
+		unset($response['REQUESTDATA']['EXPDATE']);
+		unset($response['REQUESTDATA']['CVV2']);
+		unset($response['RAWREQUEST']);
+		$this->log(array('Paypal Response' => $response), $payment);
+		return $response;
+	}
+
+
+
+	/**
+	 * @param $DataArray
+	 * @return array
+	 */
+	private function prep_and_curl_request($DataArray)
+	{
+		// Create empty holders for each portion of the NVP string
+		$DPFieldsNVP = '&METHOD=DoDirectPayment&BUTTONSOURCE=AngellEYE_PHP_Class_DDP';
+		$CCDetailsNVP = '';
+		$PayerInfoNVP = '';
+		$PayerNameNVP = '';
+		$BillingAddressNVP = '';
+		$ShippingAddressNVP = '';
+		$PaymentDetailsNVP = '';
+		$OrderItemsNVP = '';
+		$Secure3DNVP = '';
+		// DP Fields
+		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
+		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
+			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		}
+		// CC Details Fields
+		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
+		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
+			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+		}
+		// PayerInfo Type Fields
+		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
+		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
+			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+		}
+		// Payer Name Fields
+		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
+		foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
+			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+		}
+		// Address Fields (Billing)
+		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
+		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
+			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+		}
+		// Payment Details Type Fields
+		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
+		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
+			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		}
+		// Payment Details Item Type Fields
+		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
+		$n = 0;
+		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
+			$CurrentItem = $OrderItems[ $OrderItemsVar ];
+			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
+				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			}
+			$n++;
+		}
+		// Ship To Address Fields
+		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
+		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
+			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+		}
+		// 3D Secure Fields
+		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
+		foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
+			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+		}
+		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
+		$NVPRequest = 'USER='
+					  . $this->_api_username
+					  . '&PWD='
+					  . $this->_api_password
+					  . '&VERSION=64.0'
+					  . '&SIGNATURE='
+					  . $this->_api_signature
+					  . $DPFieldsNVP
+					  . $CCDetailsNVP
+					  . $PayerInfoNVP
+					  . $PayerNameNVP
+					  . $BillingAddressNVP
+					  . $PaymentDetailsNVP
+					  . $OrderItemsNVP
+					  . $ShippingAddressNVP
+					  . $Secure3DNVP;
+		$NVPResponse = $this->_CURLRequest($NVPRequest);
+		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
+		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
+		$Errors = $this->_GetErrors($NVPResponseArray);
+		$NVPResponseArray['ERRORS'] = $Errors;
+		$NVPResponseArray['REQUESTDATA'] = $NVPRequestArray;
+		$NVPResponseArray['RAWREQUEST'] = $NVPRequest;
+		$NVPResponseArray['RAWRESPONSE'] = $NVPResponse;
+		return $NVPResponseArray;
+	}
+
+
+
+	/**
+	 * @param $Request
+	 * @return mixed
+	 */
+	private function _CURLRequest($Request)
+	{
+		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', true));
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
+		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $Request);
+		curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+		// execute the curl POST
+		$Response = curl_exec($curl);
+		curl_close($curl);
+		return $Response;
+	}
+
+
+
+	/**
+	 * @param $NVPString
+	 * @return array
+	 */
+	private function _NVPToArray($NVPString)
+	{
+		// prepare responses into array
+		$proArray = array();
+		while (strlen($NVPString)) {
+			// name
+			$keypos = strpos($NVPString, '=');
+			$keyval = substr($NVPString, 0, $keypos);
+			// value
+			$valuepos = strpos($NVPString, '&') ? strpos($NVPString, '&') : strlen($NVPString);
+			$valval = substr($NVPString, $keypos + 1, $valuepos - $keypos - 1);
+			// decoding the response
+			$proArray[ $keyval ] = urldecode($valval);
+			$NVPString = substr($NVPString, $valuepos + 1, strlen($NVPString));
+		}
+		return $proArray;
+	}
+
+
+
+	/**
+	 * @param array $PayPalResult
+	 * @return bool
+	 */
+	private function _APICallSuccessful($PayPalResult)
+	{
+		$approved = false;
+		// check main response message from PayPal
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
+			$ack = strtoupper($PayPalResult['ACK']);
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
+		}
+		return $approved;
+	}
+
+
+
+	/**
+	 * @param $DataArray
+	 * @return array
+	 */
+	private function _GetErrors($DataArray)
+	{
+		$Errors = array();
+		$n = 0;
+		while (isset($DataArray[ 'L_ERRORCODE' . $n . '' ])) {
+			$LErrorCode = isset($DataArray[ 'L_ERRORCODE' . $n . '' ]) ? $DataArray[ 'L_ERRORCODE' . $n . '' ] : '';
+			$LShortMessage = isset($DataArray[ 'L_SHORTMESSAGE' . $n . '' ])
+				? $DataArray[ 'L_SHORTMESSAGE' . $n . '' ]
+				: '';
+			$LLongMessage = isset($DataArray[ 'L_LONGMESSAGE' . $n . '' ])
+				? $DataArray[ 'L_LONGMESSAGE' . $n . '' ]
+				: '';
+			$LSeverityCode = isset($DataArray[ 'L_SEVERITYCODE' . $n . '' ])
+				? $DataArray[ 'L_SEVERITYCODE' . $n . '' ]
+				: '';
+			$CurrentItem = array(
+				'L_ERRORCODE'    => $LErrorCode,
+				'L_SHORTMESSAGE' => $LShortMessage,
+				'L_LONGMESSAGE'  => $LLongMessage,
+				'L_SEVERITYCODE' => $LSeverityCode,
+			);
+			array_push($Errors, $CurrentItem);
+			$n++;
+		}
+		return $Errors;
+	}
+
+
+
+	/**
+	 *        nothing to see here...  move along....
+	 *
+	 * @access protected
+	 * @param $Errors
+	 * @return string
+	 */
+	private function _DisplayErrors($Errors)
+	{
+		$error = '';
+		foreach ($Errors as $ErrorVar => $ErrorVal) {
+			$CurrentError = $Errors[ $ErrorVar ];
+			foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
+				$CurrentVarName = '';
+				if ($CurrentErrorVar == 'L_ERRORCODE') {
+					$CurrentVarName = 'Error Code';
+				} elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
+					$CurrentVarName = 'Short Message';
+				} elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
+					$CurrentVarName = 'Long Message';
+				} elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
+					$CurrentVarName = 'Severity Code';
+				}
+				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+			}
+		}
+		return $error;
+	}
 }

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>

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/db_models/fields/EE_Enum_Text_Field.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
     {
         $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
+        if (isset($options[$value_on_field_to_be_outputted])) {
+            return $options[$value_on_field_to_be_outputted];
         } else {
             return $value_on_field_to_be_outputted;
         }

Indentation +127 added lines, -127 removed lines

@@ -11,131 +11,131 @@
 class EE_Enum_Text_Field extends EE_Text_Field_Base
 {
 
-    /**
-     * @var array $_allowed_enum_values
-     */
-    public $_allowed_enum_values;
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param boolean $nullable
-     * @param mixed   $default_value
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
-     */
-    public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-    {
-        $this->_allowed_enum_values = $allowed_enum_values;
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
-
-
-
-    /**
-     * Returns the list of allowed enum options, but filterable.
-     * This is used internally
-     *
-     * @return array
-     */
-    protected function _allowed_enum_values()
-    {
-        return apply_filters(
-            'FHEE__EE_Enum_Text_Field___allowed_enum_options',
-            $this->_allowed_enum_values,
-            $this
-        );
-    }
-
-
-
-    /**
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     * @throws EE_Error
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if (
-            $value_inputted_for_field_on_model_object !== null
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
-        ) {
-            if (defined('WP_DEBUG') && WP_DEBUG) {
-                $msg = sprintf(
-                    esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
-                    $value_inputted_for_field_on_model_object,
-                    $this->_name
-                );
-                $msg2 = sprintf(
-                    esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
-                    $this->_name,
-                    implode(', ', array_keys($this->_allowed_enum_values())),
-                    $value_inputted_for_field_on_model_object
-                );
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
-            }
-            return $this->get_default_value();
-        }
-        return $value_inputted_for_field_on_model_object;
-    }
-
-
-    /**
-     * Gets the pretty version of the enum's value.
-     *
-     * @param     int |string $value_on_field_to_be_outputted
-     * @param    null         $schema
-     * @return    string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
-        } else {
-            return $value_on_field_to_be_outputted;
-        }
-    }
-
-
-
-    /**
-     * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
-     * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
-     * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
-     *
-     * @param mixed $value_in_db
-     * @return mixed
-     */
-    public function prepare_for_set_from_db($value_in_db)
-    {
-        return $value_in_db;
-    }
-
-
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_keys($this->_allowed_enum_values)
-            ),
-            'pretty' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_values($this->_allowed_enum_values),
-                'read_only' => true
-            )
-        );
-    }
+	/**
+	 * @var array $_allowed_enum_values
+	 */
+	public $_allowed_enum_values;
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param boolean $nullable
+	 * @param mixed   $default_value
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
+	 */
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+	{
+		$this->_allowed_enum_values = $allowed_enum_values;
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
+
+
+
+	/**
+	 * Returns the list of allowed enum options, but filterable.
+	 * This is used internally
+	 *
+	 * @return array
+	 */
+	protected function _allowed_enum_values()
+	{
+		return apply_filters(
+			'FHEE__EE_Enum_Text_Field___allowed_enum_options',
+			$this->_allowed_enum_values,
+			$this
+		);
+	}
+
+
+
+	/**
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if (
+			$value_inputted_for_field_on_model_object !== null
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(
+					esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
+					$value_inputted_for_field_on_model_object,
+					$this->_name
+				);
+				$msg2 = sprintf(
+					esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
+					$this->_name,
+					implode(', ', array_keys($this->_allowed_enum_values())),
+					$value_inputted_for_field_on_model_object
+				);
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
+			}
+			return $this->get_default_value();
+		}
+		return $value_inputted_for_field_on_model_object;
+	}
+
+
+	/**
+	 * Gets the pretty version of the enum's value.
+	 *
+	 * @param     int |string $value_on_field_to_be_outputted
+	 * @param    null         $schema
+	 * @return    string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$options = $this->_allowed_enum_values();
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
+			return $options[ $value_on_field_to_be_outputted ];
+		} else {
+			return $value_on_field_to_be_outputted;
+		}
+	}
+
+
+
+	/**
+	 * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
+	 * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
+	 * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
+	 *
+	 * @param mixed $value_in_db
+	 * @return mixed
+	 */
+	public function prepare_for_set_from_db($value_in_db)
+	{
+		return $value_in_db;
+	}
+
+
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_keys($this->_allowed_enum_values)
+			),
+			'pretty' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_values($this->_allowed_enum_values),
+				'read_only' => true
+			)
+		);
+	}
 }

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