eventespresso / event-espresso-core

admin_pages/payments/Payments_Admin_Page.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -421,7 +421,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
 		if ( $payment_method->type_obj()->requires_https() ) {
@@ -451,7 +451,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _currency_support( EE_Payment_Method $payment_method ) {
 		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
@@ -483,7 +483,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_HTML
+	 * @return EE_Payment_Method_Form
 	 */
 	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
 		//modify the form so we only have/show fields that will be implemented for this version
@@ -551,7 +551,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
 		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );

Indentation +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
 		 *
 		 * When cap mapping is implemented, some routes will need to use the singular form of
 		 * capability method and also include the $id of the payment method for the route.
-		**/
+		 **/
 		$this->_page_routes = array(
 			'default' => array(
 				'func'=>'_payment_methods_list',
@@ -747,9 +747,9 @@ 
 
 	/**
 	 * 		_update_payment_settings
-	*		@access protected
-	*		@return array
-	*/
+	 *		@access protected
+	 *		@return array
+	 */
 	protected function _update_payment_settings() {
 		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
 		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );

Braces +8 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -655,7 +656,7 @@ 
 			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
 
 			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+		} else{
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -670,7 +671,7 @@ 
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
 			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+		} else{
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -712,7 +713,7 @@ 
 				$pm = $correct_pmt_form_to_use->get_model_object();
 				/** @var $pm EE_Payment_Method */
 				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$pm->slug()));
-			}else{
+			} else{
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
@@ -838,7 +839,7 @@ 
 		if(isset($this->_req_data['order'])){
 			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else{
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
 		$offset = ($current_page-1)*$per_page;
@@ -881,7 +882,7 @@ 
 		$comparison = $timeA < $timeB ? -1 : 1;
 		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
 			return $comparison * -1;
-		}else{
+		} else{
 			return $comparison;
 		}
 	}
@@ -896,7 +897,7 @@ 
 			if( $payment_log->object() instanceof EE_Payment ){
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			} elseif($payment_log->object() instanceof EE_Payment_Method){
 				$payment_method = $payment_log->object();
 			}
 		}

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template(
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,44 +243,44 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -288,19 +288,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -311,20 +311,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -342,11 +342,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -363,21 +363,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -390,14 +390,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -409,12 +409,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -431,19 +431,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -461,19 +461,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -493,9 +493,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -508,8 +508,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -520,7 +520,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -533,19 +533,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
 				'name' => 'submit',
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -562,11 +562,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -578,7 +578,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -594,12 +594,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -607,17 +607,17 @@ 
 					array(
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
-								EEH_HTML::td( $payment_method->type_obj()->introductory_html(),
+								EEH_HTML::td($payment_method->type_obj()->introductory_html(),
 									'',
 									'',
 									'',
 									'colspan="2"' 
 								)
-							) . 
+							). 
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -629,7 +629,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -651,9 +651,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -665,15 +665,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -681,14 +681,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -702,46 +702,46 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$payment_method = NULL;
-			foreach( EEM_Payment_Method::instance()->get_all() as $payment_method){
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
 				//get the form and simplify it, like what we do when we display it
-				$pmt_form = $this->_generate_payment_method_settings_form( $payment_method );
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
-				$subsection_name = 'payment_method_settings_' . $payment_method->slug();
-				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection( $subsection_name );
-				if( ! $payment_settings_subform instanceof EE_Payment_Method_Form ) {
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$subsection_name = 'payment_method_settings_'.$payment_method->slug();
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection($subsection_name);
+				if ( ! $payment_settings_subform instanceof EE_Payment_Method_Form) {
 					throw new EE_Error( 
 						sprintf(
-							__( 'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.','event_espresso' ),
+							__('The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.', 'event_espresso'),
 							$subsection_name
 						)
 					);
 				}
 				$payment_settings_subform->save();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -758,11 +758,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -776,8 +776,8 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 //		 $superform = new EE_Form_Section_Proper(
 //		 	array(
@@ -797,9 +797,9 @@ 
 //		 	$this->_redirect_after_action( 0, 'settings', 'updated', array( 'action' => 'payment_settings' ) );
 //		 }
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -825,18 +825,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -851,48 +851,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -914,36 +914,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 *
 	 * @abstract
 	 * @access protected
-	 * @return array
+	 * @return string[]
 	 */
 	protected function _get_table_filters() {
 		$filters = array();

Indentation +9 added lines, -9 removed lines

@@ -151,7 +151,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
 
 	   //txn timestamp
@@ -321,7 +321,7 @@ 
 	 * @throws \EE_Error
 	 */
  	public function column_event_name( EE_Transaction $item ){
-    	$actions = array();
+		$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
 		if ( !empty( $event ) ) {
 			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
@@ -350,18 +350,18 @@ 
 	 */
  	public function column_actions( EE_Transaction $item ){
 
-    	$registration = $item->primary_registration();
-    	$attendee = $registration->attendee();
+		$registration = $item->primary_registration();
+		$attendee = $registration->attendee();
 
-        //Build row actions
+		//Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
 		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
 		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
-		    'TXN_ID' => $item->ID()
-	    ));
+		$related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+			'TXN_ID' => $item->ID()
+		));
 
 		//Build row actions
 		$view_lnk = '
@@ -434,7 +434,7 @@ 
 		}
 
 		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
-    }
+	}
 
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +85 added lines, -85 removed lines

@@ -31,8 +31,8 @@ 
 	/**
 	 * @param \Transactions_Admin_Page $admin_page
 	 */
