eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_events.php

Spacing +24 added lines, -24 removed lines

@@ -18,52 +18,52 @@
  * and/or use any of the template tags functions found in:
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
  ************************** IMPORTANT **************************/
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' );
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_true');
 
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
 global $post;
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
 ?>
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
+<?php do_action('AHEE_event_details_before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 		<footer class="event-meta">
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-list-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 	</div>
 
 <?php endif; ?>
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

admin_pages/support/Support_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,11 +32,11 @@ 
 
 	public function __construct() {
 		//define some help/support page related constants
-		define( 'EE_SUPPORT_PG_SLUG', 'espresso_support' );
-		define( 'EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG ));
-		define( 'EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-		define( 'EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/' );
-		define( 'EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/' );
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
 		parent::__construct();
 	}
 
@@ -45,7 +45,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'extras',
 			'menu_order' => 30,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,

Braces +2 added lines, -1 removed lines

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

caffeinated/admin/extend/registrations/Extend_EE_Attendee_Contact_List_Table.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -36,7 +36,7 @@ 
 				'route' => 'contact_list_report',
 				'extra_request' =>  
 						array( 
-							'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" ) ) 
+							'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") ) 
 			),
 //			'contact_list_export'=> array(
 //				'route' => 'contact_list_export'

Braces +2 added lines, -1 removed lines

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

core/helpers/EEH_Export.helper.php

Indentation +7 added lines, -7 removed lines

@@ -87,13 +87,13 @@
 
 	 /**
 	  *
-	 *	Writes a row to the csv file
-	 *	@param array $row - individual row of csv data
-	 *	@param string $delimiter - csv delimiter
-	 *	@param string $enclosure - csv enclosure
-	 *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
-	 *	@return string of text for teh csv file
-	 */
+	  *	Writes a row to the csv file
+	  *	@param array $row - individual row of csv data
+	  *	@param string $delimiter - csv delimiter
+	  *	@param string $enclosure - csv enclosure
+	  *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
+	  *	@return string of text for teh csv file
+	  */
 	public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) {
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
 		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );

Braces +6 added lines, -4 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -77,7 +79,7 @@ 
 				$new_file_contents .= EEH_Export::get_csv_row( $data_row);
 			}
 			return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents );
-		}else{
+		} else{
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -138,9 +140,9 @@ 
 		}
 		if( $pretty_schema === true){
 			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
+		} elseif( is_string( $pretty_schema ) ) {
 			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
+		} else{
 			return $field_obj->prepare_for_get( $value_on_model_obj );
 		}
 	}

Spacing +35 added lines, -35 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param EE_Model_Field_Base $field
 	 * @return string
 	 */
-	public static function get_column_name_for_field(EE_Model_Field_Base $field){
+	public static function get_column_name_for_field(EE_Model_Field_Base $field) {
 		return $field->get_nicename()."[".$field->get_name()."]";
 	}
 
@@ -52,31 +52,31 @@ 
 	 * 						we consider that a success (because we wrote everything there was...nothing)
 	 * @throws EE_Error
 	 */
-	public static function write_data_array_to_csv( $filepath, $data, $write_column_headers = true ){
+	public static function write_data_array_to_csv($filepath, $data, $write_column_headers = true) {
 
 		$new_file_contents = '';
 		//determine if $data is actually a 2d array
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
 			//make sure top level is numerically indexed,
 
-			if( EEH_Array::is_associative_array($data)){
-				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data))));
+			if (EEH_Array::is_associative_array($data)) {
+				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
 			}
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
 			//now, is the last item in the top-level array of $data an associative or numeric array?
