eventespresso / event-espresso-core

core/db_models/fields/EE_Post_Content_Field.php

Indentation +115 added lines, -115 removed lines

@@ -7,133 +7,133 @@
  */
 class EE_Post_Content_Field extends EE_Text_Field_Base
 {
-    static protected $_added_the_content_basic_filters = false;
+	static protected $_added_the_content_basic_filters = false;
 
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
 
 
-    /**
-     * removes all tags which a WP Post wouldn't allow in its content normally
-     *
-     * @param string $value
-     * @return string
-     */
-    function prepare_for_set($value)
-    {
-        if (! current_user_can('unfiltered_html')) {
-            $value = wp_kses("$value", wp_kses_allowed_html('post'));
-        }
-        return parent::prepare_for_set($value);
-    }
+	/**
+	 * removes all tags which a WP Post wouldn't allow in its content normally
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	function prepare_for_set($value)
+	{
+		if (! current_user_can('unfiltered_html')) {
+			$value = wp_kses("$value", wp_kses_allowed_html('post'));
+		}
+		return parent::prepare_for_set($value);
+	}
 
-    function prepare_for_set_from_db($value_found_in_db_for_model_object)
-    {
-        return $value_found_in_db_for_model_object;
-    }
+	function prepare_for_set_from_db($value_found_in_db_for_model_object)
+	{
+		return $value_found_in_db_for_model_object;
+	}
 
 
 
-    /**
-     * Runs the content through `the_content`, or if prepares the content for placing in a form input
-     * @param string $value_on_field_to_be_outputted
-     * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
-     * @return string
-     * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        switch($schema){
-            case 'form_input':
-                return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-            case 'the_content':
+	/**
+	 * Runs the content through `the_content`, or if prepares the content for placing in a form input
+	 * @param string $value_on_field_to_be_outputted
+	 * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
+	 * @return string
+	 * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		switch($schema){
+			case 'form_input':
+				return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+			case 'the_content':
 
-                if(doing_filter( 'the_content')){
-                    if( defined('WP_DEBUG') && WP_DEBUG){
-                        throw new EE_Error(
-                            sprintf(
-                                esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
-                                'EE_Post_Content_Field::prepare_for_pretty_echoing',
-                                '$schema',
-                                'the_content',
-                                'the_content_wp_core_only'
-                            )
-                        );
-                    } else {
-                        return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
-                    }
-                }
-                return apply_filters(
-                    'the_content',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-            case 'the_content_wp_core_only':
-            default:
-                self::_ensure_filters_setup();
-                return apply_filters(
-                    'the_content_wp_core_only',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-        }
-    }
+				if(doing_filter( 'the_content')){
+					if( defined('WP_DEBUG') && WP_DEBUG){
+						throw new EE_Error(
+							sprintf(
+								esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
+								'EE_Post_Content_Field::prepare_for_pretty_echoing',
+								'$schema',
+								'the_content',
+								'the_content_wp_core_only'
+							)
+						);
+					} else {
+						return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
+					}
+				}
+				return apply_filters(
+					'the_content',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+			case 'the_content_wp_core_only':
+			default:
+				self::_ensure_filters_setup();
+				return apply_filters(
+					'the_content_wp_core_only',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+		}
+	}
 
 
 
-    /**
-     * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
-     */
-    protected static function _ensure_filters_setup()
-    {
-        if( !self::$_added_the_content_basic_filters){
-            add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-            add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
-            add_filter('the_content_wp_core_only', 'wptexturize', 10);
-            add_filter('the_content_wp_core_only', 'wpautop', 10);
-            add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
-            add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
-            if(function_exists('wp_make_content_images_responsive')) {
-                add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
-            }
-            add_filter('the_content_wp_core_only', 'do_shortcode', 11);
-            add_filter('the_content_wp_core_only', 'convert_smilies', 20);
-            self::$_added_the_content_basic_filters = true;
-        }
-    }
+	/**
+	 * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
+	 */
+	protected static function _ensure_filters_setup()
+	{
+		if( !self::$_added_the_content_basic_filters){
+			add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
+			add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+			add_filter('the_content_wp_core_only', 'wptexturize', 10);
+			add_filter('the_content_wp_core_only', 'wpautop', 10);
+			add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
+			add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
+			if(function_exists('wp_make_content_images_responsive')) {
+				add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
+			}
+			add_filter('the_content_wp_core_only', 'do_shortcode', 11);
+			add_filter('the_content_wp_core_only', 'convert_smilies', 20);
+			self::$_added_the_content_basic_filters = true;
+		}
+	}
 
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    __('%s - the content as it exists in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            ),
-            'rendered' => array(
-                'description' =>  sprintf(
-                    __('%s - the content rendered for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					__('%s - the content as it exists in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			),
+			'rendered' => array(
+				'description' =>  sprintf(
+					__('%s - the content rendered for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			)
+		);
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
      */
     function prepare_for_set($value)
     {
-        if (! current_user_can('unfiltered_html')) {
+        if ( ! current_user_can('unfiltered_html')) {
             $value = wp_kses("$value", wp_kses_allowed_html('post'));
         }
         return parent::prepare_for_set($value);
@@ -52,13 +52,13 @@ 
      */
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
     {
-        switch($schema){
+        switch ($schema) {
             case 'form_input':
                 return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
             case 'the_content':
 
-                if(doing_filter( 'the_content')){
-                    if( defined('WP_DEBUG') && WP_DEBUG){
+                if (doing_filter('the_content')) {
+                    if (defined('WP_DEBUG') && WP_DEBUG) {
                         throw new EE_Error(
                             sprintf(
                                 esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
@@ -99,14 +99,14 @@ 
      */
     protected static function _ensure_filters_setup()
     {
-        if( !self::$_added_the_content_basic_filters){
-            add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-            add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+        if ( ! self::$_added_the_content_basic_filters) {
+            add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
+            add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'autoembed'), 8);
             add_filter('the_content_wp_core_only', 'wptexturize', 10);
             add_filter('the_content_wp_core_only', 'wpautop', 10);
             add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
             add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
-            if(function_exists('wp_make_content_images_responsive')) {
+            if (function_exists('wp_make_content_images_responsive')) {
                 add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
             }
             add_filter('the_content_wp_core_only', 'do_shortcode', 11);

core/libraries/batch/JobHandlers/AttendeesReport.php

Indentation +4 added lines, -4 removed lines

@@ -108,10 +108,10 @@
 				}
 			}
 			$csv_data[] = apply_filters(
-			    'FHEE___EventEspresso_core_libraries_batch_JobHandlers_AttendeesReport__get_csv_data__row',
-                $csv_row,
-                $attendee_row
-            );
+				'FHEE___EventEspresso_core_libraries_batch_JobHandlers_AttendeesReport__get_csv_data__row',
+				$csv_row,
+				$attendee_row
+			);
 		}
 		return $csv_data;
 	}

Spacing +35 added lines, -35 removed lines

@@ -18,7 +18,7 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -27,84 +27,84 @@ 
 
 
 	public function create_job(JobParameters $job_parameters) {
-		if( ! \EE_Capabilities::instance()->current_user_can( 'ee_read_contacts', 'generating_report' ) ) {
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_contacts', 'generating_report')) {
 			throw new BatchRequestException(
-				__( 'You do not have permission to view contacts', 'event_espresso')
+				__('You do not have permission to view contacts', 'event_espresso')
 			);
 		}
 		$filepath = $this->create_file_from_job_with_name(
 			$job_parameters->job_id(),
 			__('contact-list-report.csv', 'event_espresso')
 		);
-		$job_parameters->add_extra_data( 'filepath', $filepath );
-		$job_parameters->set_job_size( $this->count_units_to_process() );
+		$job_parameters->add_extra_data('filepath', $filepath);
+		$job_parameters->set_job_size($this->count_units_to_process());
 		//we should also set the header columns
-		$csv_data_for_row = $this->get_csv_data( 0, 1 );
-		\EEH_Export::write_data_array_to_csv( $filepath, $csv_data_for_row, true );
+		$csv_data_for_row = $this->get_csv_data(0, 1);
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
 		//if we actually processed a row there, record it
-		if( $job_parameters->job_size() ) {
-			$job_parameters->mark_processed( 1 );
+		if ($job_parameters->job_size()) {
+			$job_parameters->mark_processed(1);
 		}
 		return new JobStepResponse(
 			$job_parameters,
-			__( 'Contacts report started successfully...', 'event_espresso' )
+			__('Contacts report started successfully...', 'event_espresso')
 		);
 	}
 
 
 	public function continue_job(JobParameters $job_parameters, $batch_size = 50) {
-		$csv_data = $this->get_csv_data( $job_parameters->units_processed(), $batch_size );
-		\EEH_Export::write_data_array_to_csv( $job_parameters->extra_datum( 'filepath' ), $csv_data, false );
-		$units_processed = count( $csv_data );
-		$job_parameters->mark_processed( $units_processed );
+		$csv_data = $this->get_csv_data($job_parameters->units_processed(), $batch_size);
+		\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
+		$units_processed = count($csv_data);
+		$job_parameters->mark_processed($units_processed);
 		$extra_response_data = array(
 			'file_url' => ''
 		);
-		if( $units_processed < $batch_size ) {
-			$job_parameters->set_status( JobParameters::status_complete );
-			$extra_response_data[ 'file_url' ] = $this->get_url_to_file( $job_parameters->extra_datum( 'filepath' ) );
+		if ($units_processed < $batch_size) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
 		}
 		return new JobStepResponse(
 				$job_parameters,
 				sprintf(
-					__( 'Wrote %1$s rows to report CSV file...', 'event_espresso' ),
-					count( $csv_data ) ),
+					__('Wrote %1$s rows to report CSV file...', 'event_espresso'),
+					count($csv_data) ),
 				$extra_response_data );
 	}
 
 
 	public function cleanup_job(JobParameters $job_parameters) {
 		$this->_file_helper->delete(
-			\EEH_File::remove_filename_from_filepath( $job_parameters->extra_datum( 'filepath' ) ),
+			\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
 			true,
 			'd'
 		);
-		return new JobStepResponse( $job_parameters, __( 'Cleaned up temporary file', 'event_espresso' ) );
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
 	}
 
 	public function count_units_to_process() {
-		return \EEM_Attendee::instance()->count( array( 'caps' => \EEM_Base::caps_read_admin ));
+		return \EEM_Attendee::instance()->count(array('caps' => \EEM_Base::caps_read_admin));
 	}
-	public function get_csv_data( $offset, $limit ) {
+	public function get_csv_data($offset, $limit) {
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
 			array( 
-				'limit' => array( $offset, $limit ),
-				'force_join' => array( 'State', 'Country' ),
+				'limit' => array($offset, $limit),
+				'force_join' => array('State', 'Country'),
 				'caps' => \EEM_Base::caps_read_admin
 			) 
 		);
 		$csv_data = array();
-		foreach( $attendee_rows as $attendee_row ){
+		foreach ($attendee_rows as $attendee_row) {
 			$csv_row = array();
-			foreach( \EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
-				if( $field_name == 'STA_ID' ){
-					$state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' );
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
-					$country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' );
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
+			foreach (\EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
+				if ($field_name == 'STA_ID') {
+					$state_name_field = \EEM_State::instance()->field_settings_for('STA_name');
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
+				}elseif ($field_name == 'CNT_ISO') {
+					$country_name_field = \EEM_Country::instance()->field_settings_for('CNT_name');
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
+				} else {
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
 				}
 			}
 			$csv_data[] = apply_filters(

core/libraries/batch/JobHandlers/RegistrationsReport.php

Indentation +414 added lines, -415 removed lines

@@ -17,7 +17,7 @@ 
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -25,443 +25,442 @@ 
 class RegistrationsReport extends JobHandlerFile
 {
 
-    /**
-     * Performs any necessary setup for starting the job. This is also a good
-     * place to setup the $job_arguments which will be used for subsequent HTTP requests
-     * when continue_job will be called
-     *
-     * @param JobParameters $job_parameters
-     * @throws BatchRequestException
-     * @return JobStepResponse
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        $event_id = intval($job_parameters->request_datum('EVT_ID', '0'));
-        if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_registrations', 'generating_report')) {
-            throw new BatchRequestException(__('You do not have permission to view registrations', 'event_espresso'));
-        }
-        $filepath = $this->create_file_from_job_with_name($job_parameters->job_id(),
-            $this->get_filename($event_id));
-        $job_parameters->add_extra_data('filepath', $filepath);
-        if ($job_parameters->request_datum('use_filters', false)) {
-            $query_params = maybe_unserialize(stripslashes($job_parameters->request_datum('filters', array())));
-        } else {
-            $query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
-                array(
-                    'OR'                 => array(
-                        //don't include registrations from failed or abandoned transactions...
-                        'Transaction.STS_ID' => array(
-                            'NOT IN',
-                            array(
-                                \EEM_Transaction::failed_status_code,
-                                \EEM_Transaction::abandoned_status_code,
-                            ),
-                        ),
-                        //unless the registration is approved, in which case include it regardless of transaction status
-                        'STS_ID'             => \EEM_Registration::status_id_approved,
-                    ),
-                    'Ticket.TKT_deleted' => array('IN', array(true, false)),
-                ),
-                'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
-                'force_join' => array('Transaction', 'Ticket', 'Attendee'),
-                'caps'       => \EEM_Base::caps_read_admin,
-            ), $event_id);
-            if ($event_id) {
-                $query_params[0]['EVT_ID'] = $event_id;
-            } else {
-                $query_params['force_join'][] = 'Event';
-            }
-        }
-        if ( ! isset($query_params['force_join'])) {
-            $query_params['force_join'] = array('Event', 'Transaction', 'Ticket', 'Attendee');
-        }
-        $job_parameters->add_extra_data('query_params', $query_params);
-        $question_labels = $this->_get_question_labels($query_params);
-        $job_parameters->add_extra_data('question_labels', $question_labels);
-        $job_parameters->set_job_size(
-            \EEM_Registration::instance()->count(
-                array_diff_key(
-                    $query_params,
-                    array_flip(
-                        array( 'limit' )
-                    )
-                )
-            )
-        );
-        //we should also set the header columns
-        $csv_data_for_row = $this->get_csv_data_for($event_id, 0, 1, $job_parameters->extra_datum('question_labels'),
-            $job_parameters->extra_datum('query_params'));
-        \EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
-        //if we actually processed a row there, record it
-        if ($job_parameters->job_size()) {
-            $job_parameters->mark_processed(1);
-        }
-        return new JobStepResponse($job_parameters,
-            __('Registrations report started successfully...', 'event_espresso'));
-    }
+	/**
+	 * Performs any necessary setup for starting the job. This is also a good
+	 * place to setup the $job_arguments which will be used for subsequent HTTP requests
+	 * when continue_job will be called
+	 *
+	 * @param JobParameters $job_parameters
+	 * @throws BatchRequestException
+	 * @return JobStepResponse
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		$event_id = intval($job_parameters->request_datum('EVT_ID', '0'));
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_registrations', 'generating_report')) {
+			throw new BatchRequestException(__('You do not have permission to view registrations', 'event_espresso'));
+		}
+		$filepath = $this->create_file_from_job_with_name($job_parameters->job_id(),
+			$this->get_filename($event_id));
+		$job_parameters->add_extra_data('filepath', $filepath);
+		if ($job_parameters->request_datum('use_filters', false)) {
+			$query_params = maybe_unserialize(stripslashes($job_parameters->request_datum('filters', array())));
+		} else {
+			$query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
+				array(
+					'OR'                 => array(
+						//don't include registrations from failed or abandoned transactions...
+						'Transaction.STS_ID' => array(
+							'NOT IN',
+							array(
+								\EEM_Transaction::failed_status_code,
+								\EEM_Transaction::abandoned_status_code,
+							),
+						),
+						//unless the registration is approved, in which case include it regardless of transaction status
+						'STS_ID'             => \EEM_Registration::status_id_approved,
+					),
+					'Ticket.TKT_deleted' => array('IN', array(true, false)),
+				),
+				'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
+				'caps'       => \EEM_Base::caps_read_admin,
+			), $event_id);
+			if ($event_id) {
+				$query_params[0]['EVT_ID'] = $event_id;
+			} else {
+				$query_params['force_join'][] = 'Event';
+			}
+		}
+		if ( ! isset($query_params['force_join'])) {
+			$query_params['force_join'] = array('Event', 'Transaction', 'Ticket', 'Attendee');
+		}
+		$job_parameters->add_extra_data('query_params', $query_params);
+		$question_labels = $this->_get_question_labels($query_params);
+		$job_parameters->add_extra_data('question_labels', $question_labels);
+		$job_parameters->set_job_size(
+			\EEM_Registration::instance()->count(
+				array_diff_key(
+					$query_params,
+					array_flip(
+						array( 'limit' )
+					)
+				)
+			)
+		);
+		//we should also set the header columns
+		$csv_data_for_row = $this->get_csv_data_for($event_id, 0, 1, $job_parameters->extra_datum('question_labels'),
+			$job_parameters->extra_datum('query_params'));
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
+		//if we actually processed a row there, record it
+		if ($job_parameters->job_size()) {
+			$job_parameters->mark_processed(1);
+		}
+		return new JobStepResponse($job_parameters,
+			__('Registrations report started successfully...', 'event_espresso'));
+	}
 
 
 
-    /**
-     * Gets the filename
-     * @return string
-     */
-    protected function get_filename()
-    {
-        return sprintf("event-espresso-registrations-%s.csv", str_replace(':', '-', current_time('mysql')));
-    }
+	/**
+	 * Gets the filename
+	 * @return string
+	 */
+	protected function get_filename()
+	{
+		return sprintf("event-espresso-registrations-%s.csv", str_replace(':', '-', current_time('mysql')));
+	}
 
 
 
-    /**
-     * Gets the questions which are to be used for this report, so they
-     * can be remembered for later
-     *
-     * @param array $registration_query_params
-     * @return array question admin labels to be used for this report
-     */
-    protected function _get_question_labels($registration_query_params)
-    {
-        $where = isset($registration_query_params[0]) ? $registration_query_params[0] : null;
-        $question_query_params = array();
-        if ($where !== null) {
-            $question_query_params = array(
-                $this->_change_registration_where_params_to_question_where_params($registration_query_params[0]),
-            );
-        }
-        $question_query_params[0]['QST_system'] = array('NOT_IN', array_keys(\EEM_Attendee::instance()->system_question_to_attendee_field_mapping()));
-        if(apply_filters('FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport___get_question_labels__only_include_answered_questions', false, $registration_query_params)) {
-            $question_query_params[0]['Answer.ANS_ID'] = array('IS_NOT_NULL');
-        }
-        $question_query_params['group_by'] = array( 'QST_ID' );
-        return array_unique( \EEM_Question::instance()->get_col( $question_query_params, 'QST_admin_label' ) );
-    }
+	/**
+	 * Gets the questions which are to be used for this report, so they
+	 * can be remembered for later
+	 *
+	 * @param array $registration_query_params
+	 * @return array question admin labels to be used for this report
+	 */
+	protected function _get_question_labels($registration_query_params)
+	{
+		$where = isset($registration_query_params[0]) ? $registration_query_params[0] : null;
+		$question_query_params = array();
+		if ($where !== null) {
+			$question_query_params = array(
+				$this->_change_registration_where_params_to_question_where_params($registration_query_params[0]),
+			);
+		}
+		$question_query_params[0]['QST_system'] = array('NOT_IN', array_keys(\EEM_Attendee::instance()->system_question_to_attendee_field_mapping()));
+		if(apply_filters('FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport___get_question_labels__only_include_answered_questions', false, $registration_query_params)) {
+			$question_query_params[0]['Answer.ANS_ID'] = array('IS_NOT_NULL');
+		}
+		$question_query_params['group_by'] = array( 'QST_ID' );
+		return array_unique( \EEM_Question::instance()->get_col( $question_query_params, 'QST_admin_label' ) );
+	}
 
 
 
-    /**
-     * Takes where params meant for registrations and changes them to work for questions
-     *
-     * @param array $reg_where_params
-     * @return array
-     */
-    protected function _change_registration_where_params_to_question_where_params($reg_where_params)
-    {
-        $question_where_params = array();
-        foreach ($reg_where_params as $key => $val) {
-            if (\EEM_Registration::instance()->is_logic_query_param_key($key)) {
-                $question_where_params[$key] = $this->_change_registration_where_params_to_question_where_params($val);
-            } else {
-                //it's a normal where condition
-                $question_where_params['Question_Group.Event.Registration.' . $key] = $val;
-            }
-        }
-        return $question_where_params;
-    }
+	/**
+	 * Takes where params meant for registrations and changes them to work for questions
+	 *
+	 * @param array $reg_where_params
+	 * @return array
+	 */
+	protected function _change_registration_where_params_to_question_where_params($reg_where_params)
+	{
+		$question_where_params = array();
+		foreach ($reg_where_params as $key => $val) {
+			if (\EEM_Registration::instance()->is_logic_query_param_key($key)) {
+				$question_where_params[$key] = $this->_change_registration_where_params_to_question_where_params($val);
+			} else {
+				//it's a normal where condition
+				$question_where_params['Question_Group.Event.Registration.' . $key] = $val;
+			}
+		}
+		return $question_where_params;
+	}
 
 
 
-    /**
-     * Performs another step of the job
-     *
-     * @param JobParameters $job_parameters
-     * @param int           $batch_size
-     * @return JobStepResponse
-     * @throws \EE_Error
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        if( $job_parameters->units_processed() < $job_parameters->job_size() ) {
-            $csv_data = $this->get_csv_data_for($job_parameters->request_datum('EVT_ID', '0'),
-                $job_parameters->units_processed(), $batch_size, $job_parameters->extra_datum('question_labels'),
-                $job_parameters->extra_datum('query_params'));
-            \EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
-            $units_processed = count($csv_data);
-        }else{
-            $units_processed = 0;
-        }
-        $job_parameters->mark_processed($units_processed);
-        $extra_response_data = array(
-            'file_url' => '',
-        );
-        if ($units_processed < $batch_size) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            $extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
-        }
+	/**
+	 * Performs another step of the job
+	 *
+	 * @param JobParameters $job_parameters
+	 * @param int           $batch_size
+	 * @return JobStepResponse
+	 * @throws \EE_Error
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		if( $job_parameters->units_processed() < $job_parameters->job_size() ) {
+			$csv_data = $this->get_csv_data_for($job_parameters->request_datum('EVT_ID', '0'),
+				$job_parameters->units_processed(), $batch_size, $job_parameters->extra_datum('question_labels'),
+				$job_parameters->extra_datum('query_params'));
+			\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
+			$units_processed = count($csv_data);
+		}else{
+			$units_processed = 0;
+		}
+		$job_parameters->mark_processed($units_processed);
+		$extra_response_data = array(
+			'file_url' => '',
+		);
+		if ($units_processed < $batch_size) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
+		}
 
-        return new JobStepResponse($job_parameters,
-            sprintf(__('Wrote %1$s rows to report CSV file...', 'event_espresso'), count($csv_data)),
-            $extra_response_data);
-    }
+		return new JobStepResponse($job_parameters,
+			sprintf(__('Wrote %1$s rows to report CSV file...', 'event_espresso'), count($csv_data)),
+			$extra_response_data);
+	}
 
 
 
-    /**
-     * Gets the csv data for a batch of registrations
-
-     *
+	/**
+	 * Gets the csv data for a batch of registrations
+	 *
 *@param int|null    $event_id
-     * @param int   $offset
-     * @param int   $limit
-     * @param array $question_labels the IDs for all the questions which were answered by someone in this selection
-     * @param array $query_params    for using where querying the model
-     * @return array top-level keys are numeric, next-level keys are column headers
-     */
-    function get_csv_data_for($event_id, $offset, $limit, $question_labels, $query_params)
-    {
-        $reg_fields_to_include = array(
-            'TXN_ID',
-            'ATT_ID',
-            'REG_ID',
-            'REG_date',
-            'REG_code',
-            'REG_count',
-            'REG_final_price',
-        );
-        $att_fields_to_include = array(
-            'ATT_fname',
-            'ATT_lname',
-            'ATT_email',
-            'ATT_address',
-            'ATT_address2',
-            'ATT_city',
-            'STA_ID',
-            'CNT_ISO',
-            'ATT_zip',
-            'ATT_phone',
-        );
-        $registrations_csv_ready_array = array();
-        $reg_model = \EE_Registry::instance()->load_model('Registration');
-        $query_params['limit'] = array($offset, $limit);
-        $registration_rows = $reg_model->get_all_wpdb_results($query_params);
-        $registration_ids = array();
-        foreach ($registration_rows as $reg_row) {
-            $registration_ids[] = intval($reg_row['Registration.REG_ID']);
-        }
-        foreach ($registration_rows as $reg_row) {
-            if (is_array($reg_row)) {
-                $reg_csv_array = array();
-                if ( ! $event_id) {
-                    //get the event's name and Id
-                    $reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'),
-                        \EEH_Export::prepare_value_from_db_for_display(\EEM_Event::instance(), 'EVT_name',
-                            $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
-                }
-                $is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
-                /*@var $reg_row EE_Registration */
-                foreach ($reg_fields_to_include as $field_name) {
-                    $field = $reg_model->field_settings_for($field_name);
-                    if ($field_name == 'REG_final_price') {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row['Registration.REG_final_price'], 'localized_float');
-                    } elseif ($field_name == 'REG_count') {
-                        $value = sprintf(__('%s of %s', 'event_espresso'),
-                            \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_count',
-                                $reg_row['Registration.REG_count']),
-                            \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_group_size',
-                                $reg_row['Registration.REG_group_size']));
-                    } elseif ($field_name == 'REG_date') {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row['Registration.REG_date'], 'no_html');
-                    } else {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row[$field->get_qualified_column()]);
-                    }
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = $value;
-                    if ($field_name == 'REG_final_price') {
-                        //add a column named Currency after the final price
-                        $reg_csv_array[__("Currency", "event_espresso")] = \EE_Config::instance()->currency->code;
-                    }
-                }
-                //get pretty status
-                $stati = \EEM_Status::instance()->localized_status(array(
-                    $reg_row['Registration.STS_ID']     => __('unknown', 'event_espresso'),
-                    $reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso'),
-                ), false, 'sentence');
-                $reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
-                //get pretty transaction status
-                $reg_csv_array[__("Transaction Status",
-                    'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
-                $reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg
-                    ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_total',
-                        $reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
-                $reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg
-                    ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_paid',
-                        $reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
-                $payment_methods = array();
-                $gateway_txn_ids_etc = array();
-                $payment_times = array();
-                if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
-                    $payments_info = \EEM_Payment::instance()->get_all_wpdb_results(array(
-                        array(
-                            'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
-                            'STS_ID' => \EEM_Payment::status_id_approved,
-                        ),
-                        'force_join' => array('Payment_Method'),
-                    ), ARRAY_A,
-                        'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time');
-                    foreach ($payments_info as $payment_method_and_gateway_txn_id) {
-                        $payment_methods[] = isset($payment_method_and_gateway_txn_id['name'])
-                            ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
-                        $gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id'])
-                            ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
-                        $payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time'])
-                            ? $payment_method_and_gateway_txn_id['payment_time'] : '';
-                    }
-                }
-                $reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
-                $reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
-                $reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
-                //get whether or not the user has checked in
-                $reg_csv_array[__("Check-Ins",
-                    "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
-                //get ticket of registration and its price
-                $ticket_model = \EE_Registry::instance()->load_model('Ticket');
-                if ($reg_row['Ticket.TKT_ID']) {
-                    $ticket_name = \EEH_Export::prepare_value_from_db_for_display($ticket_model, 'TKT_name',
-                        $reg_row['Ticket.TKT_name']);
-                    $datetimes_strings = array();
-                    foreach (
-                        \EEM_Datetime::instance()->get_all_wpdb_results(array(
-                            array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']),
-                            'order_by'                 => array('DTT_EVT_start' => 'ASC'),
-                            'default_where_conditions' => 'none',
-                        )) as $datetime
-                    ) {
-                        $datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display(\EEM_Datetime::instance(),
-                            'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
-                    }
-                } else {
-                    $ticket_name = __('Unknown', 'event_espresso');
-                    $datetimes_strings = array(__('Unknown', 'event_espresso'));
-                }
-                $reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
-                $reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
-                //get datetime(s) of registration
-                //add attendee columns
-                foreach ($att_fields_to_include as $att_field_name) {
-                    $field_obj = \EEM_Attendee::instance()->field_settings_for($att_field_name);
-                    if ($reg_row['Attendee_CPT.ID']) {
-                        if ($att_field_name == 'STA_ID') {
-                            $value = \EEM_State::instance()
-                                               ->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])),
-                                                   'STA_name');
-                        } elseif ($att_field_name == 'CNT_ISO') {
-                            $value = \EEM_Country::instance()
-                                                 ->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])),
-                                                     'CNT_name');
-                        } else {
-                            $value = \EEH_Export::prepare_value_from_db_for_display(\EEM_Attendee::instance(),
-                                $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
-                        }
-                    } else {
-                        $value = '';
-                    }
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field_obj)] = $value;
-                }
-                //make sure each registration has the same questions in the same order
-                foreach ($question_labels as $question_label) {
-                    if ( ! isset($reg_csv_array[$question_label])) {
-                        $reg_csv_array[$question_label] = null;
-                    }
-                }
-                $answers = \EEM_Answer::instance()->get_all_wpdb_results(array(
-                    array('REG_ID' => $reg_row['Registration.REG_ID']),
-                    'force_join' => array('Question'),
-                ));
-                //now fill out the questions THEY answered
-                foreach ($answers as $answer_row) {
-                    if ($answer_row['Question.QST_ID']) {
-                        $question_label = \EEH_Export::prepare_value_from_db_for_display(\EEM_Question::instance(),
-                            'QST_admin_label', $answer_row['Question.QST_admin_label']);
-                    } else {
-                        $question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
-                    }
-                    if (isset($answer_row['Question.QST_type'])
-                        && $answer_row['Question.QST_type'] == \EEM_Question::QST_type_state
-                    ) {
-                        $reg_csv_array[$question_label] = \EEM_State::instance()
-                                                                    ->get_state_name_by_ID($answer_row['Answer.ANS_value']);
-                    } else {
-                        //this isn't for html, so don't show html entities
-                        $reg_csv_array[$question_label] = html_entity_decode(\EEH_Export::prepare_value_from_db_for_display(\EEM_Answer::instance(),
-                            'ANS_value', $answer_row['Answer.ANS_value']));
-                    }
-                }
-                /**
-                 * Filter to change the contents of each row of the registrations report CSV file.
-                 *
-                 * This can be used to add or remote columns from the CSV file, or change their values.                 *
-                 * Note: it has this name because originally that's where this filter resided,
-                 * and we've left its name as-is for backward compatibility.
-                 * Note when using: all rows in the CSV should have the same columns.
-                 *
-                 * @param array $reg_csv_array keys are column-header names, and values are that columns' value
-                 *                             in this row
-                 * @param array $reg_row is the row from the database's wp_esp_registration table
-                 *
-                 */
-                $registrations_csv_ready_array[] = apply_filters(
-                    'FHEE__EE_Export__report_registrations__reg_csv_array',
-                    $reg_csv_array,
-                    $reg_row
-                );
-            }
-        }
-        //if we couldn't export anything, we want to at least show the column headers
-        if (empty($registrations_csv_ready_array)) {
-            $reg_csv_array = array();
-            $model_and_fields_to_include = array(
-                'Registration' => $reg_fields_to_include,
-                'Attendee'     => $att_fields_to_include,
-            );
-            foreach ($model_and_fields_to_include as $model_name => $field_list) {
-                $model = \EE_Registry::instance()->load_model($model_name);
-                foreach ($field_list as $field_name) {
-                    $field = $model->field_settings_for($field_name);
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = null;
-                }
-            }
-            $registrations_csv_ready_array[] = $reg_csv_array;
-        }
-        return $registrations_csv_ready_array;
-    }
+	 * @param int   $offset
+	 * @param int   $limit
+	 * @param array $question_labels the IDs for all the questions which were answered by someone in this selection
+	 * @param array $query_params    for using where querying the model
+	 * @return array top-level keys are numeric, next-level keys are column headers
+	 */
+	function get_csv_data_for($event_id, $offset, $limit, $question_labels, $query_params)
+	{
+		$reg_fields_to_include = array(
+			'TXN_ID',
+			'ATT_ID',
+			'REG_ID',
+			'REG_date',
+			'REG_code',
+			'REG_count',
+			'REG_final_price',
+		);
+		$att_fields_to_include = array(
+			'ATT_fname',
+			'ATT_lname',
+			'ATT_email',
+			'ATT_address',
+			'ATT_address2',
+			'ATT_city',
+			'STA_ID',
+			'CNT_ISO',
+			'ATT_zip',
+			'ATT_phone',
+		);
+		$registrations_csv_ready_array = array();
+		$reg_model = \EE_Registry::instance()->load_model('Registration');
+		$query_params['limit'] = array($offset, $limit);
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
+		$registration_ids = array();
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
+		}
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
+				$reg_csv_array = array();
+				if ( ! $event_id) {
+					//get the event's name and Id
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'),
+						\EEH_Export::prepare_value_from_db_for_display(\EEM_Event::instance(), 'EVT_name',
+							$reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
+				}
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
+				/*@var $reg_row EE_Registration */
+				foreach ($reg_fields_to_include as $field_name) {
+					$field = $reg_model->field_settings_for($field_name);
+					if ($field_name == 'REG_final_price') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row['Registration.REG_final_price'], 'localized_float');
+					} elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'),
+							\EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_count',
+								$reg_row['Registration.REG_count']),
+							\EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_group_size',
+								$reg_row['Registration.REG_group_size']));
+					} elseif ($field_name == 'REG_date') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row[$field->get_qualified_column()]);
+					}
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = $value;
+					if ($field_name == 'REG_final_price') {
+						//add a column named Currency after the final price
+						$reg_csv_array[__("Currency", "event_espresso")] = \EE_Config::instance()->currency->code;
+					}
+				}
+				//get pretty status
+				$stati = \EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID']     => __('unknown', 'event_espresso'),
+					$reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso'),
+				), false, 'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
+				//get pretty transaction status
+				$reg_csv_array[__("Transaction Status",
+					'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg
+					? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_total',
+						$reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg
+					? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_paid',
+						$reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
+				$payment_methods = array();
+				$gateway_txn_ids_etc = array();
+				$payment_times = array();
+				if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
+					$payments_info = \EEM_Payment::instance()->get_all_wpdb_results(array(
+						array(
+							'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
+							'STS_ID' => \EEM_Payment::status_id_approved,
+						),
+						'force_join' => array('Payment_Method'),
+					), ARRAY_A,
+						'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time');
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name'])
+							? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id'])
+							? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time'])
+							? $payment_method_and_gateway_txn_id['payment_time'] : '';
+					}
+				}
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
+				//get whether or not the user has checked in
+				$reg_csv_array[__("Check-Ins",
+					"event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
+				//get ticket of registration and its price
+				$ticket_model = \EE_Registry::instance()->load_model('Ticket');
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = \EEH_Export::prepare_value_from_db_for_display($ticket_model, 'TKT_name',
+						$reg_row['Ticket.TKT_name']);
+					$datetimes_strings = array();
+					foreach (
+						\EEM_Datetime::instance()->get_all_wpdb_results(array(
+							array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']),
+							'order_by'                 => array('DTT_EVT_start' => 'ASC'),
+							'default_where_conditions' => 'none',
+						)) as $datetime
+					) {
+						$datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display(\EEM_Datetime::instance(),
+							'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
+					}
+				} else {
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
+				}
+				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
+				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
+				//get datetime(s) of registration
+				//add attendee columns
+				foreach ($att_fields_to_include as $att_field_name) {
+					$field_obj = \EEM_Attendee::instance()->field_settings_for($att_field_name);
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = \EEM_State::instance()
+											   ->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])),
+												   'STA_name');
+						} elseif ($att_field_name == 'CNT_ISO') {
+							$value = \EEM_Country::instance()
+												 ->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])),
+													 'CNT_name');
+						} else {
+							$value = \EEH_Export::prepare_value_from_db_for_display(\EEM_Attendee::instance(),
+								$att_field_name, $reg_row[$field_obj->get_qualified_column()]);
+						}
+					} else {
+						$value = '';
+					}
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field_obj)] = $value;
+				}
+				//make sure each registration has the same questions in the same order
+				foreach ($question_labels as $question_label) {
+					if ( ! isset($reg_csv_array[$question_label])) {
+						$reg_csv_array[$question_label] = null;
+					}
+				}
+				$answers = \EEM_Answer::instance()->get_all_wpdb_results(array(
+					array('REG_ID' => $reg_row['Registration.REG_ID']),
+					'force_join' => array('Question'),
+				));
+				//now fill out the questions THEY answered
+				foreach ($answers as $answer_row) {
+					if ($answer_row['Question.QST_ID']) {
+						$question_label = \EEH_Export::prepare_value_from_db_for_display(\EEM_Question::instance(),
+							'QST_admin_label', $answer_row['Question.QST_admin_label']);
+					} else {
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
+					}
+					if (isset($answer_row['Question.QST_type'])
+						&& $answer_row['Question.QST_type'] == \EEM_Question::QST_type_state
+					) {
+						$reg_csv_array[$question_label] = \EEM_State::instance()
+																	->get_state_name_by_ID($answer_row['Answer.ANS_value']);
+					} else {
+						//this isn't for html, so don't show html entities
+						$reg_csv_array[$question_label] = html_entity_decode(\EEH_Export::prepare_value_from_db_for_display(\EEM_Answer::instance(),
+							'ANS_value', $answer_row['Answer.ANS_value']));
+					}
+				}
+				/**
+				 * Filter to change the contents of each row of the registrations report CSV file.
+				 *
+				 * This can be used to add or remote columns from the CSV file, or change their values.                 *
+				 * Note: it has this name because originally that's where this filter resided,
+				 * and we've left its name as-is for backward compatibility.
+				 * Note when using: all rows in the CSV should have the same columns.
+				 *
+				 * @param array $reg_csv_array keys are column-header names, and values are that columns' value
+				 *                             in this row
+				 * @param array $reg_row is the row from the database's wp_esp_registration table
+				 *
+				 */
+				$registrations_csv_ready_array[] = apply_filters(
+					'FHEE__EE_Export__report_registrations__reg_csv_array',
+					$reg_csv_array,
+					$reg_row
+				);
+			}
+		}
+		//if we couldn't export anything, we want to at least show the column headers
+		if (empty($registrations_csv_ready_array)) {
+			$reg_csv_array = array();
+			$model_and_fields_to_include = array(
+				'Registration' => $reg_fields_to_include,
+				'Attendee'     => $att_fields_to_include,
+			);
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
+				$model = \EE_Registry::instance()->load_model($model_name);
+				foreach ($field_list as $field_name) {
+					$field = $model->field_settings_for($field_name);
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = null;
+				}
+			}
+			$registrations_csv_ready_array[] = $reg_csv_array;
+		}
+		return $registrations_csv_ready_array;
+	}
 
 
 