-	public function __construct( \Transactions_Admin_Page $admin_page ){
-		parent::__construct( $admin_page );
+	public function __construct(\Transactions_Admin_Page $admin_page) {
+		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_transaction_status_array();
 	}
 
@@ -42,9 +42,9 @@ 
 	 *_setup_data
 	 */
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -59,25 +59,25 @@ 
 			'ajax' => TRUE,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
-		$ID_column_name = __( 'ID', 'event_espresso' );
+		$ID_column_name = __('ID', 'event_espresso');
 		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-		$ID_column_name .= __( 'Transaction Date', 'event_espresso' );
+		$ID_column_name .= __('Transaction Date', 'event_espresso');
 		$ID_column_name .= '</span> ';
 		$this->_columns = array(
 			'TXN_ID' => $ID_column_name,
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -95,11 +95,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -116,8 +116,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y', current_time('timestamp') );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y', current_time('timestamp'));
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -136,9 +136,9 @@ 
 	 *_add_view_counts
 	 */
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -150,12 +150,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+	public function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
@@ -166,18 +166,18 @@ 
 	 * @return mixed|string|void
 	 * @throws \EE_Error
 	 */
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( $item->failed() || $item->is_abandoned() )
+			($item->failed() || $item->is_abandoned())
 			&& (
-				( time() - EE_Registry::instance()->SSN->lifespan() ) < $item->datetime( false, true )
+				(time() - EE_Registry::instance()->SSN->lifespan()) < $item->datetime(false, true)
 			)
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -191,8 +191,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -204,11 +204,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	public function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -221,11 +221,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	public function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -238,17 +238,17 @@ 
 	 * @return mixed|string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_paid( EE_Transaction $item ){
+	public function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if ( \EEH_Money::compare_floats( $transaction_total, 0,'>' ) ) {
+		if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
-			if ( \EEH_Money::compare_floats( $transaction_paid, $transaction_total, '>=' ) ) {
+			if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
 				// paid in full
 				$span_class = 'txn-overview-full-payment-spn';
-			} elseif ( \EEH_Money::compare_floats( $transaction_paid, 0, '==' ) ) {
+			} elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
 				// no payments made
 				$span_class = 'txn-overview-no-payment-spn';
 			}
@@ -258,11 +258,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -276,13 +276,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_fname( EE_Transaction $item ){
+	public function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -297,13 +297,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_email( EE_Transaction $item ){
+	public function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( ! empty( $attendee ) ) {
-			return '<a href="mailto:' . $attendee->get( 'ATT_email' ) . '">' . $attendee->get( 'ATT_email' ) . '</a>';
+		if ( ! empty($attendee)) {
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		} else {
 			return $item->failed() || $item->is_abandoned()
-				? __( 'no contact record.', 'event_espresso' )
+				? __('no contact record.', 'event_espresso')
 				: __(
 					'No contact record, because the transaction was abandoned or the registration process failed.',
 					'event_espresso'
@@ -320,20 +320,20 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
- 	public function column_event_name( EE_Transaction $item ){
+ 	public function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -348,35 +348,35 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
- 	public function column_actions( EE_Transaction $item ){
+ 	public function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	    $related_messages_link = EEH_MSG_Template::get_message_action_link('see_notifications_for', null, array(
 		    'TXN_ID' => $item->ID()
 	    ));
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 		$dl_invoice_lnk = '';
 		//only show invoice link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 			$dl_invoice_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 				</a>
 			</li>';
@@ -384,17 +384,17 @@ 
 
 		$dl_receipt_lnk = '';
 		//only show receipt link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 			$dl_receipt_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
 		}
 
 		//only show payment reminder link if the message type is active.
-		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 			$send_pay_lnk = $attendee instanceof EE_Attendee
 							&& EE_Registry::instance()->CAP->current_user_can(
 								'ee_send_message',
@@ -402,7 +402,7 @@ 
 							)
 				? '
 				<li>
-					<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-email-alt"></span>
 					</a>
 				</li>'
@@ -422,18 +422,18 @@ 
 		)
 			? '
 				<li>
-					<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
 			: '';
 
 		$view_related_messages_lnk = '';
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$view_related_messages_lnk = '<li>' . $related_messages_link . '</li>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$view_related_messages_lnk = '<li>'.$related_messages_link.'</li>';
 		}
 
-		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk.$view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }
 
 

caffeinated/modules/recaptcha/EED_Recaptcha.module.php

Doc Comments +2 added lines, -2 removed lines

@@ -287,7 +287,7 @@ 
 	 * 	process_recaptcha
 	 *
 	 * 	@access private
-	 * 	@return 	boolean
+	 * 	@return 	boolean|null
 	 */
 	private static function _get_recaptcha_response() {
 		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
@@ -574,7 +574,7 @@ 
 	 *
 	 * @access public
 	 * @param EE_Registration_Config $EE_Registration_Config
-	 * @return array
+	 * @return EE_Registration_Config
 	 */
 	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
 		try {

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Indentation +2 added lines, -2 removed lines

@@ -102,8 +102,8 @@
 		// use_captcha ?
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
-            && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
-            && ! (
+			&& EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
+			&& ! (
 				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
 				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
 			)

Spacing +131 added lines, -132 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return EED_Recaptcha
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -59,32 +59,32 @@ 
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
 			&& ! (
-				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
-				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
+				EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
+				&& (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
 			)
 		) {
 			EED_Recaptcha::set_definitions();
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_action( 'wp', array( 'EED_Recaptcha', 'set_late_hooks' ), 1, 0 );
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
 			add_action(
 				'AHEE__before_spco_whats_next_buttons',
-				array( 'EED_Recaptcha', 'display_recaptcha' ), 10, 0
+				array('EED_Recaptcha', 'display_recaptcha'), 10, 0
 			);
 			add_filter(
 				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-				array( 'EED_Recaptcha', 'not_a_robot' ), 10
+				array('EED_Recaptcha', 'not_a_robot'), 10
 			);
 			add_filter(
 				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-				array( 'EED_Recaptcha', 'not_a_robot' ), 10
+				array('EED_Recaptcha', 'not_a_robot'), 10
 			);
 			add_filter(
 				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-				array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1
+				array('EED_Recaptcha', 'recaptcha_response'), 10, 1
 			);
 			add_filter(
 				'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-				array( 'EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method' ), 10, 1
+				array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method'), 10, 1
 			);
 		}
 	}
@@ -102,20 +102,20 @@ 
 		// use_captcha ?
 		if (
 			EE_Registry::instance()->CFG->registration->use_captcha
-            && EE_Registry::instance()->REQ->get( 'step', '' ) !== ''
+            && EE_Registry::instance()->REQ->get('step', '') !== ''
             && ! (
-				EE_Registry::instance()->REQ->get( 'step', '' ) === 'payment_options'
-				&& (boolean) EE_Registry::instance()->REQ->get( 'revisit', false ) === true
+				EE_Registry::instance()->REQ->get('step', '') === 'payment_options'
+				&& (boolean) EE_Registry::instance()->REQ->get('revisit', false) === true
 			)
 		) {
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
 		}
 		// admin settings
-		add_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array( 'EED_Recaptcha', 'admin_settings' ), 10, 1 );
-		add_filter( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array( 'EED_Recaptcha', 'update_admin_settings' ), 10, 1 );
+		add_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array('EED_Recaptcha', 'admin_settings'), 10, 1);
+		add_filter('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array('EED_Recaptcha', 'update_admin_settings'), 10, 1);
 	}
 
 
@@ -127,11 +127,11 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			EED_Recaptcha::$_not_a_robot = true;
 		}
-		define( 'RECAPTCHA_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'RECAPTCHA_BASE_URL', plugin_dir_url( __FILE__ ));
+		define('RECAPTCHA_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
 	}
 
 
@@ -145,7 +145,7 @@ 
 	public static function set_late_hooks() {
 		add_filter(
 			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
-			array( 'EED_Recaptcha', 'not_a_robot' )
+			array('EED_Recaptcha', 'not_a_robot')
 		);
 	}
 
@@ -158,11 +158,11 @@ 
 	 *  @return 	void
 	 */
 	public static function enqueue_styles_and_scripts() {
-		wp_register_script( 'espresso_recaptcha', RECAPTCHA_BASE_URL . 'scripts' . DS . 'espresso_recaptcha.js', array( 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl=' . EE_Registry::instance()->CFG->registration->recaptcha_language, array( 'espresso_recaptcha' ), EVENT_ESPRESSO_VERSION, TRUE );
-		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __( 'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __( 'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __( 'Please complete the anti-spam test before proceeding.', 'event_espresso' );
+		wp_register_script('espresso_recaptcha', RECAPTCHA_BASE_URL.'scripts'.DS.'espresso_recaptcha.js', array('single_page_checkout'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl='.EE_Registry::instance()->CFG->registration->recaptcha_language, array('espresso_recaptcha'), EVENT_ESPRESSO_VERSION, TRUE);
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __('It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __('There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __('Please complete the anti-spam test before proceeding.', 'event_espresso');
 	}
 
 
@@ -173,7 +173,7 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -183,8 +183,7 @@ 
 	 *  @return boolean
 	 */
 	public static function not_a_robot() {
-		$not_a_robot = is_bool( EED_Recaptcha::$_not_a_robot ) ? EED_Recaptcha::$_not_a_robot :
-			EED_Recaptcha::recaptcha_passed();
+		$not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot) ? EED_Recaptcha::$_not_a_robot : EED_Recaptcha::recaptcha_passed();
 		return $not_a_robot;
 	}
 
@@ -200,22 +199,22 @@ 
 	 */
 	public static function display_recaptcha() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return;
 		}
 		// don't display if not using recaptcha or user is logged in
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
 			// only display if they have NOT passed the test yet
-			if ( ! EED_Recaptcha::$_not_a_robot ) {
+			if ( ! EED_Recaptcha::$_not_a_robot) {
 				EEH_Template::display_template(
-					RECAPTCHA_BASE_PATH . DS . 'templates' . DS . 'recaptcha.template.php',
+					RECAPTCHA_BASE_PATH.DS.'templates'.DS.'recaptcha.template.php',
 					array(
 						'recaptcha_publickey' 	=> EE_Registry::instance()->CFG->registration->recaptcha_publickey,
 						'recaptcha_theme' 		=> EE_Registry::instance()->CFG->registration->recaptcha_theme,
 						'recaptcha_type' 			=> EE_Registry::instance()->CFG->registration->recaptcha_type
 					)
 				);
-				wp_enqueue_script( 'google_recaptcha' );
+				wp_enqueue_script('google_recaptcha');
 			}
 		}
 	}
@@ -246,17 +245,17 @@ 
 	 */
 	public static function recaptcha_passed() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha() ) {
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
 			return TRUE;
 		}
 		// was test already passed?
-		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data( 'recaptcha_passed' );
-		$recaptcha_passed = filter_var( $recaptcha_passed, FILTER_VALIDATE_BOOLEAN );
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
 		// verify recaptcha
 		EED_Recaptcha::_get_recaptcha_response();
-		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response ) {
+		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
 			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
-			EE_Registry::instance()->SSN->set_session_data( array( 'recaptcha_passed' => $recaptcha_passed ));
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
 			EE_Registry::instance()->SSN->update();
 		}
 		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
@@ -272,8 +271,8 @@ 
 	 * @param array $recaptcha_response
 	 * @return boolean
 	 */
-	public static function recaptcha_response( $recaptcha_response = array() ) {
-		if ( EED_Recaptcha::_bypass_recaptcha() ) {
+	public static function recaptcha_response($recaptcha_response = array()) {
+		if (EED_Recaptcha::_bypass_recaptcha()) {
 			$recaptcha_response['bypass_recaptcha'] = TRUE;
 			$recaptcha_response['recaptcha_passed'] = TRUE;
 		} else {
@@ -293,16 +292,16 @@ 
 	 */
 	private static function _bypass_recaptcha() {
 		// an array of key value pairs that must match exactly with the incoming request, in order to bypass recaptcha for the current request ONLY
-		$bypass_request_params_array = apply_filters( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array() );
+		$bypass_request_params_array = apply_filters('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array());
 		// does $bypass_request_params_array have any values ?
-		if ( empty( $bypass_request_params_array )) {
+		if (empty($bypass_request_params_array)) {
 			return FALSE;
 		}
 		// initially set bypass to TRUE
 		$bypass_recaptcha = TRUE;
-		foreach ( $bypass_request_params_array as $key => $value ) {
+		foreach ($bypass_request_params_array as $key => $value) {
 			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE, otherwise carry over it's value. This way, one missed setting results in no bypass
-			$bypass_recaptcha = isset( $_REQUEST[ $key ] ) && $_REQUEST[ $key ] === $value ? $bypass_recaptcha : FALSE;
+			$bypass_recaptcha = isset($_REQUEST[$key]) && $_REQUEST[$key] === $value ? $bypass_recaptcha : FALSE;
 		}
 		return $bypass_recaptcha;
 	}
@@ -317,7 +316,7 @@ 
 	 * 	@return 	boolean
 	 */
 	private static function _get_recaptcha_response() {
-		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
+		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get('g-recaptcha-response', false);
 	}
 
 
@@ -331,26 +330,26 @@ 
 	 */
 	private static function _process_recaptcha_response() {
 		// verify library is loaded
-		if ( ! class_exists( '\\ReCaptcha\\ReCaptcha' )) {
-			require_once( RECAPTCHA_BASE_PATH . DS . 'autoload.php' );
+		if ( ! class_exists('\\ReCaptcha\\ReCaptcha')) {
+			require_once(RECAPTCHA_BASE_PATH.DS.'autoload.php');
 		}
 		// The response from reCAPTCHA
 		EED_Recaptcha::_get_recaptcha_response();
 		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
 		// Was there a reCAPTCHA response?
-		if ( $recaptcha_response ) {
+		if ($recaptcha_response) {
 			// if allow_url_fopen is Off, then set a different request method
-			$request_method = ! ini_get( 'allow_url_fopen' ) ? new \ReCaptcha\RequestMethod\SocketPost() : null;
+			$request_method = ! ini_get('allow_url_fopen') ? new \ReCaptcha\RequestMethod\SocketPost() : null;
 			$recaptcha = new \ReCaptcha\ReCaptcha(
 				EE_Registry::instance()->CFG->registration->recaptcha_privatekey,
 				$request_method
 			);
 			$recaptcha_response = $recaptcha->verify(
 				EED_Recaptcha::$_recaptcha_response,
-				$_SERVER[ 'REMOTE_ADDR' ]
+				$_SERVER['REMOTE_ADDR']
 			);
 		}
-		if ( $recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess() ) {
+		if ($recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess()) {
 			return TRUE;
 		}
 		// sorry... it appears you can't don't know what soup or hamburgers are !!!
@@ -394,12 +393,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__EED_Recaptcha___recaptcha_settings_form__form_subsections',
 					array(
-						'main_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Anti-spam Settings', 'event_espresso' ) . EEH_Template::get_help_tab_link( 'recaptcha_info' ))),
+						'main_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Anti-spam Settings', 'event_espresso').EEH_Template::get_help_tab_link('recaptcha_info'))),
 						'main_settings' 						=> EED_Recaptcha::_recaptcha_main_settings(),
-						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Appearance', 'event_espresso' ) )),
+						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Appearance', 'event_espresso'))),
 						'appearance_settings' 			=> EED_Recaptcha::_recaptcha_appearance_settings(),
 						// 'recaptcha_example' 				=> new EE_Form_Section_HTML( EED_Recaptcha::display_recaptcha() ),
-						'required_fields_note' 			=> new EE_Form_Section_HTML( EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' ))
+						'required_fields_note' 			=> new EE_Form_Section_HTML(EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text'))
 					)
 				)
 			)
@@ -426,28 +425,28 @@ 
 					array(
 						'use_captcha' 				=> new EE_Yes_No_Input(
 							array(
-								'html_label_text'	 	=> __( 'Use reCAPTCHA', 'event_espresso' ),
+								'html_label_text'	 	=> __('Use reCAPTCHA', 'event_espresso'),
 								'html_help_text' 		=> sprintf(
-									__( 'reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso' ),
+									__('reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso'),
 									'<a href="https://www.google.com/recaptcha/intro/index.html">',
 									'</a>'
 								),
-								'default' 								=> isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
+								'default' 								=> isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
 								'display_html_label_text' 	=> FALSE
 							)
 						),
 						'recaptcha_publickey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Site Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The site key is used to display the widget on your site.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : ''
+								'html_label_text'	 	=> __('Site Key', 'event_espresso'),
+								'html_help_text' 		=> __('The site key is used to display the widget on your site.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : ''
 							)
 						),
 						'recaptcha_privatekey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Secret Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : ''
+								'html_label_text'	 	=> __('Secret Key', 'event_espresso'),
+								'html_help_text' 		=> __('The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : ''
 							)
 						)
 					)
@@ -479,81 +478,81 @@ 
 					array(
 						'recaptcha_theme' 		=> new EE_Radio_Button_Input(
 							array(
-								'light' => __( 'Light', 'event_espresso' ),
-								'dark' => __( 'Dark', 'event_espresso' )
+								'light' => __('Light', 'event_espresso'),
+								'dark' => __('Dark', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Theme', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The color theme of the widget.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
+								'html_label_text'	 	=> __('Theme', 'event_espresso'),
+								'html_help_text' 		=> __('The color theme of the widget.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
 								'display_html_label_text' => FALSE
 							)
 						),
 						'recaptcha_type' 		=> new EE_Radio_Button_Input(
 							array(
-								'image' => __( 'Image', 'event_espresso' ),
-								'audio' => __( 'Audio', 'event_espresso' )
+								'image' => __('Image', 'event_espresso'),
+								'audio' => __('Audio', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Type', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The type of CAPTCHA to serve.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_type ) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
+								'html_label_text'	 	=> __('Type', 'event_espresso'),
+								'html_help_text' 		=> __('The type of CAPTCHA to serve.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_type) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
 								'display_html_label_text' =>FALSE
 							)
 						),
 						'recaptcha_language' 		=> new EE_Select_Input(
 							array(
-								 'ar' 			=> __( 'Arabic', 'event_espresso' ),
-								 'bg' 		=> __( 'Bulgarian', 'event_espresso' ),
-								 'ca' 			=> __( 'Catalan', 'event_espresso' ),
-								 'zh-CN' 	=>  __( 'Chinese (Simplified)', 'event_espresso' ),
-								 'zh-TW' 	=>  __( 'Chinese (Traditional)	', 'event_espresso' ),
-								 'hr' 			=> __( 'Croatian', 'event_espresso' ),
-								 'cs' 			=> __( 'Czech', 'event_espresso' ),
-								 'da' 			=> __( 'Danish', 'event_espresso' ),
-								 'nl' 			=> __( 'Dutch', 'event_espresso' ),
-								 'en-GB' 	=>  __( 'English (UK)', 'event_espresso' ),
-								 'en' 			=> __( 'English (US)', 'event_espresso' ),
-								 'fil' 			=> __( 'Filipino', 'event_espresso' ),
-								 'fi' 			=> __( 'Finnish', 'event_espresso' ),
-								 'fr' 			=> __( 'French', 'event_espresso' ),
-								 'fr-CA' 	=>  __( 'French (Canadian)', 'event_espresso' ),
-								 'de' 			=> __( 'German', 'event_espresso' ),
-								 'de-AT' 	=>  __( 'German (Austria)', 'event_espresso' ),
-								 'de-CH' 	=>  __( 'German (Switzerland)', 'event_espresso' ),
-								 'el' 			=> __( 'Greek', 'event_espresso' ),
-								 'iw' 			=> __( 'Hebrew', 'event_espresso' ),
-								 'hi' 			=> __( 'Hindi', 'event_espresso' ),
-								 'hu' 		=> __( 'Hungarian', 'event_espresso' ),
-								 'id' 			=> __( 'Indonesian', 'event_espresso' ),
-								 'it' 			=> __( 'Italian', 'event_espresso' ),
-								 'ja' 			=> __( 'Japanese', 'event_espresso' ),
-								 'ko' 			=> __( 'Korean', 'event_espresso' ),
-								 'lv' 			=> __( 'Latvian', 'event_espresso' ),
-								 'lt' 			=> __( 'Lithuanian', 'event_espresso' ),
-								 'no' 		=> __( 'Norwegian', 'event_espresso' ),
-								 'fa' 			=> __( 'Persian', 'event_espresso' ),
-								 'pl' 			=> __( 'Polish', 'event_espresso' ),
-								 'pt' 			=> __( 'Portuguese', 'event_espresso' ),
-								 'pt-BR' 	=>  __( 'Portuguese (Brazil)', 'event_espresso' ),
-								 'pt-PT' 	=>  __( 'Portuguese (Portugal)', 'event_espresso' ),
-								 'ro' 			=> __( 'Romanian', 'event_espresso' ),
-								 'ru' 			=> __( 'Russian', 'event_espresso' ),
-								 'sr' 			=> __( 'Serbian', 'event_espresso' ),
-								 'sk' 			=> __( 'Slovak', 'event_espresso' ),
-								 'sl' 			=> __( 'Slovenian', 'event_espresso' ),
-								 'es' 			=> __( 'Spanish', 'event_espresso' ),
-								 'es-419' 	=>  __( 'Spanish (Latin America)', 'event_espresso' ),
-								 'sv' 			=> __( 'Swedish', 'event_espresso' ),
-								 'th' 			=> __( 'Thai', 'event_espresso' ),
-								 'tr' 			=> __( 'Turkish', 'event_espresso' ),
-								 'uk' 			=> __( 'Ukrainian', 'event_espresso' ),
-								 'vi' 			=> __( 'Vietnamese', 'event_espresso')
+								 'ar' 			=> __('Arabic', 'event_espresso'),
+								 'bg' 		=> __('Bulgarian', 'event_espresso'),
+								 'ca' 			=> __('Catalan', 'event_espresso'),
+								 'zh-CN' 	=>  __('Chinese (Simplified)', 'event_espresso'),
+								 'zh-TW' 	=>  __('Chinese (Traditional)	', 'event_espresso'),
+								 'hr' 			=> __('Croatian', 'event_espresso'),
+								 'cs' 			=> __('Czech', 'event_espresso'),
+								 'da' 			=> __('Danish', 'event_espresso'),
+								 'nl' 			=> __('Dutch', 'event_espresso'),
+								 'en-GB' 	=>  __('English (UK)', 'event_espresso'),
+								 'en' 			=> __('English (US)', 'event_espresso'),
+								 'fil' 			=> __('Filipino', 'event_espresso'),
+								 'fi' 			=> __('Finnish', 'event_espresso'),
+								 'fr' 			=> __('French', 'event_espresso'),
+								 'fr-CA' 	=>  __('French (Canadian)', 'event_espresso'),
+								 'de' 			=> __('German', 'event_espresso'),
+								 'de-AT' 	=>  __('German (Austria)', 'event_espresso'),
+								 'de-CH' 	=>  __('German (Switzerland)', 'event_espresso'),
+								 'el' 			=> __('Greek', 'event_espresso'),
+								 'iw' 			=> __('Hebrew', 'event_espresso'),
+								 'hi' 			=> __('Hindi', 'event_espresso'),
+								 'hu' 		=> __('Hungarian', 'event_espresso'),
+								 'id' 			=> __('Indonesian', 'event_espresso'),
+								 'it' 			=> __('Italian', 'event_espresso'),
+								 'ja' 			=> __('Japanese', 'event_espresso'),
+								 'ko' 			=> __('Korean', 'event_espresso'),
+								 'lv' 			=> __('Latvian', 'event_espresso'),
+								 'lt' 			=> __('Lithuanian', 'event_espresso'),
+								 'no' 		=> __('Norwegian', 'event_espresso'),
+								 'fa' 			=> __('Persian', 'event_espresso'),
+								 'pl' 			=> __('Polish', 'event_espresso'),
+								 'pt' 			=> __('Portuguese', 'event_espresso'),
+								 'pt-BR' 	=>  __('Portuguese (Brazil)', 'event_espresso'),
+								 'pt-PT' 	=>  __('Portuguese (Portugal)', 'event_espresso'),
+								 'ro' 			=> __('Romanian', 'event_espresso'),
+								 'ru' 			=> __('Russian', 'event_espresso'),
+								 'sr' 			=> __('Serbian', 'event_espresso'),
+								 'sk' 			=> __('Slovak', 'event_espresso'),
+								 'sl' 			=> __('Slovenian', 'event_espresso'),
+								 'es' 			=> __('Spanish', 'event_espresso'),
+								 'es-419' 	=>  __('Spanish (Latin America)', 'event_espresso'),
+								 'sv' 			=> __('Swedish', 'event_espresso'),
+								 'th' 			=> __('Thai', 'event_espresso'),
+								 'tr' 			=> __('Turkish', 'event_espresso'),
+								 'uk' 			=> __('Ukrainian', 'event_espresso'),
+								 'vi' 			=> __('Vietnamese', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Language', 'event_espresso' ),
-								'html_help_text' 		=> __( 'Forces the widget to render in a specific language.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
+								'html_label_text'	 	=> __('Language', 'event_espresso'),
+								'html_help_text' 		=> __('Forces the widget to render in a specific language.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
 							)
 						)
 					)
@@ -601,25 +600,25 @@ 
 	 * @param EE_Registration_Config $EE_Registration_Config
 	 * @return array
 	 */
-	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_admin_settings(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$recaptcha_settings_form = EED_Recaptcha::_recaptcha_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $recaptcha_settings_form->was_submitted() ) {
+			if ($recaptcha_settings_form->was_submitted()) {
 				// capture form data
 				$recaptcha_settings_form->receive_form_submission();
 				// validate form data
-				if ( $recaptcha_settings_form->is_valid() ) {
+				if ($recaptcha_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $recaptcha_settings_form->valid_data();
 					// user proofing recaptcha:  If Use reCAPTCHA is set to yes but we dont' have site or secret keys then set Use reCAPTCHA to FALSE and give error message.
 					if (
-						apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config )
+						apply_filters('FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config)
 						&& $valid_data['main_settings']['use_captcha']
-						&& ( ! $EE_Registration_Config->use_captcha && ( empty( $valid_data['main_settings']['recaptcha_publickey'] ) || empty( $valid_data['main_settings']['recaptcha_privatekey'] )))
+						&& ( ! $EE_Registration_Config->use_captcha && (empty($valid_data['main_settings']['recaptcha_publickey']) || empty($valid_data['main_settings']['recaptcha_privatekey'])))
 					) {
 						$valid_data['main_settings']['use_captcha'] = FALSE;
-						EE_Error::add_error( __('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(__('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$EE_Registration_Config->use_captcha = $valid_data['main_settings']['use_captcha'];
 					$EE_Registration_Config->recaptcha_publickey = $valid_data['main_settings']['recaptcha_publickey'];
@@ -628,12 +627,12 @@ 
 					$EE_Registration_Config->recaptcha_theme = $valid_data['appearance_settings']['recaptcha_theme'];
 					$EE_Registration_Config->recaptcha_language = $valid_data['appearance_settings']['recaptcha_language'];
 				} else {
-					if ( $recaptcha_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($recaptcha_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 
 
 	/**
-	 * @param $Request
+	 * @param string $Request
 	 * @return mixed
 	 */
 	private function _CURLRequest($Request) {

Braces +42 added lines, -31 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -123,7 +124,7 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else{
 			$order_items = array();
 			$item_amount = $payment->amount();
 			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
@@ -248,10 +249,10 @@ 
 				$payment->set_status( $this->_pay_model->failed_status() ) ;
 				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
 				$payment->set_details($PayPalResult);
-			}else{
+			} else{
 				if($this->_APICallSuccessful($PayPalResult)){
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} 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)
@@ -263,7 +264,7 @@ 
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -325,53 +326,62 @@ 
 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
-		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		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);
+		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);
+		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);
+		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);
+		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);
+		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);
+			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);
+		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);
+		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->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
@@ -500,14 +510,15 @@ 
 			$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';
+				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;
 			}

Spacing +61 added lines, -61 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,42 +88,42 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	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.',
                 'event_espresso'));
         }
         $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.',
                 'event_espresso'));
         }
-		$order_description  = $this->_format_order_description( $payment );
+		$order_description = $this->_format_order_description($payment);
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$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 ) {
+				if ($line_item->quantity() == 0) {
 					continue;
 				}
 				$item = array(
 						// Item Name.  127 char max.
 						'l_name' => substr(
-							$this->_format_line_item_name( $line_item, $payment ),
+							$this->_format_line_item_name($line_item, $payment),
 							0,
 							127
 						),
 						// Item description.  127 char max.
 						'l_desc' => substr( 
-							$this->_format_line_item_desc( $line_item, $payment ),
+							$this->_format_line_item_desc($line_item, $payment),
 							0,
 							127
 						),
@@ -147,20 +147,20 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
 				'l_name' => substr(
-					$this->_format_partial_payment_line_item_name( $payment ),
+					$this->_format_partial_payment_line_item_name($payment),
 					0,
 					127
 				),
 				// Item description.  127 char max.
 				'l_desc' => substr( 
-					$this->_format_partial_payment_line_item_desc( $payment ),
+					$this->_format_partial_payment_line_item_desc($payment),
 					0,
 					127
 				),
@@ -208,11 +208,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'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),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -225,7 +225,7 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
@@ -233,21 +233,21 @@ 
 		);
 
         //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()){
+        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),
+            '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),
-            'state' => substr($use_registration_address_info ? $attendee->state_name() : $billing_info['state'],0,40),
+            '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),
+            'state' => 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),
+            '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(
@@ -256,7 +256,7 @@ 
 			// 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' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($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.
@@ -268,10 +268,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(
@@ -285,32 +285,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		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);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} 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_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);
+				$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){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -327,7 +327,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -343,13 +343,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	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);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -374,32 +374,32 @@ 
 		// 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();
@@ -407,22 +407,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$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=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -446,7 +446,7 @@ 
 	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_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);
@@ -496,9 +496,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -514,11 +514,11 @@ 
 
 		$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 . ''] : '';
+		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,
@@ -558,7 +558,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

Indentation +31 added lines, -31 removed lines

@@ -90,19 +90,19 @@ 
 	 */
 	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'));
-        }
+		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'));
+		}
 		$order_description  = $this->_format_order_description( $payment );
 		//charge for the full amount. Show itemized list
 		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
@@ -232,23 +232,23 @@ 
 			'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),
-            'state' => 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),
-        );
+		//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),
+			'state' => 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.
@@ -280,7 +280,7 @@ 
 				'PayerInfo' => $PayerInfo,
 				'PayerName' => $PayerName,
 				'BillingAddress' => $BillingAddress,