-			if( $write_column_headers &&
-					EEH_Array::is_associative_array($item_in_top_level_array)){
+			if ($write_column_headers &&
+					EEH_Array::is_associative_array($item_in_top_level_array)) {
 				//its associative, so we want to output its keys as column headers
 				$keys = array_keys($item_in_top_level_array);
-				$new_file_contents .=  EEH_Export::get_csv_row( $keys );
+				$new_file_contents .= EEH_Export::get_csv_row($keys);
 
 			}
 			//start writing data
-			foreach($data as $data_row){
-				$new_file_contents .= EEH_Export::get_csv_row( $data_row);
+			foreach ($data as $data_row) {
+				$new_file_contents .= EEH_Export::get_csv_row($data_row);
 			}
-			return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents );
-		}else{
+			return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath).$new_file_contents);
+		} else {
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -93,29 +93,29 @@ 
 	 *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
 	 *	@return string of text for teh csv file
 	 */
-	public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) {
+	public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false) {
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
 
 		$delimiter_esc = preg_quote($delimiter, '/');
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
 		foreach ($row as $field_value) {
-			if(is_object($field_value) || is_array($field_value)){
+			if (is_object($field_value) || is_array($field_value)) {
 				$field_value = serialize($field_value);
 			}
-			if ($field_value === null && $mysql_null ) {
+			if ($field_value === null && $mysql_null) {
 				$output[] = 'NULL';
 				continue;
 			}
 
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
 		}
 
-		return  implode($delimiter, $output) . PHP_EOL;
+		return  implode($delimiter, $output).PHP_EOL;
 	}
 
 
@@ -128,19 +128,19 @@ 
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
 	 * @return string
 	 */
-	public static function prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
-		$field_obj = $model->field_settings_for( $field_name );
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
-		if( $field_obj instanceof EE_Datetime_Field ) {
-			$field_obj->set_date_format( EEH_Export::get_date_format_for_export( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
-			$field_obj->set_time_format( EEH_Export::get_time_format_for_export( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
+	public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
+		$field_obj = $model->field_settings_for($field_name);
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
+		if ($field_obj instanceof EE_Datetime_Field) {
+			$field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema);
+			$field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema);
 		}
-		if( $pretty_schema === true){
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
-			return $field_obj->prepare_for_get( $value_on_model_obj );
+		if ($pretty_schema === true) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
+		}elseif (is_string($pretty_schema)) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
+		} else {
+			return $field_obj->prepare_for_get($value_on_model_obj);
 		}
 	}
 
@@ -151,8 +151,8 @@ 
 	 * @param string $current_format
 	 * @return string
 	 */
-	public static function get_date_format_for_export( $current_format = null ) {
-		return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format );
+	public static function get_date_format_for_export($current_format = null) {
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 * @param string $current_format
 	 * @return string
 	 */
-	public static function get_time_format_for_export( $current_format = null ) {
-		return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format );
+	public static function get_time_format_for_export($current_format = null) {
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
 	}
 
 

core/libraries/batch/BatchRequestProcessor.php

Spacing +43 added lines, -43 removed lines

@@ -23,8 +23,8 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -50,32 +50,32 @@ 
 	 * @param array $request_data to be used by the batch job handler
 	 * @return JobStepResponse
 	 */
-	public function create_job( $batch_job_handler_class, $request_data ) {
+	public function create_job($batch_job_handler_class, $request_data) {
 		try {
-			$this->_job_id = wp_generate_password( 15, false );
-			$obj = $this->instantiate_batch_job_handler_from_classname( $batch_job_handler_class );
-			$this->_job_parameters = new JobParameters( $this->_job_id, $batch_job_handler_class, $request_data );
-			$response = $obj->create_job( $this->_job_parameters );
-			if( ! $response instanceof JobStepResponse ) {
+			$this->_job_id = wp_generate_password(15, false);
+			$obj = $this->instantiate_batch_job_handler_from_classname($batch_job_handler_class);
+			$this->_job_parameters = new JobParameters($this->_job_id, $batch_job_handler_class, $request_data);
+			$response = $obj->create_job($this->_job_parameters);
+			if ( ! $response instanceof JobStepResponse) {
 				throw new BatchRequestException(
 					sprintf(
-						__( 'The class implementing JobHandlerInterface did not return a JobStepResponse when create_job was called with %1$s. It needs to return one or throw an Exception', 'event_espresso' ),
-						wp_json_encode( $request_data )
+						__('The class implementing JobHandlerInterface did not return a JobStepResponse when create_job was called with %1$s. It needs to return one or throw an Exception', 'event_espresso'),
+						wp_json_encode($request_data)
 					)
 				);
 			}
-			$success = $this->_job_parameters->save( true );
-			if( ! $success ) {
+			$success = $this->_job_parameters->save(true);
+			if ( ! $success) {
 				throw new BatchRequestException(
 					sprintf(
 						__('Could not save job %1$s to the Wordpress Options table. These were the arguments used: %2$s', 'event_espresso'),
 						$this->_job_id,
-						wp_json_encode( $request_data )
+						wp_json_encode($request_data)
 					)
 				);
 			}
-		} catch( \Exception $e ) {
-			$response = $this->_get_error_response( $e, 'create_job' );
+		} catch (\Exception $e) {
+			$response = $this->_get_error_response($e, 'create_job');
 		}
 		return $response;
 	}
@@ -88,26 +88,26 @@ 
 	 * @param int $batch_size
 	 * @return JobStepResponse
 	 */
-	public function continue_job( $job_id, $batch_size = 50 ) {
+	public function continue_job($job_id, $batch_size = 50) {
 		try {
 			$this->_job_id = $job_id;
-			$batch_size = defined( 'EE_BATCHRUNNER_BATCH_SIZE' ) ? EE_BATCHRUNNER_BATCH_SIZE : $batch_size;
+			$batch_size = defined('EE_BATCHRUNNER_BATCH_SIZE') ? EE_BATCHRUNNER_BATCH_SIZE : $batch_size;
 			//get the corresponding WordPress option for the job
-			$this->_job_parameters = JobParameters::load( $this->_job_id );
-			$handler_obj = $this->instantiate_batch_job_handler_from_classname( $this->_job_parameters->classname() );
+			$this->_job_parameters = JobParameters::load($this->_job_id);
+			$handler_obj = $this->instantiate_batch_job_handler_from_classname($this->_job_parameters->classname());
 			//continue it
-			$response = $handler_obj->continue_job( $this->_job_parameters, $batch_size );
-			if( ! $response instanceof JobStepResponse ) {
+			$response = $handler_obj->continue_job($this->_job_parameters, $batch_size);
+			if ( ! $response instanceof JobStepResponse) {
 				throw new BatchRequestException(
 					sprintf(
-						__( 'The class implementing JobHandlerInterface did not return a JobStepResponse when continue_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso' ),
+						__('The class implementing JobHandlerInterface did not return a JobStepResponse when continue_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso'),
 						$this->_job_id
 					)
 				);
 			}
 			$this->_job_parameters->save();
-		} catch( \Exception $e ) {
-			$response = $this->_get_error_response( $e, 'continue_job' );
+		} catch (\Exception $e) {
+			$response = $this->_get_error_response($e, 'continue_job');
 		}
 		return $response;
 	}
@@ -122,8 +122,8 @@ 
 	 * @return JobHandlerInterface
 	 * @throws BatchRequestException
 	 */
-	public function instantiate_batch_job_handler_from_classname( $classname ) {
-		if( ! class_exists( $classname ) ) {
+	public function instantiate_batch_job_handler_from_classname($classname) {
+		if ( ! class_exists($classname)) {
 			throw new BatchRequestException(
 				sprintf(
 					__('The class %1$s does not exist, and so could not be used for running a job. It should implement JobHandlerInterface.', 'event_espresso'),
@@ -132,7 +132,7 @@ 
 			);
 		}
 		$obj = new $classname;
-		if( ! $obj instanceof JobHandlerInterface ) {
+		if ( ! $obj instanceof JobHandlerInterface) {
 			throw new BatchRequestException(
 				sprintf(
 					__('The class %1$s does not implement JobHandlerInterface and so could not be used for running a job', 'event_espresso'),
@@ -152,26 +152,26 @@ 
 	 * @return JobStepResponse
 	 * @throws BatchRequestException
 	 */
-	public function cleanup_job( $job_id ) {
-		try{
+	public function cleanup_job($job_id) {
+		try {
 			$this->_job_id = $job_id;
-			$job_parameters = JobParameters::load( $this->_job_id );
-			$handler_obj = $this->instantiate_batch_job_handler_from_classname( $job_parameters->classname() );
+			$job_parameters = JobParameters::load($this->_job_id);
+			$handler_obj = $this->instantiate_batch_job_handler_from_classname($job_parameters->classname());
 			//continue it
-			$response = $handler_obj->cleanup_job( $job_parameters );
-			if( ! $response instanceof JobStepResponse ) {
+			$response = $handler_obj->cleanup_job($job_parameters);
+			if ( ! $response instanceof JobStepResponse) {
 				throw new BatchRequestException(
 					sprintf(
-						__( 'The class implementing JobHandlerInterface did not return a JobStepResponse when cleanup_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso' ),
+						__('The class implementing JobHandlerInterface did not return a JobStepResponse when cleanup_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso'),
 						$this->_job_id
 					)
 				);
 			}
-			$job_parameters->set_status( JobParameters::status_cleaned_up );
+			$job_parameters->set_status(JobParameters::status_cleaned_up);
 			$job_parameters->delete();
 			return $response;
-		} catch( \Exception $e ) {
-			$response = $this->_get_error_response( $e, 'cleanup_job' );
+		} catch (\Exception $e) {
+			$response = $this->_get_error_response($e, 'cleanup_job');
 		}
 		return $response;
 	}
@@ -184,17 +184,17 @@ 
 	 * @param string $method_name
 	 * @return JobStepResponse
 	 */
-	protected function _get_error_response( \Exception $exception, $method_name ) {
-		if( ! $this->_job_parameters instanceof JobParameters ) {
-			$this->_job_parameters = new JobParameters( $this->_job_id, __( '__Unknown__', 'event_espresso' ), array() );
+	protected function _get_error_response(\Exception $exception, $method_name) {
+		if ( ! $this->_job_parameters instanceof JobParameters) {
+			$this->_job_parameters = new JobParameters($this->_job_id, __('__Unknown__', 'event_espresso'), array());
 		}
-		$this->_job_parameters->set_status( JobParameters::status_error );
+		$this->_job_parameters->set_status(JobParameters::status_error);
 		return new JobStepResponse(
 			$this->_job_parameters,
 			sprintf(
 				__('An exception of type %1$s occurred while running %2$s. Its message was %3$s and had trace %4$s', 'event_espresso'),
-				get_class( $exception ),
-				'BatchRunner::' . $method_name . '()',
+				get_class($exception),
+				'BatchRunner::'.$method_name.'()',
 				$exception->getMessage(),
 				$exception->getTraceAsString()
 			)

Indentation +15 added lines, -15 removed lines

@@ -1,21 +1,21 @@
 <?php
  /**
- *
- * Class BatchRequetProcessor
+  *
+  * Class BatchRequetProcessor
   * 
- * Responsible for receiving a request to start a job and assign it a job Id.
- * Then when subsequent requests come in to continue that job, dispatches
- * the request to the appropriate JobHandler, which processes a step of the batch,
- * and then returns the job's new status.
- * This class is used by controller code, and the controller code is sent HTTP
- * requests from the batch_runner.js library
- *
- * @package         Event Espresso
- * @subpackage    batch
- * @author				Mike Nelson
- * @since		 	   4.8.26
- *
- */
+  * Responsible for receiving a request to start a job and assign it a job Id.
+  * Then when subsequent requests come in to continue that job, dispatches
+  * the request to the appropriate JobHandler, which processes a step of the batch,
+  * and then returns the job's new status.
+  * This class is used by controller code, and the controller code is sent HTTP
+  * requests from the batch_runner.js library
+  *
+  * @package         Event Espresso
+  * @subpackage    batch
+  * @author				Mike Nelson
+  * @since		 	   4.8.26
+  *
+  */
 namespace EventEspressoBatchRequest;
 
 use EventEspressoBatchRequest\JobHandlerBaseClasses\JobHandlerInterface;

core/libraries/batch/Helpers/BatchRequestException.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 namespace EventEspressoBatchRequest\Helpers;
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 
-class BatchRequestException extends \Exception{
+class BatchRequestException extends \Exception {
 	//so far the same as exception
 }
 

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php 
  /**
- *
- * Class BatchRequestException
- *
- * Exception class for whenever we have trouble running start, continuing, or finishing
- * a batch job.
- *
- * @package         Event Espresso
- * @subpackage    batch
- * @author				Mike Nelson
- * @since		 	   4.8.26
- *
- */
+  *
+  * Class BatchRequestException
+  *
+  * Exception class for whenever we have trouble running start, continuing, or finishing
+  * a batch job.
+  *
+  * @package         Event Espresso
+  * @subpackage    batch
+  * @author				Mike Nelson
+  * @since		 	   4.8.26
+  *
+  */
 namespace EventEspressoBatchRequest\Helpers;
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 

core/libraries/batch/Helpers/JobStepResponse.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@
 	 * @param string $update_text
 	 * @param array $extra_data
 	 */
-	public function __construct(JobParameters $job_parameters, $update_text, $extra_data = array() ) {
-		$this->_job_parameters 	= $job_parameters;
+	public function __construct(JobParameters $job_parameters, $update_text, $extra_data = array()) {
+		$this->_job_parameters = $job_parameters;
 		$this->_update_text 	= $update_text;
-		$this->_extra_data 		= (array)$extra_data;
+		$this->_extra_data 		= (array) $extra_data;
 	}
 
 

core/libraries/batch/JobHandlerBaseClasses/JobHandlerInterface.php

Spacing +5 added lines, -5 removed lines

@@ -20,8 +20,8 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,7 +35,7 @@ 
 	 * @throws BatchRequestException
 	 * @return JobStepResponse
 	 */
-	public function create_job( JobParameters $job_parameters );
+	public function create_job(JobParameters $job_parameters);
 
 	/**
 	 * Performs another step of the job
@@ -44,7 +44,7 @@ 
 	 * @return JobStepResponse
 	 * @throws BatchRequestException
 	 */
-	public function continue_job( JobParameters $job_parameters, $batch_size = 50 );
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50);
 
 	/**
 	 * Performs any clean-up logic when we know the job is completed
@@ -52,5 +52,5 @@ 
 	 * @return JobStepResponse
 	 * @throws BatchRequestException
 	 */
-	public function cleanup_job( JobParameters $job_parameters );
+	public function cleanup_job(JobParameters $job_parameters);
 }

core/libraries/batch/JobHandlers/AttendeesReport.php

Braces +2 added lines, -2 removed lines

@@ -99,10 +99,10 @@
 				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' ){
+				} 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{
+				} else{
 					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
 				}
 			}

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[] = $csv_row;

Doc Comments +5 added lines

@@ -85,6 +85,11 @@
 	public function count_units_to_process() {
 		return \EEM_Attendee::instance()->count( array( 'caps' => \EEM_Base::caps_read_admin ));
 	}
+
+	/**
+	 * @param integer $offset
+	 * @param integer $limit
+	 */
 	public function get_csv_data( $offset, $limit ) {
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
 			array(