eventespresso / event-espresso-core

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();
-		if($exception_thrown ||
-				(	$most_recent_migration &&
+		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_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
+			$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
 			'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
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		//localize script stuff
 		wp_localize_script('ee-maintenance', 'ee_maintenance', array(
 			'migrating'=>  __("Migrating...", "event_espresso"),
@@ -273,7 +273,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();
 	}
@@ -283,7 +283,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();
 	}
@@ -294,7 +294,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();
@@ -305,14 +305,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"));
 	}
@@ -322,9 +322,9 @@ 
 	/**
 	 * a tab with options for reseting and/or deleting EE data
 	 */
-	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', array(),  'button button-primary' );
+	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', array(), 'button button-primary');
 		$this->_template_args['delete_db_url'] = EE_Admin_Page::add_query_args_and_nonce(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'), EE_MAINTENANCE_ADMIN_URL);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
@@ -334,9 +334,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);
 	}
 
 	/**
@@ -346,7 +346,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);
 	}
 
 
@@ -355,8 +355,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();
 		EE_Registry::instance()->load_helper('Array');
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
@@ -365,30 +365,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
@@ -396,14 +396,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();
 	}
 
@@ -416,18 +416,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_Registry::instance()->load_helper('Activation');
 		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);
 		}
 		//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();
 	}
 
@@ -436,20 +436,20 @@ 
 	/**
 	 * Deletes ALL EE tables, Records, and Options from the database.
 	 */
-	public function _delete_db(){
+	public function _delete_db() {
 		EE_Registry::instance()->load_helper('Activation');
 		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::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_Registry::instance()->load_helper('Activation');
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 		EEH_Activation::delete_all_espresso_cpt_data();
@@ -477,9 +477,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_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

Spacing +8 added lines, -8 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,22 +36,22 @@ 
 			<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">
-	<h3 class="espresso-header"><?php _e("Raw System Data", "event_espresso");?></h3>
+	<h3 class="espresso-header"><?php _e("Raw System Data", "event_espresso"); ?></h3>
 	<textarea class="system_status_info">
 		<?php print_r($system_stati)?>
 	</textarea>
@@ -59,7 +59,7 @@ 
 		<?php
 		foreach ($system_stati as $status_category_slug => $data) {
 			if (is_object($data)) {
-				$data = (array)$data;
+				$data = (array) $data;
 			}
 			?>
 			<thead>

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>

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_Template_List_Table.class.php

Spacing +44 added lines, -44 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,8 +31,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_message_templates( $this->_per_page, $this->_view, FALSE);
-		$this->_all_data_count = $this->_admin_page->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE );
+		$this->_data = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, FALSE);
+		$this->_all_data_count = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE);
 	}
 
 
@@ -41,21 +41,21 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('Message Template Group', 'event_espresso' ),
-			'plural' => __('Message Template', 'event_espresso' ),
+			'singular' => __('Message Template Group', 'event_espresso'),
+			'plural' => __('Message Template', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
 		$this->_columns = array(
 			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
 			'message_type' => __('Message Type', 'event_espresso'),
-			'messenger' => __( 'Messenger', 'event_espresso'),
-			'description' => __( 'Description', 'event_espresso' ),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'description' => __('Description', 'event_espresso'),
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
 			);
 
 		$this->_sortable_columns = array(
-			'messenger' => array( 'MTP_messenger' => TRUE ),
+			'messenger' => array('MTP_messenger' => TRUE),
 			//'message_type' => array( 'MTP_message_type' => FALSE )
 			);
 
@@ -74,16 +74,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		$message_type = $item->message_type_obj();
 		$messenger = $item->messenger_obj();
 
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
 			echo '';
 			return;
 		}
 
-		parent::single_row( $item );
+		parent::single_row($item);
 	}
 
 
@@ -92,24 +92,24 @@ 
 
 	protected function _get_table_filters() {
 		$filters = array();
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		$messengers = $this->_admin_page->get_active_messengers();
 		$message_types = $this->_admin_page->get_installed_message_types();
 
 
 		//setup messengers for selects
-		$i=1;
+		$i = 1;
 		$m_values[0]['id'] = 'all';
-		$m_values[0]['text'] = __('All Messengers', 'event_espresso' );
-		foreach ( $messengers as $messenger => $args ) {
+		$m_values[0]['text'] = __('All Messengers', 'event_espresso');
+		foreach ($messengers as $messenger => $args) {
 			$m_values[$i]['id'] = $messenger;
 			$m_values[$i]['text'] = ucwords($args['obj']->label['singular']);
 			$i++;
 		}
 
 		//lets do the same for message types
-		$i=1;
-		foreach ( $message_types as $message_type => $args ) {
+		$i = 1;
+		foreach ($message_types as $message_type => $args) {
 			$mt_values[$i]['id'] = $message_type;
 			$mt_values[$i]['text'] = ucwords($args['obj']->label['singular']);
 			$i++;
@@ -125,28 +125,28 @@ 
 			'text' => __('Show All', 'event_espresso')
 			);
 
-		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
-		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
+		$msgr_filters = ! empty($m_values) ? array_merge($msgr_default, $m_values) : array();
+		$mt_filters = ! empty($mt_values) ? array_merge($mt_default, $mt_values) : array();
 
-		if ( empty( $m_values ) )
+		if (empty($m_values))
 			$msgr_filters[0] = array(
 				'id' => 'no_messenger_options',
 				'text' => __('No Messengers active', 'event_espresso')
 				);
 
-		if ( empty($mt_values) )
+		if (empty($mt_values))
 			$mt_filters[0] = array(
 				'id' => 'no_message_type_options',
 				'text' => __('No Message Types active', 'event_espresso')
 				);
 
-		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
-			unset( $msgr_filters[0] );
-			$msgr_filters = array_values( $msgr_filters ); //reindex keys
+		if (count($messengers) >= 1 && ! empty($m_values)) {
+			unset($msgr_filters[0]);
+			$msgr_filters = array_values($msgr_filters); //reindex keys
 		}
 
-		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key( $this->_req_data['ee_messenger_filter_by']) : '' );
-		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key( $this->_req_data['ee_message_type_filter_by']) : '');
+		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key($this->_req_data['ee_messenger_filter_by']) : '');
+		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key($this->_req_data['ee_message_type_filter_by']) : '');
 		return $filters;
 	}
 