-                'ShippingAddress' => $ShippingAddress,
+				'ShippingAddress' => $ShippingAddress,
 				'PaymentDetails' => $PaymentDetails,
 				'OrderItems' => $order_items,
 		);

core/admin/EE_Admin_Hooks.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 
 	/**
 	 * constructor
-	 * @param EE_Admin_Page $admin_page the calling admin_page_object
+	 * @param EE_Admin_Page $adminpage the calling admin_page_object
 	 */
 	public function __construct( EE_Admin_Page $adminpage ) {
 

Braces +59 added lines, -35 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -217,12 +218,15 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
-			return; //get out nothing more to be done here.
+		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) ) {
+					return;
+		}
+		//get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
-			$this->_extend_properties();
+		if ( method_exists( $this, '_extend_properties' ) ) {
+					$this->_extend_properties();
+		}
 
 		$this->_set_page_object();
 		$this->_init_hooks();
@@ -305,8 +309,10 @@ 
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
+			if( !isset( $this->_scripts_styles['enqueues'] ) ) {
+							return;
+			}
+			//not sure if we should throw an error here or not.
 			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
@@ -323,8 +329,9 @@ 
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
-				return;
+			if ( !isset( $this->_scripts_styles['deregisters'] ) ) {
+							return;
+			}
 			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
 				$defaults = array(
 					'type' => 'js'
@@ -376,8 +383,9 @@ 
 
 		//first default file (if exists)
 		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		if ( is_readable( $decaf_file ) ) {
+				require_once( $decaf_file );
+		}
 
 		//now we have to do require for extended file (if needed)
 		if ( $this->_extend ) {
@@ -486,12 +494,14 @@ 
 
 		foreach ( $hook_filter_array as $hook => $args ) {
 			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
-					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
-				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ( isset( $this->_wp_action_filters_priority[$hook] ) ) {
+									$args['priority'] = $this->_wp_action_filters_priority[$hook];
+				}
+				if ( $args['type'] == 'action' ) {
+									add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				} else {
+									add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				}
 			}
 		}
 
@@ -504,8 +514,10 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_ajax_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		foreach ( $this->_ajax_func as $action => $method ) {
 			//make sure method exists
@@ -528,8 +540,10 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_init_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
 		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
@@ -541,8 +555,9 @@ 
 				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
 				throw new EE_Error( implode('||', $msg ) );
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ( $route == $this->_current_route ) {
+							add_action('admin_init', array( $this, $method ) );
+			}
 		}
 
 	}
