eventespresso / event-espresso-core

admin_pages/maintenance/templates/ee_migration_page.template.php

Spacing +55 added lines, -55 removed lines

@@ -16,13 +16,13 @@ 
  * @type string $reset_db_page_link
  */
 
-if ( $show_backup_db_text ) { ?>
-<h1><span class="dashicons dashicons-migrate"></span><?php _e("Database Migration Manager", "event_espresso");?></h1>
+if ($show_backup_db_text) { ?>
+<h1><span class="dashicons dashicons-migrate"></span><?php _e("Database Migration Manager", "event_espresso"); ?></h1>
 <?php } ?>
 <div class="padding">
 	<div id="migration-prep">
 
- 		<?php if ( $script_names ) { ?>
+ 		<?php if ($script_names) { ?>
  			<h3 class="espresso-header">
  				<span class="dashicons dashicons-flag ee-icon-size-22"></span>
  				<?php
@@ -39,34 +39,34 @@ 
 				?>
  			</h3>
  			<p>
- 			<?php echo apply_filters('FHEE__ee_migration_page__p_after_header',sprintf(__("Since you have already been using Event Espresso and have previous event and registration data in your database, you have the option to migrate, or copy over, this existing data into a format that is compatible with %s.", "event_espresso"),$next_db_state),$next_db_state);?>
+ 			<?php echo apply_filters('FHEE__ee_migration_page__p_after_header', sprintf(__("Since you have already been using Event Espresso and have previous event and registration data in your database, you have the option to migrate, or copy over, this existing data into a format that is compatible with %s.", "event_espresso"), $next_db_state), $next_db_state); ?>
  			</p>
- 		<?php } elseif ( $show_most_recent_migration ) { ?>
+ 		<?php } elseif ($show_most_recent_migration) { ?>
  			 <h3 class="espresso-header">
  			 	<span class="dashicons dashicons-awards ee-icon-size-22"></span>
- 				 <?php echo apply_filters('FHEE__ee_migration_page__done_migration_header',sprintf(__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s', "event_espresso"),$ultimate_db_state));?>
+ 				 <?php echo apply_filters('FHEE__ee_migration_page__done_migration_header', sprintf(__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s', "event_espresso"), $ultimate_db_state)); ?>
  			 </h3>
  			 <p>
- 			 	<?php echo apply_filters('FHEE__ee_migration_page__p_after_done_migration_header',sprintf(__("Time to find out about all the great new features %s has to offer.", "event_espresso"),$ultimate_db_state));?> &nbsp;
- 			 	<b><a id="get-started-after-migrate" class="button-primary" href="<?php echo add_query_arg( array( 'page' => 'espresso_about' ), admin_url( 'admin.php' )); ?>">
- 			 		<?php _e("Let's Get Started", "event_espresso");?>&nbsp;<span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
+ 			 	<?php echo apply_filters('FHEE__ee_migration_page__p_after_done_migration_header', sprintf(__("Time to find out about all the great new features %s has to offer.", "event_espresso"), $ultimate_db_state)); ?> &nbsp;
+ 			 	<b><a id="get-started-after-migrate" class="button-primary" href="<?php echo add_query_arg(array('page' => 'espresso_about'), admin_url('admin.php')); ?>">
+ 			 		<?php _e("Let's Get Started", "event_espresso"); ?>&nbsp;<span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
  			 	</a></b>
  			 </p>
  		<?php } ?>
 
 
-		<?php if ($show_backup_db_text){ ?>
+		<?php if ($show_backup_db_text) { ?>
 		<div id="migration-options-dv">
 			<h2>
 				<span class="dashicons dashicons-admin-tools"></span>
-				<?php _e("Migration Options", "event_espresso");?>
-				<span class="tiny-text lt-grey-text"> &nbsp; <?php _e(' to migrate or not to migrate?', "event_espresso");?></span>
+				<?php _e("Migration Options", "event_espresso"); ?>
+				<span class="tiny-text lt-grey-text"> &nbsp; <?php _e(' to migrate or not to migrate?', "event_espresso"); ?></span>
 			</h2>
 			<div class="ee-table-wrap">
 				<table>
 					<tbody>
 						<tr>
-							<td><h3><?php _e('1', 'event_espresso');?></h3></td>
+							<td><h3><?php _e('1', 'event_espresso'); ?></h3></td>
 							<td>
 								<?php
 								echo apply_filters(
@@ -75,7 +75,7 @@ 
 									__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.', "event_espresso"),
 									'<strong>',
 									'</strong>',
-									'<a id="migration-risks" class="" title="' . esc_attr__('click for more details', "event_espresso") . '">',
+									'<a id="migration-risks" class="" title="'.esc_attr__('click for more details', "event_espresso").'">',
 									'</a>',
 										$current_db_state,
 										$next_db_state
@@ -84,18 +84,18 @@ 
 									$next_db_state
 								);
 								?>
-								<a id="display-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="migration-details" ><?php _e('click for more details', "event_espresso");?>&nbsp;+</a>
-								<a  id="hide-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="migration-details" style="display:none;" ><?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?></a>
+								<a id="display-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="migration-details" ><?php _e('click for more details', "event_espresso"); ?>&nbsp;+</a>
+								<a  id="hide-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="migration-details" style="display:none;" ><?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?></a>
 							</td>
 							<td>
-								<a id="db-backed-up" class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text',sprintf(__("Migrate My %s Data to %s", "event_espresso"),$current_db_state,$next_db_state),$current_db_state,$next_db_state);?></a>
+								<a id="db-backed-up" class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text', sprintf(__("Migrate My %s Data to %s", "event_espresso"), $current_db_state, $next_db_state), $current_db_state, $next_db_state); ?></a>
 							</td>
 						</tr>
 						<tr>
 							<td colspan="3" style="padding: 0">
 								<div id="migration-details-dv" style="display: none; padding: 1em;">
 
-									<span class="reminder-spn"><?php printf(__("%s Important: %s Before migrating, please back up your database and files.", "event_espresso"),"<b>","</b>");?></span>
+									<span class="reminder-spn"><?php printf(__("%s Important: %s Before migrating, please back up your database and files.", "event_espresso"), "<b>", "</b>"); ?></span>
 									<p>
 									<?php
 										printf(
@@ -111,27 +111,27 @@ 
 										);
 									?>
 									</p>
-									<?php do_action('AHEE__ee_migration_page__option_1_extra_details');?>
+									<?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
 								</div>
 							</td>
 						</tr>
 						<tr>
-							<td><h3><?php _e('2', 'event_espresso');?></h3></td>
+							<td><h3><?php _e('2', 'event_espresso'); ?></h3></td>
 							<td>
-								<?php echo apply_filters( 'FHEE__ee_migration_page__option_2_main',sprintf(__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.', "event_espresso"),$current_db_state,$next_db_state,$ultimate_db_state),$current_db_state,$next_db_state,$ultimate_db_state);?><br />
-								<span class="reminder-spn"><?php _e( 'Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.', 'event_espresso' );?></span>
-								<a id="display-no-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="no-migration-details"><?php _e('click for more details', "event_espresso");?>&nbsp;+</a>
-								<a  id="hide-no-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="no-migration-details" style="display:none;" ><?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?></a>
+								<?php echo apply_filters('FHEE__ee_migration_page__option_2_main', sprintf(__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.', "event_espresso"), $current_db_state, $next_db_state, $ultimate_db_state), $current_db_state, $next_db_state, $ultimate_db_state); ?><br />
+								<span class="reminder-spn"><?php _e('Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.', 'event_espresso'); ?></span>
+								<a id="display-no-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="no-migration-details"><?php _e('click for more details', "event_espresso"); ?>&nbsp;+</a>
+								<a  id="hide-no-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="no-migration-details" style="display:none;" ><?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?></a>
 							</td>
 							<td>
-								<a id="do-not-migrate" class="do-not-migrate button-primary" href="<?php echo $reset_db_page_link;?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text',sprintf(__("Just Start %s and Delete Existing Data", "event_espresso"),$ultimate_db_state),$ultimate_db_state);?></a>
+								<a id="do-not-migrate" class="do-not-migrate button-primary" href="<?php echo $reset_db_page_link; ?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text', sprintf(__("Just Start %s and Delete Existing Data", "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?></a>
 							</td>
 						</tr>
 						<tr>
 							<td colspan="3" style="padding: 0">
 								<div id="no-migration-details-dv" style="display: none; padding: 1em;">
 									<p>
-									<?php echo apply_filters('FHEE__ee_migration_page__option_2_details',sprintf(__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", "event_espresso"),$ultimate_db_state),$ultimate_db_state);?>
+									<?php echo apply_filters('FHEE__ee_migration_page__option_2_details', sprintf(__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
 									</p>
 								</div>
 							</td>
@@ -139,20 +139,20 @@ 
 					</tbody>
 				</table>
 			</div>
-			<?php do_action('AHEE__ee_migration_page__after_migration_options_table');?>
+			<?php do_action('AHEE__ee_migration_page__after_migration_options_table'); ?>
 		</div>
 	<?php } ?>
 
 	<?php
-		if ( $show_most_recent_migration ) {
-			if( $most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base ) {
-				if( $most_recent_migration->can_continue() ) {
+		if ($show_most_recent_migration) {
+			if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) {
+				if ($most_recent_migration->can_continue()) {
 					//tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
 					<h3 class="espresso-header">
 						<span class="dashicons dashicons-star-half ee-icon-size-22"></span>
-						<?php printf(__("It appears that your previous Data Migration Task (%s) is incomplete, and should be resumed", "event_espresso"),$most_recent_migration->pretty_name());?>
+						<?php printf(__("It appears that your previous Data Migration Task (%s) is incomplete, and should be resumed", "event_espresso"), $most_recent_migration->pretty_name()); ?>
 					</h3>
-			<?php } elseif ( $most_recent_migration->is_broken() ) {
+			<?php } elseif ($most_recent_migration->is_broken()) {
 					//tell the user the migration failed and they should notify EE?>
 					<h3 class="espresso-header">
 						<span class="dashicons dashicons-no ee-icon-size-22"></span>
@@ -161,19 +161,19 @@ 
 			<?php }
 
 				//display errors or not of the most recent migration ran
-				if ( $most_recent_migration->get_errors() ){ ?>
+				if ($most_recent_migration->get_errors()) { ?>
 					<div class="ee-attention">
-						<strong><?php printf(__("Warnings occurred during your last migration (%s):",'event_espresso'),$most_recent_migration->pretty_name()) ?></strong>
-						<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Warnings", 'event_espresso');?></a>
+						<strong><?php printf(__("Warnings occurred during your last migration (%s):", 'event_espresso'), $most_recent_migration->pretty_name()) ?></strong>
+						<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Warnings", 'event_espresso'); ?></a>
 						<ul class="migration-warnings" style="display:none">
-						<?php foreach($most_recent_migration->get_errors() as $error){ ?>
-							<li><?php echo htmlentities( $error ) ?></li>
+						<?php foreach ($most_recent_migration->get_errors() as $error) { ?>
+							<li><?php echo htmlentities($error) ?></li>
 						<?php }?>
 						</ul>
 					</div>
 				<?php } else {
 					//there were no errors during the last migration, just say so?>
-					<h2><?php printf(__("The last data migration task (%s) ran successfully without errors.", "event_espresso"),$most_recent_migration->pretty_name())?></h2>
+					<h2><?php printf(__("The last data migration task (%s) ran successfully without errors.", "event_espresso"), $most_recent_migration->pretty_name())?></h2>
 				<?php }
 				} else {
 			}
@@ -184,12 +184,12 @@ 
 	</div>
 	<!--end of #migration-prep-->
 
-	<?php if ($show_migration_progress){?>
+	<?php if ($show_migration_progress) {?>
 	<div id='migration-monitor' <?php echo $show_backup_db_text ? "style='display:none'" : ''?>>
-		<?php if( $show_backup_db_text){?>
+		<?php if ($show_backup_db_text) {?>
 		<p>
 			<a class="toggle-migration-monitor small-text" style="cursor: pointer;">
-				<span class="dashicons dashicons-arrow-left-alt2" style="top:0;"></span><?php _e("return to previous screen", "event_espresso");?>
+				<span class="dashicons dashicons-arrow-left-alt2" style="top:0;"></span><?php _e("return to previous screen", "event_espresso"); ?>
 			</a>
 			<br/>
 
@@ -198,33 +198,33 @@ 
 		<div id='progress-area'>
 			<h3 class="espresso-header">
 				<?php
-				echo  sprintf( _n(
+				echo  sprintf(_n(
 					"In order to import all of your existing Event Espresso data, the following upgrade task needs to be performed:",
 					"In order to import all of your existing Event Espresso data, the following %s upgrade tasks need to be performed:",
 					count($script_names),
 					"event_espresso"
-				), count( $script_names ) );?>
+				), count($script_names)); ?>
 			</h3>
 			<ul style="list-style: inside;">
-				<?php foreach($script_names as $script_name){?>
+				<?php foreach ($script_names as $script_name) {?>
 				<li style="margin: 0 0 1em 1em; line-height: 1.1em;"><?php echo $script_name?></li>
 				<?php }?>
 			</ul>
 			<br/>
 			<?php if (count($script_names) > 1) {?>
-			<p><?php _e("Please note: after each task is completed you will need to continue the data migration, or report an error to Event Espresso.", "event_espresso");?></p>
+			<p><?php _e("Please note: after each task is completed you will need to continue the data migration, or report an error to Event Espresso.", "event_espresso"); ?></p>
 			<?php }?>
 
 			<div class="ee-attention">
 				<p>
 					<span class="reminder-spn">
-						<strong><?php _e("Please Note:", "event_espresso");?></strong>
+						<strong><?php _e("Please Note:", "event_espresso"); ?></strong>
 					</span>
 					<br/>
-					<?php _e("Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", "event_espresso");?>
+					<?php _e("Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", "event_espresso"); ?>
 				</p>
 				<p>
-					<?php printf(__("%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.", "event_espresso"),'<strong>', '</strong>' );?>
+					<?php printf(__("%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.", "event_espresso"), '<strong>', '</strong>'); ?>
 				</p>
 				<p>
 					<?php _e("Click the button below to begin the migration process.", "event_espresso") ?>
@@ -239,7 +239,7 @@ 
 			<!-- #progress-responsive -->
 
 			<button id='start-migration' class='button-primary'>
-				<?php echo $show_continue_current_migration_script ? __("Continue Migration", "event_espresso") : __("Begin Migration", "event_espresso");?>
+				<?php echo $show_continue_current_migration_script ? __("Continue Migration", "event_espresso") : __("Begin Migration", "event_espresso"); ?>
 			</button>
 			<br class="clear"/>
 
@@ -255,9 +255,9 @@ 
 	</div>
 
 <?php }
-	   if ( $show_maintenance_switch ) {
+	   if ($show_maintenance_switch) {
  ?>
-	<h2><span class="dashicons dashicons-admin-tools"></span><?php  _e('Set Event Espresso Maintenance Mode', 'event_espresso');?></h2>
+	<h2><span class="dashicons dashicons-admin-tools"></span><?php  _e('Set Event Espresso Maintenance Mode', 'event_espresso'); ?></h2>
    	<form method='post' action='<?php echo $update_migration_script_page_link?>'>
 		<div class="ee-table-wrap">
 			<table>
@@ -266,9 +266,9 @@ 
 						<input type="radio" id="maintenance_mode_level_off" name="maintenance_mode_level" value="0" <?php echo EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_0_not_in_maintenance ? 'checked="checked"' : ''?>>
 					</td>
 					<th align="left">
-						<label for="maintenance_mode_level_off"><?php  _e('Maintenance Mode OFF', 'event_espresso');?></label>
+						<label for="maintenance_mode_level_off"><?php  _e('Maintenance Mode OFF', 'event_espresso'); ?></label>
 				   		<p class='description' style="font-weight: normal;">
-					   		<?php _e("This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", "event_espresso");?>
+					   		<?php _e("This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", "event_espresso"); ?>
 				   		</p>
 					</th>
 				</tr>
@@ -281,14 +281,14 @@ 
 							<?php  _e('Maintenance Mode ON', 'event_espresso')?>
 						</label>
 				   		<p class='description' style="font-weight: normal;">
-					   		<?php _e("This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.", "event_espresso");?>
+					   		<?php _e("This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.", "event_espresso"); ?>
 				   		</p>
 					</th>
 				</tr>
 			</table>
 		</div>
 		<p>
-   			<input type='submit' class="button-primary" value='<?php _e("Update Maintenance Mode", "event_espresso");?>'>
+   			<input type='submit' class="button-primary" value='<?php _e("Update Maintenance Mode", "event_espresso"); ?>'>
    		</p>
    	</form>
 	   	<?php

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Spacing +204 added lines, -204 removed lines

@@ -8,15 +8,15 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_1_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 /**
@@ -34,7 +34,7 @@ 
  * --a function named update_espresso_config() which saves the EE_Config object to the database
  * --...and all its subclasses... really, you're best off copying the whole thin gwhen 4.1 is released into this file and wrapping its declaration in if( ! class_exists()){...}
  */
-class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -67,26 +67,26 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _checkin_table_exists(){
+	private function _checkin_table_exists() {
 		global $wpdb;
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
-		if($results){
+		if ($results) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
+		if ($version_string < '4.0.0' && $version_string > '3.1.26') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -96,15 +96,15 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -144,7 +144,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -165,7 +165,7 @@ 
 
 
 
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -182,41 +182,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -232,7 +232,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -259,7 +259,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -367,8 +367,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -380,12 +380,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -396,27 +396,27 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -449,8 +449,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -557,12 +557,12 @@ 
 
 		global $wpdb;
 		$state_table = $wpdb->prefix."esp_state";
-		if ( EEH_Activation::table_exists( $state_table ) ) {
+		if (EEH_Activation::table_exists($state_table)) {
 
-			$SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$SQL = "SELECT COUNT('STA_ID') FROM ".$state_table;
 			$states = $wpdb->get_var($SQL);
-			if ( ! $states ) {
-				$SQL = "INSERT INTO " . $state_table . "
+			if ( ! $states) {
+				$SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -649,12 +649,12 @@ 
 
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if ( EEH_Activation::table_exists( $country_table ) ) {
+		if (EEH_Activation::table_exists($country_table)) {
 
-			$SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$SQL = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
-				$SQL = "INSERT INTO " . $country_table . "
+			if ( ! $countries) {
+				$SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -901,20 +901,20 @@ 
 		global $wpdb;
 		$price_type_table = $wpdb->prefix."esp_price_type";
 
-		if ( EEH_Activation::table_exists( $price_type_table ) ) {
+		if (EEH_Activation::table_exists($price_type_table)) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-			$price_types_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
 
-			if ( ! $price_types_exist ) {
+			if ( ! $price_types_exist) {
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . __('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . __('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . __('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . __('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . __('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . __('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
 			}
 		}
 	}
@@ -934,16 +934,16 @@ 
 		global $wpdb;
 		$price_table = $wpdb->prefix."esp_price";
 
-		if ( EEH_Activation::table_exists(  $price_table ) ) {
+		if (EEH_Activation::table_exists($price_table)) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
+			$prices_exist = $wpdb->get_var($SQL);
 
-			if ( ! $prices_exist ) {
+			if ( ! $prices_exist) {
 				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, 0, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -960,34 +960,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( EEH_Activation::table_exists( $ticket_table ) ) {
+		if (EEH_Activation::table_exists($ticket_table)) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( EEH_Activation::table_exists( $ticket_price_table ) ) {
+		if (EEH_Activation::table_exists($ticket_price_table)) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -1000,20 +1000,20 @@ 
 	 * @param string $country_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_country($country_name){
-		if( ! $country_name ){
+	public function get_or_create_country($country_name) {
+		if ( ! $country_name) {
 			throw new EE_Error(__("Could not get a country because country name is blank", "event_espresso"));
 		}
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if(is_int($country_name)){
+		if (is_int($country_name)) {
 			$country_name = $this->get_iso_from_3_1_country_id($country_name);
 		}
 		$country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
-			CNT_name LIKE %s LIMIT 1",$country_name,$country_name,$country_name),ARRAY_A);
-		if( ! $country ){
+			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
+		if ( ! $country) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=> $this->_find_available_country_iso(2),
@@ -1033,26 +1033,26 @@ 
 				'CNT_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//CNT_ISO3
-				'%d',//RGN_ID
-				'%s',//CNT_name
-				'%s',//CNT_cur_code
-				'%s',//CNT_cur_single
-				'%s',//CNT_cur_plural
-				'%s',//CNT_cur_sign
-				'%d',//CNT_cur_sign_b4
-				'%d',//CNT_cur_dec_plc
-				'%s',//CNT_cur_dec_mrk
-				'%s',//CNT_cur_thsnds
-				'%s',//CNT_tel_code
-				'%d',//CNT_is_EU
-				'%d',//CNT_active
+				'%s', //CNT_ISO
+				'%s', //CNT_ISO3
+				'%d', //RGN_ID
+				'%s', //CNT_name
+				'%s', //CNT_cur_code
+				'%s', //CNT_cur_single
+				'%s', //CNT_cur_plural
+				'%s', //CNT_cur_sign
+				'%d', //CNT_cur_sign_b4
+				'%d', //CNT_cur_dec_plc
+				'%s', //CNT_cur_dec_mrk
+				'%s', //CNT_cur_thsnds
+				'%s', //CNT_tel_code
+				'%d', //CNT_is_EU
+				'%d', //CNT_active
 			);
 			$success = $wpdb->insert($country_table,
 					$cols_n_values,
 					$data_types);
-			if( ! $success){
+			if ( ! $success) {
 				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('country_id'=>$country_name), $country_table, $cols_n_values, $data_types));
 			}
 			$country = $cols_n_values;
@@ -1064,18 +1064,18 @@ 
 	 * @global type $wpdb
 	 * @return string
 	 */
-	private function _find_available_country_iso($num_letters = 2){
+	private function _find_available_country_iso($num_letters = 2) {
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
 		$attempts = 0;
-		do{
+		do {
 			$current_iso = strtoupper(wp_generate_password($num_letters, false));
-			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s",$current_iso));
+			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s", $current_iso));
 			$attempts++;
 		//keep going until we find an available country code, or we arbitrarily
 		//decide we've tried this enough. Somehow they have way too many countries
 		//(probably because they're mis-using the EE3 country_id like a custom question)
-		}while( intval($country_with_that_iso) && $attempts < 200 );
+		}while (intval($country_with_that_iso) && $attempts < 200);
 		return $current_iso;
 	}
 
@@ -1086,14 +1086,14 @@ 
 	 * @param string $state_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_state($state_name,$country_name = ''){
-		if( ! $state_name ){
+	public function get_or_create_state($state_name, $country_name = '') {
+		if ( ! $state_name) {
 			throw new EE_Error(__("Could not get-or-create state because no state name was provided", "event_espresso"));
 		}
-		try{
+		try {
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1101,24 +1101,24 @@ 
 		$state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
-			CNT_ISO LIKE %s LIMIT 1",$state_name,$state_name,$country_iso),ARRAY_A);
-		if ( ! $state){
+			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
+		if ( ! $state) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=>$country_iso,
-				'STA_abbrev'=>substr($state_name,0,6),
+				'STA_abbrev'=>substr($state_name, 0, 6),
 				'STA_name'=>$state_name,
 				'STA_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//STA_abbrev
-				'%s',//STA_name
-				'%d',//STA_active
+				'%s', //CNT_ISO
+				'%s', //STA_abbrev
+				'%s', //STA_name
+				'%d', //STA_active
 			);
-			$success = $wpdb->insert($state_table,$cols_n_values,$data_types);
-			if ( ! $success ){
-				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name,'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
+			$success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if ( ! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name, 'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
 			}
 			$state = $cols_n_values;
 			$state['STA_ID'] = $wpdb->insert_id;
@@ -1131,21 +1131,21 @@ 
 	 * @param type $timeString
 	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes with leading zeros)
 	 */
-	public function convertTimeFromAMPM($timeString){
+	public function convertTimeFromAMPM($timeString) {
 		$matches = array();
-		preg_match("~(\\d*):(\\d*)~",$timeString,$matches);
-		if( ! $matches || count($matches)<3){
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if ( ! $matches || count($matches) < 3) {
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else {
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
-		if(strpos($timeString, 'PM') || strpos($timeString, 'pm')){
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
 			$hour = intval($hour) + 12;
 		}
-		$hour = str_pad( "$hour", 2, '0',STR_PAD_LEFT);
-		$minutes = str_pad( "$minutes", 2, '0',STR_PAD_LEFT);
+		$hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
 		return "$hour:$minutes";
 	}
 
@@ -1154,7 +1154,7 @@ 
 	 * @param int $country_id
 	 * @return string the country's ISO3 code
 	 */
-	public function get_iso_from_3_1_country_id($country_id){
+	public function get_iso_from_3_1_country_id($country_id) {
 		$old_countries = array(
 			array(64, 'United States', 'US', 'USA', 1),
 			array(15, 'Australia', 'AU', 'AUS', 1),
@@ -1380,9 +1380,9 @@ 
 			array(226, 'Zimbabwe', 'ZW', 'ZWE', 1));
 
 		$country_iso = 'US';
-		foreach($old_countries as $country_array){
+		foreach ($old_countries as $country_array) {
 			//note: index 0 is the 3.1 country ID
-			if($country_array[0] == $country_id){
+			if ($country_array[0] == $country_id) {
 				//note: index 2 is the ISO
 				$country_iso = $country_array[2];
 				break;
@@ -1395,8 +1395,8 @@ 
 	 * Gets the ISO3 for the
 	 * @return string
 	 */
-	public function get_default_country_iso(){
-		$old_org_options= get_option('events_organization_settings');
+	public function get_default_country_iso() {
+		$old_org_options = get_option('events_organization_settings');
 		$iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
 		return $iso;
 	}
@@ -1408,13 +1408,13 @@ 
 	 * the event's DEFAULT payment status, or the attendee's payment status) required pre-approval.
 	 * @return string STS_ID for use in 4.1
 	 */
-	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false){
+	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false) {
 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-		if($this_thing_required_pre_approval){
+		if ($this_thing_required_pre_approval) {
 				return 'RNA';
-		}else{
-				$mapping = $default_reg_stati_conversions=array(
+		} else {
+				$mapping = $default_reg_stati_conversions = array(
 			'Completed'=>'RAP',
 			''=>'RPP',
 			'Incomplete'=>'RPP',
@@ -1444,22 +1444,22 @@ 
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
 	 */
-	public function convert_image_url_to_attachment_and_attach_to_post($guid,$new_cpt_id,  EE_Data_Migration_Script_Stage $migration_stage){
+	public function convert_image_url_to_attachment_and_attach_to_post($guid, $new_cpt_id, EE_Data_Migration_Script_Stage $migration_stage) {
 		$created_attachment_post = false;
 		$guid = $this->_get_original_guid($guid);
-		if($guid){
+		if ($guid) {
 			//check for an existing attachment post with this guid
 			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-			if( ! $attachment_post_id){
+			if ( ! $attachment_post_id) {
 				//post thumbnail with that GUID doesn't exist, we should create one
 				$attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
 				$created_attachment_post = true;
 			}
 			//double-check we actually have an attachment post
-			if( $attachment_post_id){
-				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
-				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"), $guid, $new_cpt_id, $attachment_post_id));
 			}
 		}
 		return $created_attachment_post;
@@ -1473,13 +1473,13 @@ 
 	 * @param string $guid_in_old_event
 	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
 	 */
-	private function _get_original_guid($guid_in_old_event){
-		$original_guid = preg_replace('~-\d*x\d*\.~','.',$guid_in_old_event,1);
+	private function _get_original_guid($guid_in_old_event) {
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
 		//do a head request to verify the file exists
 		$head_response = wp_remote_head($original_guid);
-		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
+		if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
 			return $original_guid;
-		}else{
+		} else {
 			return $guid_in_old_event;
 		}
 	}
@@ -1491,32 +1491,32 @@ 
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
-	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage){
-		if ( ! $guid){
+	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage) {
+		if ( ! $guid) {
 			$migration_stage->add_error(sprintf(__("Cannot create image attachment for a blank GUID!", "event_espresso")));
 			return 0;
 		}
-		$wp_filetype = wp_check_filetype(basename($guid), null );
+		$wp_filetype = wp_check_filetype(basename($guid), null);
 		$wp_upload_dir = wp_upload_dir();
 		//if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
-		if(strpos($guid,$wp_upload_dir['url']) === FALSE){
+		if (strpos($guid, $wp_upload_dir['url']) === FALSE) {
 			//image is located remotely. download it and place it in the uploads directory
-			if( ! is_readable($guid)){
-				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"),$guid));
+			if ( ! is_readable($guid)) {
+				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"), $guid));
 				return 0;
 			}
-			$contents= file_get_contents($guid);
-			if($contents === FALSE){
-				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"),$guid));
+			$contents = file_get_contents($guid);
+			if ($contents === FALSE) {
+				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"), $guid));
 				return false;
 			}
-			$local_filepath  = $wp_upload_dir['path'].DS.basename($guid);
+			$local_filepath = $wp_upload_dir['path'].DS.basename($guid);
 			$savefile = fopen($local_filepath, 'w');
 			fwrite($savefile, $contents);
 			fclose($savefile);
-			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
-			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
 		}
 
 		$attachment = array(
@@ -1526,24 +1526,24 @@ 
 		   'post_content' => '',
 		   'post_status' => 'inherit'
 		);
-		$attach_id = wp_insert_attachment( $attachment, $guid );
-		if( ! $attach_id ){
-			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"),$guid,$this->_json_encode($attachment)));
+		$attach_id = wp_insert_attachment($attachment, $guid);
+		if ( ! $attach_id) {
+			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"), $guid, $this->_json_encode($attachment)));
 			return $attach_id;
 		}
 
 		// you must first include the image.php file
 		// for the function wp_generate_attachment_metadata() to work
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 
-		$attach_data = wp_generate_attachment_metadata( $attach_id, $local_filepath );
-		if( ! $attach_data){
-			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"),$attach_id,$local_filepath,$guid));
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if ( ! $attach_data) {
+			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"), $attach_id, $local_filepath, $guid));
 			return $attach_id;
 		}
-		$metadata_save_result = wp_update_attachment_metadata( $attach_id, $attach_data );
-		if( ! $metadata_save_result ){
-			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"),$attach_id,$this->_json_encode($attach_data)));
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if ( ! $metadata_save_result) {
+			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"), $attach_id, $this->_json_encode($attach_data)));
 		}
 		return $attach_id;
 	}
@@ -1555,9 +1555,9 @@ 
 	 * @param string $guid
 	 * @return int
 	 */
-	private function _get_image_attachment_id_by_GUID($guid){
+	private function _get_image_attachment_id_by_GUID($guid) {
 		global $wpdb;
-		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1",$guid));
+		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
 		return $attachment_id;
 	}
 	/**
@@ -1569,20 +1569,20 @@ 
 	 * @param string $timezone
 	 * @return string
 	 */
-	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string,$timezone = null){
+	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string, $timezone = null) {
 		$original_tz = $timezone;
-		if( ! $timezone){
+		if ( ! $timezone) {
 			$timezone = $this->_get_wp_timezone();
 		}
-		if( ! $timezone){
-			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"),$original_tz,$row_of_data));
+		if ( ! $timezone) {
+			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"), $original_tz, $row_of_data));
 			$timezone = 'UTC';
 		}
-		try{
-			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
-			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
+		} catch (Exception $e) {
+			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"), $DATETIME_string, $timezone));
 			$date_obj = new DateTime();
 		}
 
@@ -1593,14 +1593,14 @@ 
 	 * Gets the DEFAULT timezone string from wordpress (even if they set a gmt offset)
 	 * @return string
 	 */
-	private function _get_wp_timezone(){
-		$timezone = empty( $timezone ) ? get_option('timezone_string') : $timezone;
+	private function _get_wp_timezone() {
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = $this->timezone_convert_to_string_from_offset( $offset );
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
 		}
 		return $timezone;
 	}
@@ -1609,11 +1609,11 @@ 
 	 * @param int $offset
 	 * @return boolean
 	 */
-	private function timezone_convert_to_string_from_offset($offset){
+	private function timezone_convert_to_string_from_offset($offset) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
         $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
+        foreach ($abbrarray as $abbr) {
                 foreach ($abbr as $city)
                 {
                         if ($city['offset'] == $offset)
@@ -1627,32 +1627,32 @@ 
         return FALSE;
 	}
 
-	public function migration_page_hooks(){
-		add_filter('FHEE__ee_migration_page__header',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__p_after_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_1_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__option_1_button_text',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_action('AHEE__ee_migration_page__option_1_extra_details',array($this,'_migration_page_hook_option_1_extra_details'),10,3);
-		add_filter('FHEE__ee_migration_page__option_2_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,4);
-		add_filter('FHEE__ee_migration_page__option_2_button_text',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_2_details',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_action('AHEE__ee_migration_page__after_migration_options_table',array($this,'_migration_page_hook_after_migration_options_table'));
-		add_filter('FHEE__ee_migration_page__done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__p_after_done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
+	public function migration_page_hooks() {
+		add_filter('FHEE__ee_migration_page__header', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__p_after_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_1_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_1_button_text', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_action('AHEE__ee_migration_page__option_1_extra_details', array($this, '_migration_page_hook_option_1_extra_details'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_2_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 4);
+		add_filter('FHEE__ee_migration_page__option_2_button_text', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_2_details', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_action('AHEE__ee_migration_page__after_migration_options_table', array($this, '_migration_page_hook_after_migration_options_table'));
+		add_filter('FHEE__ee_migration_page__done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__p_after_done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
 	}
 
-	public function _migrate_page_hook_simplify_version_strings($old_content,$current_db_state,$next_db_state,$ultimate_db_state = NULL){
-		return str_replace(array($current_db_state,$next_db_state,$ultimate_db_state),array(__('EE3','event_espresso'),__('EE4','event_espresso'),  __("EE4", 'event_espresso')),$old_content);
+	public function _migrate_page_hook_simplify_version_strings($old_content, $current_db_state, $next_db_state, $ultimate_db_state = NULL) {
+		return str_replace(array($current_db_state, $next_db_state, $ultimate_db_state), array(__('EE3', 'event_espresso'), __('EE4', 'event_espresso'), __("EE4", 'event_espresso')), $old_content);
 	}
-	public function _migration_page_hook_simplify_next_db_state($old_content,$next_db_state){
-		return str_replace($next_db_state,  __("EE4", 'event_espresso'),$old_content);
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state) {
+		return str_replace($next_db_state, __("EE4", 'event_espresso'), $old_content);
 	}
-	public function _migration_page_hook_option_1_extra_details(){
-		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso"));?></p><?php
+	public function _migration_page_hook_option_1_extra_details() {
+		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso")); ?></p><?php
 	}
-	public function _migration_page_hook_after_migration_options_table(){
+	public function _migration_page_hook_after_migration_options_table() {
 		?><p class="ee-attention">
-				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso");?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso");	?>
+				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso"); ?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso"); ?>
 			</p><?php
 	}
 }