@@ -154,20 +154,20 @@ 
 	 * we're just removing the search box for message templates, not needed.
 	 * @return string (empty);
 	 */
-	function search_box( $text, $input_id ) {
+	function search_box($text, $input_id) {
 		return '';
 	}
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args )  {
-			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates( $this->_per_page, $view, TRUE, TRUE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates($this->_per_page, $view, TRUE, TRUE);
 		}
 	}
 
 
 
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		return '';
 	}
 
@@ -175,8 +175,8 @@ 
 
 
 
-	function column_description( $item ) {
-		return '<p>' . $item->message_type_obj()->description . '</p>';
+	function column_description($item) {
+		return '<p>'.$item->message_type_obj()->description.'</p>';
 	}
 
 
@@ -191,27 +191,27 @@ 
 		$actions = array();
 
 		// edit link but only if item isn't trashed.
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
 
 		//we want to display the contexts in here so we need to set them up
 		$c_label = $item->context_label();
 		$c_configs = $item->contexts_config();
 		$ctxt = array();
 		$context_templates = $item->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
 			$context_title = ucwords($c_configs[$context]['label']);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
 		}
 
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
 
 
 		//Return the name contents
@@ -219,7 +219,7 @@ 
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->GRP_ID(),
 										/* %4$s */ $ctx_content,
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -229,7 +229,7 @@ 
 	 * @return string       message_type name
 	 */
 	function column_message_type($item) {
-		return ucwords($item->message_type_obj()->label['singular'] );
+		return ucwords($item->message_type_obj()->label['singular']);
 	}
 
 

Braces +8 added lines, -5 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
@@ -128,17 +129,19 @@ 
 		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
 		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
 
-		if ( empty( $m_values ) )
-			$msgr_filters[0] = array(
+		if ( empty( $m_values ) ) {
+					$msgr_filters[0] = array(
 				'id' => 'no_messenger_options',
 				'text' => __('No Messengers active', 'event_espresso')
 				);
+		}
 
-		if ( empty($mt_values) )
-			$mt_filters[0] = array(
+		if ( empty($mt_values) ) {
+					$mt_filters[0] = array(
 				'id' => 'no_message_type_options',
 				'text' => __('No Message Types active', 'event_espresso')
 				);
+		}
 
 		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
 			unset( $msgr_filters[0] );

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');
+}
 
 /**
  *

admin_pages/messages/help_tabs/messages_overview_messengers.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <h3><?php _e('Messengers', 'event_espresso'); ?></h3>
 <p>
-<?php printf( __('Messengers are the vehicles that deliver messages to individuals (recipients). By default, every install of Event Espresso has the %sEmail%s messenger active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd party API\'s etc.', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<?php printf(__('Messengers are the vehicles that deliver messages to individuals (recipients). By default, every install of Event Espresso has the %sEmail%s messenger active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd party API\'s etc.', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
\ No newline at end of file

admin_pages/messages/help_tabs/messages_settings_messengers.help_tab.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <h3><?php _e('Activating / Deactivating Messengers', 'event_espresso'); ?></h3>
 <p><?php _e('You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.', 'event_espresso'); ?></p>
 <p><?php _e('There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.', 'event_espresso'); ?></p>
-<p><?php echo _e('The green colored gear <img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '" alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" /> indicates that this messenger is currently active.', 'event_espresso'); echo _e(' The white colored gear <img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png' . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" /> indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.', 'event_espresso'); ?></p>
+<p><?php echo _e('The green colored gear <img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-active.png'.'" alt="'.esc_attr__('Active Email Tab', 'event_espresso').'" /> indicates that this messenger is currently active.', 'event_espresso'); echo _e(' The white colored gear <img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-inactive.png'.'" alt="'.esc_attr__('Inactive Email Tab', 'event_espresso').'" /> indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.', 'event_espresso'); ?></p>
 <p><?php _e('The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:', 'event_espresso'); ?></p>
-<p><?php printf( __('%1$s means of course that the messenger is active and %2$s means the messenger is inactive.', 'event_espresso'), '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked" disabled><label for="ee-on-off-toggle-on"></label></div>', '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled><label for="ee-on-off-toggle-on"></label></div>' ); ?></p>
-<p><?php _e( 'The on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso' ); ?></p>
-<p><?php _e( 'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
-<p><?php _e( 'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
+<p><?php printf(__('%1$s means of course that the messenger is active and %2$s means the messenger is inactive.', 'event_espresso'), '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked" disabled><label for="ee-on-off-toggle-on"></label></div>', '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled><label for="ee-on-off-toggle-on"></label></div>'); ?></p>
+<p><?php _e('The on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso'); ?></p>
+<p><?php _e('What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
+<p><?php _e('When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
 <p><strong><?php _e('Important', 'event_espresso'); ?></strong><br />
 <?php _e('Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.', 'event_espresso'); ?></p>