@@ -557,8 +572,10 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
-			return; //get out we don't have any metaboxes to set for this connection
+		if ( empty( $this->_metaboxes ) ) {
+					return;
+		}
+		//get out we don't have any metaboxes to set for this connection
 
 		$this->_handle_metabox_array( $this->_metaboxes );
 
@@ -569,19 +586,24 @@ 
 	private function _handle_metabox_array( $boxes, $add = TRUE ) {
 
 		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
-				continue; //we dont' have a valid array
+			if ( !isset($box['page_route']) ) {
+							continue;
+			}
+			//we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
 			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
-					continue; //get out we only add metaboxes for set route.
-				if ( $add )
-					$this->_add_metabox($box);
-				else
-					$this->_remove_metabox($box);
+				if ( $route != $this->_current_route ) {
+									continue;
+				}
+				//get out we only add metaboxes for set route.
+				if ( $add ) {
+									$this->_add_metabox($box);
+				} else {
+									$this->_remove_metabox($box);
+				}
 			}
 		}
 	}
@@ -596,8 +618,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
-			return; //get out there are no metaboxes to remove
+		if ( empty( $this->_remove_metaboxes ) ) {
+					return;
+		}
+		//get out there are no metaboxes to remove
 
 		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
 	}

Spacing +105 added lines, -105 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -209,7 +209,7 @@ 
 	 * constructor
 	 * @param EE_Admin_Page $admin_page the calling admin_page_object
 	 */
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 
 		$this->_adminpage_obj = $adminpage;
 		$this->_req_data = array_merge($_GET, $_POST);
@@ -217,11 +217,11 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
+		if ( ! isset($this->_req_data['page']) || (isset($this->_req_data['page']) && $this->_adminpage_obj->page_slug != $this->_req_data['page']))
 			return; //get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
+		if (method_exists($this, '_extend_properties'))
 			$this->_extend_properties();
 
 		$this->_set_page_object();
@@ -229,9 +229,9 @@ 
 		$this->_load_custom_methods();
 		$this->_load_routed_hooks();
 
