eventespresso / event-espresso-core

caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -2,18 +2,18 @@
 <p>
 <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></strong></p>
+<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></strong></p>
 <p>
 <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?>
 </p>
 <p>
 <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from this Site", 'event_espresso');?></strong></p>
-<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p>
+<p><strong><?php _e("Importing from this Site", 'event_espresso'); ?></strong></p>
+<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p>
 
-	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></strong></p>
-	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p>
-	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p>
-	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p>
-	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p>
\ No newline at end of file
+	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></strong></p>
+	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p>
+	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p>
+	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p>
+	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p>
\ No newline at end of file

core/db_models/fields/EE_Boolean_Field.php

Spacing +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Integer_Field.php');
-class EE_Boolean_Field extends EE_Integer_Field{
+require_once(EE_MODELS.'fields/EE_Integer_Field.php');
+class EE_Boolean_Field extends EE_Integer_Field {
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if ($value_inputted_for_field_on_model_object){
+		if ($value_inputted_for_field_on_model_object) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -14,7 +14,7 @@ 
 	 * @return boolean
 	 */
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
-		return intval( $value_inputted_for_field_on_model_object ) ? true : false;
+		return intval($value_inputted_for_field_on_model_object) ? true : false;
 	}
 	
 	/**
@@ -22,10 +22,10 @@ 
 	 * @param boolean $value_on_field_to_be_outputted
 	 * @return string Yes or No
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ) {
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
 		return apply_filters( 
 			'FHEE__EE_Boolean_Field__prepare_for_pretty_echoing__return',
-			$value_on_field_to_be_outputted ? __( 'Yes', 'event_espresso' ) : __( 'No', 'event_espresso' ),
+			$value_on_field_to_be_outputted ? __('Yes', 'event_espresso') : __('No', 'event_espresso'),
 			$value_on_field_to_be_outputted
 		);
 	}

modules/batch/EED_Batch.module.php

Spacing +57 added lines, -57 removed lines

@@ -17,13 +17,13 @@ 
  * @since		 	   4.8.30.rc.007
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-define( 'BATCH_URL', plugin_dir_url( __FILE__ ) );
+define('BATCH_URL', plugin_dir_url(__FILE__));
 
-class EED_Batch extends EED_Module{
+class EED_Batch extends EED_Module {
 	
 	/**
 	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
@@ -70,9 +70,9 @@ 
 	public static function set_hooks() {
 		//because this is a possibel attack vector, let's have this disabled until 
 		//we at least have a real use for it on the frontend
-		if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) {
-			add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
-			add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 );
+		if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
+			add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+			add_filter('template_include', array(self::instance(), 'override_template'), 99);
 		}
 	}
 	
@@ -80,28 +80,28 @@ 
 	 * Initializes some hooks for the admin in order to run batch jobs
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) );
-		add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
+		add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
+		add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
 		
 		//ajax
-		add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
-		add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
+		add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+		add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
 	}
 	
 	/**
 	 * Enqueues batch scripts on the frontend or admin, and creates a job
 	 */
 	public function enqueue_scripts() { 
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) 
+		if (isset($_REQUEST['espresso_batch']) 
 			|| 
 			( 
-				isset( $_REQUEST[ 'page' ] )
-				&& $_REQUEST[ 'page' ] == 'espresso_batch'
+				isset($_REQUEST['page'])
+				&& $_REQUEST['page'] == 'espresso_batch'
 			) 
 		) { 
-			switch( $this->batch_request_type() ) {
+			switch ($this->batch_request_type()) {
 				case self::batch_job:
 					$this->enqueue_scripts_styles_batch_create();
 					break;
@@ -117,11 +117,11 @@ 
 	 */
 	public function enqueue_scripts_styles_batch_create() {	
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_runner_init', BATCH_URL . '/assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_runner_init', BATCH_URL.'/assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_runner_init', 'ee_job_i18n', 
 			array(
-				'return_url' => $_REQUEST['return_url' ],
+				'return_url' => $_REQUEST['return_url'],
 			));
 	}
 	
@@ -131,15 +131,15 @@ 
 	public function enqueue_scripts_styles_batch_file_create() {
 		//creates a job based on the request variable
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . '/assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_file_runner_init', BATCH_URL.'/assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_file_runner_init', 'ee_job_i18n', 
 				array(
 					'download_and_redirecting' => sprintf( 
 							__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-							'<a href="' . $_REQUEST['return_url' ] .'">',
+							'<a href="'.$_REQUEST['return_url'].'">',
 							'</a>' ),
-					'return_url' => $_REQUEST['return_url' ],
+					'return_url' => $_REQUEST['return_url'],
 				));
 	}
 	
@@ -150,18 +150,18 @@ 
 	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
 	 */
 	protected function _enqueue_batch_job_scripts_and_styles_and_start_job() {
-		wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) );
-		wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
+		wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery'));
+		wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
 		//just copy the bits of EE admin's eei18n that we need in the JS
-		wp_localize_script( 'batch_runner', 'eei18n', array( 'ajax_url' => WP_AJAX_URL, 'is_admin' => (bool)is_admin() ) );
-		$job_handler_classname = stripslashes( $_GET[ 'job_handler' ] );
+		wp_localize_script('batch_runner', 'eei18n', array('ajax_url' => WP_AJAX_URL, 'is_admin' => (bool) is_admin()));
+		$job_handler_classname = stripslashes($_GET['job_handler']);
 		$request_data = array_diff_key( 
 				$_REQUEST, 
-				array_flip( array( 'action',  'page', 'ee', 'batch' ) ) );
+				array_flip(array('action', 'page', 'ee', 'batch')) );
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
 		//eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-		$job_response = $batch_runner->create_job( $job_handler_classname, $request_data );
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
 		//remember the response for later. We need it to display the page body
 		$this->_job_step_response = $job_response;
 		return $job_response;
@@ -172,9 +172,9 @@ 
 	 * @param string $template
 	 * @return string
 	 */
-	public function override_template( $template ) {
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) {
-			return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+	public function override_template($template) {
+		if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
+			return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html';
 		}
 		return $template;
 	}
@@ -185,11 +185,11 @@ 
 	public function register_admin_pages() {
 		add_submenu_page( 
 			'', //parent slug. we don't want this to actually appear in the menu
-			__( 'Batch Job', 'event_espresso' ), //page title
+			__('Batch Job', 'event_espresso'), //page title
 			'n/a', //menu title
 			'read', //we want this page to actually be accessible to anyone,  
 			'espresso_batch', //menu slug
-			array( self::instance(), 'show_admin_page' )
+			array(self::instance(), 'show_admin_page')
 		);
 	}
 	
@@ -199,8 +199,8 @@ 
 	 */
 	public function show_admin_page() { 
 		echo EEH_Template::locate_template( 
-			EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', 
-			array( 'batch_request_type' => $this->batch_request_type() )
+			EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', 
+			array('batch_request_type' => $this->batch_request_type())
 		);
 	}
 	
@@ -208,10 +208,10 @@ 
 	 * Receives ajax calls for continuing a job
 	 */
 	public function batch_continue() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->continue_job( $job_id);
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->continue_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	/**
@@ -219,10 +219,10 @@ 
 	 * @return type
 	 */
 	public function batch_cleanup() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->cleanup_job( $job_id );
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	
@@ -238,7 +238,7 @@ 
 	 *	'isEEajax' => true,//indicates this is a response from EE
 	 * )
 	 */
