eventespresso / event-espresso-core

admin_pages/general_settings/templates/state_details_settings.template.php

Spacing +13 added lines, -13 removed lines

@@ -1,27 +1,27 @@ 
 	<table id="general-setting-country-states-tbl" class="form-table">
 		<thead>
 			<tr>
-				<th><?php _e( 'Code', 'event_espresso' );?></th>
-				<th><?php _e( 'Name', 'event_espresso' );?></th>
-				<th colspan="2"><span class="small-text"><?php _e( 'State Appears in<br/>Dropdown Select Lists ', 'event_espresso' );?></span></th>
+				<th><?php _e('Code', 'event_espresso'); ?></th>
+				<th><?php _e('Name', 'event_espresso'); ?></th>
+				<th colspan="2"><span class="small-text"><?php _e('State Appears in<br/>Dropdown Select Lists ', 'event_espresso'); ?></span></th>
 			</tr>
 		</thead>
 		<tbody>
 		<?php
 		//EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( $states ) {
-			foreach ( $states as $STA_ID => $state ) {
+		if ($states) {
+			foreach ($states as $STA_ID => $state) {
 		?>
 			<tr id="state-<?php echo $STA_ID; ?>-tr" class="country-state-columns">
 			<?php
-				foreach ( $state['inputs'] as $ID => $input ) {
-					if ( $ID != 'STA_ID' && $ID != 'CNT_ISO' ) {
-						echo EEH_Form_Fields::generate_form_input( $input );
+				foreach ($state['inputs'] as $ID => $input) {
+					if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
+						echo EEH_Form_Fields::generate_form_input($input);
 					}
 				 }
 			 ?>
 				<td class="delete-state-td">
-					<a id="delete-state-<?php echo $STA_ID; ?>-lnk" class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>" title="<?php esc_attr_e( 'Delete State #', 'event_espresso' ); ?><?php echo $STA_ID; ?>?" href="<?php echo $state['delete_state_url']; ?>"></a>
+					<a id="delete-state-<?php echo $STA_ID; ?>-lnk" class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>" title="<?php esc_attr_e('Delete State #', 'event_espresso'); ?><?php echo $STA_ID; ?>?" href="<?php echo $state['delete_state_url']; ?>"></a>
 				</td>
 			</tr>
 		<?php
@@ -38,23 +38,23 @@ 
 	<table class="form-table add-new-state-tbl">
 		<tbody>
 			<tr>
-				<td colspan="2"><h4><?php _e( 'Add New State/Province', 'event_espresso' );?></h4></td>
+				<td colspan="2"><h4><?php _e('Add New State/Province', 'event_espresso'); ?></h4></td>
 			</tr>
 
 			<tr>
 				<td class="general-settings-country-state-input-td">
-					<label for="STA_abbrev_XXX"><?php _e( 'Code', 'event_espresso' );?></label><br />
+					<label for="STA_abbrev_XXX"><?php _e('Code', 'event_espresso'); ?></label><br />
 					<input id="STA_abbrev-XXX" class="STA_abbrev mid-text " type="text" title="" value=""
 						   name="STA_abbrev_XXX">
 				</td>
 				<td class="general-settings-country-state-input-td">
-					<label for="STA_name_XXX"><?php _e( 'Name', 'event_espresso' );?></label><br/>
+					<label for="STA_name_XXX"><?php _e('Name', 'event_espresso'); ?></label><br/>
 					<input id="STA_name-XXX" class="STA_name regular-text " type="text" title="" value="" name="STA_name_XXX">
 				</td>
 			</tr>
 			<tr>
 				<td colspan="2">
-					<input  type="submit" id="add-new-state-btn" class="secondary-button button right" value="<?php _e( 'Add New State/Province', 'event_espresso' );?>" />
+					<input  type="submit" id="add-new-state-btn" class="secondary-button button right" value="<?php _e('Add New State/Province', 'event_espresso'); ?>" />
 
 				</td>
 			</tr>

admin_pages/maintenance/Maintenance_Admin_Page.core.php

Braces +11 added lines, -10 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -185,7 +186,7 @@ 
 					$show_migration_progress = true;
 					if(isset($this->_req_data['continue_migration'])){
 						$show_backup_db_text = false;
-					}else{
+					} else{
 						$show_backup_db_text = true;
 					}
 					$scripts_needing_to_run = EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts();
@@ -205,7 +206,7 @@ 
 			}
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
 			$exception_thrown = false;
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -223,19 +224,19 @@ 
 			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
 			$this->_template_args[ 'support_url' ] = 'http://eventespresso.com/support/forums/';
 			$this->_template_args[ 'next_url' ] = EEH_URL::add_query_args_and_nonce(array( 'action' => 'confirm_migration_crash_report_sent', 'success' => '0' ), EE_MAINTENANCE_ADMIN_URL );
-		}elseif($addons_should_be_upgraded_first){
+		} elseif($addons_should_be_upgraded_first){
 			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
-		}else{
+		} else{
 			if($most_recent_migration &&
 					$most_recent_migration instanceof EE_Data_Migration_Script_Base  &&
 					$most_recent_migration->can_continue()){
 				$show_backup_db_text = false;
 				$show_continue_current_migration_script = true;
 				$show_most_recent_migration = true;
-			}elseif(isset($this->_req_data['continue_migration'])){
+			} elseif(isset($this->_req_data['continue_migration'])){
 				$show_most_recent_migration = true;
 				$show_continue_current_migration_script = false;
-			}else{
+			} else{
 				$show_most_recent_migration = false;
 				$show_continue_current_migration_script = false;
 			}
@@ -313,7 +314,7 @@ 
 		if( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
 			EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
 			$success = true;
-		}else{
+		} else{
 			EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 			$success= false;
 		}
@@ -380,7 +381,7 @@ 
 					"from:$from_name<$from>",
 //					'content-type:text/html charset=UTF-8'
 					));
-		}catch( Exception $e ){
+		} catch( Exception $e ){
 			$success = FALSE;
 		}
 		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"),array('success'=>$success,'action'=>'confirm_migration_crash_report_sent'));