-    /**
-     * Counts total unit to process
-     *
-     * @deprecated since 4.9.19
-     * @param int|array $event_id
-     * @return int
-     */
-    public function count_units_to_process($event_id)
-    {
-        //use the legacy filter
-        if ($event_id) {
-            $query_params[0]['EVT_ID'] = $event_id;
-        } else {
-            $query_params['force_join'][] = 'Event';
-        }
-        return \EEM_Registration::instance()->count($query_params);
-    }
+	/**
+	 * Counts total unit to process
+	 *
+	 * @deprecated since 4.9.19
+	 * @param int|array $event_id
+	 * @return int
+	 */
+	public function count_units_to_process($event_id)
+	{
+		//use the legacy filter
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
+		}
+		return \EEM_Registration::instance()->count($query_params);
+	}
 
 
 
-    /**
-     * Performs any clean-up logic when we know the job is completed.
-     * In this case, we delete the temporary file
-     *
-     * @param JobParameters $job_parameters
-     * @return boolean
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        $this->_file_helper->delete(\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
-            true, 'd');
-        return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed.
+	 * In this case, we delete the temporary file
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return boolean
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		$this->_file_helper->delete(\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
+			true, 'd');
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
+	}
 }
 
 

caffeinated/admin/extend/general_settings/Extend_General_Settings_Admin_Page.core.php

Indentation +45 added lines, -45 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -21,62 +21,62 @@ 
 {
     
     
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
+	}
     
     
-    protected function _extend_page_config()
-    {
+	protected function _extend_page_config()
+	{
         
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
         
-        //filters and action hooks here
-        add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
-        add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-            array($this, 'update_debug_logging_options'), 10, 1);
+		//filters and action hooks here
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
+		add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+			array($this, 'update_debug_logging_options'), 10, 1);
         
-    }
+	}
     
     
     
-    /*************        Logging Settings        *************/
+	/*************        Logging Settings        *************/
     