-	protected function _return_json( $data ) {
+	protected function _return_json($data) {
 		$json = array(
 			'notices' => EE_Error::get_notices(),
 			'data' => $data,
@@ -247,13 +247,13 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() ) {
+		if (NULL === error_get_last() || ! headers_sent()) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}	
-		if( function_exists( 'wp_json_encode' ) ) {
-			echo wp_json_encode( $json );
+		if (function_exists('wp_json_encode')) {
+			echo wp_json_encode($json);
 		} else {
-			echo json_encode( $json );
+			echo json_encode($json);
 		}
 		exit();
 	}
@@ -270,16 +270,16 @@ 
 	 * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
 	 */
 	public function batch_request_type() {
-		if( $this->_batch_request_type === null ) {
-			if( isset( $_GET[ 'batch' ] ) ) {
-				if( $_GET[ 'batch' ] == self::batch_job ) {
+		if ($this->_batch_request_type === null) {
+			if (isset($_GET['batch'])) {
+				if ($_GET['batch'] == self::batch_job) {
 					$this->_batch_request_type = self::batch_job;
-				} elseif( $_GET[ 'batch' ] == self::batch_file_job ) {
+				} elseif ($_GET['batch'] == self::batch_file_job) {
 					$this->_batch_request_type = self::batch_file_job;
 				}
 			}
 			//if we didn't find that it was a batch request, indicate it wasn't
-			if( $this->_batch_request_type === null ) {
+			if ($this->_batch_request_type === null) {
 				$this->_batch_request_type = self::batch_not_job;
 			}
 		}
@@ -290,7 +290,7 @@ 
 	 * Unnecessary
 	 * @param type $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		
 	}
 

admin_pages/maintenance/templates/ee_system_stati_page.template.php

Spacing +9 added lines, -9 removed lines

@@ -7,7 +7,7 @@ 
 
 function ee_resurse_into_array($data) {
 	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {//is_object($incomplete_class) actually returns false, hence why we check for it
-		$data = (array)$data;
+		$data = (array) $data;
 	}
 	if (is_array($data)) {
 		if (EEH_Array::is_associative_array($data)) {
@@ -19,10 +19,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php ee_resurse_into_array($data_values);?>
+								<?php ee_resurse_into_array($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -36,31 +36,31 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>";ee_resurse_into_array($datum);echo "</li>";
+					echo "<li>"; ee_resurse_into_array($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
 		}
-	}else {
+	} else {
 		//simple value
 		echo $data;
 	}
 }
 ?>
 <h1>
-	<?php _e("System Information", "event_espresso");?>
+	<?php _e("System Information", "event_espresso"); ?>
 </h1>
 <div class="padding">
-	<h2><?php _e("Raw System Data", "event_espresso");?></h2>
+	<h2><?php _e("Raw System Data", "event_espresso"); ?></h2>
 	<textarea class="system_status_info">
 		<?php print_r($system_stati)?>
 	</textarea>
-	<h2><?php _e("System Data (formatted)", "event_espresso");?></h2>
+	<h2><?php _e("System Data (formatted)", "event_espresso"); ?></h2>
 	<table class="widefat">
 		<?php
 		foreach ($system_stati as $status_category_slug => $data) {
 			if (is_object($data)) {
-				$data = (array)$data;
+				$data = (array) $data;
 			}
 			?>
 			<thead>

admin_pages/messages/templates/ee_msg_details_main_edit_meta_box.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
 
-	<h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name . ' Custom Template' : ''; ?></h3>
+	<h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name.' Custom Template' : ''; ?></h3>
 		<input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"  />
 		<!-- if this is not a global template then let's show the name and description fields -->
-		<?php if ( ! $MTP->is_global() ) : ?>
+		<?php if ( ! $MTP->is_global()) : ?>
 			<div class="non-global-mtp-fields">
 				<p>
 					<?php _e('This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.', 'event_espresso'); ?>
@@ -25,7 +25,7 @@ 
 		<?php endif; ?>
 		<!-- we need to loop through the template_fields so we know our structure -->
 		<?php
-		if ( isset($template_fields) && !empty($template_fields) && !is_wp_error($template_fields) ) {
+		if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
 				echo $template_fields;
 		} else {
 			?>

caffeinated/admin/extend/registrations/Extend_Registrations_Admin_Page.core.php

Doc Comments -2 removed lines

@@ -631,8 +631,6 @@
 	/**
 	 * 		handles toggleing the checkin status for the registration,
 	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
 	*/
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect

Indentation +15 added lines, -15 removed lines

@@ -453,9 +453,9 @@ 
 
 	/**
 	 * 		generates Business Reports regarding Registrations
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_reports() {
 		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true );
@@ -630,10 +630,10 @@ 
 
 	/**
 	 * 		handles toggleing the checkin status for the registration,
-	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param boolean 	$check_in
+	 *		@return void
+	 */
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
@@ -754,9 +754,9 @@ 
 
 	/**
 	 * 		generates HTML for the Event Registrations List Table
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _event_registrations_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
@@ -786,11 +786,11 @@ 
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
 				),
-            'cancelled_status' => array(
+			'cancelled_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
 				),
-            'declined_status' => array(
+			'declined_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
 				),
@@ -818,9 +818,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Spacing +217 added lines, -217 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -37,20 +37,20 @@ 
 	protected $_reports_template_data = array();
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/templates/');
-		define( 'REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/assets/');
-		define( 'REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registrations/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'registrations/templates/');
+		define('REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'registrations/assets/');
+		define('REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registrations/assets/');
 	}
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'registrations';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'registrations';
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) ? ! is_array( $this->_req_data['ATT_ID'] ) : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) ? ! is_array($this->_req_data['ATT_ID']) : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -89,7 +89,7 @@ 
 				)
 			);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'reports' => array(
@@ -103,7 +103,7 @@ 
 						'filename' => 'registrations_reports'
 						)
 					),
-				'help_tour' => array( 'Registration_Reports_Help_Tour' ),
+				'help_tour' => array('Registration_Reports_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'event_registrations' => array(
@@ -134,8 +134,8 @@ 
 						'filename' => 'registrations_event_checkin_other'
 					)
 				),
-				'help_tour' => array( 'Event_Checkin_Help_Tour' ),
-				'qtips' => array('Registration_List_Table_Tips' ),
+				'help_tour' => array('Event_Checkin_Help_Tour'),
+				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Event_Registrations_List_Table',
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -156,7 +156,7 @@ 
 		// var_dump($this->_req_data);
 		// exit();
 
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 		$this->_page_config['contact_list']['list_table'] = 'Extend_EE_Attendee_Contact_List_Table';
 		$this->_page_config['default']['list_table'] = 'Extend_EE_Registrations_List_Table';
 	}
@@ -165,7 +165,7 @@ 
 
 	protected function _ajax_hooks() {
 		parent::_ajax_hooks();
-		add_action('wp_ajax_get_newsletter_form_content', array( $this, 'get_newsletter_form_content') );
+		add_action('wp_ajax_get_newsletter_form_content', array($this, 'get_newsletter_form_content'));
 	}
 
 
@@ -175,20 +175,20 @@ 
 
 		//if newsletter message type is active then let's add filter and load js for it.
 		EE_Registry::instance()->load_helper('MSG_Template');
-		if ( EEH_MSG_Template::is_mt_active('newsletter') ) {
+		if (EEH_MSG_Template::is_mt_active('newsletter')) {
 			//enqueue newsletter js
-			wp_enqueue_script( 'ee-newsletter-trigger', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.js', array( 'ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_style( 'ee-newsletter-trigger-css', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION );
+			wp_enqueue_script('ee-newsletter-trigger', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_style('ee-newsletter-trigger-css', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION);
 			//hook in buttons for newsletter message type trigger.
-			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array( $this, 'add_newsletter_action_buttons'), 10 );
+			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_newsletter_action_buttons'), 10);
 		}
 	}
 
 
 
 	public function load_scripts_styles_reports() {
-		wp_register_script( 'ee-reg-reports-js', REG_CAF_ASSETS_URL . 'ee-registration-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'ee-reg-reports-js' );
+		wp_register_script('ee-reg-reports-js', REG_CAF_ASSETS_URL.'ee-registration-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-reg-reports-js');
 		$this->_registration_reports_js_setup();
 	}
 
@@ -220,7 +220,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => !isset( $this->_req_data['event_id'] ) ? array() : array(
+				'bulk_action' => ! isset($this->_req_data['event_id']) ? array() : array(
 					'toggle_checkin_status' => __('Toggle Check-In', 'event_espresso'),
 					//'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					)
@@ -238,7 +238,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array( 'delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso') )
+				'bulk_action' => array('delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso'))
 				),
 			);
 	}
@@ -254,20 +254,20 @@ 
 	 */
 	public function get_newsletter_form_content() {
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['get_newsletter_form_content_nonce'] ) ? sanitize_text_field( $this->_req_data['get_newsletter_form_content_nonce'] ) : '';
+		$nonce = isset($this->_req_data['get_newsletter_form_content_nonce']) ? sanitize_text_field($this->_req_data['get_newsletter_form_content_nonce']) : '';
 		$nonce_ref = 'get_newsletter_form_content_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 		//let's get the mtp for the incoming MTP_ ID
-		if ( !isset( $this->_req_data['GRP_ID'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['GRP_ID'])) {
+			EE_Error::add_error(__('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		}
-		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['GRP_ID'] );
-		if ( ! $MTPG instanceof EE_Message_Template_Group ) {
-			EE_Error::add_error( sprintf( __('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID'] ), __FILE__, __FUNCTION__, __LINE__  );
+		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['GRP_ID']);
+		if ( ! $MTPG instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(sprintf(__('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID']), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
@@ -276,11 +276,11 @@ 
 		$MTPs = $MTPG->context_templates();
 		$MTPs = $MTPs['attendee'];
 		$template_fields = array();
-		foreach ( $MTPs as $MTP ) {
+		foreach ($MTPs as $MTP) {
 			$field = $MTP->get('MTP_template_field');
-			if ( $field == 'content'  ) {
+			if ($field == 'content') {
 				$content = $MTP->get('MTP_content');
-				if ( !empty( $content['newsletter_content'] ) ) {
+				if ( ! empty($content['newsletter_content'])) {
 					$template_fields['newsletter_content'] = $content['newsletter_content'];
 					}
 				continue;
@@ -293,7 +293,7 @@ 
 		$this->_template_args['data'] = array(
 			'batch_message_from' => isset($template_fields['from']) ? $template_fields['from'] : '',
 			'batch_message_subject' => isset($template_fields['subject']) ? $template_fields['subject'] : '',
-			'batch_message_content' => isset( $template_fields['newsletter_content'] ) ? $template_fields['newsletter_content'] : ''
+			'batch_message_content' => isset($template_fields['newsletter_content']) ? $template_fields['newsletter_content'] : ''
 			);
 		$this->_return_json();
 	}
@@ -309,8 +309,8 @@ 
 	 * @param EE_Admin_List_Table $list_table
 	 * @return string html string for extra buttons
 	 */
-	public function add_newsletter_action_buttons( EE_Admin_List_Table $list_table ) {
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_newsletter_selected_send' ) ) {
+	public function add_newsletter_action_buttons(EE_Admin_List_Table $list_table) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_newsletter_selected_send')) {
 			return '';
 		}
 
@@ -319,13 +319,13 @@ 
 			'event_registrations',
 			'default'
 			);
-		if ( $this->_current_page == 'espresso_registrations' && in_array( $this->_req_action, $routes_to_add_to )  ) {
-			if ( ( $this->_req_action == 'event_registrations' && empty( $this->_req_data['event_id'] ) ) || ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ) ) {
+		if ($this->_current_page == 'espresso_registrations' && in_array($this->_req_action, $routes_to_add_to)) {
+			if (($this->_req_action == 'event_registrations' && empty($this->_req_data['event_id'])) || (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash')) {
 				echo '';
 			} else {
-				$button_text = sprintf( __('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>' );
-				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>' . $button_text . '</button>';
-				add_action('admin_footer', array( $this, 'newsletter_send_form_skeleton') );
+				$button_text = sprintf(__('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>');
+				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>'.$button_text.'</button>';
+				add_action('admin_footer', array($this, 'newsletter_send_form_skeleton'));
 			}
 		}
 	}
@@ -337,38 +337,38 @@ 
 		$list_table = $this->_list_table_object;
 		$codes = array();
 		//need to templates for the newsletter message type for the template selector.
-		$values[] = array( 'text' => __('Select Template to Use', 'event_espresso'), 'id' => 0 );
-		$mtps = EEM_Message_Template_Group::instance()->get_all( array( array( 'MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email' ) ) );
-		foreach ( $mtps as $mtp ) {
+		$values[] = array('text' => __('Select Template to Use', 'event_espresso'), 'id' => 0);
+		$mtps = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email')));
+		foreach ($mtps as $mtp) {
 			$name = $mtp->name();
 			$values[] = array(
-				'text' => empty( $name ) ? __('Global', 'event_espresso') : $name,
+				'text' => empty($name) ? __('Global', 'event_espresso') : $name,
 				'id' => $mtp->ID()
 				);
 		}
 
 		//need to get a list of shortcodes that are available for the newsletter message type.
 		EE_Registry::instance()->load_helper('MSG_Template');
-		$shortcodes = EEH_MSG_Template::get_shortcodes( 'newsletter', 'email', array(), 'attendee', FALSE );
-		foreach ( $shortcodes as $field => $shortcode_array ) {
-			$codes[$field] = implode(', ', array_keys($shortcode_array ) );
+		$shortcodes = EEH_MSG_Template::get_shortcodes('newsletter', 'email', array(), 'attendee', FALSE);
+		foreach ($shortcodes as $field => $shortcode_array) {
+			$codes[$field] = implode(', ', array_keys($shortcode_array));
 		}
 
 		$shortcodes = $codes;
 
-		$form_template = REG_CAF_TEMPLATE_PATH . 'newsletter-send-form.template.php';
+		$form_template = REG_CAF_TEMPLATE_PATH.'newsletter-send-form.template.php';
 		$form_template_args = array(
 			'form_action' => admin_url('admin.php?page=espresso_registrations'),
 			'form_route' => 'newsletter_selected_send',
 			'form_nonce_name' => 'newsletter_selected_send_nonce',
-			'form_nonce' => wp_create_nonce( 'newsletter_selected_send_nonce' ),
+			'form_nonce' => wp_create_nonce('newsletter_selected_send_nonce'),
 			'redirect_back_to' => $this->_req_action,
-			'ajax_nonce' => wp_create_nonce( 'get_newsletter_form_content_nonce'),
-			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values ),
+			'ajax_nonce' => wp_create_nonce('get_newsletter_form_content_nonce'),
+			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values),
 			'shortcodes' => $shortcodes,
 			'id_type' => $list_table instanceof EE_Attendee_Contact_List_Table ? 'contact' : 'registration'
 			);
-		EEH_Template::display_template( $form_template, $form_template_args );
+		EEH_Template::display_template($form_template, $form_template_args);
 	}
 
 
@@ -383,35 +383,35 @@ 
 	protected function _newsletter_selected_send() {
 		$success = TRUE;
 		//first we need to make sure we have a GRP_ID so we know what template we're sending and updating!
-		if ( empty( $this->_req_data['newsletter_mtp_selected'] ) ) {
-			EE_Error::add_error( __('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($this->_req_data['newsletter_mtp_selected'])) {
+			EE_Error::add_error(__('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//update Message template in case there are any changes
-			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['newsletter_mtp_selected'] );
+			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['newsletter_mtp_selected']);
 			$MTPs = $MTPG instanceof EE_Message_Template_Group ? $MTPG->context_templates() : array();
-			if ( empty( $MTPs ) ) {
-				EE_Error::add_error( __('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			if (empty($MTPs)) {
+				EE_Error::add_error(__('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$success = FALSE;
 			}
 
 			//let's just update the specific fields
-			foreach ( $MTPs['attendee'] as $MTP ) {
+			foreach ($MTPs['attendee'] as $MTP) {
 				$field = $MTP->get('MTP_template_field');
 				$content = $MTP->get('MTP_content');
 				$new_content = $content;
-				switch( $field ) {
+				switch ($field) {
 					case 'from' :
-						$new_content = !empty( $this->_req_data['batch_message']['from'] ) ? $this->_req_data['batch_message']['from'] : $content;
+						$new_content = ! empty($this->_req_data['batch_message']['from']) ? $this->_req_data['batch_message']['from'] : $content;
 						break;
 					case 'subject' :
-						$new_content = !empty( $this->_req_data['batch_message']['subject'] ) ? $this->_req_data['batch_message']['subject'] : $content;
+						$new_content = ! empty($this->_req_data['batch_message']['subject']) ? $this->_req_data['batch_message']['subject'] : $content;
 						break;
 					case 'content' :
 						$new_content = $content;
-						$new_content['newsletter_content'] = !empty( $this->_req_data['batch_message']['content'] ) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content'];
+						$new_content['newsletter_content'] = ! empty($this->_req_data['batch_message']['content']) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content'];
 						break;
 					default :
 						continue;
@@ -422,20 +422,20 @@ 
 			}
 
 			//great fields are updated!  now let's make sure we just have contact objects (EE_Attendee).
-			$id_type = !empty( $this->_req_data['batch_message']['id_type'] ) ? $this->_req_data['batch_message']['id_type'] : 'registration';
+			$id_type = ! empty($this->_req_data['batch_message']['id_type']) ? $this->_req_data['batch_message']['id_type'] : 'registration';
 
 			//id_type will affect how we assemble the ids.
-			$ids = !empty( $this->_req_data['batch_message']['ids'] ) ? json_decode( stripslashes($this->_req_data['batch_message']['ids']) ) : array();
+			$ids = ! empty($this->_req_data['batch_message']['ids']) ? json_decode(stripslashes($this->_req_data['batch_message']['ids'])) : array();
 
-			$contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids( $ids ) : EEM_Attendee::instance()->get_all( array( array( 'ATT_ID' => array('in', $ids ) ) ) );
+			$contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids($ids) : EEM_Attendee::instance()->get_all(array(array('ATT_ID' => array('in', $ids))));
 
 			//we do _action because ALL triggers are handled in EED_Messages.
-			do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID() );
+			do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID());
 		}
 		$query_args = array(
-			'action' => !empty( $this->_req_data['redirect_back_to'] ) ? $this->_req_data['redirect_back_to'] : 'default'
+			'action' => ! empty($this->_req_data['redirect_back_to']) ? $this->_req_data['redirect_back_to'] : 'default'
 			);
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -457,8 +457,8 @@ 
 	*		@return void
 	*/
 	protected function _registration_reports() {
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true );
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, true);
 		// the final template wrapper
 		$this->display_admin_page_with_no_sidebar();
 
@@ -471,41 +471,41 @@ 
 	 *
 	 * @return string
 	 */
-	private function _registrations_per_day_report( $period = '-1 month' ) {
+	private function _registrations_per_day_report($period = '-1 month') {
 		$report_ID = 'reg-admin-registrations-per-day-report-dv';
 
 		$REG = EEM_Registration::instance();
 
-		$results = $REG->get_registrations_per_day_report( $period );
+		$results = $REG->get_registrations_per_day_report($period);
 
 		$results = (array) $results;
 		$regs = array();
 		$subtitle = '';
 
-		if( $results ) {
-			$regs[] = array( __( 'Date (only days with registrations are shown)', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				$regs[] = array( $result->regDate, (int) $result->total );
+		if ($results) {
+			$regs[] = array(__('Date (only days with registrations are shown)', 'event_espresso'), __('Total Registrations', 'event_espresso'));
+			foreach ($results as $result) {
+				$regs[] = array($result->regDate, (int) $result->total);
 			}
 
 			//setup the date range.
-			EE_Registry::instance()->load_helper( 'DTT_Helper' );
-			$beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			EE_Registry::instance()->load_helper('DTT_Helper');
+			$beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = __( 'Total Registrations per Day', 'event_espresso' );
+		$report_title = __('Total Registrations per Day', 'event_espresso');
 
 		$report_params = array(
 			'title' 	=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 		=> $report_ID,
 			'regs' 	=> $regs,
-			'noResults' => empty( $regs ),
-			'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ),
+			'noResults' => empty($regs),
+			'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'),
 		);
-		wp_localize_script( 'ee-reg-reports-js', 'regPerDay', $report_params );
+		wp_localize_script('ee-reg-reports-js', 'regPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -517,41 +517,41 @@ 
 	 *
 	 * @return string
 	 */
-	private function _registrations_per_event_report( $period = '-1 month' ) {
+	private function _registrations_per_event_report($period = '-1 month') {
 
 		$report_ID = 'reg-admin-registrations-per-event-report-dv';
 
 		$REG = EEM_Registration::instance();
 
-		$results = $REG->get_registrations_per_event_report( $period );
+		$results = $REG->get_registrations_per_event_report($period);
 		$results = (array) $results;
 		$regs = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$regs[] = array( __( 'Event', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				$regs[] = array( wp_trim_words( $result->event_name, 4, '...' ), (int) $result->total );
+		if ($results) {
+			$regs[] = array(__('Event', 'event_espresso'), __('Total Registrations', 'event_espresso'));
+			foreach ($results as $result) {
+				$regs[] = array(wp_trim_words($result->event_name, 4, '...'), (int) $result->total);
 			}
 
 			//setup the date range.
-			EE_Registry::instance()->load_helper( 'DTT_Helper' );
-			$beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			EE_Registry::instance()->load_helper('DTT_Helper');
+			$beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = __( 'Total Registrations per Event', 'event_espresso' );
+		$report_title = __('Total Registrations per Event', 'event_espresso');
 
 		$report_params = array(
 			'title' 	=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 		=> $report_ID,
 			'regs' 	=> $regs,
-			'noResults' => empty( $regs ),
-			'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ),
+			'noResults' => empty($regs),
+			'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'),
 		);
-		wp_localize_script( 'ee-reg-reports-js', 'regPerEvent', $report_params );
+		wp_localize_script('ee-reg-reports-js', 'regPerEvent', $report_params);
 
 		return $report_ID;
 	}
@@ -565,8 +565,8 @@ 
 	 * @return void
 	 */
 	protected function _registration_checkin_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$reg_id = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$reg_id = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : null;
 		$reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
 		$this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $reg->event_ID()), 'add-new-h2');
 
@@ -580,15 +580,15 @@ 
 				'desc' => __('This indicates the attendee has been checked out', 'event_espresso')
 				)
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
 
-		$dtt_id = isset(  $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
-		$go_back_url = !empty( $reg_id )  ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id ), $this->_admin_base_url ) : '';
+		$dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
+		$go_back_url = ! empty($reg_id) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id), $this->_admin_base_url) : '';
 
-		$this->_template_args['before_list_table'] = !empty( $reg_id ) && !empty( $dtt_id ) ? '<h2>' . sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">' . EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name() . '</span>', '<span id="checkin-dtt"><a href="' . $go_back_url . '">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time() . ' - ' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time() . '</a></span>', '<span id="checkin-event-name">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name') . '</span>' ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $reg_id ) ? '<input type="hidden" name="_REGID" value="' . $reg_id . '">' : '';
-		$this->_template_args['list_table_hidden_fields'] .= !empty( $dtt_id ) ? '<input type="hidden" name="DTT_ID" value="' . $dtt_id . '">' : '';
+		$this->_template_args['before_list_table'] = ! empty($reg_id) && ! empty($dtt_id) ? '<h2>'.sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">'.EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name().'</span>', '<span id="checkin-dtt"><a href="'.$go_back_url.'">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time().' - '.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time().'</a></span>', '<span id="checkin-event-name">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name').'</span>').'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($reg_id) ? '<input type="hidden" name="_REGID" value="'.$reg_id.'">' : '';
+		$this->_template_args['list_table_hidden_fields'] .= ! empty($dtt_id) ? '<input type="hidden" name="DTT_ID" value="'.$dtt_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -601,24 +601,24 @@ 
 	 */
 	public function toggle_checkin_status() {
 		//first make sure we have the necessary data
-		if ( !isset( $this->_req_data['_regid'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['_regid'])) {
+			EE_Error::add_error(__('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		};
 
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['checkinnonce'] ) ? sanitize_text_field( $this->_req_data['checkinnonce'] ) : '';
+		$nonce = isset($this->_req_data['checkinnonce']) ? sanitize_text_field($this->_req_data['checkinnonce']) : '';
 		$nonce_ref = 'checkin_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
 		//beautiful! Made it this far so let's get the status.
 		$new_status = $this->_toggle_checkin_status();
 
 		//setup new class to return via ajax
-		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-' . $new_status;
+		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-'.$new_status;
 		$this->_template_args['success'] = TRUE;
 		$this->_return_json();
 	}
@@ -638,32 +638,32 @@ 
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
 			'action' => 'event_registrations',
-			'event_id' => isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL,
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL
+			'event_id' => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL,
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL
 			);
 		$new_status = FALSE;
 
 		// bulk action check in toggle
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// cycle thru checkboxes
-			while ( list( $REG_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+			while (list($REG_ID, $value) = each($this->_req_data['checkbox'])) {
+				$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 				$new_status = $this->_toggle_checkin($REG_ID, $DTT_ID);
 			}
 
-		} elseif ( isset( $this->_req_data['_regid'] ) ) {
+		} elseif (isset($this->_req_data['_regid'])) {
 			//coming from ajax request
-			$DTT_ID = isset( $this->_req_data['dttid'] ) ? $this->_req_data['dttid'] : NULL;
+			$DTT_ID = isset($this->_req_data['dttid']) ? $this->_req_data['dttid'] : NULL;
 			$query_args['DTT_ID'] = $DTT_ID;
 			$new_status = $this->_toggle_checkin($this->_req_data['_regid'], $DTT_ID);
 		} else {
-			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
+			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( defined('DOING_AJAX' ) )
+		if (defined('DOING_AJAX'))
 			return $new_status;
 
-		$this->_redirect_after_action( FALSE,'', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -679,11 +679,11 @@ 
 	 */
 	private function _toggle_checkin($REG_ID, $DTT_ID) {
 		$REG = EEM_Registration::instance()->get_one_by_ID($REG_ID);
-		$new_status = $REG->toggle_checkin_status( $DTT_ID );
-		if ( $new_status !== FALSE ) {
-			EE_Error::add_success($REG->get_checkin_msg($DTT_ID) );
+		$new_status = $REG->toggle_checkin_status($DTT_ID);
+		if ($new_status !== FALSE) {
+			EE_Error::add_success($REG->get_checkin_msg($DTT_ID));
 		} else {
-			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__);
 			$new_status = FALSE;
 		}
 		return $new_status;
@@ -699,28 +699,28 @@ 
 	protected function _delete_checkin_rows() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
-			while ( list( $CHK_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			while (list($CHK_ID, $value) = each($this->_req_data['checkbox'])) {
 				$errors = 0;
-				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID ) ) {
+				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID)) {
 					$errors++;
 				}
 			}
 		} else {
-			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 		}
 
-		if ( $errors > 0 ) {
-			EE_Error::add_error( sprintf( __('There were %d records that did not delete successfully', 'event_espresso'), $errors ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($errors > 0) {
+			EE_Error::add_error(sprintf(__('There were %d records that did not delete successfully', 'event_espresso'), $errors), __FILE__, __FUNCTION__, __LINE__);
 		} else {
-			EE_Error::add_success( __('Records were successfully deleted', 'event_espresso') );
+			EE_Error::add_success(__('Records were successfully deleted', 'event_espresso'));
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -732,20 +732,20 @@ 
 	protected function _delete_checkin_row() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
 
-		if ( !empty( $this->_req_data['CHK_ID'] ) ) {
-			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'] ) ) {
-				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($this->_req_data['CHK_ID'])) {
+			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'])) {
+				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_success( __('Check-In record successfully deleted', 'event_espresso') );
+				EE_Error::add_success(__('Check-In record successfully deleted', 'event_espresso'));
 			}
 		} else {
-			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -758,8 +758,8 @@ 
 	*		@return void
 	*/
 	protected function _event_registrations_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_admin_page_title .= isset($this->_req_data['event_id']) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
 
 		$legend_items = array(
 			'star-icon' => array(
@@ -783,31 +783,31 @@ 
 				'desc' => __('View All Check-in Records for this Registrant', 'event_espresso')
 				),
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
             'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				),
             'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				)/**/
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
-		$event_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null;
-		$this->_template_args['before_list_table'] = !empty( $event_id ) ? '<h2>' . sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name') ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $event_id ) ? '<input type="hidden" name="event_id" value="' . $event_id . '">' : '';
+		$event_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null;
+		$this->_template_args['before_list_table'] = ! empty($event_id) ? '<h2>'.sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name')).'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($event_id) ? '<input type="hidden" name="event_id" value="'.$event_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -821,15 +821,15 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
+	public function get_event_attendees($per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '') {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once(EE_MODELS . 'EEM_Attendee.model.php');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(EE_MODELS.'EEM_Attendee.model.php');
 		//$ATT_MDL = EEM_Attendee::instance();
 
-		$EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = isset($this->_req_data['category_id']) ? absint( $this->_req_data['category_id'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = isset($this->_req_data['category_id']) ? absint($this->_req_data['category_id']) : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : $orderby;
 
@@ -842,94 +842,94 @@ 
 //				$orderby = 'reg.REG_final_price';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count ? NULL : array( $offset, $per_page );
-		$query_params = array(array('Event.status'=>array('IN',  array_keys(EEM_Event::instance()->get_status_array()))));
-		if ($EVT_ID){
-			$query_params[0]['EVT_ID']=$EVT_ID;
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
+		$query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array()))));
+		if ($EVT_ID) {
+			$query_params[0]['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			throw new EE_Error("You specified a Category Id for this query. Thats odd because we are now using terms and taxonomies. So did you mean the term taxonomy id o rthe term id?");
 		}
 
 		//if DTT is included we do multiple datetimes.
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
 
 		//make sure we only have default where on the current regs
 		$query_params['default_where_conditions'] = 'this_model_only';
 
-		$status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) );
+		$status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved));
 
-		$query_params[0]['STS_ID']= array('IN', $status_ids_array );
+		$query_params[0]['STS_ID'] = array('IN', $status_ids_array);
 
-		if($trash){
-			$query_params[0]['Attendee.status']=  EEM_CPT_Base::post_status_trashed;
+		if ($trash) {
+			$query_params[0]['Attendee.status'] = EEM_CPT_Base::post_status_trashed;
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params['order_by'][$orderby] = $sort;
 		$query_params['limit'] = $limit;
-		$query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
-		if($count){
-			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only' ));
-		}else{
+		$query_params['force_join'] = array('Attendee'); //force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
+		if ($count) {
+			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only'));
+		} else {
 			$registrations = EEM_Registration::instance()->get_all($query_params);
 
 
 	//		$registrations = EEM_Registration::instance();
 	//		$all_attendees = EEM_Attendee::instance()->get_event_attendees( $EVT_ID, $CAT_ID, $reg_status, $trash, $orderby, $sort, $limit, $output );
-			if ( isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration ) {
+			if (isset($registrations[0]) && $registrations[0] instanceof EE_Registration) {
 				//EEH_Debug_Tools::printr( $all_attendees[0], '$all_attendees[0]  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				// name
 				$first_registration = $registrations[0];
 				$event_obj = $first_registration->event_obj();
-				if($event_obj){
+				if ($event_obj) {
 					$event_name = $first_registration->event_obj()->name();
-					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?';//$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?'; //$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 					// edit event link
-					if ( $event_name != '' ) {
-						$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+					if ($event_name != '') {
+						$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 					}
 
-					$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+					$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 					$this->_template_args['before_admin_page_content'] = '
 				<div id="admin-page-header">
-					<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-					<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+					<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+					<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 				</div>
 				';
 				}

caffeinated/admin/extend/transactions/Extend_Transactions_Admin_Page.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 	 * generates Business Report showing total revenue per event.
 	 *
 	 * @param string $period  The period (acceptable by PHP Datetime constructor) for which the report is generated.
-	 * @return int
+	 * @return string
 	 */
 	private function _revenue_per_event_report( $period = '-1 month' ) {
 

Indentation +3 added lines, -3 removed lines

@@ -122,9 +122,9 @@
 	/**
 	 * _transaction_reports
 	 * 	generates Business Reports regarding Transactions
-	*
-	* @return void
-	*/
+	 *
+	 * @return void
+	 */
 	protected function _transaction_reports() {
 		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
 		$this->_admin_page_title = __('Transactions', 'event_espresso');

Spacing +46 added lines, -46 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -42,11 +42,11 @@ 
 	 * @param bool $routing
 	 * @return \Extend_Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-		define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-		define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
 	}
 
 
@@ -58,7 +58,7 @@ 
 	 * @return void
 	 */
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -67,7 +67,7 @@ 
 			)
 		);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'reports' => array(
@@ -81,11 +81,11 @@ 
 						'filename' => 'transactions_reports'
 					)
 				),
-				'help_tour' => array( 'Transaction_Reports_Help_Tour' ),
+				'help_tour' => array('Transaction_Reports_Help_Tour'),
 				'require_nonce' => FALSE
 			)
 		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @return void
 	 */
 	public function load_scripts_styles_reports() {
-		wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'ee-txn-reports-js' );
+		wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-txn-reports-js');
 		$this->_transaction_reports_js_setup();
 		EE_Registry::instance()->load_helper('Money');
 		EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
@@ -126,9 +126,9 @@ 
 	* @return void
 	*/
 	protected function _transaction_reports() {
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
 		$this->_admin_page_title = __('Transactions', 'event_espresso');
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE);
 
 		// the final template wrapper
 		$this->display_admin_page_with_no_sidebar();
@@ -143,43 +143,43 @@ 
 	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return string
 	 */
-	private function _revenue_per_day_report( $period = '-1 month' ) {
+	private function _revenue_per_day_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-day-report-dv';
 
 		$TXN = EEM_Transaction::instance();
 
-		$results = $TXN->get_revenue_per_day_report( $period );
+		$results = $TXN->get_revenue_per_day_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$revenue[] = array( $result->txnDate, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$revenue[] = array($result->txnDate, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			EE_Registry::instance()->load_helper( 'DTT_Helper' );
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			EE_Registry::instance()->load_helper('DTT_Helper');
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = __( 'Total Revenue per Day' );
+		$report_title = __('Total Revenue per Day');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -193,44 +193,44 @@ 
 	 * @param string $period  The period (acceptable by PHP Datetime constructor) for which the report is generated.
 	 * @return int
 	 */
-	private function _revenue_per_event_report( $period = '-1 month' ) {
+	private function _revenue_per_event_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-event-report-dv';
 
 		$TXN = EEM_Transaction::instance();
-		$results = $TXN->get_revenue_per_event_report( $period );
+		$results = $TXN->get_revenue_per_event_report($period);
 		$results = (array) $results;
 		$revenue = array();
 		$subtitle = '';
 
-		if ( $results ) {
-			$revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) );
-			foreach ( $results as $result ) {
-				if ( $result->revenue > 1 ) {
-					$event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) );
-					$event_name = wp_trim_words( $event_name, 5, '...' );
-					$revenue[]  = array( $event_name, (float) $result->revenue );
+		if ($results) {
+			$revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso'));
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+					$event_name = wp_trim_words($event_name, 5, '...');
+					$revenue[]  = array($event_name, (float) $result->revenue);
 				}
 			}
 
 			//setup the date range.
-			EE_Registry::instance()->load_helper( 'DTT_Helper' );
-			$beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) );
-			$subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) );
+			EE_Registry::instance()->load_helper('DTT_Helper');
+			$beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d'));
 		}
 
-		$report_title = __( 'Total Revenue per Event' );
+		$report_title = __('Total Revenue per Event');
 
 		$report_params = array(
 			'title' 		=> $report_title,
 			'subtitle' => $subtitle,
 			'id' 			=> $report_ID,
 			'revenue' => $revenue,
-			'noResults' => empty( $revenue ),
-			'noTxnMsg'	=> sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' )
+			'noResults' => empty($revenue),
+			'noTxnMsg'	=> sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>')
 		);
-		wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params );
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
 
 		return $report_ID;
 	}

core/helpers/EEH_Activation.helper.php

Indentation +10 added lines, -10 removed lines

@@ -1100,14 +1100,14 @@ 
 							$QSG_ID = reset( $id_col );
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
-                                                        EE_Log::instance()->log(
-                                                                __FILE__,
-                                                                __FUNCTION__,
-                                                                sprintf(
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
-                                                                        $QST_ID ),
-                                                                'error' );
-                                                        continue;
+														EE_Log::instance()->log(
+																__FILE__,
+																__FUNCTION__,
+																sprintf(
+																		__( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
+																		$QST_ID ),
+																'error' );
+														continue;
 						}
 					}
 
@@ -1509,8 +1509,8 @@ 
 				}
 			}
 		}
-                //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+				//also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
+				remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
 
 		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
 			$db_update_sans_ee4 = array();

Spacing +370 added lines, -370 removed lines

@@ -57,9 +57,9 @@ 
 	 * @param $table_name
 	 * @return string
 	 */
-	public static function ensure_table_name_has_prefix( $table_name ) {
+	public static function ensure_table_name_has_prefix($table_name) {
 		global $wpdb;
-		return strpos( $table_name, $wpdb->prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name;
+		return strpos($table_name, $wpdb->prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
 	}
 
 
@@ -85,7 +85,7 @@ 
 	 * be called on plugin activation and reactivation
 	 * @return boolean success, whether the database and folders are setup properly
 	 */
-	public static function initialize_db_and_folders(){
+	public static function initialize_db_and_folders() {
 		$good_filesystem = EEH_Activation::create_upload_directories();
 		$good_db = EEH_Activation::create_database_tables();
 		return $good_filesystem && $good_db;
@@ -99,9 +99,9 @@ 
 	 * upon activation of a new plugin, reactivation, and at the end
 	 * of running migration scripts
 	 */
-	public static function initialize_db_content(){
+	public static function initialize_db_content() {
 		//let's avoid doing all this logic repeatedly, especially when addons are requesting it
-		if( EEH_Activation::$_initialized_db_content_already_in_this_request ) {
+		if (EEH_Activation::$_initialized_db_content_already_in_this_request) {
 			return;
 		}
 		EEH_Activation::$_initialized_db_content_already_in_this_request = true;
@@ -118,7 +118,7 @@ 
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::create_cron_tasks();
 		//also, check for CAF default db content
-		do_action( 'AHEE__EEH_Activation__initialize_db_content' );
+		do_action('AHEE__EEH_Activation__initialize_db_content');
 		//also: EEM_Gateways::load_all_gateways() outputs a lot of success messages
 		//which users really won't care about on initial activation
 		EE_Error::overwrite_success();
@@ -137,7 +137,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function get_cron_tasks( $which_to_include ) {
+	public static function get_cron_tasks($which_to_include) {
 		$cron_tasks = apply_filters(
 			'FHEE__EEH_Activation__get_cron_tasks',
 			array(
@@ -146,17 +146,17 @@ 
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment' => EEH_Activation::cron_task_no_longer_in_use, //there may have been a bug which prevented from these cron tasks from getting unscheduled, so we might want to remove these for a few updates
 			)
 		);
-		if( $which_to_include === 'all' ) {
+		if ($which_to_include === 'all') {
 			//leave as-is
-		}elseif( $which_to_include === 'old' ) {
-			$cron_tasks = array_filter( $cron_tasks, function ( $value ) {
+		}elseif ($which_to_include === 'old') {
+			$cron_tasks = array_filter($cron_tasks, function($value) {
 				return $value === EEH_Activation::cron_task_no_longer_in_use;
 			});
-		}elseif( $which_to_include === 'current' ) {
-			$cron_tasks = array_filter( $cron_tasks );
-		}elseif( WP_DEBUG ) {
-			throw new EE_Error( sprintf( __( 'Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso' ), $which_to_include ) );
-		}else{
+		}elseif ($which_to_include === 'current') {
+			$cron_tasks = array_filter($cron_tasks);
+		}elseif (WP_DEBUG) {
+			throw new EE_Error(sprintf(__('Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso'), $which_to_include));
+		} else {
 			//leave as-is
 		}
 		return $cron_tasks;
@@ -167,9 +167,9 @@ 
 	 */
 	public static function create_cron_tasks() {
 
-		foreach( EEH_Activation::get_cron_tasks( 'current' ) as $hook_name => $frequency ) {
-			if( ! wp_next_scheduled( $hook_name ) ) {
-				wp_schedule_event( time(), $frequency, $hook_name );
+		foreach (EEH_Activation::get_cron_tasks('current') as $hook_name => $frequency) {
+			if ( ! wp_next_scheduled($hook_name)) {
+				wp_schedule_event(time(), $frequency, $hook_name);
 			}
 		}
 
@@ -179,10 +179,10 @@ 
 	 * Remove the currently-existing and now-removed cron tasks.
 	 * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones
 	 */
-	public static function remove_cron_tasks( $remove_all = true ) {
+	public static function remove_cron_tasks($remove_all = true) {
 		$cron_tasks_to_remove = $remove_all ? 'all' : 'old';
 		$crons = _get_cron_array();
-		$crons = is_array( $crons ) ? $crons : array();
+		$crons = is_array($crons) ? $crons : array();
 		/* reminder that $crons looks like: top-level keys are timestamps,
 		 * and their values are arrays.
 		 * The 2nd level arrays have keys with each of the cron task hooknames to run at that time
@@ -200,14 +200,14 @@ 
 		 *					...
 		 *      ...
 		 */
-		foreach( EEH_Activation::get_cron_tasks( $cron_tasks_to_remove ) as $hook_name => $frequency ) {
-			foreach( $crons as $timestamp => $hooks_to_fire_at_time ) {
-				if ( array_key_exists( $hook_name, $hooks_to_fire_at_time ) )  {
-					unset( $crons[ $timestamp ][ $hook_name ] );
+		foreach (EEH_Activation::get_cron_tasks($cron_tasks_to_remove) as $hook_name => $frequency) {
+			foreach ($crons as $timestamp => $hooks_to_fire_at_time) {
+				if (array_key_exists($hook_name, $hooks_to_fire_at_time)) {
+					unset($crons[$timestamp][$hook_name]);
 				}
 			}
 		}
-		_set_cron_array( $crons );
+		_set_cron_array($crons);
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 */
 	public static function CPT_initialization() {
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
+		EE_Registry::instance()->load_core('Register_CPTs');
 		flush_rewrite_rules();
 	}
 
@@ -240,8 +240,8 @@ 
 	 * 	@return void
 	 */
 	public static function reset_and_update_config() {
-		do_action( 'AHEE__EE_Config___load_core_config__start', array( 'EEH_Activation', 'load_calendar_config' ) );
-		add_filter( 'FHEE__EE_Config___load_core_config__config_settings', array( 'EEH_Activation', 'migrate_old_config_data' ), 10, 3 );
+		do_action('AHEE__EE_Config___load_core_config__start', array('EEH_Activation', 'load_calendar_config'));
+		add_filter('FHEE__EE_Config___load_core_config__config_settings', array('EEH_Activation', 'migrate_old_config_data'), 10, 3);
 		//EE_Config::reset();
 	}
 
@@ -254,23 +254,23 @@ 
 	 */
 	public static function load_calendar_config() {
 		// grab array of all plugin folders and loop thru it
-		$plugins = glob( WP_PLUGIN_DIR . DS . '*', GLOB_ONLYDIR );
-		if ( empty( $plugins ) ) {
+		$plugins = glob(WP_PLUGIN_DIR.DS.'*', GLOB_ONLYDIR);
+		if (empty($plugins)) {
 			return;
 		}
-		foreach ( $plugins as $plugin_path ) {
+		foreach ($plugins as $plugin_path) {
 			// grab plugin folder name from path
-			$plugin = basename( $plugin_path );
+			$plugin = basename($plugin_path);
 			// drill down to Espresso plugins
-			if ( strpos( $plugin, 'espresso' ) !== FALSE || strpos( $plugin, 'Espresso' ) !== FALSE || strpos( $plugin, 'ee4' ) !== FALSE || strpos( $plugin, 'EE4' ) !== FALSE ) {
+			if (strpos($plugin, 'espresso') !== FALSE || strpos($plugin, 'Espresso') !== FALSE || strpos($plugin, 'ee4') !== FALSE || strpos($plugin, 'EE4') !== FALSE) {
 				// then to calendar related plugins
-				if ( strpos( $plugin, 'calendar' ) !== FALSE ) {
+				if (strpos($plugin, 'calendar') !== FALSE) {
 					// this is what we are looking for
-					$calendar_config = $plugin_path . DS . 'EE_Calendar_Config.php';
+					$calendar_config = $plugin_path.DS.'EE_Calendar_Config.php';
 					// does it exist in this folder ?
-					if ( is_readable( $calendar_config )) {
+					if (is_readable($calendar_config)) {
 						// YEAH! let's load it
-						require_once( $calendar_config );
+						require_once($calendar_config);
 					}
 				}
 			}
@@ -287,21 +287,21 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \stdClass
 	 */
-	public static function migrate_old_config_data( $settings = array(), $config = '', EE_Config $EE_Config ) {
-		$convert_from_array = array( 'addons' );
+	public static function migrate_old_config_data($settings = array(), $config = '', EE_Config $EE_Config) {
+		$convert_from_array = array('addons');
 		// in case old settings were saved as an array
-		if ( is_array( $settings ) && in_array( $config, $convert_from_array )) {
+		if (is_array($settings) && in_array($config, $convert_from_array)) {
 			// convert existing settings to an object
 			$config_array = $settings;
 			$settings = new stdClass();
-			foreach ( $config_array as $key => $value ){
-				if ( $key == 'calendar' && class_exists( 'EE_Calendar_Config' )) {
-					$EE_Config->set_config( 'addons', 'EE_Calendar', 'EE_Calendar_Config', $value );
+			foreach ($config_array as $key => $value) {
+				if ($key == 'calendar' && class_exists('EE_Calendar_Config')) {
+					$EE_Config->set_config('addons', 'EE_Calendar', 'EE_Calendar_Config', $value);
 				} else {
 					$settings->{$key} = $value;
 				}
 			}
-			add_filter( 'FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true' );
+			add_filter('FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true');
 		}
 		return $settings;
 	}
@@ -317,8 +317,8 @@ 
 	 */
 	public static function deactivate_event_espresso() {
 		// check permissions
-		if ( current_user_can( 'activate_plugins' )) {
-			deactivate_plugins( EE_PLUGIN_BASENAME, TRUE );
+		if (current_user_can('activate_plugins')) {
+			deactivate_plugins(EE_PLUGIN_BASENAME, TRUE);
 		}
 	}
 
@@ -340,25 +340,25 @@ 
 		$critical_pages = array(
 			array(
 				'id' =>'reg_page_id',
-				'name' => __( 'Registration Checkout', 'event_espresso' ),
+				'name' => __('Registration Checkout', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CHECKOUT'
 			),
 			array(
 				'id' => 'txn_page_id',
-				'name' => __( 'Transactions', 'event_espresso' ),
+				'name' => __('Transactions', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_TXN_PAGE'
 			),
 			array(
 				'id' => 'thank_you_page_id',
-				'name' => __( 'Thank You', 'event_espresso' ),
+				'name' => __('Thank You', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_THANK_YOU'
 			),
 			array(
 				'id' => 'cancel_page_id',
-				'name' => __( 'Registration Cancelled', 'event_espresso' ),
+				'name' => __('Registration Cancelled', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CANCELLED'
 			),
@@ -366,62 +366,62 @@ 
 
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 
-		foreach ( $critical_pages as $critical_page ) {
+		foreach ($critical_pages as $critical_page) {
 			// is critical page ID set in config ?
-			if ( $EE_Core_Config->{$critical_page[ 'id' ]} !== FALSE ) {
+			if ($EE_Core_Config->{$critical_page['id']} !== FALSE) {
 				// attempt to find post by ID
-				$critical_page['post'] = get_post( $EE_Core_Config->{$critical_page[ 'id' ]} );
+				$critical_page['post'] = get_post($EE_Core_Config->{$critical_page['id']} );
 			}
 			// no dice?
-			if ( $critical_page['post'] == NULL ) {
+			if ($critical_page['post'] == NULL) {
 				// attempt to find post by title
-				$critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] );
+				$critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']);
 				// still nothing?
-				if ( $critical_page['post'] == NULL ) {
-					$critical_page = EEH_Activation::create_critical_page( $critical_page );
+				if ($critical_page['post'] == NULL) {
+					$critical_page = EEH_Activation::create_critical_page($critical_page);
 					// REALLY? Still nothing ??!?!?
-					if ( $critical_page['post'] == NULL ) {
-						$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ($critical_page['post'] == NULL) {
+						$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						break;
 					}
 				}
 			}
 			// track post_shortcodes
-			if ( $critical_page['post'] ) {
-				EEH_Activation::_track_critical_page_post_shortcodes( $critical_page );
+			if ($critical_page['post']) {
+				EEH_Activation::_track_critical_page_post_shortcodes($critical_page);
 			}
 			// check that Post ID matches critical page ID in config
 			if (
-				isset( $critical_page['post']->ID )
-				&& $critical_page['post']->ID != $EE_Core_Config->{$critical_page[ 'id' ]}
+				isset($critical_page['post']->ID)
+				&& $critical_page['post']->ID != $EE_Core_Config->{$critical_page['id']}
 			) {
 				//update Config with post ID
-				$EE_Core_Config->{$critical_page[ 'id' ]} = $critical_page['post']->ID;
-				if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) {
-					$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				$EE_Core_Config->{$critical_page['id']} = $critical_page['post']->ID;
+				if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+					$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 
 			$critical_page_problem =
-				! isset( $critical_page['post']->post_status )
+				! isset($critical_page['post']->post_status)
 				|| $critical_page['post']->post_status != 'publish'
-				|| strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE
+				|| strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE
 					? TRUE
 					: $critical_page_problem;
 
 		}
 
-		if ( $critical_page_problem ) {
+		if ($critical_page_problem) {
 			$msg = sprintf(
-				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ),
-				'<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>'
+				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'),
+				'<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>'
 			);
-			EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg );
+			EE_Error::add_persistent_admin_notice('critical_page_problem', $msg);
 		}
-		if ( EE_Error::has_notices() ) {
-			EE_Error::get_notices( FALSE, TRUE, TRUE );
+		if (EE_Error::has_notices()) {
+			EE_Error::get_notices(FALSE, TRUE, TRUE);
 		}
 	}
 
@@ -433,13 +433,13 @@ 
 	 * parameter to the shortcode
 	 * @return WP_Post or NULl
 	 */
-	public static function get_page_by_ee_shortcode($ee_shortcode){
+	public static function get_page_by_ee_shortcode($ee_shortcode) {
 		global $wpdb;
 		$shortcode_and_opening_bracket = '['.$ee_shortcode;
 		$post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1");
-		if($post_id){
+		if ($post_id) {
 			return get_post($post_id);
-		}else{
+		} else {
 			return NULL;
 		}
 
@@ -456,32 +456,32 @@ 
 	 * @param array $critical_page
 	 * @return array
 	 */
-	public static function create_critical_page( $critical_page ) {
+	public static function create_critical_page($critical_page) {
 
 		$post_args = array(
 			'post_title' => $critical_page['name'],
 			'post_status' => 'publish',
 			'post_type' => 'page',
 			'comment_status' => 'closed',
-			'post_content' => '[' . $critical_page['code'] . ']'
+			'post_content' => '['.$critical_page['code'].']'
 		);
 
-		$post_id = wp_insert_post( $post_args );
-		if ( ! $post_id ) {
+		$post_id = wp_insert_post($post_args);
+		if ( ! $post_id) {
 			$msg = sprintf(
-				__( 'The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso' ),
+				__('The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return $critical_page;
 		}
 		// get newly created post's details
-		if ( ! $critical_page['post'] = get_post( $post_id )) {
+		if ( ! $critical_page['post'] = get_post($post_id)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ),
+				__('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		return $critical_page;
@@ -500,35 +500,35 @@ 
 	 * @param array $critical_page
 	 * @return void
 	 */
-	private static function _track_critical_page_post_shortcodes( $critical_page = array() ) {
+	private static function _track_critical_page_post_shortcodes($critical_page = array()) {
 		// check the goods
-		if ( ! $critical_page['post'] instanceof WP_Post ) {
+		if ( ! $critical_page['post'] instanceof WP_Post) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 		// map shortcode to post
-		$EE_Core_Config->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID;
+		$EE_Core_Config->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID;
 		// and make sure it's NOT added to the WP "Posts Page"
 		// name of the WP Posts Page
 		$posts_page = EE_Registry::instance()->CFG->get_page_for_posts();
-		if ( isset( $EE_Core_Config->post_shortcodes[ $posts_page ] )) {
-			unset( $EE_Core_Config->post_shortcodes[ $posts_page ][ $critical_page['code'] ] );
+		if (isset($EE_Core_Config->post_shortcodes[$posts_page])) {
+			unset($EE_Core_Config->post_shortcodes[$posts_page][$critical_page['code']]);
 		}
-		if ( $posts_page != 'posts' && isset( $EE_Core_Config->post_shortcodes['posts'] )) {
-			unset( $EE_Core_Config->post_shortcodes['posts'][ $critical_page['code'] ] );
+		if ($posts_page != 'posts' && isset($EE_Core_Config->post_shortcodes['posts'])) {
+			unset($EE_Core_Config->post_shortcodes['posts'][$critical_page['code']]);
 		}
 		// update post_shortcode CFG
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -546,24 +546,24 @@ 
 	public static function get_default_creator_id() {
 		global $wpdb;
 
-		if ( ! empty( self::$_default_creator_id ) ) {
+		if ( ! empty(self::$_default_creator_id)) {
 			return self::$_default_creator_id;
 		}/**/
 
-		$role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' );
+		$role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator');
 
 		//let's allow pre_filtering for early exits by alternative methods for getting id.  We check for truthy result and if so then exit early.
-		$pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check );
-		if ( $pre_filtered_id !== false ) {
+		$pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check);
+		if ($pre_filtered_id !== false) {
 			return (int) $pre_filtered_id;
 		}
 
-		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix( 'capabilities' );
-		$query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' );
-		$user_id = $wpdb->get_var( $query );
-		 $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id );
-		 if ( $user_id && intval( $user_id ) ) {
-		 	self::$_default_creator_id =  intval( $user_id );
+		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix('capabilities');
+		$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%');
+		$user_id = $wpdb->get_var($query);
+		 $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id);
+		 if ($user_id && intval($user_id)) {
+		 	self::$_default_creator_id = intval($user_id);
 		 	return self::$_default_creator_id;
 		 } else {
 		 	return NULL;
@@ -590,29 +590,29 @@ 
 	 * 	@return void
 	 * @throws EE_Error if there are database errors
 	 */
-	public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false ) {
-		if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){
+	public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false) {
+		if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! function_exists( 'dbDelta' )) {
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! function_exists('dbDelta')) {
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 		}
 		/** @var WPDB $wpdb */
 		global $wpdb;
-		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		// do we need to first delete an existing version of this table ?
-		if ( $drop_pre_existing_table && EEH_Activation::table_exists( $wp_table_name ) ){
+		if ($drop_pre_existing_table && EEH_Activation::table_exists($wp_table_name)) {
 			// ok, delete the table... but ONLY if it's empty
-			$deleted_safely = EEH_Activation::delete_db_table_if_empty( $wp_table_name );
+			$deleted_safely = EEH_Activation::delete_db_table_if_empty($wp_table_name);
 			// table is NOT empty, are you SURE you want to delete this table ???
-			if ( ! $deleted_safely && defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){
-				EEH_Activation::delete_unused_db_table( $wp_table_name );
-			} else if ( ! $deleted_safely ) {
+			if ( ! $deleted_safely && defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) {
+				EEH_Activation::delete_unused_db_table($wp_table_name);
+			} else if ( ! $deleted_safely) {
 				// so we should be more cautious rather than just dropping tables so easily
 				EE_Error::add_persistent_admin_notice(
-						'bad_table_' . $wp_table_name . '_detected',
-						sprintf( __( 'Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ),
+						'bad_table_'.$wp_table_name.'_detected',
+						sprintf(__('Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'),
 								$wp_table_name,
 								"<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>",
 								'<b>wp-config.php</b>',
@@ -621,25 +621,25 @@ 
 			}
 		}
 		// does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
-		if ( preg_match( '((((.*?))(,\s))+)', $sql, $valid_column_data ) ) {
+		if (preg_match('((((.*?))(,\s))+)', $sql, $valid_column_data)) {
 			$SQL = "CREATE TABLE $wp_table_name ( $sql ) $engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;";
 			//get $wpdb to echo errors, but buffer them. This way at least WE know an error
 			//happened. And then we can choose to tell the end user
-			$old_show_errors_policy = $wpdb->show_errors( TRUE );
-			$old_error_suppression_policy = $wpdb->suppress_errors( FALSE );
+			$old_show_errors_policy = $wpdb->show_errors(TRUE);
+			$old_error_suppression_policy = $wpdb->suppress_errors(FALSE);
 			ob_start();
-			dbDelta( $SQL );
+			dbDelta($SQL);
 			$output = ob_get_contents();
 			ob_end_clean();
-			$wpdb->show_errors( $old_show_errors_policy );
-			$wpdb->suppress_errors( $old_error_suppression_policy );
-			if( ! empty( $output ) ){
-				throw new EE_Error( $output	);
+			$wpdb->show_errors($old_show_errors_policy);
+			$wpdb->suppress_errors($old_error_suppression_policy);
+			if ( ! empty($output)) {
+				throw new EE_Error($output);
 			}
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso' ),
+					__('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso'),
 					'<br />',
 					$sql
 				)
@@ -661,15 +661,15 @@ 
 	 * @param string $column_info if your SQL were 'ALTER TABLE table_name ADD price VARCHAR(10)', this would be 'VARCHAR(10)'
 	 * @return bool|int
 	 */
-	public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){
-		if( apply_filters( 'FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE ) ){
+	public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') {
+		if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$full_table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$full_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$fields = self::get_fields_on_table($table_name);
-		if (!in_array($column_name, $fields)){
-			$alter_query="ALTER TABLE $full_table_name ADD $column_name $column_info";
+		if ( ! in_array($column_name, $fields)) {
+			$alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info";
 			//echo "alter query:$alter_query";
 			return $wpdb->query($alter_query);
 		}
@@ -688,15 +688,15 @@ 
 	 * 	@param string $table_name, without prefixed $wpdb->prefix
 	 * 	@return array of database column names
 	 */
-	public static function get_fields_on_table( $table_name = NULL ) {
+	public static function get_fields_on_table($table_name = NULL) {
 		global $wpdb;
-		$table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( ! empty( $table_name )) {
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if ( ! empty($table_name)) {
 			$columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name ");
 			if ($columns !== FALSE) {
 				$field_array = array();
-				foreach($columns as $column ){
-					$field_array[] = $column->Field;;
+				foreach ($columns as $column) {
+					$field_array[] = $column->Field; ;
 				}
 				return $field_array;
 			}
@@ -714,12 +714,12 @@ 
 	 * @param string $table_name
 	 * @return bool
 	 */
-	public static function db_table_is_empty( $table_name ) {
+	public static function db_table_is_empty($table_name) {
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$count = $wpdb->get_var( "SELECT COUNT(*) FROM $table_name" );
-			return absint( $count ) === 0 ? true : false;
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if (EEH_Activation::table_exists($table_name)) {
+			$count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
+			return absint($count) === 0 ? true : false;
 		}
 		return false;
 	}
@@ -734,9 +734,9 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_db_table_if_empty( $table_name ) {
-		if ( EEH_Activation::db_table_is_empty( $table_name ) ) {
-			return EEH_Activation::delete_unused_db_table( $table_name );
+	public static function delete_db_table_if_empty($table_name) {
+		if (EEH_Activation::db_table_is_empty($table_name)) {
+			return EEH_Activation::delete_unused_db_table($table_name);
 		}
 		return false;
 	}
@@ -751,11 +751,11 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_unused_db_table( $table_name ) {
+	public static function delete_unused_db_table($table_name) {
 		global $wpdb;
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-			return $wpdb->query( "DROP TABLE IF EXISTS $table_name" );
+		if (EEH_Activation::table_exists($table_name)) {
+			$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+			return $wpdb->query("DROP TABLE IF EXISTS $table_name");
 		}
 		return false;
 	}
@@ -771,18 +771,18 @@ 
 	 * @param string $index_name
 	 * @return bool | int
 	 */
-	public static function drop_index( $table_name, $index_name ) {
-		if( apply_filters( 'FHEE__EEH_Activation__drop_index__short_circuit', FALSE ) ){
+	public static function drop_index($table_name, $index_name) {
+		if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'";
 		if (
-			$wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name
-			&& $wpdb->get_var( $index_exists_query ) == $table_name //using get_var with the $index_exists_query returns the table's name
+			$wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name
+			&& $wpdb->get_var($index_exists_query) == $table_name //using get_var with the $index_exists_query returns the table's name
 		) {
-			return $wpdb->query( "ALTER TABLE $table_name DROP INDEX $index_name" );
+			return $wpdb->query("ALTER TABLE $table_name DROP INDEX $index_name");
 		}
 		return TRUE;
 	}
@@ -798,27 +798,27 @@ 
 	 * @return boolean success (whether database is setup properly or not)
 	 */
 	public static function create_database_tables() {
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
 		//find the migration script that sets the database to be compatible with the code
 		$dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms();
-		if( $dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name );
-			$current_data_migration_script->set_migrating( false );
+		if ($dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($dms_name);
+			$current_data_migration_script->set_migrating(false);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if( $current_data_migration_script->get_errors() ){
-				if( WP_DEBUG ){
-					foreach( $current_data_migration_script->get_errors() as $error ){
-						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				if (WP_DEBUG) {
+					foreach ($current_data_migration_script->get_errors() as $error) {
+						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 					}
-				}else{
-					EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) );
+				} else {
+					EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso'));
 				}
 				return false;
 			}
 			EE_Data_Migration_Manager::instance()->update_current_database_state_to();
-		}else{
-			EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -838,27 +838,27 @@ 
 	public static function initialize_system_questions() {
 		// QUESTION GROUPS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question_group');
 		$SQL = "SELECT QSG_system FROM $table_name WHERE QSG_system != 0";
 		// what we have
-		$question_groups = $wpdb->get_col( $SQL );
+		$question_groups = $wpdb->get_col($SQL);
 		// check the response
-		$question_groups = is_array( $question_groups ) ? $question_groups : array();
+		$question_groups = is_array($question_groups) ? $question_groups : array();
 		// what we should have
-		$QSG_systems = array( 1, 2 );
+		$QSG_systems = array(1, 2);
 		// loop thru what we should have and compare to what we have
-		foreach ( $QSG_systems as $QSG_system ) {
+		foreach ($QSG_systems as $QSG_system) {
 			// reset values array
 			$QSG_values = array();
 			// if we don't have what we should have (but use $QST_system as as string because that's what we got from the db)
-			if ( ! in_array( "$QSG_system", $question_groups )) {
+			if ( ! in_array("$QSG_system", $question_groups)) {
 				// add it
-				switch ( $QSG_system ) {
+				switch ($QSG_system) {
 
 					case 1:
 							$QSG_values = array(
-									'QSG_name' => __( 'Personal Information', 'event_espresso' ),
-									'QSG_identifier' => 'personal-information-' . time(),
+									'QSG_name' => __('Personal Information', 'event_espresso'),
+									'QSG_identifier' => 'personal-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 1,
 									'QSG_show_group_name' => 1,
@@ -870,8 +870,8 @@ 
 
 					case 2:
 							$QSG_values = array(
-									'QSG_name' => __( 'Address Information','event_espresso' ),
-									'QSG_identifier' => 'address-information-' . time(),
+									'QSG_name' => __('Address Information', 'event_espresso'),
+									'QSG_identifier' => 'address-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 2,
 									'QSG_show_group_name' => 1,
@@ -883,14 +883,14 @@ 
 
 				}
 				// make sure we have some values before inserting them
-				if ( ! empty( $QSG_values )) {
+				if ( ! empty($QSG_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QSG_values,
-						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d')
 					);
-					$QSG_IDs[ $QSG_system ] = $wpdb->insert_id;
+					$QSG_IDs[$QSG_system] = $wpdb->insert_id;
 				}
 			}
 		}
@@ -899,10 +899,10 @@ 
 
 		// QUESTIONS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question');
 		$SQL = "SELECT QST_system FROM $table_name WHERE QST_system != ''";
 		// what we have
-		$questions = $wpdb->get_col( $SQL );
+		$questions = $wpdb->get_col($SQL);
 		// what we should have
 		$QST_systems = array(
 			'fname',
@@ -919,25 +919,25 @@ 
 		$order_for_group_1 = 1;
 		$order_for_group_2 = 1;
 		// loop thru what we should have and compare to what we have
-		foreach ( $QST_systems as $QST_system ) {
+		foreach ($QST_systems as $QST_system) {
 			// reset values array
 			$QST_values = array();
 			// if we don't have what we should have
-			if ( ! in_array( $QST_system, $questions )) {
+			if ( ! in_array($QST_system, $questions)) {
 				// add it
-				switch ( $QST_system ) {
+				switch ($QST_system) {
 
 					case 'fname':
 							$QST_values = array(
-									'QST_display_text' => __( 'First Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'First Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('First Name', 'event_espresso'),
+									'QST_admin_label' => __('First Name - System Question', 'event_espresso'),
 									'QST_system' => 'fname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 1,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -945,15 +945,15 @@ 
 
 					case 'lname':
 							$QST_values = array(
-									'QST_display_text' => __( 'Last Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'Last Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Last Name', 'event_espresso'),
+									'QST_admin_label' => __('Last Name - System Question', 'event_espresso'),
 									'QST_system' => 'lname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 2,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -961,15 +961,15 @@ 
 
 					case 'email':
 							$QST_values = array(
-									'QST_display_text' => __( 'Email Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Email Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Email Address', 'event_espresso'),
+									'QST_admin_label' => __('Email Address - System Question', 'event_espresso'),
 									'QST_system' => 'email',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 3,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -977,15 +977,15 @@ 
 
 					case 'address':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address', 'event_espresso'),
+									'QST_admin_label' => __('Address - System Question', 'event_espresso'),
 									'QST_system' => 'address',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 4,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -993,15 +993,15 @@ 
 
 					case 'address2':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address2', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address2 - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address2', 'event_espresso'),
+									'QST_admin_label' => __('Address2 - System Question', 'event_espresso'),
 									'QST_system' => 'address2',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 5,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1009,15 +1009,15 @@ 
 
 					case 'city':
 							$QST_values = array(
-									'QST_display_text' => __( 'City', 'event_espresso' ),
-									'QST_admin_label' => __( 'City - System Question', 'event_espresso' ),
+									'QST_display_text' => __('City', 'event_espresso'),
+									'QST_admin_label' => __('City - System Question', 'event_espresso'),
 									'QST_system' => 'city',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 6,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1025,12 +1025,12 @@ 
 
 					case 'state':
 							$QST_values = array(
-									'QST_display_text' => __( 'State/Province', 'event_espresso' ),
-									'QST_admin_label' => __( 'State/Province - System Question', 'event_espresso' ),
+									'QST_display_text' => __('State/Province', 'event_espresso'),
+									'QST_admin_label' => __('State/Province - System Question', 'event_espresso'),
 									'QST_system' => 'state',
 									'QST_type' => 'STATE',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 7,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1040,12 +1040,12 @@ 
 
 					case 'country' :
 							$QST_values = array(
-									'QST_display_text' => __( 'Country', 'event_espresso' ),
-									'QST_admin_label' => __( 'Country - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Country', 'event_espresso'),
+									'QST_admin_label' => __('Country - System Question', 'event_espresso'),
 									'QST_system' => 'country',
 									'QST_type' => 'COUNTRY',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 8,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1055,15 +1055,15 @@ 
 
 					case 'zip':
 							$QST_values = array(
-									'QST_display_text' => __( 'Zip/Postal Code', 'event_espresso' ),
-									'QST_admin_label' => __( 'Zip/Postal Code - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Zip/Postal Code', 'event_espresso'),
+									'QST_admin_label' => __('Zip/Postal Code - System Question', 'event_espresso'),
 									'QST_system' => 'zip',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 9,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1071,49 +1071,49 @@ 
 
 					case 'phone':
 							$QST_values = array(
-									'QST_display_text' => __( 'Phone Number', 'event_espresso' ),
-									'QST_admin_label' => __( 'Phone Number - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Phone Number', 'event_espresso'),
+									'QST_admin_label' => __('Phone Number - System Question', 'event_espresso'),
 									'QST_system' => 'phone',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 10,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
 						break;
 
 				}
-				if ( ! empty( $QST_values )) {
+				if ( ! empty($QST_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QST_values,
-						array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d')
 					);
 					$QST_ID = $wpdb->insert_id;
 
 					// QUESTION GROUP QUESTIONS
-					if(  in_array( $QST_system, array( 'fname', 'lname', 'email' ) ) ) {
+					if (in_array($QST_system, array('fname', 'lname', 'email'))) {
 						$system_question_we_want = EEM_Question_Group::system_personal;
 					} else {
 						$system_question_we_want = EEM_Question_Group::system_address;
 					}
-					if( isset( $QSG_IDs[ $system_question_we_want ] ) ) {
-						$QSG_ID = $QSG_IDs[ $system_question_we_want ];
+					if (isset($QSG_IDs[$system_question_we_want])) {
+						$QSG_ID = $QSG_IDs[$system_question_we_want];
 					} else {
-						$id_col = EEM_Question_Group::instance()->get_col( array( array( 'QSG_system' => $system_question_we_want ) ) );
-						if( is_array( $id_col ) ) {
-							$QSG_ID = reset( $id_col );
+						$id_col = EEM_Question_Group::instance()->get_col(array(array('QSG_system' => $system_question_we_want)));
+						if (is_array($id_col)) {
+							$QSG_ID = reset($id_col);
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
                                                         EE_Log::instance()->log(
                                                                 __FILE__,
                                                                 __FUNCTION__,
                                                                 sprintf(
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
+                                                                        __('Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
                                                                         $QST_ID ),
                                                                 'error' );
                                                         continue;
@@ -1122,9 +1122,9 @@ 
 
 					// add system questions to groups
 					$wpdb->insert(
-						EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group_question' ),
-						array( 'QSG_ID' => $QSG_ID , 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID==1)? $order_for_group_1++ : $order_for_group_2++ ),
-						array( '%d', '%d','%d' )
+						EEH_Activation::ensure_table_name_has_prefix('esp_question_group_question'),
+						array('QSG_ID' => $QSG_ID, 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID == 1) ? $order_for_group_1++ : $order_for_group_2++),
+						array('%d', '%d', '%d')
 					);
 				}
 			}
@@ -1136,11 +1136,11 @@ 
 	 * Makes sure the default payment method (Invoice) is active.
 	 * This used to be done automatically as part of constructing the old gateways config
 	 */
-	public static function insert_default_payment_methods(){
-		if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-		}else{
+	public static function insert_default_payment_methods() {
+		if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+		} else {
 			EEM_Payment_Method::instance()->verify_button_urls();
 		}
 	}
@@ -1156,7 +1156,7 @@ 
 
 		global $wpdb;
 
-		if ( EEH_Activation::table_exists( EEM_Status::instance()->table() ) ) {
+		if (EEH_Activation::table_exists(EEM_Status::instance()->table())) {
 
 			$table_name = EEM_Status::instance()->table();
 
@@ -1222,38 +1222,38 @@ 
 	 * 	@return boolean success of verifying upload directories exist
 	 */
 	public static function create_upload_directories() {
-		EE_Registry::instance()->load_helper( 'File' );
+		EE_Registry::instance()->load_helper('File');
 		// Create the required folders
 		$folders = array(
 				EVENT_ESPRESSO_TEMPLATE_DIR,
 				EVENT_ESPRESSO_GATEWAY_DIR,
-				EVENT_ESPRESSO_UPLOAD_DIR . 'logs/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'css/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'tickets/'
+				EVENT_ESPRESSO_UPLOAD_DIR.'logs/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'css/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'tickets/'
 		);
-		foreach ( $folders as $folder ) {
+		foreach ($folders as $folder) {
 			try {
-				EEH_File::ensure_folder_exists_and_is_writable( $folder );
-				@ chmod( $folder, 0755 );
-			} catch( EE_Error $e ){
+				EEH_File::ensure_folder_exists_and_is_writable($folder);
+				@ chmod($folder, 0755);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					sprintf(
-						__(  'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ),
+						__('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'),
 						$folder,
-						'<br />' . $e->getMessage()
+						'<br />'.$e->getMessage()
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				//indicate we'll need to fix this later
-				update_option( EEH_Activation::upload_directories_incomplete_option_name, true );
+				update_option(EEH_Activation::upload_directories_incomplete_option_name, true);
 				return FALSE;
 			}
 		}
 		//just add the .htaccess file to the logs directory to begin with. Even if logging
 		//is disabled, there might be activation errors recorded in there
-		EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs/' );
+		EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs/');
 		//remember EE's folders are all good
-		delete_option( EEH_Activation::upload_directories_incomplete_option_name );
+		delete_option(EEH_Activation::upload_directories_incomplete_option_name);
 		return TRUE;
 	}
 
@@ -1266,7 +1266,7 @@ 
 	 * @return boolean
 	 */
 	public static function upload_directories_incomplete() {
-		return get_option( EEH_Activation::upload_directories_incomplete_option_name, false );
+		return get_option(EEH_Activation::upload_directories_incomplete_option_name, false);
 	}
 
 
@@ -1285,16 +1285,16 @@ 
 		$installed_messengers = $default_messengers = array();
 
 		//include our helper
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//get all installed messenger objects
 		$installed = EEH_MSG_Template::get_installed_message_objects();
 
 		//let's setup the $installed messengers in an array AND the messengers that are set to be activated on install.
-		foreach ( $installed['messengers'] as $msgr ) {
-			if ( $msgr instanceof EE_messenger ) {
+		foreach ($installed['messengers'] as $msgr) {
+			if ($msgr instanceof EE_messenger) {
 				$installed_messengers[$msgr->name] = $msgr;
-				if ( $msgr->activate_on_install ) {
+				if ($msgr->activate_on_install) {
 					$default_messengers[] = $msgr->name;
 				}
 			}
@@ -1304,36 +1304,36 @@ 
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 
 		//things that have already been activated before
-		$has_activated = get_option( 'ee_has_activated_messenger' );
+		$has_activated = get_option('ee_has_activated_messenger');
 
 		//do an initial loop to determine if we need to continue
 		$def_ms = array();
-		foreach ( $default_messengers as $msgr ) {
-			if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) continue;
+		foreach ($default_messengers as $msgr) {
+			if (isset($active_messengers[$msgr]) || isset($has_activated[$msgr])) continue;
 			$def_ms[] = $msgr;
 		}
 
 		//setup the $installed_mts in an array
-		foreach ( $installed['message_types'] as $imt ) {
-			if ( $imt instanceof EE_message_type ) {
+		foreach ($installed['message_types'] as $imt) {
+			if ($imt instanceof EE_message_type) {
 				$installed_mts[$imt->name] = $imt;
 			}
 		}
 
 		//loop through default array for default messengers (if present)
-		if ( ! empty( $def_ms ) ) {
-			foreach ( $def_ms as $messenger ) {
+		if ( ! empty($def_ms)) {
+			foreach ($def_ms as $messenger) {
 				//all is good so let's setup the default stuff. We need to use the given messenger object (if exists) to get the default message type for the messenger.
-				if ( ! isset( $installed_messengers[$messenger] )) {
+				if ( ! isset($installed_messengers[$messenger])) {
 					continue;
 				}
 				/** @var EE_messenger[] $installed_messengers  */
 				$default_mts = $installed_messengers[$messenger]->get_default_message_types();
 				$active_messengers[$messenger]['obj'] = $installed_messengers[$messenger];
-				foreach ( $default_mts as $index => $mt ) {
+				foreach ($default_mts as $index => $mt) {
 					//is there an installed_mt matching the default string?  If not then nothing to do here.
-					if ( ! isset( $installed_mts[$mt] ) ) {
-						unset( $default_mts[$index] );
+					if ( ! isset($installed_mts[$mt])) {
+						unset($default_mts[$index]);
 						continue;
 					}
 
@@ -1342,41 +1342,41 @@ 
 					/** @var EE_message_type[] $installed_mts */
 					$settings_fields = $installed_mts[$mt]->get_admin_settings_fields();
 					$settings = array();
-					if ( is_array( $settings_fields ) ) {
-						foreach ( $settings_fields as $field => $values ) {
-							if ( isset( $values['default'] ) ) {
+					if (is_array($settings_fields)) {
+						foreach ($settings_fields as $field => $values) {
+							if (isset($values['default'])) {
 								$settings[$field] = $values['default'];
 							}
 						}
 					}
 
-					$active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings;
+					$active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings;
 					$has_activated[$messenger][] = $mt;
 				}
 
 				//setup any initial settings for the messenger
 				$msgr_settings = $installed_messengers[$messenger]->get_admin_settings_fields();
 
-				if ( !empty( $msgr_settings ) ) {
-					foreach ( $msgr_settings as $field => $value ) {
+				if ( ! empty($msgr_settings)) {
+					foreach ($msgr_settings as $field => $value) {
 						$active_messengers[$messenger]['settings'][$field] = $value;
 					}
 				}
 
 				//now let's save the settings for this messenger! Must do now because the validator checks the db for active messengers to validate.
-				EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
+				EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
 
 				//let's generate all the templates but only if the messenger has default_mts (otherwise its just activated).
-				if ( !empty( $default_mts ) ) {
-					$success = EEH_MSG_Template::generate_new_templates( $messenger, $default_mts, '', TRUE );
+				if ( ! empty($default_mts)) {
+					$success = EEH_MSG_Template::generate_new_templates($messenger, $default_mts, '', TRUE);
 				}
 			}
 		} //end check for empty( $def_ms )
 
 		//still need to see if there are any message types to activate for active messengers
-		foreach ( $active_messengers as $messenger => $settings ) {
+		foreach ($active_messengers as $messenger => $settings) {
 			$msg_obj = $settings['obj'];
-			if ( ! $msg_obj instanceof EE_messenger ) {
+			if ( ! $msg_obj instanceof EE_messenger) {
 				continue;
 			}
 
@@ -1384,45 +1384,45 @@ 
 			$new_default_mts = array();
 
 			//loop through each default mt reported by the messenger and make sure its set in its active db entry.
-			foreach( $all_default_mts as $index => $mt ) {
+			foreach ($all_default_mts as $index => $mt) {
 				//already active? already has generated templates? || has already been activated before (we dont' want to reactivate things users intentionally deactivated).
-				if ( ( isset( $has_activated[$messenger] ) && in_array($mt, $has_activated[$messenger]) ) || isset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] ) ||  EEH_MSG_Template::already_generated( $messenger, $mt, 0, FALSE ) ) {
+				if ((isset($has_activated[$messenger]) && in_array($mt, $has_activated[$messenger])) || isset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]) || EEH_MSG_Template::already_generated($messenger, $mt, 0, FALSE)) {
 					continue;
 				}
 
 				//is there an installed_mt matching the default string?  If not then nothing to do here.
-				if ( ! isset( $installed_mts[$mt] ) ) {
-					unset( $all_default_mts[$mt] );
+				if ( ! isset($installed_mts[$mt])) {
+					unset($all_default_mts[$mt]);
 					continue;
 				}
 
 				$settings_fields = $installed_mts[$mt]->get_admin_settings_fields();
 				$settings = array();
-				if ( is_array( $settings_fields ) ) {
-					foreach ( $settings_fields as $field => $values ) {
-						if ( isset( $values['default'] ) ) {
+				if (is_array($settings_fields)) {
+					foreach ($settings_fields as $field => $values) {
+						if (isset($values['default'])) {
 							$settings[$field] = $values['default'];
 						}
 					}
 				}
 
-				$active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings;
+				$active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings;
 				$new_default_mts[] = $mt;
 				$has_activated[$messenger][] = $mt;
 			}
 
 
-			if ( ! empty( $new_default_mts ) ) {
-				$success = EEH_MSG_Template::generate_new_templates( $messenger, $new_default_mts, '', TRUE );
+			if ( ! empty($new_default_mts)) {
+				$success = EEH_MSG_Template::generate_new_templates($messenger, $new_default_mts, '', TRUE);
 			}
 
 		}
 
 		//now let's save the settings for this messenger!
-		EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
+		EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
 
 		//update $has_activated record
-		update_option( 'ee_has_activated_messenger', $has_activated );
+		update_option('ee_has_activated_messenger', $has_activated);
 
 		//that's it!
 		return $success;
@@ -1442,47 +1442,47 @@ 
 	 */
 	public static function validate_messages_system() {
 		//include our helper
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//get active and installed  messengers/message types.
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 		$installed = EEH_MSG_Template::get_installed_message_objects();
 		$installed_messengers = $installed_mts = array();
 		//set up the arrays so they can be handled easier.
-		foreach( $installed['messengers'] as $im ) {
-			if ( $im instanceof EE_messenger ) {
+		foreach ($installed['messengers'] as $im) {
+			if ($im instanceof EE_messenger) {
 				$installed_messengers[$im->name] = $im;
 			}
 		}
-		foreach( $installed['message_types'] as $imt ) {
-			if ( $imt instanceof EE_message_type ) {
+		foreach ($installed['message_types'] as $imt) {
+			if ($imt instanceof EE_message_type) {
 				$installed_mts[$imt->name] = $imt;
 			}
 		}
 
 		//now let's loop through the active array and validate
-		foreach( $active_messengers as $messenger => $active_details ) {
+		foreach ($active_messengers as $messenger => $active_details) {
 			//first let's see if this messenger is installed.
-			if ( ! isset( $installed_messengers[$messenger] ) ) {
+			if ( ! isset($installed_messengers[$messenger])) {
 				//not set so let's just remove from actives and make sure templates are inactive.
-				unset( $active_messengers[$messenger] );
-				EEH_MSG_Template::update_to_inactive( $messenger );
+				unset($active_messengers[$messenger]);
+				EEH_MSG_Template::update_to_inactive($messenger);
 				continue;
 			}
 
 			//messenger is active, so let's just make sure that any active message types not installed are deactivated.
-			$mts = ! empty( $active_details['settings'][$messenger . '-message_types'] ) ? $active_details['settings'][$messenger . '-message_types'] : array();
-			foreach ( $mts as $mt_name => $mt ) {
-				if ( ! isset( $installed_mts[$mt_name] )  ) {
-					unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] );
-					EEH_MSG_Template::update_to_inactive( $messenger, $mt_name );
+			$mts = ! empty($active_details['settings'][$messenger.'-message_types']) ? $active_details['settings'][$messenger.'-message_types'] : array();
+			foreach ($mts as $mt_name => $mt) {
+				if ( ! isset($installed_mts[$mt_name])) {
+					unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt_name]);
+					EEH_MSG_Template::update_to_inactive($messenger, $mt_name);
 				}
 			}
 		}
 
 		//all done! let's update the active_messengers.
-		EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-		do_action( 'AHEE__EEH_Activation__validate_messages_system' );
+		EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
+		do_action('AHEE__EEH_Activation__validate_messages_system');
 		return;
 	}
 
@@ -1496,12 +1496,12 @@ 
 	 * 	@static
 	 * 	@return void
 	 */
-	public static function create_no_ticket_prices_array(){
+	public static function create_no_ticket_prices_array() {
 		// this creates an array for tracking events that have no active ticket prices created
 		// this allows us to warn admins of the situation so that it can be corrected
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE );
-		if ( ! $espresso_no_ticket_prices ) {
-			add_option( 'ee_no_ticket_prices', array(), '', FALSE );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE);
+		if ( ! $espresso_no_ticket_prices) {
+			add_option('ee_no_ticket_prices', array(), '', FALSE);
 		}
 	}
 
@@ -1523,24 +1523,24 @@ 
 	 * Finds all our EE4 custom post types, and deletes them and their associated data (like post meta or term relations)/
 	 * @global wpdb $wpdb
 	 */
-	public static function delete_all_espresso_cpt_data(){
+	public static function delete_all_espresso_cpt_data() {
 		global $wpdb;
 		//get all the CPT post_types
 		$ee_post_types = array();
-		foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_CPT_Base ) {
-					$ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type());
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_CPT_Base) {
+					$ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type());
 				}
 			}
 		}
 		//get all our CPTs
-		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")";
+		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")";
 		$cpt_ids = $wpdb->get_col($query);
 		//delete each post meta and term relations too
-		foreach($cpt_ids as $post_id){
-			wp_delete_post($post_id,true);
+		foreach ($cpt_ids as $post_id) {
+			wp_delete_post($post_id, true);
 		}
 	}
 
@@ -1554,18 +1554,18 @@ 
 	 * @param bool $remove_all
 	 * @return void
 	 */
-	public static function delete_all_espresso_tables_and_data( $remove_all = true ) {
+	public static function delete_all_espresso_tables_and_data($remove_all = true) {
 		global $wpdb;
 		$undeleted_tables = array();
 
 		// load registry
-		foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_Base ) {
-					foreach ( $model_obj->get_tables() as $table ) {
-						if ( strpos( $table->get_table_name(), 'esp_' )) {
-							switch ( EEH_Activation::delete_unused_db_table( $table->get_table_name() )) {
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_Base) {
+					foreach ($model_obj->get_tables() as $table) {
+						if (strpos($table->get_table_name(), 'esp_')) {
+							switch (EEH_Activation::delete_unused_db_table($table->get_table_name())) {
 								case false :
 									$undeleted_tables[] = $table->get_table_name();
 								break;
@@ -1590,8 +1590,8 @@ 
 			'esp_promotion_rule',
 			'esp_rule'
 		);
-		foreach( $tables_without_models as $table ){
-			EEH_Activation::delete_db_table_if_empty( $table );
+		foreach ($tables_without_models as $table) {
+			EEH_Activation::delete_db_table_if_empty($table);
 		}
 
 
@@ -1629,58 +1629,58 @@ 
 			'ee_job_parameters_' => false,
 			'ee_upload_directories_incomplete' => true,
 		);
-		if( is_main_site() ) {
-			$wp_options_to_delete[ 'ee_network_config' ] = true;
+		if (is_main_site()) {
+			$wp_options_to_delete['ee_network_config'] = true;
 		}
 
 		$undeleted_options = array();
-		foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) {
+		foreach ($wp_options_to_delete as $option_name => $no_wildcard) {
 
-			if( $no_wildcard ){
-				if( ! delete_option( $option_name ) ){
+			if ($no_wildcard) {
+				if ( ! delete_option($option_name)) {
 					$undeleted_options[] = $option_name;
 				}
-			}else{
-				$option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" );
-				foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){
-					if( ! delete_option( $option_name_from_wildcard ) ){
+			} else {
+				$option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'");
+				foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) {
+					if ( ! delete_option($option_name_from_wildcard)) {
 						$undeleted_options[] = $option_name_from_wildcard;
 					}
 				}
 			}
 		}
                 //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+                remove_action('shutdown', array(EE_Config::instance(), 'shutdown'), 10);
 
-		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
+		if ($remove_all && $espresso_db_update = get_option('espresso_db_update')) {
 			$db_update_sans_ee4 = array();
-			foreach($espresso_db_update as $version => $times_activated){
-				if( $version[0] =='3'){//if its NON EE4
+			foreach ($espresso_db_update as $version => $times_activated) {
+				if ($version[0] == '3') {//if its NON EE4
 					$db_update_sans_ee4[$version] = $times_activated;
 				}
 			}
-			update_option( 'espresso_db_update', $db_update_sans_ee4 );
+			update_option('espresso_db_update', $db_update_sans_ee4);
 		}
 
 		$errors = '';
-		if ( ! empty( $undeleted_tables )) {
+		if ( ! empty($undeleted_tables)) {
 			$errors .= sprintf(
-				__( 'The following tables could not be deleted: %s%s', 'event_espresso' ),
+				__('The following tables could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_tables )
+				implode(',<br/>', $undeleted_tables)
 			);
 		}
-		if ( ! empty( $undeleted_options )) {
-			$errors .= ! empty( $undeleted_tables ) ? '<br/>' : '';
+		if ( ! empty($undeleted_options)) {
+			$errors .= ! empty($undeleted_tables) ? '<br/>' : '';
 			$errors .= sprintf(
-				__( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ),
+				__('The following wp-options could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_options )
+				implode(',<br/>', $undeleted_options)
 			);
 
 		}
-		if ( $errors != '' ) {
-			EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ );
+		if ($errors != '') {
+			EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -1690,23 +1690,23 @@ 
 	 * @param string $table_name with or without $wpdb->prefix
 	 * @return boolean
 	 */
-	public static function table_exists( $table_name ){
+	public static function table_exists($table_name) {
 		global $wpdb, $EZSQL_ERROR;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		//ignore if this causes an sql error
 		$old_error = $wpdb->last_error;
 		$old_suppress_errors = $wpdb->suppress_errors();
-		$old_show_errors_value = $wpdb->show_errors( FALSE );
+		$old_show_errors_value = $wpdb->show_errors(FALSE);
 		$ezsql_error_cache = $EZSQL_ERROR;
-		$wpdb->get_results( "SELECT * from $table_name LIMIT 1");
-		$wpdb->show_errors( $old_show_errors_value );
-		$wpdb->suppress_errors( $old_suppress_errors );
+		$wpdb->get_results("SELECT * from $table_name LIMIT 1");
+		$wpdb->show_errors($old_show_errors_value);
+		$wpdb->suppress_errors($old_suppress_errors);
 		$new_error = $wpdb->last_error;
 		$wpdb->last_error = $old_error;
 		$EZSQL_ERROR = $ezsql_error_cache;
-		if( empty( $new_error ) ){
+		if (empty($new_error)) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -1714,7 +1714,7 @@ 
 	/**
 	 * Resets the cache on EEH_Activation
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_default_creator_id = NULL;
 		self::$_initialized_db_content_already_in_this_request = false;
 	}

payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -26,9 +26,9 @@ 
  */
 ?>
 	<tr>
-		<th><h3><?php _e("Invoice Gateway Settings", 'event_espresso');?></h3></th>
+		<th><h3><?php _e("Invoice Gateway Settings", 'event_espresso'); ?></h3></th>
 		<td>
-			<span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso');?></span>
+			<span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso'); ?></span>
 		</td>
 	</tr>
 <?php