@@ -391,7 +392,7 @@ 
 	public function _confirm_migration_crash_report_sent(){
 		try{
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
 			//now, just so we can display the page correctly, make a error migration script stage object

Spacing +89 added lines, -89 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,8 +30,8 @@ 
 class Maintenance_Admin_Page extends EE_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -46,8 +46,8 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_migration_step',array($this,'migration_step'));
-		add_action('wp_ajax_add_error_to_migrations_ran',array($this,'add_error_to_migrations_ran'));
+		add_action('wp_ajax_migration_step', array($this, 'migration_step'));
+		add_action('wp_ajax_add_error_to_migrations_ran', array($this, 'add_error_to_migrations_ran'));
 	}
 
 
@@ -56,7 +56,7 @@ 
 		$this->_admin_page_title = EE_MAINTENANCE_LABEL;
 		$this->_labels = array(
 			'buttons' => array(
-				'reset_capabilities' => __( 'Reset Event Espresso Capabilities', 'event_espresso' )
+				'reset_capabilities' => __('Reset Event Espresso Capabilities', 'event_espresso')
 				)
 			);
 	}
@@ -155,23 +155,23 @@ 
 	 * default maintenance page. If we're in maintenance mode level 2, then we need to show
 	 * the migration scripts and all that UI.
 	 */