-		add_action( 'admin_enqueue_scripts', array($this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array($this, 'add_metaboxes'), 20 );
-		add_action( 'admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'add_metaboxes'), 20);
+		add_action('admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15);
 
 		$this->_ajax_hooks();
 
@@ -272,15 +272,15 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 
-		if ( !empty( $this->_scripts_styles ) ) {
+		if ( ! empty($this->_scripts_styles)) {
 			//first let's do all the registrations
-			if ( !isset($this->_scripts_styles['registers'] ) ) {
+			if ( ! isset($this->_scripts_styles['registers'])) {
 				$msg[] = __('There is no "registers" index in the <code>$this->_scripts_styles</code> property.', 'event_espresso');
-				$msg[] = sprintf ( __('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>' . $this->caller . '</strong>' );
-				throw new EE_Error( implode( '||', $msg ) );
+				$msg[] = sprintf(__('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>'.$this->caller.'</strong>');
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			foreach( $this->_scripts_styles['registers'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js',
 					'url' => '',
@@ -289,48 +289,48 @@ 
 					'footer' => TRUE
 					);
 				$details = wp_parse_args($details, $defaults);
-				extract( $details );
+				extract($details);
 
 				//let's make sure that we set the 'registers' type if it's not set! We need it later to determine whhich enqueu we do
 				$this->_scripts_styles['registers'][$ref]['type'] = $type;
 
 				//let's make sure we're not missing any REQUIRED parameters
-				if ( empty($url) ) {
-					$msg[] = sprintf( __('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet' );
-					$msg[] = sprintf( __('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>' . $this->caller . '</strong>', $ref );
-					throw new EE_Error( implode( '||', $msg ) );
+				if (empty($url)) {
+					$msg[] = sprintf(__('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet');
+					$msg[] = sprintf(__('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>'.$this->caller.'</strong>', $ref);
+					throw new EE_Error(implode('||', $msg));
 				}
 				//made it here so let's do the appropriate registration
-				$type == 'js' ? wp_register_script( $ref, $url, $depends, $version, $footer ) : wp_register_style( $ref, $url, $depends, $version );
+				$type == 'js' ? wp_register_script($ref, $url, $depends, $version, $footer) : wp_register_style($ref, $url, $depends, $version);
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
-			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
+			if ( ! isset($this->_scripts_styles['enqueues']))
+				return; //not sure if we should throw an error here or not.
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
 
-				if ( in_array($this->_current_route, $routes ) ) {
+				if (in_array($this->_current_route, $routes)) {
 					$this->_scripts_styles['registers'][$ref]['type'] == 'js' ? wp_enqueue_script($ref) : wp_enqueue_style($ref);
 					//if we have a localization for the script let's do that too.
-					if ( isset( $this->_scripts_styles['localize'][$ref] ) ) {
-						foreach ( $this->_scripts_styles['localize'][$ref] as $object_name => $indexes ) {
-							wp_localize_script($ref, $object_name , $this->_scripts_styles['localize'][$ref][$object_name] );
+					if (isset($this->_scripts_styles['localize'][$ref])) {
+						foreach ($this->_scripts_styles['localize'][$ref] as $object_name => $indexes) {
+							wp_localize_script($ref, $object_name, $this->_scripts_styles['localize'][$ref][$object_name]);
 						}
 					}
 				}
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
+			if ( ! isset($this->_scripts_styles['deregisters']))
 				return;
-			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js'
 					);
-				$details = wp_parse_args( $details, $defaults );
-				extract( $details );
+				$details = wp_parse_args($details, $defaults);
+				extract($details);
 
 				$type == 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
 
@@ -349,7 +349,7 @@ 
 	 */
 	private function _set_defaults() {
 		$this->_ajax_func = $this->_init_func = $this->_metaboxes = $this->_scripts = $this->_styles = $this->_wp_action_filters_priority = array();
-		$this->_current_route = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$this->_current_route = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 		$this->caller = get_class($this);
 		$this->_extend = stripos($this->caller, 'Extend') ? TRUE : FALSE;
 	}
@@ -364,34 +364,34 @@ 
 	 */
 	protected function _set_page_object() {
 		//first make sure $this->_name is set
-		if ( empty( $this->_name ) ) {
+		if (empty($this->_name)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$ref = str_replace('_' , ' ', $this->_name); //take the_message -> the message
-		$ref = str_replace(' ', '_', ucwords($ref) ) . '_Admin_Page'; //take the message -> The_Message
+		$ref = str_replace('_', ' ', $this->_name); //take the_message -> the message
+		$ref = str_replace(' ', '_', ucwords($ref)).'_Admin_Page'; //take the message -> The_Message
 
 		//first default file (if exists)
-		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		$decaf_file = EE_ADMIN_PAGES.$this->_name.DS.$ref.'.core.php';
+		if (is_readable($decaf_file))
+		require_once($decaf_file);
 
 		//now we have to do require for extended file (if needed)
-		if ( $this->_extend ) {
-			require_once( EE_CORE_CAF_ADMIN_EXTEND . $this->_name . DS . 'Extend_' . $ref . '.core.php' );
+		if ($this->_extend) {
+			require_once(EE_CORE_CAF_ADMIN_EXTEND.$this->_name.DS.'Extend_'.$ref.'.core.php');
 		}
 
 
 		//if we've got an extended class we use that!
-		$ref = $this->_extend ? 'Extend_' . $ref : $ref;
+		$ref = $this->_extend ? 'Extend_'.$ref : $ref;
 
 		//let's make sure the class exists
-		if ( !class_exists( $ref ) ) {
+		if ( ! class_exists($ref)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$a = new ReflectionClass($ref);
@@ -416,27 +416,27 @@ 
 		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
 
 		//these run before the Admin_Page route executes.
-		if ( method_exists( $this, $method_callback ) ) {
-			call_user_func( array( $this, $method_callback) );
+		if (method_exists($this, $method_callback)) {
+			call_user_func(array($this, $method_callback));
 		}
 
 
 		//these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the seond fires right before the actual redirect happens.
 		//first the actions
 		//note that these action hooks will have the $query_args value available.
-		$admin_class_name = get_class( $this->_adminpage_obj );
+		$admin_class_name = get_class($this->_adminpage_obj);
 
-		if ( method_exists( $this, '_redirect_action_early_' . $this->_current_route ) ) {
-			add_action( 'AHEE__' . $admin_class_name . '___redirect_after_action__before_redirect_modification_' . $this->_current_route, array( $this, '_redirect_action_early_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_early_'.$this->_current_route)) {
+			add_action('AHEE__'.$admin_class_name.'___redirect_after_action__before_redirect_modification_'.$this->_current_route, array($this, '_redirect_action_early_'.$this->_current_route), 10);
 		}
 
-		if ( method_exists( $this, '_redirect_action_' . $this->_current_route ) ) {
-			add_action( 'AHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_action_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_'.$this->_current_route)) {
+			add_action('AHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_action_'.$this->_current_route), 10);
 		}
 
 		//let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
-		if ( method_exists( $this, '_redirect_filter_' . $this->_current_route ) ) {
-			add_filter( 'FHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_filter_' . $this->_current_route ), 10, 2 );
+		if (method_exists($this, '_redirect_filter_'.$this->_current_route)) {
+			add_filter('FHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_filter_'.$this->_current_route), 10, 2);
 		}
 
 	}
@@ -459,12 +459,12 @@ 
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug.'_'.$this->_current_route => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
@@ -483,14 +483,14 @@ 
 
 
 
-		foreach ( $hook_filter_array as $hook => $args ) {
-			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
+		foreach ($hook_filter_array as $hook => $args) {
+			if (method_exists($this, $this->_current_route.'_'.$hook)) {
+				if (isset($this->_wp_action_filters_priority[$hook]))
 					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ($args['type'] == 'action')
+					add_action($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+					add_filter($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 			}
 		}
 
@@ -503,18 +503,18 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
+		if (empty($this->_ajax_func))
 			return; //get out there's nothing to take care of.
 
-		foreach ( $this->_ajax_func as $action => $method ) {
+		foreach ($this->_ajax_func as $action => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			add_action('wp_ajax_' . $action, array( $this, $method ) );
+			add_action('wp_ajax_'.$action, array($this, $method));
 		}
 
 	}
@@ -527,21 +527,21 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
+		if (empty($this->_init_func))
 			return; //get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
-		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$current_route = isset ($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 
-		foreach ( $this->_init_func as $route => $method ) {
+		foreach ($this->_init_func as $route => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ($route == $this->_current_route)
+				add_action('admin_init', array($this, $method));
 		}
 
 	}
@@ -556,28 +556,28 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
+		if (empty($this->_metaboxes))
 			return; //get out we don't have any metaboxes to set for this connection
 
-		$this->_handle_metabox_array( $this->_metaboxes );
+		$this->_handle_metabox_array($this->_metaboxes);
 
 	}
 
 
 
-	private function _handle_metabox_array( $boxes, $add = TRUE ) {
+	private function _handle_metabox_array($boxes, $add = TRUE) {
 
-		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
+		foreach ($boxes as $box) {
+			if ( ! isset($box['page_route']))
 				continue; //we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
-			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
+			foreach ($box['page_route'] as $route) {
+				if ($route != $this->_current_route)
 					continue; //get out we only add metaboxes for set route.
-				if ( $add )
+				if ($add)
 					$this->_add_metabox($box);
 				else
 					$this->_remove_metabox($box);
@@ -595,10 +595,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
+		if (empty($this->_remove_metaboxes))
 			return; //get out there are no metaboxes to remove
 
-		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
+		$this->_handle_metabox_array($this->_remove_metaboxes, FALSE);
 	}
 
 
@@ -608,53 +608,53 @@ 
 	 * @access private
 	 * @param array $args an array of args that have been set for this metabox by the child class
 	 */
-	private function _add_metabox( $args ) {
+	private function _add_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
 			'func' => $func,
-			'id' => $this->caller . '_' . $func . '_metabox',
+			'id' => $this->caller.'_'.$func.'_metabox',
 			'priority' => 'default',
 			'label' => $this->caller,
 			'context' => 'advanced',
 			'callback_args' => array(),
-			'page' => isset( $args['page'] ) ? $args['page'] : $screen_id
+			'page' => isset($args['page']) ? $args['page'] : $screen_id
 			);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		extract($args);
 
 
 		//make sure method exists
-		if ( !method_exists($this, $func) ) {
-			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso') . '<br />';
-			$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $func, $this->caller );
-			throw new EE_Error( implode('||', $msg ) );
+		if ( ! method_exists($this, $func)) {
+			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso').'<br />';
+			$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $func, $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//everything checks out so lets add the metabox
-		add_meta_box( $id, $label, array( $this, $func ), $page, $context, $priority, $callback_args);
+		add_meta_box($id, $label, array($this, $func), $page, $context, $priority, $callback_args);
 	}
 
 
 
-	private function _remove_metabox( $args ) {
+	private function _remove_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
-			'id' => isset( $args['id'] ) ? $args['id'] : $this->_current_route . '_' . $this->caller . '_' . $func . '_metabox',
+			'id' => isset($args['id']) ? $args['id'] : $this->_current_route.'_'.$this->caller.'_'.$func.'_metabox',
 			'context' => 'default',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : $screen_id
+			'screen' => isset($args['screen']) ? $args['screen'] : $screen_id
 		);
 
-		$args = wp_parse_args( $args, $defaults );
-		extract( $args );
+		$args = wp_parse_args($args, $defaults);
+		extract($args);
 
 		//everything checks out so lets remove the box!
 		remove_meta_box($id, $screen, $context);

core/admin/EE_Admin_Page_Menu_Map.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	 *
 	 * @param  array $menu_args  An array of arguments used to setup the menu
 	 *                           		properties on construct.
-	 * @param  array $required   	An array of keys that should be in the $menu_args, this
+	 * @param  string[] $required   	An array of keys that should be in the $menu_args, this
 	 *                            		is used to validate that the items that should be defined
 	 *                            		are present.
 	 * @return void

Spacing +39 added lines, -39 removed lines

@@ -15,7 +15,7 @@ 
  * @package 		Event Espresso
  * @subpackage 	admin
  */
-abstract class EE_Admin_Page_Menu_Map  {
+abstract class EE_Admin_Page_Menu_Map {
 
 
 	/**
@@ -155,28 +155,28 @@ 
 	 *                            		are present.
 	 * @return void
 	 */
-	public function __construct( $menu_args, $required ) {
+	public function __construct($menu_args, $required) {
 		//filter all args before processing so plugins can manipulate various settings for menus.
-		$menu_args = apply_filters( 'FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class( $this ) );
+		$menu_args = apply_filters('FHEE__EE_Admin_Page_Menu_Map__construct__menu_args', $menu_args, $required, get_class($this));
 
 
 		//verify that required keys are present in the incoming array.
-		$missing = array_diff( (array) $required, array_keys( (array) $menu_args ) );
+		$missing = array_diff((array) $required, array_keys((array) $menu_args));
 
-		if ( !empty( $missing ) ) {
-			throw new EE_Error( sprintf( __('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class( $this ), implode(', ', $missing ) ) );
+		if ( ! empty($missing)) {
+			throw new EE_Error(sprintf(__('%s is missing some expected keys in the argument array.  The following keys are missing: %s', 'event_espresso'), get_class($this), implode(', ', $missing)));
 		}
 
 		//made it here okay, so let's set the properties!
-		foreach ( $menu_args as $prop => $value ) {
+		foreach ($menu_args as $prop => $value) {
 
-			switch ( $prop ) {
+			switch ($prop) {
 				case 'show_on_menu' :
 					$value = (int) $value;
 					break;
 				case 'admin_init_page' :
-					if ( in_array( 'admin_init_page', $required ) && ! $value instanceof EE_Admin_Page_Init ) {
-						throw new EE_Error( sprintf( __('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE) ) );
+					if (in_array('admin_init_page', $required) && ! $value instanceof EE_Admin_Page_Init) {
+						throw new EE_Error(sprintf(__('The value for the "admin_init_page" argument must be an instance of an EE_Admin_Page_Init object.  Instead %s was given as the value.', 'event_espresso'), print_r($value, TRUE)));
 					}
 					break;
 				case 'menu_callback' :
@@ -187,24 +187,24 @@ 
 					break;
 
 			}
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			if ( ! EEH_Class_Tools::has_property($this, $prop))
+				throw new EE_Error(sprintf(__('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class($this), $prop));
 			$this->{$prop} = $value;
 
 		}
 
 		//filter capabilities (both static and dynamic)
-		$this->capability = apply_filters( 'FHEE_management_capability', $this->capability, NULL );
-		$this->capability = apply_filters( 'FHEE_' . $this->menu_slug . '_capability', $this->capability, NULL );
+		$this->capability = apply_filters('FHEE_management_capability', $this->capability, NULL);
+		$this->capability = apply_filters('FHEE_'.$this->menu_slug.'_capability', $this->capability, NULL);
 
 		//Might need to change parent slug depending on maintenance mode.
-		if ( ! empty( $this->maintenance_mode_parent ) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance )  {
+		if ( ! empty($this->maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 			$this->parent_slug = $this->maintenance_mode_parent;
 		}
 
 		//if empty menu_callback let's set default (but only if we have admin page init object)
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		if (empty($this->menu_callback) && $this->admin_init_page instanceof EE_Admin_Page_Init)
+			$this->menu_callback = array($this->admin_init_page, 'initialize_admin_page');
 
 	}
 
@@ -226,21 +226,21 @@ 
 	 * @param boolean $network_admin whether this is being added to the network admin page or not
 	 * @since  4.4.0
 	 */
-	public function add_menu_page( $network_admin = FALSE ) {
+	public function add_menu_page($network_admin = FALSE) {
 
 		$show_on_menu_int = (int) $this->show_on_menu;
-		if( ( $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY ), TRUE ) )
+		if (($network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::NETWORK_ADMIN_ONLY), TRUE))
 				||
-			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
+			( ! $network_admin && in_array($show_on_menu_int, array(self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY), TRUE))) {
 			$wp_page_slug = $this->_add_menu_page();
-		}else{
+		} else {
 			$wp_page_slug = '';
 		}
 
-		if ( !empty( $wp_page_slug ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
+		if ( ! empty($wp_page_slug) && $this->admin_init_page instanceof EE_Admin_Page_Init) {
 			try {
-				$this->admin_init_page->set_page_dependencies( $wp_page_slug );
-			} catch( EE_Error $e ) {
+				$this->admin_init_page->set_page_dependencies($wp_page_slug);
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -293,12 +293,12 @@ 
 	public $position;
 
 
-	public function __construct( $menu_args ) {
-		$required = array( 'menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
+	public function __construct($menu_args) {
+		$required = array('menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page');
 
-		parent::__construct( $menu_args, $required );
+		parent::__construct($menu_args, $required);
 
-		$this->position = ! empty( $this->position ) ? (int) $this->position : $this->position;
+		$this->position = ! empty($this->position) ? (int) $this->position : $this->position;
 	}
 
 
@@ -306,9 +306,9 @@ 
 	 * Uses the proper WP utility for registering a menu page for the main WP pages.
 	 */
 	protected function _add_menu_page() {
-		$main =  add_menu_page( $this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position );
-		if ( ! empty( $this->subtitle ) ) {
-			add_submenu_page( $this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback );
+		$main = add_menu_page($this->title, $this->menu_label, $this->capability, $this->parent_slug, $this->menu_callback, $this->icon_url, $this->position);
+		if ( ! empty($this->subtitle)) {
+			add_submenu_page($this->parent_slug, $this->subtitle, $this->subtitle, $this->capability, $this->menu_slug, $this->menu_callback);
 		}
 		return $main;
 	}
@@ -325,13 +325,13 @@ 
  */
 class EE_Admin_Page_Sub_Menu extends EE_Admin_Page_Main_Menu {
 
-	public function __construct( $menu_args ) {
-		parent::__construct( $menu_args );
+	public function __construct($menu_args) {
+		parent::__construct($menu_args);
 	}
 
 
 	protected function _add_menu_page() {
-		return add_submenu_page( $this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback );
+		return add_submenu_page($this->parent_slug, $this->title, $this->menu_label, $this->capability, $this->menu_slug, $this->menu_callback);
 	}
 
 } //end class EE_Admin_Page_Menu_Map
@@ -352,18 +352,18 @@ 
 
 
 
-	public function __construct( $menu_args = array() ) {
-		$required = array( 'menu_label', 'menu_slug', 'menu_order', 'parent_slug' );
-		parent::__construct( $menu_args, $required );
+	public function __construct($menu_args = array()) {
+		$required = array('menu_label', 'menu_slug', 'menu_order', 'parent_slug');
+		parent::__construct($menu_args, $required);
 	}
 
 
 	protected function _add_menu_page() {
-		return add_submenu_page( $this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false' );
+		return add_submenu_page($this->parent_slug, $this->menu_label, $this->_group_link(), $this->capability, $this->menu_slug, '__return_false');
 	}
 
 
 	private function _group_link() {
-		return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
+		return '<span class="ee_menu_group"  onclick="return false;">'.$this->menu_label.'</span>';
 	}
 } //end EE_Admin_Page_Menu_Group

Braces +7 added lines, -5 removed lines

@@ -187,8 +187,9 @@ 
 					break;
 
 			}
-			if ( ! EEH_Class_Tools::has_property( $this, $prop ) )
-				throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			if ( ! EEH_Class_Tools::has_property( $this, $prop ) ) {
+							throw new EE_Error( sprintf( __('The $menu_args coming into %s has a index key (%s) representing a property that is not defined by the class.  Perhaps there is a typo?', 'event_espresso'), get_class( $this ), $prop ) );
+			}
 			$this->{$prop} = $value;
 
 		}
@@ -203,8 +204,9 @@ 
 		}
 
 		//if empty menu_callback let's set default (but only if we have admin page init object)
-		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init )
-			$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		if ( empty( $this->menu_callback ) && $this->admin_init_page instanceof EE_Admin_Page_Init ) {
+					$this->menu_callback = array( $this->admin_init_page, 'initialize_admin_page' );
+		}
 
 	}
 
@@ -233,7 +235,7 @@ 
 				||
 			( ! $network_admin && in_array( $show_on_menu_int, array( self::BLOG_AND_NETWORK_ADMIN, self::BLOG_ADMIN_ONLY ), TRUE )) ){
 			$wp_page_slug = $this->_add_menu_page();
-		}else{
+		} else{
 			$wp_page_slug = '';
 		}
 

core/admin/EE_Help_Tour.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 *
 	 * @access public
 	 * @param boolean $caf used to indicate if this tour is happening on caf install or not.
-	 * @return void
+	 * @return EE_Help_Tour
 	 */
 	public function __construct($caf = FALSE) {
 		$this->_is_caf = $caf;

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -115,7 +115,7 @@ 
 	 */
 	public function __construct($caf = FALSE) {
 		$this->_is_caf = $caf;
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 		$this->_set_tour_properties();
 		$this->_set_tour_stops();
 		$this->_set_tour_options();
@@ -158,36 +158,36 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _set_tour_options( $options = array() ) {
+	protected function _set_tour_options($options = array()) {
 		$defaults = array(
-			'tipLocation' => 'bottom',         // 'top', 'bottom', 'right', 'left' in relation to parent
-		  	'nubPosition' => 'auto',           // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
-		  	'tipAdjustmentY' => 0, 			//allow for adjustment of tip
-		  	'tipAdjustmentX' => 0,			//allow for adjustment of tip
+			'tipLocation' => 'bottom', // 'top', 'bottom', 'right', 'left' in relation to parent
+		  	'nubPosition' => 'auto', // override on a per tooltip bases. can be "auto", "right", "top", "bottom", "left"
+		  	'tipAdjustmentY' => 0, //allow for adjustment of tip
+		  	'tipAdjustmentX' => 0, //allow for adjustment of tip
 		  	'scroll' => true, //whether to scrollTo the next step or not
-		  	'scrollSpeed' => 300,              // Page scrolling speed in ms
-		  	'timer' => 0,	                // 0 = off, all other numbers = time(ms)
-		  	'autoStart' => true,			// true or false - false tour starts when restart called
-		  	'startTimerOnClick' => true,       // true/false to start timer on first click
-		  	'nextButton' => true,              // true/false for next button visibility
+		  	'scrollSpeed' => 300, // Page scrolling speed in ms
+		  	'timer' => 0, // 0 = off, all other numbers = time(ms)
+		  	'autoStart' => true, // true or false - false tour starts when restart called
+		  	'startTimerOnClick' => true, // true/false to start timer on first click
+		  	'nextButton' => true, // true/false for next button visibility
 		  	'button_text' => __('Next', 'event_espresso'),
-		  	'tipAnimation' => 'fade',           // 'pop' or 'fade' in each tip
-		  	'pauseAfter' => array(),                // array of indexes where to pause the tour after
-		  	'tipAnimationFadeSpeed' => 300,    // if 'fade'- speed in ms of transition
-		  	'cookieMonster' => true,           // true/false for whether cookies are used
-		  	'cookieName' => $this->get_slug(),         // choose your own cookie name (setup will add the prefix for the specific page joyride)
-	  		'cookieDomain' => false,           // set to false or yoursite.com
+		  	'tipAnimation' => 'fade', // 'pop' or 'fade' in each tip
+		  	'pauseAfter' => array(), // array of indexes where to pause the tour after
+		  	'tipAnimationFadeSpeed' => 300, // if 'fade'- speed in ms of transition
+		  	'cookieMonster' => true, // true/false for whether cookies are used
+		  	'cookieName' => $this->get_slug(), // choose your own cookie name (setup will add the prefix for the specific page joyride)
+	  		'cookieDomain' => false, // set to false or yoursite.com
 		  	//'tipContainer' => 'body',            // Where the tip be attached if not inline
-		  	'modal' => false, 					// Whether to cover page with modal during the tour
-		  	'expose' => false,					// Whether to expose the elements at each step in the tour (requires modal:true),
-		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback',    // A method to call after an element has been exposed
-		  	'preRideCallback' => 'EEHelpTour_preRideCallback',    // A method to call before the tour starts (passed index, tip, and cloned exposed element)
-		  	'postRideCallback' => 'EEHelpTour_postRideCallback',       // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
-		  	'preStepCallback' => 'EEHelpTour_preStepCallback',    // A method to call before each step
-		  	'postStepCallback' => 'EEHelpTour_postStepCallback',        // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
+		  	'modal' => false, // Whether to cover page with modal during the tour
+		  	'expose' => false, // Whether to expose the elements at each step in the tour (requires modal:true),
+		  	'postExposeCallback' => 'EEHelpTour.postExposeCallback', // A method to call after an element has been exposed
+		  	'preRideCallback' => 'EEHelpTour_preRideCallback', // A method to call before the tour starts (passed index, tip, and cloned exposed element)
+		  	'postRideCallback' => 'EEHelpTour_postRideCallback', // a method to call once the tour closes.  This will correspond to the name of a js method that will have to be defined in loaded js.
+		  	'preStepCallback' => 'EEHelpTour_preStepCallback', // A method to call before each step
+		  	'postStepCallback' => 'EEHelpTour_postStepCallback', // A method to call after each step (remember this will correspond with a js method that you will have to define in a js file BEFORE ee-help-tour.js loads, if the default methods do not exist, then ee-help-tour.js just substitues empty functions $.noop)/**/
 			);
 
-		$options = !empty( $options ) && is_array($options)  ? array_merge( $defaults, $options ) : $defaults;
+		$options = ! empty($options) && is_array($options) ? array_merge($defaults, $options) : $defaults;
 		$this->_options = $options;
 	}
 
@@ -202,8 +202,8 @@ 
 	 * @return string slug for the tour
 	 */
 	public function get_slug() {
-		if ( empty( $this->_slug ) )
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if (empty($this->_slug))
+			throw new EE_Error(sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this)));
 		return $this->_slug;
 	}
 
@@ -215,8 +215,8 @@ 
 	 * @return string
 	 */
 	public function get_label() {
-		if ( empty( $this->_label ) )
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if (empty($this->_label))
+			throw new EE_Error(sprintf(__('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this)));
 		return $this->_label;
 	}
 
@@ -227,8 +227,8 @@ 
 	 * @return array
 	 */
 	public function get_stops() {
-		foreach( $this->_stops as $ind => $stop ) {
-			if ( ! isset( $stop['button_text'] ) ) {
+		foreach ($this->_stops as $ind => $stop) {
+			if ( ! isset($stop['button_text'])) {
 				$this->_stops[$ind]['button_text'] = $this->_options['button_text'];
 			}
 		}
@@ -243,12 +243,12 @@ 
 	 */
 	public function get_options() {
 		//let's make sure there are not pauses set
-		foreach ( $this->_stops as $ind => $stop ) {
-			if ( isset( $stop['pause_after'] ) && $stop['pause_after'] ) {
+		foreach ($this->_stops as $ind => $stop) {
+			if (isset($stop['pause_after']) && $stop['pause_after']) {
 				$this->_options['pauseAfter'][] = $ind;
 			}
 		}
-		return apply_filters( 'FHEE__' . get_class($this) . '__get_options', $this->_options, $this );
+		return apply_filters('FHEE__'.get_class($this).'__get_options', $this->_options, $this);
 	}
 
 }

Braces +8 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -202,8 +203,9 @@ 
 	 * @return string slug for the tour
 	 */
 	public function get_slug() {
-		if ( empty( $this->_slug ) )
-			throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if ( empty( $this->_slug ) ) {
+					throw new EE_Error( sprintf(__('There is no slug set for the help tour class (%s). Make sure that the $_slug property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		}
 		return $this->_slug;
 	}
 
@@ -215,8 +217,9 @@ 
 	 * @return string
 	 */
 	public function get_label() {
-		if ( empty( $this->_label ) )
-			throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		if ( empty( $this->_label ) ) {
+					throw new EE_Error( sprintf( __('There is no label set for the help tour class (%s). Make sure that the $_label property is set in the class constructor', 'event_espresso'), get_class($this) ) );
+		}
 		return $this->_label;
 	}
 

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_answers.dmsstage.php

Doc Comments -1 removed lines

@@ -59,7 +59,6 @@
 	/**
 	 * Creates a 4.1 price base type
 	 * @global type $wpdb
-	 * @param array $old_price
 	 * @param int $new_reg_id
 	 * @return int
 	 */

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
 			));
 */
 
-class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_answer_table;
 	private $_new_question_table;
 	function __construct() {
@@ -47,13 +47,13 @@ 
 		$old_attendee_table = $wpdb->prefix."events_attendee";
 		$new_reg_table = $wpdb->prefix."esp_registration";
 		$regs = $this->get_migration_script()->get_mapping_new_pk($old_attendee_table, $old_row['attendee_id'], $new_reg_table);
-		if( ! $regs){
-			$this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"),$old_row['attendee_id'],  $this->_json_encode($old_row)));
+		if ( ! $regs) {
+			$this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"), $old_row['attendee_id'], $this->_json_encode($old_row)));
 			return false;
 		}
 		//as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
-		foreach($regs as $new_reg_id){
-			$new_answer_id = $this->_insert_new_answer($old_row,$new_reg_id);
+		foreach ($regs as $new_reg_id) {
+			$new_answer_id = $this->_insert_new_answer($old_row, $new_reg_id);
 		}
 	}
 	/**
@@ -63,15 +63,15 @@ 
 	 * @param int $new_reg_id
 	 * @return int
 	 */
-	private function _insert_new_answer($old_answer,$new_reg_id){
+	private function _insert_new_answer($old_answer, $new_reg_id) {
 		global $wpdb;
 		$old_question_table = $wpdb->prefix."events_question";
 		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($old_question_table, $old_answer['question_id'], $this->_new_question_table);
 
 		$question_type = $this->_get_question_type($new_question_id);
-		if(in_array($question_type,array('MULTIPLE'))){
-			$ans_value = serialize(explode(",",stripslashes($old_answer['answer'])));
-		}else{
+		if (in_array($question_type, array('MULTIPLE'))) {
+			$ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
+		} else {
 			$ans_value = stripslashes($old_answer['answer']);
 		}
 		$cols_n_values = array(
@@ -80,12 +80,12 @@ 
 			'ANS_value'=>$ans_value
 		);
 		$datatypes = array(
-			'%d',//REG_ID
-			'%d',//QST_ID
-			'%s',//ANS_value
+			'%d', //REG_ID
+			'%d', //QST_ID
+			'%s', //ANS_value
 		);
-		$success = $wpdb->insert($this->_new_answer_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_answer_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_answer, $this->_new_answer_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -99,9 +99,9 @@ 
 	 * @param type $question_id
 	 * @return string
 	 */
-	private function _get_question_type($question_id){
+	private function _get_question_type($question_id) {
 		global $wpdb;
-		$type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1",$question_id));
+		$type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1", $question_id));
 		return $type;
 	}
 

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_attendees.dmsstage.php

Doc Comments +6 added lines, -2 removed lines

@@ -565,8 +565,8 @@ 
 	 * that they WILL be added (because the attendees stage runs nearly last during
 	 * the migration script)
 	 * @param type $new_ticket_id
-	 * @param type $sold
-	 * @param type $STS_ID
+	 * @param string $STS_ID
+	 * @param integer $quantity_sold
 	 * @return boolean whether they were successfully updated or not
 	 */
 	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id,$quantity_sold,$STS_ID){
@@ -744,6 +744,10 @@ 
 		}
 		return $count;
 	}
+
+	/**
+	 * @param integer $new_txn_id
+	 */
 	private function _insert_new_payment($old_attendee,$new_txn_id){
 		global $wpdb;
 		//only add a payment for primary attendees

Braces +5 added lines, -5 removed lines

@@ -339,13 +339,13 @@ 
 		try{
 			$new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
 			$new_country_iso = $new_country['CNT_ISO'];
-		}catch(EE_Error $exception){
+		} catch(EE_Error $exception){
 			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
 		}
 		try{
 			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']),$new_country_iso);
 			$new_state_id = $new_state['STA_ID'];
-		}catch(EE_Error $exception){
+		} catch(EE_Error $exception){
 			$new_state_id = 0;
 		}
 		$cols_n_values = array(
@@ -459,7 +459,7 @@ 
 
 			if( $wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table){
 				$this->_mer_tables_exist = false;
-			}else{
+			} else{
 				$this->_mer_tables_exist = true;
 			}
 		}
@@ -584,7 +584,7 @@ 
 			if( ! $success_update_dateimtes){
 				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
 			}
-		}else{
+		} else{
 			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
 		}
 		return true;
@@ -791,7 +791,7 @@ 
 			$new_id = $wpdb->insert_id;
 			return $new_id;
 
-		}else{
+		} else{
 			return 0;
 		}
 

Indentation -3 removed lines

@@ -25,9 +25,6 @@
 				
 			)
 		);
-
-
-
  * 
  */
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{

Spacing +182 added lines, -182 removed lines

@@ -214,7 +214,7 @@ 
 			)
 		);
  */
-class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table {
 	private $_new_attendee_cpt_table;
 	private $_new_attendee_meta_table;
 	private $_new_reg_table;
@@ -237,7 +237,7 @@ 
 		global $wpdb;
 		$this->_pretty_name = __("Attendees", "event_espresso");
 		$this->_old_table = $wpdb->prefix."events_attendee";
-		$this->_old_mer_table = $wpdb->prefix."events_multi_event_registration_id_group";;
+		$this->_old_mer_table = $wpdb->prefix."events_multi_event_registration_id_group"; ;
 		$this->_new_attendee_cpt_table = $wpdb->posts;
 		$this->_new_attendee_meta_table = $wpdb->prefix."esp_attendee_meta";
 		$this->_new_reg_table = $wpdb->prefix."esp_registration";
@@ -256,34 +256,34 @@ 
 	protected function _migrate_old_row($old_row) {
 		//first check if there's already a new attendee with similar characteristics
 		$new_att_id = $this->_find_attendee_cpt_matching($old_row);
-		if( ! $new_att_id ){
+		if ( ! $new_att_id) {
 			$new_att_id = $this->_insert_new_attendee_cpt($old_row);
-			if( ! $new_att_id){
+			if ( ! $new_att_id) {
 				//if we couldnt even make an attendee, abandon all hope
 				return false;
 			}
 			$new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
-			if($new_att_meta_id){
+			if ($new_att_meta_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_meta_table, $new_att_meta_id);
 			}
 		}
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_cpt_table, $new_att_id);
 
 		$txn_id = $this->_insert_new_transaction($old_row);
-		if( ! $txn_id){
+		if ( ! $txn_id) {
 			//if we couldnt make the transaction, also abandon all hope
 			return false;
 		}
-		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id);$pay_id = $this->_insert_new_payment($old_row,$txn_id);
-		if($pay_id){
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_payment_table,$pay_id);
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id); $pay_id = $this->_insert_new_payment($old_row, $txn_id);
+		if ($pay_id) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_payment_table, $pay_id);
 		}
 
 
 		//even if there was no payment, we can go ahead with adding the reg
-		$new_regs = $this->_insert_new_registrations($old_row,$new_att_id,$txn_id);
-		if($new_regs){
-			$this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_reg_table,$new_regs);
+		$new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
+		if ($new_regs) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_reg_table, $new_regs);
 		}
 	}
 	/**
@@ -293,39 +293,39 @@ 
 	 * @param array $old_attendee
 	 * @return int
 	 */
-	private function _find_attendee_cpt_matching($old_attendee){
+	private function _find_attendee_cpt_matching($old_attendee) {
 		global $wpdb;
-		$existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_new_attendee_cpt_table." AS cpt INNER JOIN ".$this->_new_attendee_meta_table." AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1",$old_attendee['fname'],$old_attendee['lname'],$old_attendee['email']));
+		$existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_new_attendee_cpt_table." AS cpt INNER JOIN ".$this->_new_attendee_meta_table." AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
 		return intval($existing_attendee_id);
 	}
-	private function _insert_new_attendee_cpt($old_attendee){
+	private function _insert_new_attendee_cpt($old_attendee) {
 		global $wpdb;
 		$cols_n_values = array(
-			'post_title'=>stripslashes($old_attendee['fname']." ".$old_attendee['lname']),//ATT_full_name
-			'post_content'=>'',//ATT_bio
-			'post_name'=>sanitize_title($old_attendee['fname']."-".$old_attendee['lname']),//ATT_slug
-			'post_date'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),//ATT_created
-			'post_excerpt'=>'',//ATT_short_bio
-			'post_modified'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),//ATT_modified
-			'post_author'=>0,//ATT_author
-			'post_parent'=>0,//ATT_parent
-			'post_type'=>'espresso_attendees',//post_type
+			'post_title'=>stripslashes($old_attendee['fname']." ".$old_attendee['lname']), //ATT_full_name
+			'post_content'=>'', //ATT_bio
+			'post_name'=>sanitize_title($old_attendee['fname']."-".$old_attendee['lname']), //ATT_slug
+			'post_date'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), //ATT_created
+			'post_excerpt'=>'', //ATT_short_bio
+			'post_modified'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), //ATT_modified
+			'post_author'=>0, //ATT_author
+			'post_parent'=>0, //ATT_parent
+			'post_type'=>'espresso_attendees', //post_type
 			'post_status'=>'publish'//status
 		);
 		$datatypes = array(
-			'%s',//ATT_full_name
-			'%s',//ATT_bio
-			'%s',//ATT_slug
-			'%s',//ATT_created
-			'%s',//ATT_short_bio
-			'%s',//ATT_modified
-			'%d',//ATT_author
-			'%d',//ATT_parent
-			'%s',//post_type
-			'%s',//status
+			'%s', //ATT_full_name
+			'%s', //ATT_bio
+			'%s', //ATT_slug
+			'%s', //ATT_created
+			'%s', //ATT_short_bio
+			'%s', //ATT_modified
+			'%d', //ATT_author
+			'%d', //ATT_parent
+			'%s', //post_type
+			'%s', //status
 		);
-		$success = $wpdb->insert($this->_new_attendee_cpt_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -333,19 +333,19 @@ 
 		return $new_id;
 	}
 
-	private function _insert_attendee_meta_row($old_attendee,$new_attendee_cpt_id){
+	private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id) {
 		global $wpdb;
 		//get the state and country ids from the old row
-		try{
+		try {
 			$new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
 			$new_country_iso = $new_country['CNT_ISO'];
-		}catch(EE_Error $exception){
+		} catch (EE_Error $exception) {
 			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
 		}
-		try{
-			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']),$new_country_iso);
+		try {
+			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']), $new_country_iso);
 			$new_state_id = $new_state['STA_ID'];
-		}catch(EE_Error $exception){
+		} catch (EE_Error $exception) {
 			$new_state_id = 0;
 		}
 		$cols_n_values = array(
@@ -362,20 +362,20 @@ 
 			'ATT_phone'=>stripslashes($old_attendee['phone']),
 		);
 		$datatypes = array(
-			'%d',//ATT_ID
-			'%s',//ATT_fname
-			'%s',//ATT_lname
-			'%s',//ATT_address
-			'%s',//ATT_address2
-			'%s',//ATT_city
-			'%d',//STA_ID
-			'%s',//CNT_ISO
-			'%s',//ATT_zip
-			'%s',//ATT_email
-			'%s',//ATT_phone
+			'%d', //ATT_ID
+			'%s', //ATT_fname
+			'%s', //ATT_lname
+			'%s', //ATT_address
+			'%s', //ATT_address2
+			'%s', //ATT_city
+			'%d', //STA_ID
+			'%s', //CNT_ISO
+			'%s', //ATT_zip
+			'%s', //ATT_email
+			'%s', //ATT_phone
 		);
-		$success = $wpdb->insert($this->_new_attendee_meta_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_meta_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -391,28 +391,28 @@ 
 	 * @param type $old_attendee
 	 * @return int new transaction id
 	 */
-	private function _insert_new_transaction($old_attendee){
+	private function _insert_new_transaction($old_attendee) {
 		global $wpdb;
 
 		//first: let's check for an existing transaction for this old attendee
-		if( intval( $old_attendee[ 'is_primary' ] ) ) {//primary attendee, so create txn
-			$txn_id = $this->get_migration_script()->get_mapping_new_pk( $this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table );
+		if (intval($old_attendee['is_primary'])) {//primary attendee, so create txn
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table);
 		} else { //non-primary attendee, so find its primary attendee's transaction
-			$primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s",$old_attendee['registration_id']));
-			if( ! $primary_attendee_old_id){
+			$primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
+			if ( ! $primary_attendee_old_id) {
 				$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
 				$primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : NULL;
 			}
 			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($primary_attendee_old_id), $this->_new_transaction_table);
-			if( ! $txn_id){
-				$this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"),  $this->_json_encode($old_attendee),$primary_attendee_old_id));
+			if ( ! $txn_id) {
+				$this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"), $this->_json_encode($old_attendee), $primary_attendee_old_id));
 				$txn_id = 0;
 			}
 		}
 		//if there isn't yet a transaction row for this, create one
 		//(so even if it was a non-primary attendee with no EE3 primary attendee,
 		// it ought to have SOME transaction, so we'll make one)
-		if( ! $txn_id ) {
+		if ( ! $txn_id) {
 			//maps 3.1 payment stati onto 4.1 transaction stati
 			$txn_status_mapping = array(
 				'Completed'=>'TCM',
@@ -425,21 +425,21 @@ 
 			);
 			$STS_ID = isset($txn_status_mapping[$old_attendee['payment_status']]) ? $txn_status_mapping[$old_attendee['payment_status']] : 'TIN';
 			$cols_n_values = array(
-				'TXN_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'TXN_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'TXN_total'=>floatval($old_attendee['total_cost']),
 				'TXN_paid'=>floatval($old_attendee['amount_pd']),
 				'STS_ID'=>$STS_ID,
 				'TXN_hash_salt'=>$old_attendee['hashSalt']
 			);
 			$datatypes = array(
-				'%s',//TXN_timestamp
-				'%f',//TXN_total
-				'%f',//TXN_paid
-				'%s',//STS_ID
-				'%s',//TXN_hash_salt
+				'%s', //TXN_timestamp
+				'%f', //TXN_total
+				'%f', //TXN_paid
+				'%s', //STS_ID
+				'%s', //TXN_hash_salt
 			);
-			$success = $wpdb->insert($this->_new_transaction_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $datatypes);
+			if ( ! $success) {
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_transaction_table, $cols_n_values, $datatypes));
 				return 0;
 			}
@@ -453,13 +453,13 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _mer_tables_exist(){
-		if( $this->_mer_tables_exist === NULL){
+	private function _mer_tables_exist() {
+		if ($this->_mer_tables_exist === NULL) {
 			global $wpdb;
 
-			if( $wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table){
+			if ($wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table) {
 				$this->_mer_tables_exist = false;
-			}else{
+			} else {
 				$this->_mer_tables_exist = true;
 			}
 		}
@@ -473,10 +473,10 @@ 
 	 * @param type $old_attendee_row
 	 * @return string
 	 */
-	private function _get_reg_status_for_old_payment_status($old_attendee_row){
+	private function _get_reg_status_for_old_payment_status($old_attendee_row) {
 		//need event default reg status and if pre_approval was required
 		global $wpdb;
-		$event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d",$old_attendee_row['event_id']));
+		$event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d", $old_attendee_row['event_id']));
 		return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($old_attendee_row['payment_status'],
 				intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve']));
 	}
@@ -489,19 +489,19 @@ 
 	 * @param int $new_txn_id
 	 * @return array of new registratio ids
 	 */
-	private function _insert_new_registrations($old_attendee,$new_attendee_id,$new_txn_id){
+	private function _insert_new_registrations($old_attendee, $new_attendee_id, $new_txn_id) {
 		global $wpdb;
 
 		$STS_ID = $this->_get_reg_status_for_old_payment_status($old_attendee);
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix.'events_detail', $old_attendee['event_id'], $wpdb->posts);
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"),$old_attendee['event_id'],$this->_json_encode($old_attendee)));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
 		}
 
-		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee,$new_event_id);
-		if( ! $ticket_id){
-			$ticket_id = $this->_insert_new_ticket_because_none_found( $old_attendee, $new_event_id );
-			$this->add_error( sprintf( __( 'Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso' ), $old_attendee['id'], $new_event_id, $ticket_id ) );
+		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
+		if ( ! $ticket_id) {
+			$ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
+			$this->add_error(sprintf(__('Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso'), $old_attendee['id'], $new_event_id, $ticket_id));
 		}
 		$regs_on_this_row = intval($old_attendee['quantity']);
 		$new_regs = array();
@@ -510,50 +510,50 @@ 
 		//Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
 		//Y old attendee_details rows with a quantity of x (because of mer)
 		//Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
-		for($count = 1; $count <= $regs_on_this_row; $count++){
+		for ($count = 1; $count <= $regs_on_this_row; $count++) {
 			//sum regs on older rows
-			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee,true);
+			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
 			$cols_n_values = array(
 				'EVT_ID'=>$new_event_id,
 				'ATT_ID'=>$new_attendee_id,
 				'TXN_ID'=>$new_txn_id,
 				'TKT_ID'=>$ticket_id,
 				'STS_ID'=>$STS_ID,
-				'REG_date'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'REG_date'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'REG_final_price'=>$old_attendee['final_price'],
-				'REG_session'=> substr( $old_attendee['attendee_session'], 0, 44 ),
+				'REG_session'=> substr($old_attendee['attendee_session'], 0, 44),
 				'REG_code'=>sanitize_key($old_attendee['registration_id']),
 				'REG_url_link'=>  sanitize_key($old_attendee['registration_id'].'-'.$count),
 				'REG_count'=>$regs_on_this_event_and_txn + $count,
-				'REG_group_size'=>$this->_sum_old_attendees_on_old_txn($old_attendee,false),
+				'REG_group_size'=>$this->_sum_old_attendees_on_old_txn($old_attendee, false),
 				'REG_att_is_going'=>true,
 				'REG_deleted'=>false
 			);
 			$datatypes = array(
-				'%d',//EVT_ID
-				'%d',//ATT_ID
-				'%d',//TXN_ID
-				'%d',//TKT_ID
-				'%s',//STS_ID
-				'%s',//REG_date
-				'%f',//REG_final_price
-				'%s',//REG_session
-				'%s',//REG_code
-				'%s',//REG_url_link
-				'%d',//REG_count
-				'%d',//REG_group_size
-				'%d',//REG_att_is_going
-				'%d',//REG_deleted
+				'%d', //EVT_ID
+				'%d', //ATT_ID
+				'%d', //TXN_ID
+				'%d', //TKT_ID
+				'%s', //STS_ID
+				'%s', //REG_date
+				'%f', //REG_final_price
+				'%s', //REG_session
+				'%s', //REG_code
+				'%s', //REG_url_link
+				'%d', //REG_count
+				'%d', //REG_group_size
+				'%d', //REG_att_is_going
+				'%d', //REG_deleted
 			);
-			$success = $wpdb->insert($this->_new_reg_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_reg_table, $cols_n_values, $datatypes);
+			if ( ! $success) {
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
 				return 0;
 			}
 			$cols_n_values['REG_ID'] = $wpdb->insert_id;
 			$new_regs[] = $wpdb->insert_id;
 		}
-		$this->_add_regs_to_ticket_and_datetimes($ticket_id,count($new_regs),$STS_ID);
+		$this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
 		return $new_regs;
 	}
 
@@ -569,23 +569,23 @@ 
 	 * @param type $STS_ID
 	 * @return boolean whether they were successfully updated or not
 	 */
-	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id,$quantity_sold,$STS_ID){
-		if($STS_ID != 'RAP'){
+	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id, $quantity_sold, $STS_ID) {
+		if ($STS_ID != 'RAP') {
 			return true;
 		}
 		global $wpdb;
-		$success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d",$quantity_sold,$new_ticket_id));
-		if($success){
+		$success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d", $quantity_sold, $new_ticket_id));
+		if ($success) {
 			//get the ticket's datetimes, and increment them too
-			$success_update_dateimtes =  $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
+			$success_update_dateimtes = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
 				INNER JOIN {$this->_new_ticket_datetime_table} as DTK ON TKT.TKT_ID = DTK.TKT_ID
 				INNER JOIN {$this->_new_datetime_table} as DTT ON DTK.DTT_ID = DTT.DTT_ID
-				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d",$quantity_sold,$new_ticket_id));
-			if( ! $success_update_dateimtes){
-				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
+				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d", $quantity_sold, $new_ticket_id));
+			if ( ! $success_update_dateimtes) {
+				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
 			}
-		}else{
-			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"),$new_ticket_id,$quantity_sold,$wpdb->last_error));
+		} else {
+			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
 		}
 		return true;
 	}
@@ -597,7 +597,7 @@ 
 	 * and lastly if none of that works, just use the first ticket for the event we find
 	 * @param array $old_attendee
 	 */
-	private function _try_to_find_new_ticket_id($old_attendee,$new_event_id){
+	private function _try_to_find_new_ticket_id($old_attendee, $new_event_id) {
 		global $wpdb;
 		$tickets_table = $this->_new_ticket_table;
 		$datetime_tickets_table = $this->_new_ticket_datetime_table;
@@ -608,24 +608,24 @@ 
 
 		$old_att_start_date = $old_attendee['start_date'];
 		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_start_date $old_att_start_time:00");
+		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
 		//add all conditions to an array from which we can SHIFT conditions off in order to widen our search
 		//the most important condition should be last, as it will be array_shift'ed off last
 		$conditions = array(
-			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s",$old_att_datetime),//times match?
-			$wpdb->prepare("$tickets_table.TKT_price = %f",$old_att_price),//prices match?
-			$wpdb->prepare("$tickets_table.TKT_name = %s",$old_att_price_option),//names match?
-			$wpdb->prepare("$datetime_table.EVT_ID = %d",$new_event_id),//events match?
+			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), //times match?
+			$wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price), //prices match?
+			$wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option), //names match?
+			$wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), //events match?
 		);
 		$select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
 		//start running queries, widening search each time by removing a condition
-		do{
-			$full_query = $select_and_join_part." WHERE ".implode(" AND ",$conditions)." LIMIT 1";
+		do {
+			$full_query = $select_and_join_part." WHERE ".implode(" AND ", $conditions)." LIMIT 1";
 			$ticket_id_found = $wpdb->get_var($full_query);
 			array_shift($conditions);
-		}while( ! $ticket_id_found && $conditions);
+		}while ( ! $ticket_id_found && $conditions);
 		return $ticket_id_found;
 
 	}
@@ -636,23 +636,23 @@ 
 	 * the new ticket to that datetime and price.
 	 * @return int ticket id
 	 */
-	private function _insert_new_ticket_because_none_found( $old_attendee, $new_event_id ) {
+	private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id) {
 		global $wpdb;
 		$old_att_price_option = $old_attendee['price_option'];
 		$old_att_price = floatval($old_attendee['orig_price']);
 
 		$old_att_start_date = $old_attendee['start_date'];
 		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-		$old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_start_date $old_att_start_time:00");
+		$old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
 
 
 		//insert new datetime unless we find one
-		$datetime_id = $wpdb->get_var( $wpdb->prepare( "SELECT DTT_ID FROM " . $this->_new_datetime_table . " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id ), ARRAY_A );
-		if( ! $datetime_id ) {
+		$datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM ".$this->_new_datetime_table." WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
+		if ( ! $datetime_id) {
 			$old_att_end_date = $old_attendee['start_date'];
 			$old_att_end_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,"$old_att_end_date $old_att_end_time:00");
-			$wpdb->insert( $this->_new_datetime_table,
+			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_end_date $old_att_end_time:00");
+			$wpdb->insert($this->_new_datetime_table,
 					array(
 						'EVT_ID' => $new_event_id,
 						'DTT_EVT_start' => $old_att_start_datetime,
@@ -660,44 +660,44 @@ 
 						'DTT_deleted' => TRUE
 					),
 					array(
-						'%d',//EVT_ID
-						'%s',//DTT_EVT_start
-						'%s',//DTT_EVT_end
-						'%d',//DTT_deleted
+						'%d', //EVT_ID
+						'%s', //DTT_EVT_start
+						'%s', //DTT_EVT_end
+						'%d', //DTT_deleted
 					));
 			$datetime_id = $wpdb->insert_id;
 		}
 
 		//insert new ticket
-		$success = $wpdb->insert( $wpdb->prefix . 'esp_ticket',
+		$success = $wpdb->insert($wpdb->prefix.'esp_ticket',
 				array(
 					'TKT_name' => $old_att_price_option,
 					'TKT_qty' => -1,
 					'TKT_price' => $old_att_price,
-					'TKT_start_date' => $old_att_start_datetime,//we really have no clue what the time should be, but at least it was available when they attended
+					'TKT_start_date' => $old_att_start_datetime, //we really have no clue what the time should be, but at least it was available when they attended
 					'TKT_end_date' => $old_att_end_datetime,
 
 				),
 				array(
-					'%s',//name
-					'%d',//qty
-					'%d',//price
-					'%s',//start_date
-					'%s',//end_date
+					'%s', //name
+					'%d', //qty
+					'%d', //price
+					'%s', //start_date
+					'%s', //end_date
 				));
 		$ticket_id = $wpdb->insert_id;
 		//associate the ticket with the datetime we found earlier
-		$wpdb->insert( $this->_new_datetime_ticket_table,
+		$wpdb->insert($this->_new_datetime_ticket_table,
 				array(
 					'DTT_ID' => $datetime_id,
 					'TKT_ID' => $ticket_id
 				),
 				array(
-					'%d',//DTT_ID
-					'%d',//TKT_ID
+					'%d', //DTT_ID
+					'%d', //TKT_ID
 				));
 		//insert new price
-		$wpdb->insert( $this->_new_price_table,
+		$wpdb->insert($this->_new_price_table,
 				array(
 					'PRC_amount' => $old_att_price,
 					'PRT_ID' => EE_DMS_4_1_0_prices::price_type_base,
@@ -705,22 +705,22 @@ 
 					'PRC_deleted' => TRUE
 				),
 				array(
-					'%d',//PRC_amount
-					'%d',//PRT_ID
-					'%s',//PRC_name
-					'%d',//PRC_deleted
+					'%d', //PRC_amount
+					'%d', //PRT_ID
+					'%s', //PRC_name
+					'%d', //PRC_deleted
 				));
 		$price_id = $wpdb->insert_id;
 		//associate the price to the ticket
-		$wpdb->insert( $this->_new_ticket_price_table,
+		$wpdb->insert($this->_new_ticket_price_table,
 				array(
 					'TKT_ID' => $ticket_id,
 					'PRC_ID' => $price_id
 				),
 				array(
-					'%d',//TKT_ID
-					'%d',//PRC_ID
-				) );
+					'%d', //TKT_ID
+					'%d', //PRC_ID
+				));
 		return $ticket_id;
 	}
 	/**
@@ -731,12 +731,12 @@ 
 	 * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if you want ALL
 	 * @return int
 	 */
-	private function _sum_old_attendees_on_old_txn($old_attendee_row,$count_only_older = false){
+	private function _sum_old_attendees_on_old_txn($old_attendee_row, $count_only_older = false) {
 		global $wpdb;
-		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d",$old_attendee_row['id']) : '';
-		$count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM ".$this->_old_table." WHERE registration_id=%s $count_only_older_sql",$old_attendee_row['registration_id'])));
+		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
+		$count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM ".$this->_old_table." WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
 
-		if( $this->_mer_tables_exist()){
+		if ($this->_mer_tables_exist()) {
 			//if MER exists, then its a little tricky.
 			//when users registered by adding items to the cart, and it was a
 			//group registration requiring additional attendee INFO, then the attendee rows
@@ -745,17 +745,17 @@ 
 			//BUT we want to count all the MER attendee rows for the same registration
 			$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
 
-			$count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql",$old_attendee_row['event_id'],$primary_attendee['registration_id']));
-			$count = max($count_using_mer_table,$count);
+			$count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql", $old_attendee_row['event_id'], $primary_attendee['registration_id']));
+			$count = max($count_using_mer_table, $count);
 		}
 		return $count;
 	}
-	private function _insert_new_payment($old_attendee,$new_txn_id){
+	private function _insert_new_payment($old_attendee, $new_txn_id) {
 		global $wpdb;
 		//only add a payment for primary attendees
-		$old_pay_stati_indicating_no_payment = array('Pending','Incomplete','Not Completed');
+		$old_pay_stati_indicating_no_payment = array('Pending', 'Incomplete', 'Not Completed');
 		//if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
-		if(intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)){
+		if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
 			$pay_status_mapping = array(
 				'Completed'=>'PAP',
 				'Payment Declined'=>'PDC',
@@ -763,41 +763,41 @@ 
 				'Declined'=>'PDC'
 			);
 			$by_admin = $old_attendee['payment'] == 'Admin';
-			$STS_ID = isset($pay_status_mapping[$old_attendee['payment_status']]) ? $pay_status_mapping[$old_attendee['payment_status']] : 'PFL';//IE, if we don't recognize the status, assume payment failed
+			$STS_ID = isset($pay_status_mapping[$old_attendee['payment_status']]) ? $pay_status_mapping[$old_attendee['payment_status']] : 'PFL'; //IE, if we don't recognize the status, assume payment failed
 			$cols_n_values = array(
 				'TXN_ID'=>$new_txn_id,
 				'STS_ID'=>$STS_ID,
-				'PAY_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this,$old_attendee,$old_attendee['date']),
+				'PAY_timestamp'=>$this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
 				'PAY_method'=>'CART',
 				'PAY_amount'=>$old_attendee['amount_pd'],
 				'PAY_gateway'=>$old_attendee['txn_type'],
 				'PAY_gateway_response'=>'',
-				'PAY_txn_id_chq_nmbr'=>substr( $old_attendee['txn_id'], 0, 32 ),
+				'PAY_txn_id_chq_nmbr'=>substr($old_attendee['txn_id'], 0, 32),
 				'PAY_via_admin'=>$by_admin,
 				'PAY_details'=>$old_attendee['transaction_details']
 
 			);
 			$datatypes = array(
-				'%d',//TXN_Id
-				'%s',//STS_ID
-				'%s',//PAY_timestamp
-				'%s',//PAY_method
-				'%f',//PAY_amount
-				'%s',//PAY_gateway
-				'%s',//PAY_gateway_response
-				'%s',//PAY_txn_id_chq_nmbr
-				'%d',//PAY_via_admin
-				'%s',//PAY_details
+				'%d', //TXN_Id
+				'%s', //STS_ID
+				'%s', //PAY_timestamp
+				'%s', //PAY_method
+				'%f', //PAY_amount
+				'%s', //PAY_gateway
+				'%s', //PAY_gateway_response
+				'%s', //PAY_txn_id_chq_nmbr
+				'%d', //PAY_via_admin
+				'%s', //PAY_details
 			);
-			$success = $wpdb->insert($this->_new_payment_table,$cols_n_values,$datatypes);
-			if ( ! $success){
+			$success = $wpdb->insert($this->_new_payment_table, $cols_n_values, $datatypes);
+			if ( ! $success) {
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
 				return 0;
 			}
 			$new_id = $wpdb->insert_id;
 			return $new_id;
 
-		}else{
+		} else {
 			return 0;
 		}
 
@@ -810,12 +810,12 @@ 
 	 * @param type $old_registration_id
 	 * @return array
 	 */
-	private function _find_mer_primary_attendee_using_mer_tables($old_registration_id){
-		if (! $this->_mer_tables_exist()){
+	private function _find_mer_primary_attendee_using_mer_tables($old_registration_id) {
+		if ( ! $this->_mer_tables_exist()) {
 			return false;
 		}
 		global $wpdb;
-		$old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1",$old_registration_id),ARRAY_A);
+		$old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1", $old_registration_id), ARRAY_A);
 return $old_att_for_primary_reg;
 	}