-    /**
-     * debug_logging_options
-     *
-     * @param array $template_args
-     *
-     * @return void
-     */
-    public function debug_logging_options($template_args = array())
-    {
-        $template_args['use_full_logging']   = EE_Registry::instance()->CFG->admin->use_full_logging;
-        $template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(EE_Registry::instance()->CFG->admin->use_remote_logging) : false;
-        $template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url) && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url) ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
-        $template                            = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
+	/**
+	 * debug_logging_options
+	 *
+	 * @param array $template_args
+	 *
+	 * @return void
+	 */
+	public function debug_logging_options($template_args = array())
+	{
+		$template_args['use_full_logging']   = EE_Registry::instance()->CFG->admin->use_full_logging;
+		$template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(EE_Registry::instance()->CFG->admin->use_remote_logging) : false;
+		$template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url) && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url) ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
+		$template                            = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
     
     
-    /**
-     * update_debug_logging_options
-     *
-     * @param array $admin_options
-     *
-     * @return array
-     */
-    public function update_debug_logging_options($admin_options = array())
-    {
-        $use_full_logging                = isset($this->_req_data['use_full_logging']) ? (bool)absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
-        $admin_options->use_full_logging = $use_full_logging;
-        $admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint($this->_req_data['use_remote_logging']) : $admin_options->use_remote_logging;
-        $admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw($this->_req_data['remote_logging_url']) : $admin_options->remote_logging_url;
+	/**
+	 * update_debug_logging_options
+	 *
+	 * @param array $admin_options
+	 *
+	 * @return array
+	 */
+	public function update_debug_logging_options($admin_options = array())
+	{
+		$use_full_logging                = isset($this->_req_data['use_full_logging']) ? (bool)absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
+		$admin_options->use_full_logging = $use_full_logging;
+		$admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint($this->_req_data['use_remote_logging']) : $admin_options->use_remote_logging;
+		$admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw($this->_req_data['remote_logging_url']) : $admin_options->remote_logging_url;
         
-        return $admin_options;
-    }
+		return $admin_options;
+	}
     
     
 }

Spacing +4 added lines, -4 removed lines

@@ -24,14 +24,14 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
+        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'general_settings/templates/');
     }
     
     
     protected function _extend_page_config()
     {
         
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'general_settings';
         
         //filters and action hooks here
         add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
@@ -56,7 +56,7 @@ 
         $template_args['use_full_logging']   = EE_Registry::instance()->CFG->admin->use_full_logging;
         $template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(EE_Registry::instance()->CFG->admin->use_remote_logging) : false;
         $template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url) && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url) ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
-        $template                            = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
+        $template                            = GEN_SET_CAF_TEMPLATE_PATH.'debug_log_settings.template.php';
         EEH_Template::display_template($template, $template_args);
     }
     
@@ -70,7 +70,7 @@ 
      */
     public function update_debug_logging_options($admin_options = array())
     {
-        $use_full_logging                = isset($this->_req_data['use_full_logging']) ? (bool)absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
+        $use_full_logging                = isset($this->_req_data['use_full_logging']) ? (bool) absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
         $admin_options->use_full_logging = $use_full_logging;
         $admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint($this->_req_data['use_remote_logging']) : $admin_options->use_remote_logging;
         $admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw($this->_req_data['remote_logging_url']) : $admin_options->remote_logging_url;

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Spacing +43 added lines, -43 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_Aim extends EE_Onsite_Gateway{
+class EEG_Aim extends EE_Onsite_Gateway {
 
 	const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
 
@@ -157,9 +157,9 @@ 
 	 * @param EEG_Aim $gateway_object
 	 * @return string
 	 */
-	public function possibly_use_deprecated_aim_server( $url, EEG_Aim $gateway_object ) {
-		if(  $gateway_object->_server === 'authorize.net'
-			&& ! $gateway_object->_debug_mode ) {
+	public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object) {
+		if ($gateway_object->_server === 'authorize.net'
+			&& ! $gateway_object->_debug_mode) {
 			return 'https://secure.authorize.net/gateway/transact.dll';
 		} else {
 			return $url;
@@ -182,33 +182,33 @@ 
 	 */
 
 	public function do_direct_payment($payment, $billing_info = null) {
-			add_filter( 'FHEE__EEG_Aim___get_server_url', array( $this, 'possibly_use_deprecated_aim_server' ), 10, 2 );
+			add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
 			// Enable test mode if needed
 			//4007000000027  <-- test successful visa
 			//4222222222222  <-- test failure card number
 
 			$item_num = 1;
 			$transaction = $payment->transaction();
-			$order_description = $this->_format_order_description( $payment );
+			$order_description = $this->_format_order_description($payment);
 			$primary_registrant = $transaction->primary_registration();
 			//if we're are charging for the full amount, show the normal line items
 			//and the itemized total adds up properly
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
 				$total_line_item = $transaction->total_line_item();
 				foreach ($total_line_item->get_items() as $line_item) {
-					if( $line_item->quantity() == 0 ){
+					if ($line_item->quantity() == 0) {
 						continue;
 					}
 					$this->addLineItem(
 						$item_num++, 
-						$this->_format_line_item_name( $line_item, $payment ), 
-						$this->_format_line_item_desc( $line_item, $payment ), 
+						$this->_format_line_item_name($line_item, $payment), 
+						$this->_format_line_item_desc($line_item, $payment), 
 						$line_item->quantity(),
 						$line_item->unit_price(), 
 						'N');
 					$order_description .= $line_item->desc().', ';
 				}
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
 			}
@@ -219,18 +219,18 @@ 
 			//start transaction
 			//if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
 			$partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
-			$this->setField( 'solution_id', $partner_id );
+			$this->setField('solution_id', $partner_id);
 			$this->setField('amount', $this->format_currency($payment->amount()));
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
-			$this->_set_sensitive_billing_data( $billing_info );
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
+			$this->_set_sensitive_billing_data($billing_info);
 			$this->setField('first_name', $billing_info['first_name']);
 			$this->setField('last_name', $billing_info['last_name']);
 			$this->setField('email', $billing_info['email']);
 			$this->setField('company', $billing_info['company']);
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
 			$this->setField('city', $billing_info['city']);
-			$this->setField('state', $billing_info['state'] );
-			$this->setField('country', $billing_info['country'] );
+			$this->setField('state', $billing_info['state']);
+			$this->setField('country', $billing_info['country']);
 			$this->setField('zip', $billing_info['zip']);
 			$this->setField('fax', $billing_info['fax']);
 			$this->setField('cust_id', $primary_registrant->ID());
@@ -238,9 +238,9 @@ 
 			//invoice_num would be nice to have it be unique per SPCO page-load, that way if users
 			//press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
 			//in which case, we need to generate teh invoice num per request right here...
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
 
 			if ($this->_test_transactions) {
@@ -250,7 +250,7 @@ 
 			//Capture response
 			$this->type = "AUTH_CAPTURE";
 			$response = $this->_sendRequest($payment);
-			if (!empty($response)){
+			if ( ! empty($response)) {
 				if ($response->error_message) {
                     $payment->set_status($this->_pay_model->failed_status());
                     $payment->set_gateway_response($response->error_message);
@@ -258,7 +258,7 @@ 
                     $payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
                     $payment->set_status($payment_status);
                     //make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-                    $payment->set_amount( (float) $response->amount );
+                    $payment->set_amount((float) $response->amount);
                     $payment->set_gateway_response(
                         sprintf(
                             esc_html__('%1$s (Reason Code: %2$s)', 'event_espresso'),
@@ -271,14 +271,14 @@ 
                     } else {
                         $txn_id = $response->transaction_id;
                     }
-                    $payment->set_txn_id_chq_nmbr( $txn_id );
+                    $payment->set_txn_id_chq_nmbr($txn_id);
                 }
 				$payment->set_extra_accntng($primary_registrant->reg_code());
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			} else {
 				$payment->set_status($this->_pay_model->failed_status());
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			}
 		return $payment;
 	}
@@ -289,7 +289,7 @@ 
 	 * what billing data gets sent
 	 * @param array $billing_info
 	 */
-	protected function _set_sensitive_billing_data( $billing_info ) {
+	protected function _set_sensitive_billing_data($billing_info) {
 		$this->setField('card_num', $billing_info['credit_card']);
 		$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
 		$this->setField('card_code', $billing_info['cvv']);
@@ -347,23 +347,23 @@ 
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
 		$x_keys = array();
 		foreach ($this->_x_post_fields as $key => $value) {
-			$x_keys[] = "x_$key=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+			$x_keys[] = "x_$key=".urlencode($this->_get_unsupported_character_remover()->format($value));
 		}
 		// Add line items
 		foreach ($this->_additional_line_items as $key => $value) {
-			$x_keys[] =  "x_line_item=" . urlencode($this->_get_unsupported_character_remover()->format($value));
+			$x_keys[] = "x_line_item=".urlencode($this->_get_unsupported_character_remover()->format($value));
 		}
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = $this->_get_server_url();
 		$curl_request = curl_init($post_url);
-        $post_body = implode("&",$x_keys);
+        $post_body = implode("&", $x_keys);
 		curl_setopt($curl_request, CURLOPT_POSTFIELDS, $post_body);
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
 		if ($this->VERIFY_PEER) {
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname( __DIR__ ) . '/ssl/cert.pem');
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__).'/ssl/cert.pem');
 		} else {
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
 		}
@@ -375,7 +375,7 @@ 
 		$response = curl_exec($curl_request);
 
 		curl_close($curl_request);
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
 
 		return $this->_log_and_clean_response($response_obj, $payment);
 	}
@@ -384,18 +384,18 @@ 
 	 * @param array $request_array
 	 * @param EEI_Payment $payment
 	 */
-	protected function _log_clean_request($request_array,$payment){
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
-		foreach($request_array as $index => $keyvaltogether ) {
-			foreach( $keys_to_filter_out as $key ) {
-				if( strpos( $keyvaltogether, $key ) === 0 ){
+	protected function _log_clean_request($request_array, $payment) {
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
 					//found it at the first character
 					//so its one of them
-					unset( $request_array[ $index ] );
+					unset($request_array[$index]);
 				}
 			}
 		}
-		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url() ),$payment);
+		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url()), $payment);
 	}
 
 
@@ -407,9 +407,9 @@ 
 	 * @param EE_Payment                  $payment
 	 * @return \EE_AuthorizeNetAIM_Response
 	 */
-	private function _log_and_clean_response($response_obj,$payment){
+	private function _log_and_clean_response($response_obj, $payment) {
 		$response_obj->account_number = '';
-		$this->log(array('AIM Response received:'=>(array)$response_obj),$payment);
+		$this->log(array('AIM Response received:'=>(array) $response_obj), $payment);
 		return $response_obj;
 	}
 
@@ -508,7 +508,7 @@ 
 			// Split Array
 			$this->response = $response;
 			if ($encap_char) {
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
 			} else {
 				$this->_response_array = explode($delimiter, $response);
 			}
@@ -591,7 +591,7 @@ 
 
 }
 
-if ( ! class_exists( 'AuthorizeNetException' ) ) {
+if ( ! class_exists('AuthorizeNetException')) {
 	/**
 	 * Class AuthorizeNetException
 	 *
@@ -607,8 +607,8 @@ 
 		 * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
 		 * @since 5.1.0
 		 */
-		public function __construct( $message = "", $code = 0, Exception $previous = null ) {
-			parent::__construct( $message, $code, $previous );
+		public function __construct($message = "", $code = 0, Exception $previous = null) {
+			parent::__construct($message, $code, $previous);
 		}
 	}
 }

Indentation +30 added lines, -30 removed lines

@@ -240,7 +240,7 @@ 
 			//in which case, we need to generate teh invoice num per request right here...
 			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+			$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
 
 
 			if ($this->_test_transactions) {
@@ -252,27 +252,27 @@ 
 			$response = $this->_sendRequest($payment);
 			if (!empty($response)){
 				if ($response->error_message) {
-                    $payment->set_status($this->_pay_model->failed_status());
-                    $payment->set_gateway_response($response->error_message);
-                } else {
-                    $payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
-                    $payment->set_status($payment_status);
-                    //make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-                    $payment->set_amount( (float) $response->amount );
-                    $payment->set_gateway_response(
-                        sprintf(
-                            esc_html__('%1$s (Reason Code: %2$s)', 'event_espresso'),
-                            $response->response_reason_text,
-                            $response->response_reason_code
-                        )
-                    );
-                    if ($this->_debug_mode) {
-                        $txn_id = $response->invoice_number;
-                    } else {
-                        $txn_id = $response->transaction_id;
-                    }
-                    $payment->set_txn_id_chq_nmbr( $txn_id );
-                }
+					$payment->set_status($this->_pay_model->failed_status());
+					$payment->set_gateway_response($response->error_message);
+				} else {
+					$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
+					$payment->set_status($payment_status);
+					//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
+					$payment->set_amount( (float) $response->amount );
+					$payment->set_gateway_response(
+						sprintf(
+							esc_html__('%1$s (Reason Code: %2$s)', 'event_espresso'),
+							$response->response_reason_text,
+							$response->response_reason_code
+						)
+					);
+					if ($this->_debug_mode) {
+						$txn_id = $response->invoice_number;
+					} else {
+						$txn_id = $response->transaction_id;
+					}
+					$payment->set_txn_id_chq_nmbr( $txn_id );
+				}
 				$payment->set_extra_accntng($primary_registrant->reg_code());
 				$payment->set_details(print_r($response,true));
 			} else {
@@ -356,7 +356,7 @@ 
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = $this->_get_server_url();
 		$curl_request = curl_init($post_url);
-        $post_body = implode("&",$x_keys);
+		$post_body = implode("&",$x_keys);
 		curl_setopt($curl_request, CURLOPT_POSTFIELDS, $post_body);
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
@@ -489,7 +489,7 @@ 
 	public $requested_amount;
 	public $balance_on_card;
 	public $response; // The response string from AuthorizeNet.
-    public $error_message;
+	public $error_message;
 	private $_response_array = array(); // An array with the split response.
 
 	/**
@@ -521,9 +521,9 @@ 
 				$this->approved = false;
 				$this->error = true;
 				$this->error_message = sprintf(
-				    esc_html__('Unrecognized response from Authorize.net: %1$s', 'event_espresso'),
-                    esc_html($response)
-                );
+					esc_html__('Unrecognized response from Authorize.net: %1$s', 'event_espresso'),
+					esc_html($response)
+				);
 				return;
 			}
 
@@ -584,9 +584,9 @@ 
 			$this->approved = false;
 			$this->error = true;
 			$this->error_message = esc_html__(
-			    'Error connecting to Authorize.net',
-                'event_espresso'
-            );
+				'Error connecting to Authorize.net',
+				'event_espresso'
+			);
 		}
 	}
 

core/services/collections/LooseCollection.php

Indentation +32 added lines, -32 removed lines

@@ -4,7 +4,7 @@ 
 use EventEspresso\core\exceptions\InvalidEntityException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -22,40 +22,40 @@ 
 
 
 
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     */
-    protected function setCollectionInterface($collection_interface )
-    {
-        $this->collection_interface = '';
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 */
+	protected function setCollectionInterface($collection_interface )
+	{
+		$this->collection_interface = '';
+	}
 
 
 
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        if (! is_object($object)) {
-            throw new InvalidEntityException($object, 'object');
-        }
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		if (! is_object($object)) {
+			throw new InvalidEntityException($object, 'object');
+		}
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 
 
 

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
      * @access protected
      * @param  string $collection_interface
      */
-    protected function setCollectionInterface($collection_interface )
+    protected function setCollectionInterface($collection_interface)
     {
         $this->collection_interface = '';
     }
@@ -49,7 +49,7 @@ 
      */
     public function add($object, $identifier = null)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw new InvalidEntityException($object, 'object');
         }
         $this->attach($object);

core/services/shortcodes/ShortcodesManager.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
                 'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
                 $this->getShortcodes()
             );
-            if (! $this->shortcodes instanceof CollectionInterface) {
+            if ( ! $this->shortcodes instanceof CollectionInterface) {
                 throw new InvalidEntityException(
                     $this->shortcodes,
                     'CollectionInterface',
@@ -166,7 +166,7 @@ 
             // cycle thru shortcode folders
             foreach ($this->shortcodes as $shortcode) {
                 /** @var ShortcodeInterface $shortcode */
-                if ( $shortcode instanceof EnqueueAssetsInterface) {
+                if ($shortcode instanceof EnqueueAssetsInterface) {
                     add_action('wp_enqueue_scripts', array($shortcode, 'registerScriptsAndStylesheets'), 10);
                     add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
                 }
@@ -225,7 +225,7 @@ 
     public function parseContentForShortcodes($content)
     {
         $has_shortcode = false;
-        if(empty($this->shortcodes)){
+        if (empty($this->shortcodes)) {
             return $has_shortcode;
         }
         foreach ($this->shortcodes as $shortcode) {

Indentation +205 added lines, -205 removed lines

@@ -32,211 +32,211 @@
 class ShortcodesManager
 {
 
-    /**
-     * @var LegacyShortcodesManager $legacy_shortcodes_manager
-     */
-    private $legacy_shortcodes_manager;
-
-    /**
-     * @var ShortcodeInterface[] $shortcodes
-     */
-    private $shortcodes;
-
-
-
-    /**
-     * ShortcodesManager constructor
-     *
-     * @param LegacyShortcodesManager $legacy_shortcodes_manager
-     */
-    public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager) {
-        $this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
-        // assemble a list of installed and active shortcodes
-        add_action(
-            'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-            array($this, 'registerShortcodes'),
-            999
-        );
-        //  call add_shortcode() for all installed shortcodes
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'addShortcodes'));
-        // check content for shortcodes the old way
-        add_action('parse_query', array($this->legacy_shortcodes_manager, 'initializeShortcodes'), 5);
-        // check content for shortcodes the NEW more efficient way
-        add_action('template_redirect', array($this, 'templateRedirect'), 999);
-    }
-
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    public function getShortcodes()
-    {
-        if ( ! $this->shortcodes instanceof CollectionInterface) {
-            $this->shortcodes = $this->loadShortcodesCollection();
-        }
-        return $this->shortcodes;
-    }
-
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadShortcodesCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-            // collection name
-                'shortcodes',
-                // collection interface
-                'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                array('EventEspresso\core\domain\entities\shortcodes'),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
-
-
-
-    /**
-     * @return void
-     * @throws DomainException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    public function registerShortcodes()
-    {
-        try {
-            $this->shortcodes = apply_filters(
-                'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
-                $this->getShortcodes()
-            );
-            if (! $this->shortcodes instanceof CollectionInterface) {
-                throw new InvalidEntityException(
-                    $this->shortcodes,
-                    'CollectionInterface',
-                    sprintf(
-                        esc_html__(
-                            'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
-                            'event_espresso'
-                        ),
-                        is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
-                    )
-                );
-            }
-            $this->legacy_shortcodes_manager->registerShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-
-    /**
-     * @return void
-     */
-    public function addShortcodes()
-    {
-        try {
-            // cycle thru shortcode folders
-            foreach ($this->shortcodes as $shortcode) {
-                /** @var ShortcodeInterface $shortcode */
-                if ( $shortcode instanceof EnqueueAssetsInterface) {
-                    add_action('wp_enqueue_scripts', array($shortcode, 'registerScriptsAndStylesheets'), 10);
-                    add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
-                }
-                // add_shortcode() if it has not already been added
-                if ( ! shortcode_exists($shortcode->getTag())) {
-                    add_shortcode($shortcode->getTag(), array($shortcode, 'processShortcodeCallback'));
-                }
-            }
-            $this->legacy_shortcodes_manager->addShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-
-    /**
-     * callback for the "template_redirect" hook point
-     * checks posts for EE shortcodes, and initializes them,
-     * then toggles filter switch that loads core default assets
-     *
-     * @return void
-     */
-    public function templateRedirect()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts)) {
-            return;
-        }
-        $load_assets = false;
-        // array of posts displayed in current request
-        $posts = is_array($wp_query->posts) ? $wp_query->posts : array($wp_query->posts);
-        foreach ($posts as $post) {
-            // now check post content and excerpt for EE shortcodes
-            $load_assets = $this->parseContentForShortcodes($post->post_content)
-                ? true
-                : $load_assets;
-        }
-        if ($load_assets) {
-            $this->legacy_shortcodes_manager->registry()->REQ->set_espresso_page(true);
-            add_filter('FHEE_load_css', '__return_true');
-            add_filter('FHEE_load_js', '__return_true');
-        }
-    }
-
-
-
-    /**
-     * checks supplied content against list of shortcodes,
-     * then initializes any found shortcodes, and returns true.
-     * returns false if no shortcodes found.
-     *
-     * @param string $content
-     * @return bool
-     */
-    public function parseContentForShortcodes($content)
-    {
-        $has_shortcode = false;
-        if(empty($this->shortcodes)){
-            return $has_shortcode;
-        }
-        foreach ($this->shortcodes as $shortcode) {
-            /** @var ShortcodeInterface $shortcode */
-            if (has_shortcode($content, $shortcode->getTag())) {
-                $shortcode->initializeShortcode();
-                $has_shortcode = true;
-            }
-        }
-        return $has_shortcode;
-    }
+	/**
+	 * @var LegacyShortcodesManager $legacy_shortcodes_manager
+	 */
+	private $legacy_shortcodes_manager;
+
+	/**
+	 * @var ShortcodeInterface[] $shortcodes
+	 */
+	private $shortcodes;
+
+
+
+	/**
+	 * ShortcodesManager constructor
+	 *
+	 * @param LegacyShortcodesManager $legacy_shortcodes_manager
+	 */
+	public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager) {
+		$this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
+		// assemble a list of installed and active shortcodes
+		add_action(
+			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
+			array($this, 'registerShortcodes'),
+			999
+		);
+		//  call add_shortcode() for all installed shortcodes
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'addShortcodes'));
+		// check content for shortcodes the old way
+		add_action('parse_query', array($this->legacy_shortcodes_manager, 'initializeShortcodes'), 5);
+		// check content for shortcodes the NEW more efficient way
+		add_action('template_redirect', array($this, 'templateRedirect'), 999);
+	}
+
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	public function getShortcodes()
+	{
+		if ( ! $this->shortcodes instanceof CollectionInterface) {
+			$this->shortcodes = $this->loadShortcodesCollection();
+		}
+		return $this->shortcodes;
+	}
+
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadShortcodesCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+			// collection name
+				'shortcodes',
+				// collection interface
+				'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				array('EventEspresso\core\domain\entities\shortcodes'),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
+
+
+
+	/**
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	public function registerShortcodes()
+	{
+		try {
+			$this->shortcodes = apply_filters(
+				'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
+				$this->getShortcodes()
+			);
+			if (! $this->shortcodes instanceof CollectionInterface) {
+				throw new InvalidEntityException(
+					$this->shortcodes,
+					'CollectionInterface',
+					sprintf(
+						esc_html__(
+							'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
+							'event_espresso'
+						),
+						is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
+					)
+				);
+			}
+			$this->legacy_shortcodes_manager->registerShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+
+	/**
+	 * @return void
+	 */
+	public function addShortcodes()
+	{
+		try {
+			// cycle thru shortcode folders
+			foreach ($this->shortcodes as $shortcode) {
+				/** @var ShortcodeInterface $shortcode */
+				if ( $shortcode instanceof EnqueueAssetsInterface) {
+					add_action('wp_enqueue_scripts', array($shortcode, 'registerScriptsAndStylesheets'), 10);
+					add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
+				}
+				// add_shortcode() if it has not already been added
+				if ( ! shortcode_exists($shortcode->getTag())) {
+					add_shortcode($shortcode->getTag(), array($shortcode, 'processShortcodeCallback'));
+				}
+			}
+			$this->legacy_shortcodes_manager->addShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+
+	/**
+	 * callback for the "template_redirect" hook point
+	 * checks posts for EE shortcodes, and initializes them,
+	 * then toggles filter switch that loads core default assets
+	 *
+	 * @return void
+	 */
+	public function templateRedirect()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts)) {
+			return;
+		}
+		$load_assets = false;
+		// array of posts displayed in current request
+		$posts = is_array($wp_query->posts) ? $wp_query->posts : array($wp_query->posts);
+		foreach ($posts as $post) {
+			// now check post content and excerpt for EE shortcodes
+			$load_assets = $this->parseContentForShortcodes($post->post_content)
+				? true
+				: $load_assets;
+		}
+		if ($load_assets) {
+			$this->legacy_shortcodes_manager->registry()->REQ->set_espresso_page(true);
+			add_filter('FHEE_load_css', '__return_true');
+			add_filter('FHEE_load_js', '__return_true');
+		}
+	}
+
+
+
+	/**
+	 * checks supplied content against list of shortcodes,
+	 * then initializes any found shortcodes, and returns true.
+	 * returns false if no shortcodes found.
+	 *
+	 * @param string $content
+	 * @return bool
+	 */
+	public function parseContentForShortcodes($content)
+	{
+		$has_shortcode = false;
+		if(empty($this->shortcodes)){
+			return $has_shortcode;
+		}
+		foreach ($this->shortcodes as $shortcode) {
+			/** @var ShortcodeInterface $shortcode */
+			if (has_shortcode($content, $shortcode->getTag())) {
+				$shortcode->initializeShortcode();
+				$has_shortcode = true;
+			}
+		}
+		return $has_shortcode;
+	}
 
 }
 // End of file ShortcodesManager.php

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

Indentation +64 added lines, -64 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -36,82 +36,82 @@ 
 {
     
     
-    /**
-     * _init_props
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _init_props()
-    {
-        $this->label       = __('Attendee Shortcodes', 'event_espresso');
-        $this->description = __('All shortcodes specific to attendee related data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[QUESTION]' => __('Will parse to a question.', 'event_espresso'),
-            '[ANSWER]'   => __('Will parse to the answer for a question', 'event_espresso')
-        );
-    }
+	/**
+	 * _init_props
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _init_props()
+	{
+		$this->label       = __('Attendee Shortcodes', 'event_espresso');
+		$this->description = __('All shortcodes specific to attendee related data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[QUESTION]' => __('Will parse to a question.', 'event_espresso'),
+			'[ANSWER]'   => __('Will parse to the answer for a question', 'event_espresso')
+		);
+	}
     
     
-    /**
-     * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
-     * will have to take care of handling.
-     *
-     * @access protected
-     *
-     * @param string $shortcode the shortcode to be parsed.
-     *
-     * @return string parsed shortcode
-     */
-    protected function _parser($shortcode)
-    {
+	/**
+	 * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
+	 * will have to take care of handling.
+	 *
+	 * @access protected
+	 *
+	 * @param string $shortcode the shortcode to be parsed.
+	 *
+	 * @return string parsed shortcode
+	 */
+	protected function _parser($shortcode)
+	{
         
-        if ( ! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
-            return '';
-        }
+		if ( ! $this->_data instanceof EE_Answer || ! isset($this->_extra_data['data']) || ! $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+			return '';
+		}
         
-        switch ($shortcode) {
+		switch ($shortcode) {
             
-            case '[QUESTION]' :
-                $question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
-                if ( ! $question instanceof EE_Question) {
-                    return ''; //get out because we can't figure out what the question is.
-                }
+			case '[QUESTION]' :
+				$question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+				if ( ! $question instanceof EE_Question) {
+					return ''; //get out because we can't figure out what the question is.
+				}
                 
-                return $question->get('QST_display_text');
-                break;
+				return $question->get('QST_display_text');
+				break;
             
-            case '[ANSWER]' :
-                //need to get the question to determine the type of question (some questions require translation of the answer).
-                $question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
-                if ( ! $question instanceof EE_Question) {
-                    return ''; //get out cause we can't figure out what the question type is!
-                }
+			case '[ANSWER]' :
+				//need to get the question to determine the type of question (some questions require translation of the answer).
+				$question = isset($this->_extra_data['data']->questions[$this->_data->ID()]) ? $this->_extra_data['data']->questions[$this->_data->ID()] : $this->_data->question();
+				if ( ! $question instanceof EE_Question) {
+					return ''; //get out cause we can't figure out what the question type is!
+				}
                 
-                //what we show for the answer depends on the question type!
-                switch ($question->get('QST_type')) {
+				//what we show for the answer depends on the question type!
+				switch ($question->get('QST_type')) {
                     
-                    case 'STATE' :
-                        $state  = EEM_State::instance()->get_one_by_ID($this->_data->get('ANS_value'));
-                        $answer = $state instanceof EE_State ? $state->name() : '';
-                        break;
+					case 'STATE' :
+						$state  = EEM_State::instance()->get_one_by_ID($this->_data->get('ANS_value'));
+						$answer = $state instanceof EE_State ? $state->name() : '';
+						break;
                     
-                    case 'COUNTRY' :
-                        $country = EEM_Country::instance()->get_one_by_ID($this->_data->get('ANS_value'));
-                        $answer  = $country instanceof EE_Country ? $country->name() : '';
-                        break;
+					case 'COUNTRY' :
+						$country = EEM_Country::instance()->get_one_by_ID($this->_data->get('ANS_value'));
+						$answer  = $country instanceof EE_Country ? $country->name() : '';
+						break;
                     
-                    default :
-                        $answer = $this->_data->get_pretty('ANS_value', 'no_wpautop');
-                        break;
-                }
+					default :
+						$answer = $this->_data->get_pretty('ANS_value', 'no_wpautop');
+						break;
+				}
                 
-                return $answer;
-                break;
+				return $answer;
+				break;
             
-        }
+		}
         
-        return '';
-    }
+		return '';
+	}
     
 } //end EE_Question_Shortcodes class

admin_pages/maintenance/templates/ee_data_reset_and_delete.template.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 <div class="padding">
 	<h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php esc_html_e('Permanently Delete ALL Event Espresso Data', 'event_espresso');?></h4>
     <p><?php esc_html_e(' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
-            'event_espresso');?></p>
+			'event_espresso');?></p>
 	<p><?php esc_html_e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso');?></p>
 	<p class="important-notice"><?php printf( esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<em>', '</em>' ); ?><br/></p>
 	<ol>

Spacing +17 added lines, -17 removed lines

@@ -7,13 +7,13 @@ 
 /** @var string $delete_db_url */
 ?>
 <h2>
-	<?php esc_html_e( 'Reset/Delete Data for Event Espresso', 'event_espresso' );?>
+	<?php esc_html_e('Reset/Delete Data for Event Espresso', 'event_espresso'); ?>
 </h2>
 <br />
 
 <div class="padding">
-	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Ticket and Datetime Reserved Counts', 'event_espresso');?></h4>
-	<p><?php esc_html_e('Use this to reset the counts for ticket and datetime reservations.', 'event_espresso');?></p>
+	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Ticket and Datetime Reserved Counts', 'event_espresso'); ?></h4>
+	<p><?php esc_html_e('Use this to reset the counts for ticket and datetime reservations.', 'event_espresso'); ?></p>
 	<div class="float-right"><?php echo $reset_reservations_button; ?></div>
 	<div class="clear"></div>
 </div>
@@ -22,8 +22,8 @@ 
 
 <!-- reset DB url is here. Just need to make it look pretty and unhide it-->
 <div class="padding">
-	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Event Espresso Capabilities', 'event_espresso');?></h4>
-	<p><?php esc_html_e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso');?></p>
+	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Event Espresso Capabilities', 'event_espresso'); ?></h4>
+	<p><?php esc_html_e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso'); ?></p>
 	<div class="float-right"><?php echo $reset_capabilities_button; ?></div>
 	<div class="clear"></div>
 </div>
@@ -31,27 +31,27 @@ 
 <br />
 
 <div class="padding">
-	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Event Espresso Data', 'event_espresso');?></h4>
-    <p><?php esc_html_e(' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.', 'event_espresso');?></p>
-    <p><?php esc_html_e('Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.', 'event_espresso');?></p>
-	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url;?>"><?php esc_html_e('Reset Event Espresso Tables', 'event_espresso');?></a></div>
+	<h4 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php esc_html_e('Reset Event Espresso Data', 'event_espresso'); ?></h4>
+    <p><?php esc_html_e(' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.', 'event_espresso'); ?></p>
+    <p><?php esc_html_e('Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.', 'event_espresso'); ?></p>
+	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url; ?>"><?php esc_html_e('Reset Event Espresso Tables', 'event_espresso'); ?></a></div>
 	<div class="clear"></div>
 </div>
 <br />
 <br />
 
 <div class="padding">
-	<h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php esc_html_e('Permanently Delete ALL Event Espresso Data', 'event_espresso');?></h4>
+	<h4 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php esc_html_e('Permanently Delete ALL Event Espresso Data', 'event_espresso'); ?></h4>
     <p><?php esc_html_e(' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
-            'event_espresso');?></p>
-	<p><?php esc_html_e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso');?></p>
-	<p class="important-notice"><?php printf( esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<em>', '</em>' ); ?><br/></p>
+            'event_espresso'); ?></p>
+	<p><?php esc_html_e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso'); ?></p>
+	<p class="important-notice"><?php printf(esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<em>', '</em>'); ?><br/></p>
 	<ol>
-		<li><?php  printf( esc_html__('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.', 'event_espresso'), '<strong>', '</strong>' );?></li>
-		<li><?php printf( esc_html__('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
-        <li><?php printf( esc_html__('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
+		<li><?php  printf(esc_html__('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.', 'event_espresso'), '<strong>', '</strong>'); ?></li>
+		<li><?php printf(esc_html__('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
+        <li><?php printf(esc_html__('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
 	</ol>
-	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php esc_html_e('Permanently Delete All Event Espresso Data', 'event_espresso');?></a></div>
+	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php esc_html_e('Permanently Delete All Event Espresso Data', 'event_espresso'); ?></a></div>
 	<div class="clear"></div>
 </div>
 <br/>