-	public function _maintenance(){
+	public function _maintenance() {
 		//it all depends if we're in maintenance model level 1 (frontend-only) or
 		//level 2 (everything except maintenance page)
-		try{
+		try {
 			//get the current maintenance level and check if
 			//we are removed
 			$mm = EE_Maintenance_Mode::instance()->level();
 			$placed_in_mm = EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-			if( $mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm){
+			if ($mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
 				//we just took the site out of maintenance mode, so notify the user.
 				//unfortunately this message appears to be echoed on the NEXT page load...
 				//oh well, we should really be checking for this on addon deactivation anyways
-				EE_Error::add_attention( __( 'Site taken out of maintenance mode because no data migration scripts are required', 'event_espresso' ) );
-				$this->_process_notices( array( 'page' => 'espresso_maintenance_settings'), false );
+				EE_Error::add_attention(__('Site taken out of maintenance mode because no data migration scripts are required', 'event_espresso'));
+				$this->_process_notices(array('page' => 'espresso_maintenance_settings'), false);
 			}
 			//in case an exception is thrown while trying to handle migrations
-			switch(EE_Maintenance_Mode::instance()->level()){
+			switch (EE_Maintenance_Mode::instance()->level()) {
 				case EE_Maintenance_Mode::level_0_not_in_maintenance:
 				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
 					$show_maintenance_switch = true;
@@ -183,18 +183,18 @@ 
 				case EE_Maintenance_Mode::level_2_complete_maintenance:
 					$show_maintenance_switch = false;
 					$show_migration_progress = true;
-					if(isset($this->_req_data['continue_migration'])){
+					if (isset($this->_req_data['continue_migration'])) {
 						$show_backup_db_text = false;
-					}else{
+					} else {
 						$show_backup_db_text = true;
 					}
 					$scripts_needing_to_run = EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts();
 					$addons_should_be_upgraded_first = EE_Data_Migration_Manager::instance()->addons_need_updating();
 					$script_names = array();
 					$current_script = NULL;
-					foreach($scripts_needing_to_run as $script){
-						if($script instanceof EE_Data_Migration_Script_Base){
-							if( ! $current_script){
+					foreach ($scripts_needing_to_run as $script) {
+						if ($script instanceof EE_Data_Migration_Script_Base) {
+							if ( ! $current_script) {
 								$current_script = $script;
 								$current_script->migration_page_hooks();
 							}
@@ -205,7 +205,7 @@ 
 			}
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
 			$exception_thrown = false;
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -215,54 +215,54 @@ 
 			$exception_thrown = true;
 		}
 		$current_db_state = EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set();
-		$current_db_state = str_replace( '.decaf', '', $current_db_state );
-		if($exception_thrown ||
-				(	$most_recent_migration &&
+		$current_db_state = str_replace('.decaf', '', $current_db_state);
+		if ($exception_thrown ||
+				($most_recent_migration &&
 					$most_recent_migration instanceof EE_Data_Migration_Script_Base &&
 					$most_recent_migration->is_broken()
-				)){
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
-			$this->_template_args[ 'support_url' ] = 'http://eventespresso.com/support/forums/';
-			$this->_template_args[ 'next_url' ] = EEH_URL::add_query_args_and_nonce(array( 'action' => 'confirm_migration_crash_report_sent', 'success' => '0' ), EE_MAINTENANCE_ADMIN_URL );
-		}elseif($addons_should_be_upgraded_first){
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
-		}else{
-			if($most_recent_migration &&
-					$most_recent_migration instanceof EE_Data_Migration_Script_Base  &&
-					$most_recent_migration->can_continue()){
+				)) {
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_was_borked_page.template.php';
+			$this->_template_args['support_url'] = 'http://eventespresso.com/support/forums/';
+			$this->_template_args['next_url'] = EEH_URL::add_query_args_and_nonce(array('action' => 'confirm_migration_crash_report_sent', 'success' => '0'), EE_MAINTENANCE_ADMIN_URL);
+		}elseif ($addons_should_be_upgraded_first) {
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_upgrade_addons_before_migrating.template.php';
+		} else {
+			if ($most_recent_migration &&
+					$most_recent_migration instanceof EE_Data_Migration_Script_Base &&
+					$most_recent_migration->can_continue()) {
 				$show_backup_db_text = false;
 				$show_continue_current_migration_script = true;
 				$show_most_recent_migration = true;
-			}elseif(isset($this->_req_data['continue_migration'])){
+			}elseif (isset($this->_req_data['continue_migration'])) {
 				$show_most_recent_migration = true;
 				$show_continue_current_migration_script = false;
-			}else{
+			} else {
 				$show_most_recent_migration = false;
 				$show_continue_current_migration_script = false;
 			}
 
-			if(isset($current_script)){
+			if (isset($current_script)) {
 				$migrates_to = $current_script->migrates_to_version();
-				$plugin_slug = $migrates_to[ 'slug' ];
-				$new_version = $migrates_to[ 'version' ];
-				$this->_template_args = array_merge($this->_template_args,array(
-					'current_db_state'=>  sprintf(__("EE%s (%s)", "event_espresso"), isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3,$plugin_slug),
-					'next_db_state'=>isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'),$new_version,$plugin_slug) : NULL));
+				$plugin_slug = $migrates_to['slug'];
+				$new_version = $migrates_to['version'];
+				$this->_template_args = array_merge($this->_template_args, array(
+					'current_db_state'=>  sprintf(__("EE%s (%s)", "event_espresso"), isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3, $plugin_slug),
+					'next_db_state'=>isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'), $new_version, $plugin_slug) : NULL));
 			}
 
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_page.template.php';
 			$this->_template_args = array_merge(
 				$this->_template_args,
 				array(
-					'show_most_recent_migration' => $show_most_recent_migration,//flag for showing the most recent migration's status and/or errors
-					'show_migration_progress' => $show_migration_progress,//flag for showing the option to run migrations and see their progress
-					'show_backup_db_text' => $show_backup_db_text,//flag for showing text telling the user to backup their DB
-					'show_maintenance_switch'=> $show_maintenance_switch,//flag for showing the option to change maintenance mode between levels 0 and 1
-					'script_names'=>$script_names,//array of names of scripts that have run
-					'show_continue_current_migration_script'=>$show_continue_current_migration_script,//flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
+					'show_most_recent_migration' => $show_most_recent_migration, //flag for showing the most recent migration's status and/or errors
+					'show_migration_progress' => $show_migration_progress, //flag for showing the option to run migrations and see their progress
+					'show_backup_db_text' => $show_backup_db_text, //flag for showing text telling the user to backup their DB
+					'show_maintenance_switch'=> $show_maintenance_switch, //flag for showing the option to change maintenance mode between levels 0 and 1
+					'script_names'=>$script_names, //array of names of scripts that have run
+					'show_continue_current_migration_script'=>$show_continue_current_migration_script, //flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
 					'reset_db_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'reset_db'), EE_MAINTENANCE_ADMIN_URL),
-					'update_migration_script_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'change_maintenance_level'),EE_MAINTENANCE_ADMIN_URL),
-					'ultimate_db_state'=>  sprintf(__("EE%s", 'event_espresso'),espresso_version()),
+					'update_migration_script_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'change_maintenance_level'), EE_MAINTENANCE_ADMIN_URL),
+					'ultimate_db_state'=>  sprintf(__("EE%s", 'event_espresso'), espresso_version()),
 				)
 			);
 		//make sure we have the form fields helper available. It usually is, but sometimes it isn't
@@ -276,7 +276,7 @@ 
 			'status_fatal_error'=>  EE_Data_Migration_Manager::status_fatal_error,
 			'status_completed'=>  EE_Data_Migration_Manager::status_completed));
 		}
-		$this->_template_args['most_recent_migration'] = $most_recent_migration;//the actual most recently ran migration
+		$this->_template_args['most_recent_migration'] = $most_recent_migration; //the actual most recently ran migration
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
@@ -286,7 +286,7 @@ 
 	/**
 	 * returns JSON and executes another step of the currently-executing data migration (called via ajax)
 	 */
-	public function migration_step(){
+	public function migration_step() {
 		$this->_template_args['data'] = EE_Data_Migration_Manager::instance()->response_to_migration_ajax_request();
 		$this->_return_json();
 	}
@@ -297,7 +297,7 @@ 
 	 * Can be used by js when it notices a response with HTML in it in order
 	 * to log the malformed response
 	 */
-	public function add_error_to_migrations_ran(){
+	public function add_error_to_migrations_ran() {
 		EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($this->_req_data['message']);
 		$this->_template_args['data'] = array('ok'=>true);
 		$this->_return_json();
@@ -308,14 +308,14 @@ 
 	/**
 	 * changes the maintenance level, provided there are still no migration scripts that shoudl run
 	 */
-	public function _change_maintenance_level(){
+	public function _change_maintenance_level() {
 		$new_level = intval($this->_req_data['maintenance_mode_level']);
-		if( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
+		if ( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
 			EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
 			$success = true;
-		}else{
+		} else {
 			EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-			$success= false;
+			$success = false;
 		}
 		$this->_redirect_after_action($success, 'Maintenance Mode', __("Updated", "event_espresso"));
 	}
@@ -327,8 +327,8 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function _data_reset_and_delete(){
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
+	public function _data_reset_and_delete() {
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_data_reset_and_delete.template.php';
 		$this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
 			'reset_capabilities',
 			'reset_capabilities',
@@ -338,11 +338,11 @@ 
 			false
 		);
 		$this->_template_args['delete_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'delete_db' ),
+			array('action' => 'delete_db'),
 			EE_MAINTENANCE_ADMIN_URL
 		);
 		$this->_template_args['reset_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'reset_db' ),
+			array('action' => 'reset_db'),
 			EE_MAINTENANCE_ADMIN_URL
 		);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
@@ -356,9 +356,9 @@ 
 
 
 	protected function _reset_capabilities() {
-		EE_Registry::instance()->CAP->init_caps( true );
-		EE_Error::add_success( __('Default Event Espresso capabilities have been restored for all current roles.', 'event_espresso' ) );
-		$this->_redirect_after_action( FALSE, '', '', array( 'action' => 'data_reset' ), TRUE );
+		EE_Registry::instance()->CAP->init_caps(true);
+		EE_Error::add_success(__('Default Event Espresso capabilities have been restored for all current roles.', 'event_espresso'));
+		$this->_redirect_after_action(FALSE, '', '', array('action' => 'data_reset'), TRUE);
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 	 */
 	protected function _reattempt_migration() {
 		EE_Data_Migration_Manager::instance()->reattempt();
-		$this->_redirect_after_action( FALSE, '', '', array( 'action' => 'default' ), TRUE );
+		$this->_redirect_after_action(FALSE, '', '', array('action' => 'default'), TRUE);
 	}
 
 
@@ -377,8 +377,8 @@ 
 	/**
 	 * shows the big ol' System Information page
 	 */
-	public function _system_status(){
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
+	public function _system_status() {
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_system_stati_page.template.php';
 		$this->_template_args['system_stati'] = EEM_System_Status::instance()->get_system_stati();
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
@@ -386,30 +386,30 @@ 
 
 
 
-	public function _send_migration_crash_report(){
+	public function _send_migration_crash_report() {
 		$from = $this->_req_data['from'];
 		$from_name = $this->_req_data['from_name'];
 		$body = $this->_req_data['body'];
-		try{
+		try {
 		$success = wp_mail(EE_SUPPORT_EMAIL,
 				'Migration Crash Report',
-				$body."/r/n<br>".  print_r(EEM_System_Status::instance()->get_system_stati(),true),
+				$body."/r/n<br>".print_r(EEM_System_Status::instance()->get_system_stati(), true),
 				array(
 					"from:$from_name<$from>",
 //					'content-type:text/html charset=UTF-8'
 					));
-		}catch( Exception $e ){
+		} catch (Exception $e) {
 			$success = FALSE;
 		}
-		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"),array('success'=>$success,'action'=>'confirm_migration_crash_report_sent'));
+		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"), array('success'=>$success, 'action'=>'confirm_migration_crash_report_sent'));
 	}
 
 
 
-	public function _confirm_migration_crash_report_sent(){
-		try{
+	public function _confirm_migration_crash_report_sent() {
+		try {
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -417,14 +417,14 @@ 
 			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
 			$most_recent_migration->add_error($e->getMessage());
 		}
-		$success = $this->_req_data['success']=='1' ? true : false;
+		$success = $this->_req_data['success'] == '1' ? true : false;
 		$this->_template_args['success'] = $success;
-		$this->_template_args[ 'most_recent_migration' ] = $most_recent_migration;
+		$this->_template_args['most_recent_migration'] = $most_recent_migration;
 		$this->_template_args['reset_db_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'reset_db'), EE_MAINTENANCE_ADMIN_URL);
-		$this->_template_args[ 'reset_db_page_url' ] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'data_reset'), EE_MAINTENANCE_ADMIN_URL);
-		$this->_template_args[ 'reattempt_action_url' ] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'reattempt_migration'), EE_MAINTENANCE_ADMIN_URL );
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,$this->_template_args,TRUE);
+		$this->_template_args['reset_db_page_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'data_reset'), EE_MAINTENANCE_ADMIN_URL);
+		$this->_template_args['reattempt_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reattempt_migration'), EE_MAINTENANCE_ADMIN_URL);
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_confirm_migration_crash_report_sent.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -437,18 +437,18 @@ 
 	 * @param boolean $nuke_old_ee4_data controls whether or not we
 	 * destroy the old ee4 data, or just try initializing ee4 default data
 	 */
-	public function _reset_db( $nuke_old_ee4_data = TRUE ){
+	public function _reset_db($nuke_old_ee4_data = TRUE) {
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 
-		if( $nuke_old_ee4_data ){
+		if ($nuke_old_ee4_data) {
 			EEH_Activation::delete_all_espresso_cpt_data();
-			EEH_Activation::delete_all_espresso_tables_and_data( FALSE );
+			EEH_Activation::delete_all_espresso_tables_and_data(FALSE);
 			EEH_Activation::remove_cron_tasks();
 		}
 		//make sure when we reset the registry's config that it
 		//switches to using the new singleton
-		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset( TRUE );
-		EE_System::instance()->initialize_db_if_no_migrations_required( TRUE );
+		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(TRUE);
+		EE_System::instance()->initialize_db_if_no_migrations_required(TRUE);
 		EE_System::instance()->redirect_to_about_ee();
 	}
 
@@ -457,20 +457,20 @@ 
 	/**
 	 * Deletes ALL EE tables, Records, and Options from the database.
 	 */
-	public function _delete_db(){
+	public function _delete_db() {
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 		EEH_Activation::delete_all_espresso_cpt_data();
 		EEH_Activation::delete_all_espresso_tables_and_data();
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::deactivate_event_espresso();
-		wp_safe_redirect( admin_url( 'plugins.php' ));
+		wp_safe_redirect(admin_url('plugins.php'));
 		exit;
 	}
 
 	/**
 	 * sets up EE4 to rerun the migrations from ee3 to ee4
 	 */
-	public function _rerun_migration_from_ee3(){
+	public function _rerun_migration_from_ee3() {
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 		EEH_Activation::delete_all_espresso_cpt_data();
 		EEH_Activation::delete_all_espresso_tables_and_data(false);
@@ -497,9 +497,9 @@ 
 		wp_enqueue_script('ee_admin_js');
 //		wp_enqueue_media();
 //		wp_enqueue_script('media-upload');
-		wp_enqueue_script('ee-maintenance',EE_MAINTENANCE_ASSETS_URL.'/ee-maintenance.js',array('jquery'),EVENT_ESPRESSO_VERSION,true);
+		wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL.'/ee-maintenance.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
 
-		wp_register_style( 'espresso_maintenance', EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL.'ee-maintenance.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_maintenance');
 	}
 

admin_pages/maintenance/templates/ee_confirm_migration_crash_report_sent.template.php

Spacing +24 added lines, -24 removed lines

@@ -5,39 +5,39 @@ 
 /** @type string $reset_db_action_url */
 /** @type EE_Data_Migration_Script_Base $most_recent_migration */
 ?>
-<?php if ( $success ) { ?>
-	<h1><?php _e( "Data Migration Report Sent", "event_espresso" ); ?></h1>
-	<p><?php _e( "A migration crash report email was sent to Event Espresso. You should hear back from us soon.", "event_espresso" ); ?></p>
+<?php if ($success) { ?>
+	<h1><?php _e("Data Migration Report Sent", "event_espresso"); ?></h1>
+	<p><?php _e("A migration crash report email was sent to Event Espresso. You should hear back from us soon.", "event_espresso"); ?></p>
 <?php } else {//didn't send email properly ?>
-	<h1><?php _e( "Migration Report not sent", "event_espresso" ); ?></h1>
-	<p><?php _e( "An error occurred and we were not able to automatically send a report to Event Espresso support.", "event_espresso" ); ?></p>
-	<p><?php printf( __( "Please copy-and-paste the system information below to %s", "event_espresso" ), '<a href="mailto:' . EE_SUPPORT_EMAIL . '">' .EE_SUPPORT_EMAIL . "</a>" ); ?></p>
+	<h1><?php _e("Migration Report not sent", "event_espresso"); ?></h1>
+	<p><?php _e("An error occurred and we were not able to automatically send a report to Event Espresso support.", "event_espresso"); ?></p>
+	<p><?php printf(__("Please copy-and-paste the system information below to %s", "event_espresso"), '<a href="mailto:'.EE_SUPPORT_EMAIL.'">'.EE_SUPPORT_EMAIL."</a>"); ?></p>
 	<label>
-		<?php _e( "system status info", "event_espresso" ); ?>
-		<textarea name="system_status_info" class="system_status_info"><?php print_r( EEM_System_Status::instance()->get_system_stati() ); ?></textarea>
+		<?php _e("system status info", "event_espresso"); ?>
+		<textarea name="system_status_info" class="system_status_info"><?php print_r(EEM_System_Status::instance()->get_system_stati()); ?></textarea>
 	</label>
 <?php } ?>
 
 
-<h1><?php _e( "What's next?", 'event_espresso' ); ?></h1>
-<p><?php _e( "Well, it depends on your situation:", 'event_espresso' ); ?></p>
+<h1><?php _e("What's next?", 'event_espresso'); ?></h1>
+<p><?php _e("Well, it depends on your situation:", 'event_espresso'); ?></p>
 <div class='ee-table-wrap'>
 	<table>
 		<thead>
 			<tr>
-				<th><?php _e( "Your Situation", 'event_espresso' ); ?></th>
-				<th><?php _e( "Suggested Action", 'event_espresso' ); ?></th>
+				<th><?php _e("Your Situation", 'event_espresso'); ?></th>
+				<th><?php _e("Suggested Action", 'event_espresso'); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr>
-				<td><p class='big-text'><?php _e( "I want to retry migrating my data", 'event_espresso' ); ?></p></td>
+				<td><p class='big-text'><?php _e("I want to retry migrating my data", 'event_espresso'); ?></p></td>
 				<td>
 					<p>
 						<?php
 						printf(
-							__( 'First, %1$s check the forums %2$s to see if there is a solution before re-attempting to migrate. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the migrations run slower, but may resolve any memory exhaustion errors.', 'event_espresso' ),
-							"<a href='" . EE_SUPPORT_EMAIL . "' target='_blank'>",
+							__('First, %1$s check the forums %2$s to see if there is a solution before re-attempting to migrate. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the migrations run slower, but may resolve any memory exhaustion errors.', 'event_espresso'),
+							"<a href='".EE_SUPPORT_EMAIL."' target='_blank'>",
 							'</a>',
 							'<pre lang="php">define( EE_MIGRATION_STEP_SIZE, 10 );</pre>',
 							'<b>',
@@ -49,7 +49,7 @@ 
 					<p>
 						<?php
 						printf(
-							__( 'To retry migrating your data: restore to the backup you made before the migration and reactivate EE (and any addons you are using) and re-run the migration scripts. If you did not make a database migration and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration scripts. If you did not make a database backup, are not migrating from EE3, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.', 'event_espresso' ),
+							__('To retry migrating your data: restore to the backup you made before the migration and reactivate EE (and any addons you are using) and re-run the migration scripts. If you did not make a database migration and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration scripts. If you did not make a database backup, are not migrating from EE3, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.', 'event_espresso'),
 							"<a href='$reset_db_page_url'>",
 							"</a>",
 							"<a class='button-primary' href='$reattempt_action_url'>"
@@ -60,13 +60,13 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php _e( "I want to hear from Support before proceeding", 'event_espresso' ); ?></p>
+					<p class='big-text'><?php _e("I want to hear from Support before proceeding", 'event_espresso'); ?></p>
 				</td>
 				<td>
 					<?php
 					printf(
-						__( 'Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible', 'event_espresso' ),
-						"<a href='" . EE_SUPPORT_EMAIL . "'>",
+						__('Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible', 'event_espresso'),
+						"<a href='".EE_SUPPORT_EMAIL."'>",
 						"</a>"
 					);
 					?>
@@ -74,12 +74,12 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php printf( __( 'I don\'t need my old EE %s data', 'event_espresso' ), $most_recent_migration->slug() ); ?></p>
+					<p class='big-text'><?php printf(__('I don\'t need my old EE %s data', 'event_espresso'), $most_recent_migration->slug()); ?></p>
 				</td>
 				<td>
 					<?php
 					printf(
-						__( 'If you are ok with losing all the EE %1$s data, you can skip the migrations and %2$s use EE4 with only default Data%3$s', 'event_espresso' ),
+						__('If you are ok with losing all the EE %1$s data, you can skip the migrations and %2$s use EE4 with only default Data%3$s', 'event_espresso'),
 						$most_recent_migration->slug(),
 						"<a id='do-not-migrate' class='do-not-migrate button-primary' href='$reset_db_action_url'>",
 						"</a>"
@@ -89,20 +89,20 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php printf( __( 'I want to go back to my old version of EE %1$s', 'event_espresso' ), $most_recent_migration->slug() ); ?>
+					<p class='big-text'><?php printf(__('I want to go back to my old version of EE %1$s', 'event_espresso'), $most_recent_migration->slug()); ?>
 				</td>
 				<td>
 					<p>
 					<?php
 					printf(
-						__( 'Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before migrating . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.', 'event_espresso' ),
+						__('Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before migrating . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.', 'event_espresso'),
 						"<a href='$reset_db_page_url'>",
 						"</a>",
 						$most_recent_migration->slug()
 					);
 					?>
 					</p>
-					<p><?php _e( "If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.", 'event_espresso' ); ?></p>
+					<p><?php _e("If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.", 'event_espresso'); ?></p>
 				</td>
 			</tr>
 

admin_pages/maintenance/templates/ee_migration_page.template.php

Spacing +54 added lines, -54 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){ ?>
+						<?php foreach ($most_recent_migration->get_errors() as $error) { ?>
 							<li><?php echo $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

admin_pages/maintenance/templates/ee_migration_was_borked_page.template.php

Spacing +15 added lines, -15 removed lines

@@ -1,26 +1,26 @@
 <?php
 
 ?>
-<h1><?php _e("Data Migration Error", "event_espresso");?></h1>
-<p class='error'><?php printf(__("Your last data migration had a %s FATAL ERROR, and CANNOT be continued%s.", "event_espresso"),"<b>","</b>");?></p>
-<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Errors", 'event_espresso');?></a>
+<h1><?php _e("Data Migration Error", "event_espresso"); ?></h1>
+<p class='error'><?php printf(__("Your last data migration had a %s FATAL ERROR, and CANNOT be continued%s.", "event_espresso"), "<b>", "</b>"); ?></p>
+<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Errors", 'event_espresso'); ?></a>
 <ul class="migration-warnings" style="display:none">
-<?php foreach($most_recent_migration->get_errors() as $error){ ?>
+<?php foreach ($most_recent_migration->get_errors() as $error) { ?>
 	<li><?php echo $error ?></li>
 <?php }?>
 </ul>
-<h2><?php _e("Fill out the below form to automatically Send Event Espresso a Crash Report", "event_espresso");?></h2>
-<form action='<?php echo EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_migration_crash_report'), EE_MAINTENANCE_ADMIN_URL);?>' method='post'>
+<h2><?php _e("Fill out the below form to automatically Send Event Espresso a Crash Report", "event_espresso"); ?></h2>
+<form action='<?php echo EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_migration_crash_report'), EE_MAINTENANCE_ADMIN_URL); ?>' method='post'>
 	<table class='widefat'>
-		<tr><td><label for='from'><?php _e("From/Reply-To:", "event_espresso");?></label></td><td><input name='from' id='from' type='text' style="width:200px"value='<?php echo get_bloginfo('admin_email','display'); ?>'></td></tr>
-		<tr><td><label for='from_name'><?php _e("Your Name", "event_espresso");?></label></td><td><input name='from_name' id='from_name' type='text' style="width:200px"value='<?php printf(__("Admin of %s", "event_espresso"),get_bloginfo('name','display'));?>'></td></tr>
-		<tr><td><label for='body'><?php _e("Comments", "event_espresso");?></label></td><td><textarea name="body" id="body" class='system_status_info'><?php _e("Enter any comments about why you think the error may have occurred", "event_espresso");?></textarea>
-			<p class='description'><?php _e("Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.", "event_espresso");?></p></td></tr>
-		<tr><td colspan="2"><input type="submit" value="<?php _e("Mail Crash Report to Event Espresso", "event_espresso");?>"/></td></tr>
+		<tr><td><label for='from'><?php _e("From/Reply-To:", "event_espresso"); ?></label></td><td><input name='from' id='from' type='text' style="width:200px"value='<?php echo get_bloginfo('admin_email', 'display'); ?>'></td></tr>
+		<tr><td><label for='from_name'><?php _e("Your Name", "event_espresso"); ?></label></td><td><input name='from_name' id='from_name' type='text' style="width:200px"value='<?php printf(__("Admin of %s", "event_espresso"), get_bloginfo('name', 'display')); ?>'></td></tr>
+		<tr><td><label for='body'><?php _e("Comments", "event_espresso"); ?></label></td><td><textarea name="body" id="body" class='system_status_info'><?php _e("Enter any comments about why you think the error may have occurred", "event_espresso"); ?></textarea>
+			<p class='description'><?php _e("Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.", "event_espresso"); ?></p></td></tr>
+		<tr><td colspan="2"><input type="submit" value="<?php _e("Mail Crash Report to Event Espresso", "event_espresso"); ?>"/></td></tr>
 	</table>
 </form>
 <br>
-<p><?php printf(__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"),'<a href="mailto:'.EE_SUPPORT_EMAIL.'">',EE_SUPPORT_EMAIL,"</a>");?></p>
-<textarea class="system_status_info"><?php print_r( EEM_System_Status::instance()->get_system_stati())?></textarea>
-<p><?php printf( __( '%1$sNext Step%2$s', 'event_espresso' ), "<a href='$next_url'>","</a>");?></p>
-<p><?php printf( __( '...or %1$sDON\'T send migration crash report%2$s.', 'event_espresso' ), "<a href='$next_url'>","</a>");?></p>
+<p><?php printf(__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"), '<a href="mailto:'.EE_SUPPORT_EMAIL.'">', EE_SUPPORT_EMAIL, "</a>"); ?></p>
+<textarea class="system_status_info"><?php print_r(EEM_System_Status::instance()->get_system_stati())?></textarea>
+<p><?php printf(__('%1$sNext Step%2$s', 'event_espresso'), "<a href='$next_url'>", "</a>"); ?></p>
+<p><?php printf(__('...or %1$sDON\'T send migration crash report%2$s.', 'event_espresso'), "<a href='$next_url'>", "</a>"); ?></p>

admin_pages/maintenance/templates/ee_system_stati_page.template.php

Braces +3 added lines, -5 removed lines

@@ -30,8 +30,7 @@ 
 				</tbody>
 			</table>
 			<?php
-		}
-		else {
+		} else {
 			?>
 			<ul>
 				<?php
@@ -41,7 +40,7 @@ 
 			</ul>
 			<?php
 		}
-	}else {
+	} else {
 		//simple value
 		echo $data;
 	}
@@ -86,8 +85,7 @@ 
 				}?>
 			</tbody>
 			<?php
-			}
-			else {
+			} else {
 				?>
 				<tbody>
 					<tr>

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/maintenance/templates/ee_upgrade_addons_before_migrating.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 ?>
-<h1><?php _e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso");?></h1>
-<p><?php printf(__("Please %s visit the plugins page%s and upgade all Event Espresso before migrating.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>","</a>");?></p>
-<p><?php _e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso");?></p>
\ No newline at end of file
+<h1><?php _e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso"); ?></h1>
+<p><?php printf(__("Please %s visit the plugins page%s and upgade all Event Espresso before migrating.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>", "</a>"); ?></p>
+<p><?php _e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso"); ?></p>
\ No newline at end of file

admin_pages/messages/Messages_Admin_Page_Init.core.php

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for Wordpress
- *
- * @package		Event Espresso
- * @author		Seth Shoultes
- * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
- * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
- * @link		http://www.eventespresso.com
- * @version		4.0
- *
- * ------------------------------------------------------------------------
- *
- * Messages_Admin_Page_Init
- *
- * for setup of the message admin pages
- *
- * @package		Event Espresso
- * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for Wordpress
+	 *
+	 * @package		Event Espresso
+	 * @author		Seth Shoultes
+	 * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
+	 * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
+	 * @link		http://www.eventespresso.com
+	 * @version		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Messages_Admin_Page_Init
+	 *
+	 * for setup of the message admin pages
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
+	 * @author		Darren Ethier
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
 	/**
 	 *constructor

Braces +2 added lines, -1 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * Event Espresso
@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Messages_Admin_Page_Init extends EE_Admin_Page_Init {
 	/**
 	 *constructor
 	 *@Constructor
@@ -33,18 +33,18 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( ! defined( 'EE_MSG_PG_SLUG' ) ) {
+		if ( ! defined('EE_MSG_PG_SLUG')) {
 
-			define( 'EE_MSG_PG_SLUG', 'espresso_messages' );
-			define( 'EE_MSG_PG_NAME', ucwords( str_replace( '_', '', EE_MSG_PG_SLUG ) ) );
-			define( 'EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS );
-			define( 'EE_MSG_ADMIN_URL', admin_url( 'admin.php?page=' . EE_MSG_PG_SLUG ) );
-			define( 'EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS );
-			define( 'EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/' );
-			define( 'EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS );
-			define( 'EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/' );
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
 		}
 
 		parent::__construct();
@@ -60,7 +60,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 10,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

admin_pages/messages/espresso_events_Messages_Hooks.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class espresso_events_Messages_Hooks extends EE_Admin_Hooks {
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		parent::__construct($admin_page);
 	}
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *