eventespresso / event-espresso-core

core/EE_Data_Migration_Manager.core.php

Indentation +8 added lines, -8 removed lines

@@ -110,9 +110,9 @@ 
 	var $stati_that_indicate_to_stop_single_migration_script = array();
 
 	/**
-     * 	@var EE_Data_Migration_Manager $_instance
+	 * 	@var EE_Data_Migration_Manager $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance = NULL;
 
 	/**
@@ -905,12 +905,12 @@ 
 	}
 
 /**
-	 * Resets the borked data migration scripts so they're no longer borked
-	 * so we can again attempt to migrate
-	 *
-	 * @return bool
-	 * @throws \EE_Error
-	 */
+ * Resets the borked data migration scripts so they're no longer borked
+ * so we can again attempt to migrate
+ *
+ * @return bool
+ * @throws \EE_Error
+ */
 	public function reattempt(){
 		//find if the last-ran script was borked
 		//set it as being non-borked (we shouldn't ever get DMSs that we don't recognize)

Spacing +198 added lines, -198 removed lines

@@ -21,7 +21,7 @@ 
  * to indicate it successfully migrate some data, and has nothing left to do; or EE_Data_Migration_Manager::status_fatal_error to indicate
  * an error occurred which means the ajax script should probably stop executing.
  */
-class EE_Data_Migration_Manager{
+class EE_Data_Migration_Manager {
 
 	/**
 	 *
@@ -78,7 +78,7 @@ 
 	 * of this EE installation. Keys should be the name of the version the script upgraded to
 	 * @var EE_Data_Migration_Script_Base[]
 	 */
-	private $_data_migrations_ran =null;
+	private $_data_migrations_ran = null;
 	/**
 	 * The last ran script. It's nice to store this somewhere accessible, as its easiest
 	 * to know which was the last run by which is the newest wp option; but in most of the code
@@ -122,7 +122,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Data_Migration_Manager ) {
+		if ( ! self::$_instance instanceof EE_Data_Migration_Manager) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -132,7 +132,7 @@ 
 	 * all new usages of the singleton should be made with Classname::instance()) and returns it
 	 * @return EE_Data_Migration_Manager
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = NULL;
 		return self::instance();
 	}
@@ -142,7 +142,7 @@ 
 	/**
 	 * constructor
 	 */
-	private function __construct(){
+	private function __construct() {
 		$this->stati_that_indicate_to_continue_migrations = array(
 			self::status_continue,
 			self::status_completed
@@ -161,11 +161,11 @@ 
 		);
 		//make sure we've included the base migration script, because we may need the EE_DMS_Unknown_1_0_0 class
 		//to be defined, because right now it doesn't get autoloaded on its own
-		EE_Registry::instance()->load_core( 'Data_Migration_Class_Base', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Base', array(), TRUE );
-		EE_Registry::instance()->load_core( 'DMS_Unknown_1_0_0', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Stage', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Stage_Table', array(), TRUE );
+		EE_Registry::instance()->load_core('Data_Migration_Class_Base', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Base', array(), TRUE);
+		EE_Registry::instance()->load_core('DMS_Unknown_1_0_0', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Stage', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Stage_Table', array(), TRUE);
 	}
 
 
@@ -178,21 +178,21 @@ 
 	 * @param string $option_name (see EE_Data_Migration_Manage::_save_migrations_ran() where the option name is set)
 	 * @return array where the first item is the plugin slug (eg 'Core','Calendar',etc) and the 2nd is the version of that plugin (eg '4.1.0')
 	 */
-	private function _get_plugin_slug_and_version_string_from_dms_option_name($option_name){
+	private function _get_plugin_slug_and_version_string_from_dms_option_name($option_name) {
 		$plugin_slug_and_version_string = str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_name);
 		//check if $plugin_slug_and_version_string is like '4.1.0' (4.1-style) or 'Core.4.1.0' (4.2-style)
-		$parts = explode(".",$plugin_slug_and_version_string);
+		$parts = explode(".", $plugin_slug_and_version_string);
 
-		if(count($parts) == 4){
+		if (count($parts) == 4) {
 			//it's 4.2-style.eg Core.4.1.0
-			$plugin_slug = $parts[0];//eg Core
+			$plugin_slug = $parts[0]; //eg Core
 			$version_string = $parts[1].".".$parts[2].".".$parts[3]; //eg 4.1.0
-		}else{
+		} else {
 			//it's 4.1-style: eg 4.1.0
 			$plugin_slug = 'Core';
-			$version_string = $plugin_slug_and_version_string;//eg 4.1.0
+			$version_string = $plugin_slug_and_version_string; //eg 4.1.0
 		}
-		return array($plugin_slug,$version_string);
+		return array($plugin_slug, $version_string);
 	}
 
 	/**
@@ -203,21 +203,21 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws EE_Error
 	 */
-	private function _get_dms_class_from_wp_option($dms_option_name,$dms_option_value){
+	private function _get_dms_class_from_wp_option($dms_option_name, $dms_option_value) {
 		$data_migration_data = maybe_unserialize($dms_option_value);
-		if(isset($data_migration_data['class']) && class_exists($data_migration_data['class'])){
+		if (isset($data_migration_data['class']) && class_exists($data_migration_data['class'])) {
 			$class = new $data_migration_data['class'];
-			if($class instanceof EE_Data_Migration_Script_Base){
+			if ($class instanceof EE_Data_Migration_Script_Base) {
 				$class->instantiate_from_array_of_properties($data_migration_data);
 				return $class;
-			}else{
+			} else {
 				//huh, so its an object but not a data migration script?? that shouldn't happen
 				//just leave it as an array (which will probably just get ignored)
-				throw new EE_Error(sprintf(__("Trying to retrieve DMS class from wp option. No DMS by the name '%s' exists", 'event_espresso'),$data_migration_data['class']));
+				throw new EE_Error(sprintf(__("Trying to retrieve DMS class from wp option. No DMS by the name '%s' exists", 'event_espresso'), $data_migration_data['class']));
 			}
-		}else{
+		} else {
 			//so the data doesn't specify a class. So it must either be a legacy array of info or some array (which we'll probably just ignore), or a class that no longer exists
-			throw new EE_Error(sprintf(__("The wp option  with key '%s' does not represent a DMS", 'event_espresso'),$dms_option_name));
+			throw new EE_Error(sprintf(__("The wp option  with key '%s' does not represent a DMS", 'event_espresso'), $dms_option_name));
 		}
 	}
 	/**
@@ -225,34 +225,34 @@ 
 	 * the last ran which hasn't finished yet
 	 * @return array where each element should be an array of EE_Data_Migration_Script_Base (but also has a few legacy arrays in there - which should probably be ignored)
 	 */
-	public function get_data_migrations_ran(){
-		if( ! $this->_data_migrations_ran ){
+	public function get_data_migrations_ran() {
+		if ( ! $this->_data_migrations_ran) {
 			//setup autoloaders for each of the scripts in there
 			$this->get_all_data_migration_scripts_available();
-			$data_migrations_options = $this->get_all_migration_script_options();//get_option(EE_Data_Migration_Manager::data_migrations_option_name,get_option('espresso_data_migrations',array()));
+			$data_migrations_options = $this->get_all_migration_script_options(); //get_option(EE_Data_Migration_Manager::data_migrations_option_name,get_option('espresso_data_migrations',array()));
 
 			$data_migrations_ran = array();
 			//convert into data migration script classes where possible
-			foreach($data_migrations_options as $data_migration_option){
-				list($plugin_slug,$version_string) = $this->_get_plugin_slug_and_version_string_from_dms_option_name($data_migration_option['option_name']);
+			foreach ($data_migrations_options as $data_migration_option) {
+				list($plugin_slug, $version_string) = $this->_get_plugin_slug_and_version_string_from_dms_option_name($data_migration_option['option_name']);
 
-				try{
-					$class = $this->_get_dms_class_from_wp_option($data_migration_option['option_name'],$data_migration_option['option_value']);
+				try {
+					$class = $this->_get_dms_class_from_wp_option($data_migration_option['option_name'], $data_migration_option['option_value']);
 					$data_migrations_ran[$plugin_slug][$version_string] = $class;
 					//ok so far THIS is the 'last-ran-script'... unless we find another on next iteration
 					$this->_last_ran_script = $class;
-					if( ! $class->is_completed()){
+					if ( ! $class->is_completed()) {
 						//sometimes we also like to know which was the last incomplete script (or if there are any at all)
 						$this->_last_ran_incomplete_script = $class;
 					}
-				}catch(EE_Error $e){
+				} catch (EE_Error $e) {
 					//ok so its not a DMS. We'll just keep it, although other code will need to expect non-DMSs
 					$data_migrations_ran[$plugin_slug][$version_string] = maybe_unserialize($data_migration_option['option_value']);
 				}
 			}
 			//so here the array of $data_migrations_ran is actually a mix of classes and a few legacy arrays
 			$this->_data_migrations_ran = $data_migrations_ran;
-			 if ( ! $this->_data_migrations_ran || ! is_array($this->_data_migrations_ran) ){
+			 if ( ! $this->_data_migrations_ran || ! is_array($this->_data_migrations_ran)) {
 				$this->_data_migrations_ran = array();
 			}
 		}
@@ -269,7 +269,7 @@ 
 	 * @param        $new_table
 	 * @return mixed string or int
 	 */
-	public function get_mapping_new_pk( $script_name, $old_table, $old_pk, $new_table){
+	public function get_mapping_new_pk($script_name, $old_table, $old_pk, $new_table) {
 		$script = EE_Registry::instance()->load_dms($script_name);
 		$mapping = $script->get_mapping_new_pk($old_table, $old_pk, $new_table);
 		return $mapping;
@@ -280,9 +280,9 @@ 
 	 * option returned in this array is the most-recently ran DMS option
 	 * @return array
 	 */
-	 public function get_all_migration_script_options(){
+	 public function get_all_migration_script_options() {
 		global $wpdb;
-		return $wpdb->get_results("SELECT * FROM {$wpdb->options} WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id ASC",ARRAY_A);
+		return $wpdb->get_results("SELECT * FROM {$wpdb->options} WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id ASC", ARRAY_A);
 	}
 
 	/**
@@ -290,8 +290,8 @@ 
 	 * @return array where each value is the full folder path of a folder containing data migration scripts, WITH slashes at the end of the
 	 * folder name.
 	 */
-	public function get_data_migration_script_folders(){
-		return  apply_filters( 'FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders',array(EE_CORE.'data_migration_scripts') );
+	public function get_data_migration_script_folders() {
+		return  apply_filters('FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders', array(EE_CORE.'data_migration_scripts'));
 	}
 
 	/**
@@ -303,11 +303,11 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public function script_migrates_to_version($migration_script_name){
+	public function script_migrates_to_version($migration_script_name) {
 		$dms_info = $this->parse_dms_classname($migration_script_name);
 		return array(
-			'slug'=> $dms_info[ 'slug' ],
-			'version'=> $dms_info[ 'major_version' ] . "." . $dms_info[ 'minor_version' ] . "." . $dms_info[ 'micro_version' ] );
+			'slug'=> $dms_info['slug'],
+			'version'=> $dms_info['major_version'].".".$dms_info['minor_version'].".".$dms_info['micro_version'] );
 	}
 
 	/**
@@ -316,13 +316,13 @@ 
 	 * @return array with keys 'slug','major_version','minor_version', and 'micro_version' (the last 3 are ints)
 	 * @throws EE_Error
 	 */
-	public function parse_dms_classname($classname){
+	public function parse_dms_classname($classname) {
 		$matches = array();
-		preg_match('~EE_DMS_(.*)_([0-9]*)_([0-9]*)_([0-9]*)~',$classname,$matches);
-		if( ! $matches || ! (isset($matches[1]) && isset($matches[2]) && isset($matches[3]))){
-				throw new EE_Error(sprintf(__("%s is not a valid Data Migration Script. The classname should be like EE_DMS_w_x_y_z, where w is either 'Core' or the slug of an addon and x, y and z are numbers, ", "event_espresso"),$classname));
+		preg_match('~EE_DMS_(.*)_([0-9]*)_([0-9]*)_([0-9]*)~', $classname, $matches);
+		if ( ! $matches || ! (isset($matches[1]) && isset($matches[2]) && isset($matches[3]))) {
+				throw new EE_Error(sprintf(__("%s is not a valid Data Migration Script. The classname should be like EE_DMS_w_x_y_z, where w is either 'Core' or the slug of an addon and x, y and z are numbers, ", "event_espresso"), $classname));
 		}
-		return array('slug'=>$matches[1],'major_version'=>intval($matches[2]),'minor_version'=>intval($matches[3]),'micro_version'=>intval($matches[4]));
+		return array('slug'=>$matches[1], 'major_version'=>intval($matches[2]), 'minor_version'=>intval($matches[3]), 'micro_version'=>intval($matches[4]));
 	}
 	/**
 	 * Ensures that the option indicating the current DB version is set. This should only be
@@ -331,33 +331,33 @@ 
 	 * to 4.1.x.
 	 * @return string of current db state
 	 */
-	public function ensure_current_database_state_is_set(){
-		$espresso_db_core_updates = get_option( 'espresso_db_update', array() );
+	public function ensure_current_database_state_is_set() {
+		$espresso_db_core_updates = get_option('espresso_db_update', array());
 		$db_state = get_option(EE_Data_Migration_Manager::current_database_state);
-		if( ! $db_state ){
+		if ( ! $db_state) {
 			//mark the DB as being in the state as the last version in there.
 			//this is done to trigger maintenance mode and do data migration scripts
 			//if the admin installed this version of EE over 3.1.x or 4.0.x
 			//otherwise, the normal maintenance mode code is fine
 			$previous_versions_installed = array_keys($espresso_db_core_updates);
 			$previous_version_installed = end($previous_versions_installed);
-			if(version_compare('4.1.0', $previous_version_installed)){
+			if (version_compare('4.1.0', $previous_version_installed)) {
 				//last installed version was less than 4.1
 				//so we want the data migrations to happen. SO, we're going to say the DB is at that state
 //				echo "4.1.0 is greater than $previous_version_installed! update the option";
 				$db_state = array('Core'=>$previous_version_installed);
-			}else{
+			} else {
 //					echo "4.1.0 is SMALLER than $previous_version_installed";
 					$db_state = array('Core'=>EVENT_ESPRESSO_VERSION);
 			}
-			update_option(EE_Data_Migration_Manager::current_database_state,$db_state);
+			update_option(EE_Data_Migration_Manager::current_database_state, $db_state);
 		}
 		//in 4.1, $db_state would have only been a simple string like '4.1.0',
 		//but in 4.2+ it should be an array with at least key 'Core' and the value of that plugin's
 		//db, and possibly other keys for other addons like 'Calendar','Permissions',etc
-		if( ! is_array($db_state)){
+		if ( ! is_array($db_state)) {
 			$db_state = array('Core'=>$db_state);
-			update_option(EE_Data_Migration_Manager::current_database_state,$db_state);
+			update_option(EE_Data_Migration_Manager::current_database_state, $db_state);
 		}
 		return $db_state;
 	}
@@ -368,7 +368,7 @@ 
 	 * or they don't apply), returns an empty array
 	 * @return EE_Data_Migration_Script_Base[]
 	 */
-	public function check_for_applicable_data_migration_scripts(){
+	public function check_for_applicable_data_migration_scripts() {
 		//get the option describing what options have already run
 		$scripts_ran = $this->get_data_migrations_ran();
 		//$scripts_ran = array('4.1.0.core'=>array('monkey'=>null));
@@ -381,62 +381,62 @@ 
 		$iteration = 0;
 		$next_database_state_to_consider = $current_database_state;
 		$theoretical_database_state = NULL;
-		do{
+		do {
 			//the next state after the currently-considered one will start off looking the same as the current, but we may make additions...
 			$theoretical_database_state = $next_database_state_to_consider;
 			//the next db state to consider is "what would the DB be like had we run all the scripts we found that applied last time?)
-			foreach($script_class_and_filepaths_available as $classname => $filepath){
+			foreach ($script_class_and_filepaths_available as $classname => $filepath) {
 
 				$migrates_to_version = $this->script_migrates_to_version($classname);
-				$script_converts_plugin_slug = $migrates_to_version[ 'slug' ];
-				$script_converts_to_version = $migrates_to_version[ 'version' ];
+				$script_converts_plugin_slug = $migrates_to_version['slug'];
+				$script_converts_to_version = $migrates_to_version['version'];
 				//check if this version script is DONE or not; or if it's never been ran
-				if(		! $scripts_ran ||
+				if ( ! $scripts_ran ||
 						! isset($scripts_ran[$script_converts_plugin_slug]) ||
-						! isset($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version])){
+						! isset($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version])) {
 					//we haven't ran this conversion script before
 					//now check if it applies... note that we've added an autoloader for it on get_all_data_migration_scripts_available
 					$script = new $classname;
 					/* @var $script EE_Data_Migration_Script_Base */
 					$can_migrate = $script->can_migrate_from_version($theoretical_database_state);
-					if($can_migrate){
+					if ($can_migrate) {
 						$script_classes_that_should_run_per_iteration[$iteration][$script->priority()][] = $script;
 						$migrates_to_version = $script->migrates_to_version();
-						$next_database_state_to_consider[ $migrates_to_version[ 'slug' ] ] = $migrates_to_version[ 'version' ];
+						$next_database_state_to_consider[$migrates_to_version['slug']] = $migrates_to_version['version'];
 						unset($script_class_and_filepaths_available[$classname]);
 					}
-				} elseif($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version] instanceof EE_Data_Migration_Script_Base){
+				} elseif ($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version] instanceof EE_Data_Migration_Script_Base) {
 					//this script has been ran, or at least started
 					$script = $scripts_ran[$script_converts_plugin_slug][$script_converts_to_version];
-					if( $script->get_status() != self::status_completed){
+					if ($script->get_status() != self::status_completed) {
 						//this script is already underway... keep going with it
 						$script_classes_that_should_run_per_iteration[$iteration][$script->priority()][] = $script;
 						$migrates_to_version = $script->migrates_to_version();
-						$next_database_state_to_consider[ $migrates_to_version[ 'slug' ] ] = $migrates_to_version[ 'version' ];
+						$next_database_state_to_consider[$migrates_to_version['slug']] = $migrates_to_version['version'];
 						unset($script_class_and_filepaths_available[$classname]);
-					}else{
+					} else {
 						//it must have a status that indicates it has finished, so we don't want to try and run it again
 					}
-				}else{
+				} else {
 					//it exists but it's not  a proper data migration script
 					//maybe the script got renamed? or was simply removed from EE?
 					//either way, its certainly not runnable!
 				}
 			}
 			$iteration++;
-		}while( $next_database_state_to_consider != $theoretical_database_state && $iteration<6);
+		}while ($next_database_state_to_consider != $theoretical_database_state && $iteration < 6);
 		//ok we have all the scripts that should run, now let's make them into flat array
 		$scripts_that_should_run = array();
-		foreach($script_classes_that_should_run_per_iteration as $scripts_at_priority){
+		foreach ($script_classes_that_should_run_per_iteration as $scripts_at_priority) {
 			ksort($scripts_at_priority);
-			foreach($scripts_at_priority as $scripts){
-				foreach($scripts as $script){
+			foreach ($scripts_at_priority as $scripts) {
+				foreach ($scripts as $script) {
 					$scripts_that_should_run[get_class($script)] = $script;
 				}
 			}
 		}
 
-		do_action( 'AHEE__EE_Data_Migration_Manager__check_for_applicable_data_migration_scripts__scripts_that_should_run', $scripts_that_should_run );
+		do_action('AHEE__EE_Data_Migration_Manager__check_for_applicable_data_migration_scripts__scripts_that_should_run', $scripts_that_should_run);
 		return $scripts_that_should_run;
 	}
 
@@ -450,14 +450,14 @@ 
 	 * @param bool $include_completed_scripts
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function get_last_ran_script($include_completed_scripts = false){
+	public function get_last_ran_script($include_completed_scripts = false) {
 		//make sure we've setup the class properties _last_ran_script and _last_ran_incomplete_script
-		if( ! $this->_data_migrations_ran){
+		if ( ! $this->_data_migrations_ran) {
 			$this->get_data_migrations_ran();
 		}
-		if($include_completed_scripts){
+		if ($include_completed_scripts) {
 			return $this->_last_ran_script;
-		}else{
+		} else {
 			return $this->_last_ran_incomplete_script;
 		}
 	}
@@ -480,17 +480,17 @@ 
 	 * 		@type string $message string describing what was done during this step
 	 * }
 	 */
-	public function migration_step( $step_size = 0 ){
+	public function migration_step($step_size = 0) {
 
 		//bandaid fix for issue https://events.codebasehq.com/projects/event-espresso/tickets/7535
-		remove_action( 'pre_get_posts', array( EE_CPT_Strategy::instance(), 'pre_get_posts' ), 5 );
+		remove_action('pre_get_posts', array(EE_CPT_Strategy::instance(), 'pre_get_posts'), 5);
 
-		try{
+		try {
 			$currently_executing_script = $this->get_last_ran_script();
-			if( ! $currently_executing_script){
+			if ( ! $currently_executing_script) {
 				//Find the next script that needs to execute
 				$scripts = $this->check_for_applicable_data_migration_scripts();
-				if( ! $scripts ){
+				if ( ! $scripts) {
 					//huh, no more scripts to run... apparently we're done!
 					//but dont forget to make sure initial data is there
 					//we should be good to allow them to exit maintenance mode now
@@ -511,18 +511,18 @@ 
 				//and add to the array/wp option showing the scripts ran
 //				$this->_data_migrations_ran[$this->script_migrates_to_version(get_class($currently_executing_script))] = $currently_executing_script;
 				$migrates_to = $this->script_migrates_to_version(get_class($currently_executing_script));
-				$plugin_slug = $migrates_to[ 'slug' ];
-				$version = $migrates_to[ 'version' ];
+				$plugin_slug = $migrates_to['slug'];
+				$version = $migrates_to['version'];
 				$this->_data_migrations_ran[$plugin_slug][$version] = $currently_executing_script;
 			}
 			$current_script_name = get_class($currently_executing_script);
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			//an exception occurred while trying to get migration scripts
 
-			$message =  sprintf( __("Error Message: %sStack Trace:%s", "event_espresso"), $e->getMessage() . '<br>', $e->getTraceAsString() );
+			$message = sprintf(__("Error Message: %sStack Trace:%s", "event_espresso"), $e->getMessage().'<br>', $e->getTraceAsString());
 			//record it on the array of data migration scripts ran. This will be overwritten next time we try and try to run data migrations
 			//but that's ok-- it's just an FYI to support that we couldn't even run any data migrations
-			$this->add_error_to_migrations_ran(sprintf(__("Could not run data migrations because: %s", "event_espresso"),$message));
+			$this->add_error_to_migrations_ran(sprintf(__("Could not run data migrations because: %s", "event_espresso"), $message));
 			return array(
 				'records_to_migrate'=>1,
 				'records_migrated'=>0,
@@ -532,16 +532,16 @@ 
 			);
 		}
 		//ok so we definitely have a data migration script
-		try{
+		try {
 			//how big of a bite do we want to take? Allow users to easily override via their wp-config
-			if( ! absint( $step_size ) > 0 ){
-				$step_size = defined( 'EE_MIGRATION_STEP_SIZE' ) && absint( EE_MIGRATION_STEP_SIZE ) ? EE_MIGRATION_STEP_SIZE : EE_Data_Migration_Manager::step_size;
+			if ( ! absint($step_size) > 0) {
+				$step_size = defined('EE_MIGRATION_STEP_SIZE') && absint(EE_MIGRATION_STEP_SIZE) ? EE_MIGRATION_STEP_SIZE : EE_Data_Migration_Manager::step_size;
 			}
 			//do what we came to do!
 			$currently_executing_script->migration_step($step_size);
 			//can we wrap it up and verify default data?
 			$init_dbs = false;
-			switch($currently_executing_script->get_status()){
+			switch ($currently_executing_script->get_status()) {
 				case EE_Data_Migration_Manager::status_continue:
 					$response_array = array(
 						'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
@@ -553,16 +553,16 @@ 
 				case EE_Data_Migration_Manager::status_completed:
 					//ok so THAT script has completed
 					$this->update_current_database_state_to($this->script_migrates_to_version($current_script_name));
-					$response_array =  array(
+					$response_array = array(
 							'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
 							'records_migrated'=>$currently_executing_script->count_records_migrated(),
 							'status'=> EE_Data_Migration_Manager::status_completed,
 							'message'=>$currently_executing_script->get_feedback_message(),
-							'script'=> sprintf(__("%s Completed",'event_espresso'),$currently_executing_script->pretty_name())
+							'script'=> sprintf(__("%s Completed", 'event_espresso'), $currently_executing_script->pretty_name())
 						);
 					//check if there are any more after this one.
 					$scripts_remaining = $this->check_for_applicable_data_migration_scripts();
-					if( ! $scripts_remaining ){
+					if ( ! $scripts_remaining) {
 						//we should be good to allow them to exit maintenance mode now
 						EE_Maintenance_Mode::instance()->set_maintenance_level(intval(EE_Maintenance_Mode::level_0_not_in_maintenance));
 						////huh, no more scripts to run... apparently we're done!
@@ -576,39 +576,39 @@ 
 						'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
 						'records_migrated'=>$currently_executing_script->count_records_migrated(),
 						'status'=> $currently_executing_script->get_status(),
-						'message'=>  sprintf(__("Minor errors occurred during %s: %s", "event_espresso"), $currently_executing_script->pretty_name(), implode(", ",$currently_executing_script->get_errors())),
+						'message'=>  sprintf(__("Minor errors occurred during %s: %s", "event_espresso"), $currently_executing_script->pretty_name(), implode(", ", $currently_executing_script->get_errors())),
 						'script'=>$currently_executing_script->pretty_name()
 					);
 					break;
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			//ok so some exception was thrown which killed the data migration script
 			//double-check we have a real script
-			if($currently_executing_script instanceof EE_Data_Migration_Script_Base){
+			if ($currently_executing_script instanceof EE_Data_Migration_Script_Base) {
 				$script_name = $currently_executing_script->pretty_name();
 				$currently_executing_script->set_broken();
 				$currently_executing_script->add_error($e->getMessage());
-			}else{
+			} else {
 				$script_name = __("Error getting Migration Script", "event_espresso");
 			}
 			$response_array = array(
 				'records_to_migrate'=>1,
 				'records_migrated'=>0,
 				'status'=>self::status_fatal_error,
-				'message'=>  sprintf(__("A fatal error occurred during the migration: %s", "event_espresso"),$e->getMessage()),
+				'message'=>  sprintf(__("A fatal error occurred during the migration: %s", "event_espresso"), $e->getMessage()),
 				'script'=>$script_name
 			);
 		}
 		$successful_save = $this->_save_migrations_ran();
-		if($successful_save !== TRUE){
+		if ($successful_save !== TRUE) {
 			//ok so the current wp option didn't save. that's tricky, because we'd like to update it
 			//and mark it as having a fatal error, but remember- WE CAN'T SAVE THIS WP OPTION!
 			//however, if we throw an exception, and return that, then the next request
 			//won't have as much info in it, and it may be able to save
-			throw new EE_Error(sprintf(__("The error '%s' occurred updating the status of the migration. This is a FATAL ERROR, but the error is preventing the system from remembering that. Please contact event espresso support.", "event_espresso"),$successful_save));
+			throw new EE_Error(sprintf(__("The error '%s' occurred updating the status of the migration. This is a FATAL ERROR, but the error is preventing the system from remembering that. Please contact event espresso support.", "event_espresso"), $successful_save));
 		}
 		//if we're all done, initialize EE plugins' default data etc.
-		if( $init_dbs ) {
+		if ($init_dbs) {
 			$this->initialize_db_for_enqueued_ee_plugins();
 		}
 		return $response_array;
@@ -626,23 +626,23 @@ 
 	 * 'message'=>a string, containing any message you want to show to the user. We may decide to split this up into errors, notifications, and successes
 	 * 'script'=>a pretty name of the script currently running
 	 */
-	public function response_to_migration_ajax_request(){
+	public function response_to_migration_ajax_request() {
 //		//start output buffer just to make sure we don't mess up the json
 		ob_start();
-		try{
+		try {
 			$response = $this->migration_step();
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$response = array(
 				'records_to_migrate'=>0,
 				'records_migrated'=>0,
 				'status'=> EE_Data_Migration_Manager::status_fatal_error,
-				'message'=> sprintf(__("Unknown fatal error occurred: %s", "event_espresso"),$e->getMessage()),
+				'message'=> sprintf(__("Unknown fatal error occurred: %s", "event_espresso"), $e->getMessage()),
 				'script'=>'Unknown');
 			$this->add_error_to_migrations_ran($e->getMessage()."; Stack trace:".$e->getTraceAsString());
 		}
 		$warnings_etc = @ob_get_contents();
 		ob_end_clean();
-		$response['message'] .=$warnings_etc;
+		$response['message'] .= $warnings_etc;
 		return $response;
 	}
 
@@ -655,14 +655,14 @@ 
 	 * }
 	 * @return void
 	 */
-	public function update_current_database_state_to($slug_and_version = null){
-		if( ! $slug_and_version ){
+	public function update_current_database_state_to($slug_and_version = null) {
+		if ( ! $slug_and_version) {
 			//no version was provided, assume it should be at the current code version
 			$slug_and_version = array('slug' => 'Core', 'version' => espresso_version());
 		}
 		$current_database_state = get_option(self::current_database_state);
-		$current_database_state[ $slug_and_version[ 'slug' ] ]=$slug_and_version[ 'version' ];
-		update_option(self::current_database_state,$current_database_state);
+		$current_database_state[$slug_and_version['slug']] = $slug_and_version['version'];
+		update_option(self::current_database_state, $current_database_state);
 	}
 
 	/**
@@ -673,20 +673,20 @@ 
 	 * }
 	 * @return boolean
 	 */
-	public function database_needs_updating_to( $slug_and_version ) {
+	public function database_needs_updating_to($slug_and_version) {
 
-		$slug = $slug_and_version[ 'slug' ];
-		$version = $slug_and_version[ 'version' ];
+		$slug = $slug_and_version['slug'];
+		$version = $slug_and_version['version'];
 		$current_database_state = get_option(self::current_database_state);
-		if( ! isset( $current_database_state[ $slug ] ) ) {
+		if ( ! isset($current_database_state[$slug])) {
 			return true;
-		}else{
+		} else {
 			//just compare the first 3 parts of version string, eg "4.7.1", not "4.7.1.dev.032" because DBs shouldn't change on nano version changes
-			$version_parts_current_db_state = array_slice( explode('.', $current_database_state[ $slug ] ), 0, 3);
-			$version_parts_of_provided_db_state = array_slice( explode( '.', $version ), 0, 3 );
+			$version_parts_current_db_state = array_slice(explode('.', $current_database_state[$slug]), 0, 3);
+			$version_parts_of_provided_db_state = array_slice(explode('.', $version), 0, 3);
 			$needs_updating = false;
-			foreach($version_parts_current_db_state as $offset => $version_part_in_current_db_state ) {
-				if( $version_part_in_current_db_state < $version_parts_of_provided_db_state[ $offset ] ) {
+			foreach ($version_parts_current_db_state as $offset => $version_part_in_current_db_state) {
+				if ($version_part_in_current_db_state < $version_parts_of_provided_db_state[$offset]) {
 					$needs_updating = true;
 					break;
 				}
@@ -700,29 +700,29 @@ 
 	 * in addons. Has the side effect of adding them for autoloading
 	 * @return array keys are expected classnames, values are their filepaths
 	 */
-	public function get_all_data_migration_scripts_available(){
-		if( ! $this->_data_migration_class_to_filepath_map){
+	public function get_all_data_migration_scripts_available() {
+		if ( ! $this->_data_migration_class_to_filepath_map) {
 			$this->_data_migration_class_to_filepath_map = array();
-			foreach($this->get_data_migration_script_folders() as $folder_path){
-				if($folder_path[count($folder_path-1)] != DS ){
-					$folder_path.= DS;
+			foreach ($this->get_data_migration_script_folders() as $folder_path) {
+				if ($folder_path[count($folder_path - 1)] != DS) {
+					$folder_path .= DS;
 				}
-				$files = glob( $folder_path. '*.dms.php' );
+				$files = glob($folder_path.'*.dms.php');
 
-				if ( empty( $files ) ) {
+				if (empty($files)) {
 					continue;
 				}
 
-				foreach($files as $file){
-					$pos_of_last_slash = strrpos($file,DS);
-					$classname = str_replace(".dms.php","", substr($file, $pos_of_last_slash+1));
-					$migrates_to = $this->script_migrates_to_version( $classname );
-					$slug = $migrates_to[ 'slug' ];
+				foreach ($files as $file) {
+					$pos_of_last_slash = strrpos($file, DS);
+					$classname = str_replace(".dms.php", "", substr($file, $pos_of_last_slash + 1));
+					$migrates_to = $this->script_migrates_to_version($classname);
+					$slug = $migrates_to['slug'];
 					//check that the slug as contained in the DMS is associated with
 					//the slug of an addon or core
-					if( $slug != 'Core' ){
-						if( ! EE_Registry::instance()->get_addon_by_name( $slug ) ) {
-							EE_Error::doing_it_wrong(__FUNCTION__, sprintf( __( 'The data migration script "%s" migrates the "%s" data, but there is no EE addon with that name. There is only: %s. ', 'event_espresso' ),$classname,$slug,implode(",", array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ), '4.3.0.alpha.019' );
+					if ($slug != 'Core') {
+						if ( ! EE_Registry::instance()->get_addon_by_name($slug)) {
+							EE_Error::doing_it_wrong(__FUNCTION__, sprintf(__('The data migration script "%s" migrates the "%s" data, but there is no EE addon with that name. There is only: %s. ', 'event_espresso'), $classname, $slug, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name()))), '4.3.0.alpha.019');
 						}
 					}
 					$this->_data_migration_class_to_filepath_map[$classname] = $file;
@@ -742,7 +742,7 @@ 
 	 * from each addon, and check if they need updating,
 	 * @return boolean
 	 */
-	public function addons_need_updating(){
+	public function addons_need_updating() {
 		return false;
 	}
 	/**
@@ -751,25 +751,25 @@ 
 	 * @param string $error_message
 	 * @throws EE_Error
 	 */
-	public function add_error_to_migrations_ran($error_message){
+	public function add_error_to_migrations_ran($error_message) {
 		//get last-ran migration script
 		global $wpdb;
-		$last_migration_script_option = $wpdb->get_row("SELECT * FROM $wpdb->options WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id DESC LIMIT 1",ARRAY_A);
+		$last_migration_script_option = $wpdb->get_row("SELECT * FROM $wpdb->options WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id DESC LIMIT 1", ARRAY_A);
 
 		$last_ran_migration_script_properties = isset($last_migration_script_option['option_value']) ? maybe_unserialize($last_migration_script_option['option_value']) : null;
 		//now, tread lightly because we're here because a FATAL non-catchable error
 		//was thrown last time when we were trying to run a data migration script
 		//so the fatal error could have happened while getting the migration script
 		//or doing running it...
-		$versions_migrated_to = isset($last_migration_script_option['option_name']) ? str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix,"",$last_migration_script_option['option_name']) : null;
+		$versions_migrated_to = isset($last_migration_script_option['option_name']) ? str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $last_migration_script_option['option_name']) : null;
 
 		//check if it THINKS its a data migration script and especially if it's one that HASN'T finished yet
 		//because if it has finished, then it obviously couldn't be the cause of this error, right? (because its all done)
-		if(isset($last_ran_migration_script_properties['class']) && isset($last_ran_migration_script_properties['_status']) && $last_ran_migration_script_properties['_status'] != self::status_completed){
+		if (isset($last_ran_migration_script_properties['class']) && isset($last_ran_migration_script_properties['_status']) && $last_ran_migration_script_properties['_status'] != self::status_completed) {
 			//ok then just add this error to its list of errors
 			$last_ran_migration_script_properties['_errors'][] = $error_message;
 			$last_ran_migration_script_properties['_status'] = self::status_fatal_error;
-		}else{
+		} else {
 			//so we don't even know which script was last running
 			//use the data migration error stub, which is designed specifically for this type of thing
 			$general_migration_error = new EE_DMS_Unknown_1_0_0();
@@ -779,39 +779,39 @@ 
 			$versions_migrated_to = 'Unknown.1.0.0';
 			//now just to make sure appears as last (in case the were previously a fatal error like this)
 			//delete the old one
-			delete_option( self::data_migration_script_option_prefix . $versions_migrated_to );
+			delete_option(self::data_migration_script_option_prefix.$versions_migrated_to);
 		}
-		update_option(self::data_migration_script_option_prefix.$versions_migrated_to,$last_ran_migration_script_properties);
+		update_option(self::data_migration_script_option_prefix.$versions_migrated_to, $last_ran_migration_script_properties);
 
 	}
 	/**
 	 * saves what data migrations have ran to the database
 	 * @return mixed TRUE if successfully saved migrations ran, string if an error occurred
 	 */
-	protected function _save_migrations_ran(){
-		if($this->_data_migrations_ran == null){
+	protected function _save_migrations_ran() {
+		if ($this->_data_migrations_ran == null) {
 			$this->get_data_migrations_ran();
 		}
 		//now, we don't want to save actual classes to the DB because that's messy
 		$successful_updates = true;
-		foreach($this->_data_migrations_ran as $plugin_slug => $migrations_ran_for_plugin){
-			foreach($migrations_ran_for_plugin as $version_string => $array_or_migration_obj){
+		foreach ($this->_data_migrations_ran as $plugin_slug => $migrations_ran_for_plugin) {
+			foreach ($migrations_ran_for_plugin as $version_string => $array_or_migration_obj) {
 	//			echo "saving migration script to $version_string<br>";
 				$plugin_slug_for_use_in_option_name = $plugin_slug.".";
 				$option_name = self::data_migration_script_option_prefix.$plugin_slug_for_use_in_option_name.$version_string;
 				$old_option_value = get_option($option_name);
-				if($array_or_migration_obj instanceof EE_Data_Migration_Script_Base){
+				if ($array_or_migration_obj instanceof EE_Data_Migration_Script_Base) {
 					$script_array_for_saving = $array_or_migration_obj->properties_as_array();
-					if( $old_option_value != $script_array_for_saving){
-						$successful_updates = update_option($option_name,$script_array_for_saving);
+					if ($old_option_value != $script_array_for_saving) {
+						$successful_updates = update_option($option_name, $script_array_for_saving);
 					}
-				}else{//we don't know what this array-thing is. So just save it as-is
+				} else {//we don't know what this array-thing is. So just save it as-is
 	//				$array_of_migrations[$version_string] = $array_or_migration_obj;
-					if($old_option_value != $array_or_migration_obj){
-						$successful_updates = update_option($option_name,$array_or_migration_obj);
+					if ($old_option_value != $array_or_migration_obj) {
+						$successful_updates = update_option($option_name, $array_or_migration_obj);
 					}
 				}
-				if( ! $successful_updates ){
+				if ( ! $successful_updates) {
 					global $wpdb;
 					return $wpdb->last_error;
 				}
@@ -835,17 +835,17 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws EE_Error
 	 */
-	function _instantiate_script_from_properties_array($properties_array){
-		if( ! isset($properties_array['class'])){
-			throw new EE_Error(sprintf(__("Properties array  has no 'class' properties. Here's what it has: %s", "event_espresso"),implode(",",$properties_array)));
+	function _instantiate_script_from_properties_array($properties_array) {
+		if ( ! isset($properties_array['class'])) {
+			throw new EE_Error(sprintf(__("Properties array  has no 'class' properties. Here's what it has: %s", "event_espresso"), implode(",", $properties_array)));
 		}
 		$class_name = $properties_array['class'];
-		if( ! class_exists($class_name)){
-			throw new EE_Error(sprintf(__("There is no migration script named %s", "event_espresso"),$class_name));
+		if ( ! class_exists($class_name)) {
+			throw new EE_Error(sprintf(__("There is no migration script named %s", "event_espresso"), $class_name));
 		}
 		$class = new $class_name;
-		if( ! $class instanceof EE_Data_Migration_Script_Base){
-			throw new EE_Error(sprintf(__("Class '%s' is supposed to be a migration script. Its not, its a '%s'", "event_espresso"),$class_name,get_class($class)));
+		if ( ! $class instanceof EE_Data_Migration_Script_Base) {
+			throw new EE_Error(sprintf(__("Class '%s' is supposed to be a migration script. Its not, its a '%s'", "event_espresso"), $class_name, get_class($class)));
 		}
 		$class->instantiate_from_array_of_properties($properties_array);
 		return $class;
@@ -857,25 +857,25 @@ 
 	 * @param string $plugin_slug the slug for the ee plugin we are searching for. Default is 'Core'
 	 * @return string
 	 */
-	public function get_most_up_to_date_dms($plugin_slug = 'Core'){
+	public function get_most_up_to_date_dms($plugin_slug = 'Core') {
 		$class_to_filepath_map = $this->get_all_data_migration_scripts_available();
 		$most_up_to_date_dms_classname = NULL;
-		foreach($class_to_filepath_map as $classname => $filepath){
-			if($most_up_to_date_dms_classname === NULL){
+		foreach ($class_to_filepath_map as $classname => $filepath) {
+			if ($most_up_to_date_dms_classname === NULL) {
 				$migrates_to = $this->script_migrates_to_version($classname);
-				$this_plugin_slug = $migrates_to[ 'slug' ];
+				$this_plugin_slug = $migrates_to['slug'];
 //				$version_string = $migrates_to[ 'version' ];
 //				$details = $this->parse_dms_classname($classname);
-				if($this_plugin_slug == $plugin_slug){
+				if ($this_plugin_slug == $plugin_slug) {
 					//if it's for core, it wins
 					$most_up_to_date_dms_classname = $classname;
 				}
 				//if it wasn't for core, we must keep searching for one that is!
 				continue;
-			}else{
-				$champion_migrates_to= $this->script_migrates_to_version($most_up_to_date_dms_classname);
+			} else {
+				$champion_migrates_to = $this->script_migrates_to_version($most_up_to_date_dms_classname);
 				$contender_migrates_to = $this->script_migrates_to_version($classname);
-				if($contender_migrates_to[ 'slug' ] == $plugin_slug && version_compare($champion_migrates_to[ 'version' ], $contender_migrates_to[ 'version' ], '<')){
+				if ($contender_migrates_to['slug'] == $plugin_slug && version_compare($champion_migrates_to['version'], $contender_migrates_to['version'], '<')) {
 					//so the contenders version is higher and its for Core
 					$most_up_to_date_dms_classname = $classname;
 				}
@@ -895,11 +895,11 @@ 
 	 * @param string $plugin_slug like 'Core', 'Mailchimp', 'Calendar', etc
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function get_migration_ran( $version, $plugin_slug = 'Core' ) {
+	public function get_migration_ran($version, $plugin_slug = 'Core') {
 		$migrations_ran = $this->get_data_migrations_ran();
-		if( isset( $migrations_ran[ $plugin_slug ] ) && isset( $migrations_ran[ $plugin_slug ][ $version ] ) ){
-			return $migrations_ran[ $plugin_slug ][ $version ];
-		}else{
+		if (isset($migrations_ran[$plugin_slug]) && isset($migrations_ran[$plugin_slug][$version])) {
+			return $migrations_ran[$plugin_slug][$version];
+		} else {
 			return NULL;
 		}
 	}
@@ -911,20 +911,20 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		//find if the last-ran script was borked
 		//set it as being non-borked (we shouldn't ever get DMSs that we don't recognize)
 		//add an 'error' saying that we attempted to reset
 		//does it have a stage that was borked too? if so make it no longer borked
 		//add an 'error' saying we attempted to reset
 		$last_ran_script = $this->get_last_ran_script();
-		if( $last_ran_script instanceof EE_DMS_Unknown_1_0_0 ){
+		if ($last_ran_script instanceof EE_DMS_Unknown_1_0_0) {
 			//if it was an error DMS, just mark it as complete (if another error occurs it will overwrite it)
 			$last_ran_script->set_completed();
-		}elseif( $last_ran_script instanceof EE_Data_Migration_Script_Base ) {
+		}elseif ($last_ran_script instanceof EE_Data_Migration_Script_Base) {
 			$last_ran_script->reattempt();
-		}else{
-			throw new EE_Error( sprintf( __( 'Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s', 'event_espresso' ), print_r( $last_ran_script ) ) );
+		} else {
+			throw new EE_Error(sprintf(__('Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s', 'event_espresso'), print_r($last_ran_script)));
 		}
 		return $this->_save_migrations_ran();
 	}
@@ -934,19 +934,19 @@ 
 	 * @param string $plugin_slug like 'Core', 'Mailchimp', 'Calendar', etc
 	 * @return boolean
 	 */
-	public function migration_has_ran( $version, $plugin_slug = 'Core' ) {
-		return $this->get_migration_ran( $version, $plugin_slug ) !== NULL;
+	public function migration_has_ran($version, $plugin_slug = 'Core') {
+		return $this->get_migration_ran($version, $plugin_slug) !== NULL;
 	}
 	/**
 	 * Enqueues this ee plugin to have its data initialized
 	 * @param string $plugin_slug either 'Core' or EE_Addon::name()'s return value
 	 */
-	public function enqueue_db_initialization_for( $plugin_slug ) {
+	public function enqueue_db_initialization_for($plugin_slug) {
 		$queue = $this->get_db_initialization_queue();
-		if( ! in_array( $plugin_slug, $queue ) ) {
+		if ( ! in_array($plugin_slug, $queue)) {
 			$queue[] = $plugin_slug;
 		}
-		update_option( self::db_init_queue_option_name, $queue );
+		update_option(self::db_init_queue_option_name, $queue);
 	}
 	/**
 	 * Calls EE_Addon::initialize_db_if_no_migrations_required() on each addon
@@ -957,26 +957,26 @@ 
 //		EE_Registry::instance()->load_helper( 'Debug_Tools' );
 //		EEH_Debug_Tools::instance()->start_timer( 'initialize_db_for_enqueued_ee_plugins' );
 		$queue = $this->get_db_initialization_queue();
-		foreach( $queue as $plugin_slug ) {
-			$most_up_to_date_dms = $this->get_most_up_to_date_dms( $plugin_slug );
-			if( ! $most_up_to_date_dms ) {
+		foreach ($queue as $plugin_slug) {
+			$most_up_to_date_dms = $this->get_most_up_to_date_dms($plugin_slug);
+			if ( ! $most_up_to_date_dms) {
 				//if there is NO DMS for this plugin, obviously there's no schema to verify anyways
 				$verify_db = false;
-			}else{
-				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version( $most_up_to_date_dms );
-				$verify_db = $this->database_needs_updating_to( $most_up_to_date_dms_migrates_to );
+			} else {
+				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version($most_up_to_date_dms);
+				$verify_db = $this->database_needs_updating_to($most_up_to_date_dms_migrates_to);
 			}
-			if( $plugin_slug == 'Core' ){
+			if ($plugin_slug == 'Core') {
 				EE_System::instance()->initialize_db_if_no_migrations_required(
 						false,
 						$verify_db
 					);
-			}else{
+			} else {
 				//just loop through the addons to make sure their database is setup
-				foreach( EE_Registry::instance()->addons as $addon ) {
-					if( $addon->name() == $plugin_slug ) {
+				foreach (EE_Registry::instance()->addons as $addon) {
+					if ($addon->name() == $plugin_slug) {
 
-						$addon->initialize_db_if_no_migrations_required( $verify_db );
+						$addon->initialize_db_if_no_migrations_required($verify_db);
 						break;
 					}
 				}
@@ -986,7 +986,7 @@ 
 //		EEH_Debug_Tools::instance()->show_times();
 		//because we just initialized the DBs for the enqueued ee plugins
 		//we don't need to keep remembering which ones needed to be initialized
-		delete_option( self::db_init_queue_option_name );
+		delete_option(self::db_init_queue_option_name);
 	}
 
 	/**
@@ -995,7 +995,7 @@ 
 	 * 'Core', or the return value of EE_Addon::name() for an addon
 	 * @return array
 	 */
-	public function get_db_initialization_queue(){
-		return get_option ( self::db_init_queue_option_name, array() );
+	public function get_db_initialization_queue() {
+		return get_option(self::db_init_queue_option_name, array());
 	}
 }

Braces +21 added lines, -21 removed lines

@@ -187,7 +187,7 @@ 
 			//it's 4.2-style.eg Core.4.1.0
 			$plugin_slug = $parts[0];//eg Core
 			$version_string = $parts[1].".".$parts[2].".".$parts[3]; //eg 4.1.0
-		}else{
+		} else{
 			//it's 4.1-style: eg 4.1.0
 			$plugin_slug = 'Core';
 			$version_string = $plugin_slug_and_version_string;//eg 4.1.0
@@ -210,12 +210,12 @@ 
 			if($class instanceof EE_Data_Migration_Script_Base){
 				$class->instantiate_from_array_of_properties($data_migration_data);
 				return $class;
-			}else{
+			} else{
 				//huh, so its an object but not a data migration script?? that shouldn't happen
 				//just leave it as an array (which will probably just get ignored)
 				throw new EE_Error(sprintf(__("Trying to retrieve DMS class from wp option. No DMS by the name '%s' exists", 'event_espresso'),$data_migration_data['class']));
 			}
-		}else{
+		} else{
 			//so the data doesn't specify a class. So it must either be a legacy array of info or some array (which we'll probably just ignore), or a class that no longer exists
 			throw new EE_Error(sprintf(__("The wp option  with key '%s' does not represent a DMS", 'event_espresso'),$dms_option_name));
 		}
@@ -245,7 +245,7 @@ 
 						//sometimes we also like to know which was the last incomplete script (or if there are any at all)
 						$this->_last_ran_incomplete_script = $class;
 					}
-				}catch(EE_Error $e){
+				} catch(EE_Error $e){
 					//ok so its not a DMS. We'll just keep it, although other code will need to expect non-DMSs
 					$data_migrations_ran[$plugin_slug][$version_string] = maybe_unserialize($data_migration_option['option_value']);
 				}
@@ -346,7 +346,7 @@ 
 				//so we want the data migrations to happen. SO, we're going to say the DB is at that state
 //				echo "4.1.0 is greater than $previous_version_installed! update the option";
 				$db_state = array('Core'=>$previous_version_installed);
-			}else{
+			} else{
 //					echo "4.1.0 is SMALLER than $previous_version_installed";
 					$db_state = array('Core'=>EVENT_ESPRESSO_VERSION);
 			}
@@ -414,10 +414,10 @@ 
 						$migrates_to_version = $script->migrates_to_version();
 						$next_database_state_to_consider[ $migrates_to_version[ 'slug' ] ] = $migrates_to_version[ 'version' ];
 						unset($script_class_and_filepaths_available[$classname]);
-					}else{
+					} else{
 						//it must have a status that indicates it has finished, so we don't want to try and run it again
 					}
-				}else{
+				} else{
 					//it exists but it's not  a proper data migration script
 					//maybe the script got renamed? or was simply removed from EE?
 					//either way, its certainly not runnable!
@@ -457,7 +457,7 @@ 
 		}
 		if($include_completed_scripts){
 			return $this->_last_ran_script;
-		}else{
+		} else{
 			return $this->_last_ran_incomplete_script;
 		}
 	}
@@ -516,7 +516,7 @@ 
 				$this->_data_migrations_ran[$plugin_slug][$version] = $currently_executing_script;
 			}
 			$current_script_name = get_class($currently_executing_script);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			//an exception occurred while trying to get migration scripts
 
 			$message =  sprintf( __("Error Message: %sStack Trace:%s", "event_espresso"), $e->getMessage() . '<br>', $e->getTraceAsString() );
@@ -581,14 +581,14 @@ 
 					);
 					break;
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			//ok so some exception was thrown which killed the data migration script
 			//double-check we have a real script
 			if($currently_executing_script instanceof EE_Data_Migration_Script_Base){
 				$script_name = $currently_executing_script->pretty_name();
 				$currently_executing_script->set_broken();
 				$currently_executing_script->add_error($e->getMessage());
-			}else{
+			} else{
 				$script_name = __("Error getting Migration Script", "event_espresso");
 			}
 			$response_array = array(
@@ -631,7 +631,7 @@ 
 		ob_start();
 		try{
 			$response = $this->migration_step();
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$response = array(
 				'records_to_migrate'=>0,
 				'records_migrated'=>0,
@@ -680,7 +680,7 @@ 
 		$current_database_state = get_option(self::current_database_state);
 		if( ! isset( $current_database_state[ $slug ] ) ) {
 			return true;
-		}else{
+		} else{
 			//just compare the first 3 parts of version string, eg "4.7.1", not "4.7.1.dev.032" because DBs shouldn't change on nano version changes
 			$version_parts_current_db_state = array_slice( explode('.', $current_database_state[ $slug ] ), 0, 3);
 			$version_parts_of_provided_db_state = array_slice( explode( '.', $version ), 0, 3 );
@@ -769,7 +769,7 @@ 
 			//ok then just add this error to its list of errors
 			$last_ran_migration_script_properties['_errors'][] = $error_message;
 			$last_ran_migration_script_properties['_status'] = self::status_fatal_error;
-		}else{
+		} else{
 			//so we don't even know which script was last running
 			//use the data migration error stub, which is designed specifically for this type of thing
 			$general_migration_error = new EE_DMS_Unknown_1_0_0();
@@ -805,7 +805,7 @@ 
 					if( $old_option_value != $script_array_for_saving){
 						$successful_updates = update_option($option_name,$script_array_for_saving);
 					}
-				}else{//we don't know what this array-thing is. So just save it as-is
+				} else{//we don't know what this array-thing is. So just save it as-is
 	//				$array_of_migrations[$version_string] = $array_or_migration_obj;
 					if($old_option_value != $array_or_migration_obj){
 						$successful_updates = update_option($option_name,$array_or_migration_obj);
@@ -872,7 +872,7 @@ 
 				}
 				//if it wasn't for core, we must keep searching for one that is!
 				continue;
-			}else{
+			} else{
 				$champion_migrates_to= $this->script_migrates_to_version($most_up_to_date_dms_classname);
 				$contender_migrates_to = $this->script_migrates_to_version($classname);
 				if($contender_migrates_to[ 'slug' ] == $plugin_slug && version_compare($champion_migrates_to[ 'version' ], $contender_migrates_to[ 'version' ], '<')){
@@ -899,7 +899,7 @@ 
 		$migrations_ran = $this->get_data_migrations_ran();
 		if( isset( $migrations_ran[ $plugin_slug ] ) && isset( $migrations_ran[ $plugin_slug ][ $version ] ) ){
 			return $migrations_ran[ $plugin_slug ][ $version ];
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -921,9 +921,9 @@ 
 		if( $last_ran_script instanceof EE_DMS_Unknown_1_0_0 ){
 			//if it was an error DMS, just mark it as complete (if another error occurs it will overwrite it)
 			$last_ran_script->set_completed();
-		}elseif( $last_ran_script instanceof EE_Data_Migration_Script_Base ) {
+		} elseif( $last_ran_script instanceof EE_Data_Migration_Script_Base ) {
 			$last_ran_script->reattempt();
-		}else{
+		} else{
 			throw new EE_Error( sprintf( __( 'Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s', 'event_espresso' ), print_r( $last_ran_script ) ) );
 		}
 		return $this->_save_migrations_ran();
@@ -962,7 +962,7 @@ 
 			if( ! $most_up_to_date_dms ) {
 				//if there is NO DMS for this plugin, obviously there's no schema to verify anyways
 				$verify_db = false;
-			}else{
+			} else{
 				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version( $most_up_to_date_dms );
 				$verify_db = $this->database_needs_updating_to( $most_up_to_date_dms_migrates_to );
 			}
@@ -971,7 +971,7 @@ 
 						false,
 						$verify_db
 					);
-			}else{
+			} else{
 				//just loop through the addons to make sure their database is setup
 				foreach( EE_Registry::instance()->addons as $addon ) {
 					if( $addon->name() == $plugin_slug ) {

core/EE_Encryption.core.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * EE_Encryption class
- *
- * @package				Event Espresso
- * @subpackage		includes/functions
- * @author					Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * EE_Encryption class
+	 *
+	 * @package				Event Espresso
+	 * @subpackage		includes/functions
+	 * @author					Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Encryption {
 
   // instance of the EE_Encryption object

Spacing +63 added lines, -63 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * EE_Encryption class
  *
@@ -27,9 +27,9 @@ 
 	 */
   private function __construct() {
 
-		define( 'ESPRESSO_ENCRYPT', TRUE );
+		define('ESPRESSO_ENCRYPT', TRUE);
 
-		if ( ! function_exists( 'mcrypt_encrypt' ) ) {
+		if ( ! function_exists('mcrypt_encrypt')) {
 			self::$_use_mcrypt = FALSE;
 		}
 
@@ -42,9 +42,9 @@ 
 	 *	@access public
 	 * @return \EE_Encryption
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Encryption ) {
+		if ( ! self::$_instance instanceof EE_Encryption) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -60,17 +60,17 @@ 
 	public  function get_encryption_key() {
 
 		// if encryption key has not been set
-		if ( empty( self::$_encryption_key )) {
+		if (empty(self::$_encryption_key)) {
 
 			// retrieve encryption_key from db
-			self::$_encryption_key = get_option( 'ee_encryption_key' );
+			self::$_encryption_key = get_option('ee_encryption_key');
 
 			// WHAT?? No encryption_key in the db ??
-			if ( self::$_encryption_key == FALSE ) {
+			if (self::$_encryption_key == FALSE) {
 				// let's make one. And md5 it to make it just the right size for a key
-				$new_key =  md5( self::generate_random_string() );
+				$new_key = md5(self::generate_random_string());
 				// now save it to the db for later
-				add_option( 'ee_encryption_key', $new_key );
+				add_option('ee_encryption_key', $new_key);
 				// here's the key - FINALLY !
 				self::$_encryption_key = $new_key;
 			}
@@ -87,17 +87,17 @@ 
 	 * @param string $text_string  - the text to be encrypted
 	 * @return string
 	 */
-	public function encrypt ( $text_string = '' ) {
+	public function encrypt($text_string = '') {
 
 		// you give me nothing??? GET OUT !
-		if  ( empty( $text_string ))  {
+		if (empty($text_string)) {
 			return FALSE;
 		}
 
-		if ( self::$_use_mcrypt ) {
-			$encrypted_text = $this->m_encrypt( $text_string );
+		if (self::$_use_mcrypt) {
+			$encrypted_text = $this->m_encrypt($text_string);
 		} else {
-			$encrypted_text = $this->acme_encrypt( $text_string );
+			$encrypted_text = $this->acme_encrypt($text_string);
 		}
 
 		return $encrypted_text;
@@ -112,18 +112,18 @@ 
 	 * @param string $encrypted_text - the text to be decrypted
 	 * @return string
 	 */
-	public function decrypt  ( $encrypted_text = '' )  {
+	public function decrypt($encrypted_text = '') {
 
 		// you give me nothing??? GET OUT !
-		if  ( empty( $encrypted_text ))  {
+		if (empty($encrypted_text)) {
 			return FALSE;
 		}
 
 		// if PHP's mcrypt functions are installed then we'll use them
-		if ( self::$_use_mcrypt ) {
-			$decrypted_text = $this->m_decrypt( $encrypted_text );
+		if (self::$_use_mcrypt) {
+			$decrypted_text = $this->m_decrypt($encrypted_text);
 		} else {
-			$decrypted_text = $this->acme_decrypt( $encrypted_text );
+			$decrypted_text = $this->acme_decrypt($encrypted_text);
 		}
 
 		return $decrypted_text;
@@ -140,17 +140,17 @@ 
 	 * @internal param $string - the text to be encoded
 	 * @return string
 	 */
-	public function base64_url_encode ( $text_string = FALSE ) {
+	public function base64_url_encode($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
 		// encode
-		$encoded_string = base64_encode ( $text_string );
+		$encoded_string = base64_encode($text_string);
 		// remove chars to make encoding more URL friendly
-		$encoded_string = strtr ( $encoded_string, '+/=', '-_,' );
+		$encoded_string = strtr($encoded_string, '+/=', '-_,');
 
 		return $encoded_string;
 
@@ -166,17 +166,17 @@ 
 	 * @internal param $string - the text to be decoded
 	 * @return string
 	 */
-	public function base64_url_decode ( $encoded_string = FALSE ) {
+	public function base64_url_decode($encoded_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encoded_string )  {
+		if ( ! $encoded_string) {
 			return FALSE;
 		}
 
 		// replace previously removed characters
-		$encoded_string = strtr ( $encoded_string, '-_,', '+/=' );
+		$encoded_string = strtr($encoded_string, '-_,', '+/=');
 		// decode
-		$decoded_string = base64_decode ( $encoded_string );
+		$decoded_string = base64_decode($encoded_string);
 
 		return $decoded_string;
 
@@ -191,22 +191,22 @@ 
 	 * @internal param $string - the text to be encrypted
 	 * @return string
 	 */
-	private function m_encrypt  ( $text_string = FALSE ) {
+	private function m_encrypt($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
 		// initialization vector
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 		// encrypt it
-		$encrypted_text = mcrypt_encrypt ( MCRYPT_RIJNDAEL_256, self::$_encryption_key, $text_string, MCRYPT_MODE_ECB, $iv );
+		$encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, self::$_encryption_key, $text_string, MCRYPT_MODE_ECB, $iv);
 		// trim and encode
-		$encrypted_text = trim ( base64_encode( $encrypted_text ) );
+		$encrypted_text = trim(base64_encode($encrypted_text));
 
 		return $encrypted_text;
 
@@ -221,23 +221,23 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function m_decrypt  ( $encrypted_text = FALSE )  {
+	private function m_decrypt($encrypted_text = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return FALSE;
 		}
 
 		// decode
-		$encrypted_text = base64_decode ( $encrypted_text );
+		$encrypted_text = base64_decode($encrypted_text);
 
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 		// decrypt it
-		$decrypted_text = mcrypt_decrypt ( MCRYPT_RIJNDAEL_256, self::$_encryption_key, $encrypted_text, MCRYPT_MODE_ECB, $iv );
-		$decrypted_text = trim ( $decrypted_text );
+		$decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, self::$_encryption_key, $encrypted_text, MCRYPT_MODE_ECB, $iv);
+		$decrypted_text = trim($decrypted_text);
 
 		return $decrypted_text;
 
@@ -253,22 +253,22 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_encrypt ( $text_string = FALSE ) {
+	private function acme_encrypt($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
-		$key_bits = str_split ( str_pad ( '', strlen( $text_string ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split( $text_string );
+		$key_bits = str_split(str_pad('', strlen($text_string), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($text_string);
 
-		foreach ( $string_bits as $k =>$v ) {
-			$temp = ord( $v ) + ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp > 255 ? ( $temp - 256 ) : $temp );
+		foreach ($string_bits as $k =>$v) {
+			$temp = ord($v) + ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
 		}
 
-		$encrypted = base64_encode( join( '', $string_bits ) );
+		$encrypted = base64_encode(join('', $string_bits));
 
 		return $encrypted;
 
@@ -284,24 +284,24 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_decrypt ( $encrypted_text = FALSE ) {
+	private function acme_decrypt($encrypted_text = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return FALSE;
 		}
 
-		$encrypted_text = base64_decode ( $encrypted_text );
+		$encrypted_text = base64_decode($encrypted_text);
 
-		$key_bits = str_split ( str_pad ( '', strlen ( $encrypted_text ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split ( $encrypted_text );
+		$key_bits = str_split(str_pad('', strlen($encrypted_text), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($encrypted_text);
 
-		foreach ( $string_bits as $k => $v ) {
-			$temp = ord ( $v ) - ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp < 0 ? ( $temp + 256 ) : $temp );
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) - ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
 		}
 
-		$decrypted = join( '', $string_bits );
+		$decrypted = join('', $string_bits);
 
 		return $decrypted;
 
@@ -317,16 +317,16 @@ 
 	 * @internal param $string - number of characters for random string
 	 * @return string
 	 */
-	public function generate_random_string ( $length = 40 ) {
+	public function generate_random_string($length = 40) {
 
-		$iterations = ceil ( $length / 40 );
+		$iterations = ceil($length / 40);
 
 		$random_string = '';
 
-		for ($i = 0; $i < $iterations; $i ++) {
-			$random_string .= sha1( microtime(TRUE) . mt_rand( 10000, 90000 ));
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(TRUE).mt_rand(10000, 90000));
 		}
-		$random_string =  substr( $random_string, 0, $length );
+		$random_string = substr($random_string, 0, $length);
 
 		return $random_string;
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

core/EE_Load_Textdomain.core.php

Spacing +12 added lines, -12 removed lines

@@ -39,13 +39,13 @@ 
 	public static function load_textdomain() {
 		self::_maybe_get_langfile();
 		//now load the textdomain
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo' ) ) {
+		EE_Registry::instance()->load_helper('File');
+		if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event_espresso-'.self::$_lang.'.mo')) {
 			load_plugin_textdomain('event_espresso', FALSE, EE_LANGUAGES_SAFE_LOC);
-		} else if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo' ) ) {
-			load_textdomain( 'event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'  );
+		} else if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo')) {
+			load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo');
 		} else {
-			load_plugin_textdomain( 'event_espresso', FALSE, dirname( EE_PLUGIN_BASENAME ) . '/languages/');
+			load_plugin_textdomain('event_espresso', FALSE, dirname(EE_PLUGIN_BASENAME).'/languages/');
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
+		if ($has_check = get_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION) || empty(self::$_lang))
 			return;
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
+		if (empty(self::$_lang) || self::$_lang == 'en_US')
 			return;
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(
-			'_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/',
-			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true',
-			'_new_file_name' => 'event_espresso-' . self::$_lang . '.mo'
+			'_upload_to' => EE_PLUGIN_DIR_PATH.'languages/',
+			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-'.self::$_lang.'.mo?raw=true',
+			'_new_file_name' => 'event_espresso-'.self::$_lang.'.mo'
 			);
 
 
-		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE );
+		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE);
 
 		$sideloader->sideload();
-		update_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1 );
+		update_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION, 1);
 	}
 } //end EE_Load_Textdomain

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -60,12 +62,14 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
-			return;
+		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) ) {
+					return;
+		}
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
-			return;
+		if ( empty( self::$_lang ) || self::$_lang == 'en_US' ) {
+					return;
+		}
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(

core/EE_Log.core.php

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- *
- * Class EE_Log
- *
- * Singleton logging class. Can be called from anywhere in the plugin to log data to a log file.
- * Defaults to wp-content/uploads/espresso/logs/espresso_log.txt
- * Usage:
- * do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'logging message' );
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Sidney Harrel, Brent Christensen
- *
- */
+	 *
+	 * Class EE_Log
+	 *
+	 * Singleton logging class. Can be called from anywhere in the plugin to log data to a log file.
+	 * Defaults to wp-content/uploads/espresso/logs/espresso_log.txt
+	 * Usage:
+	 * do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'logging message' );
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Sidney Harrel, Brent Christensen
+	 *
+	 */
 class EE_Log {
 
 	/**

Spacing +59 added lines, -59 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  *
  * Class EE_Log
@@ -62,7 +62,7 @@ 
 	 * @return EE_Log
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Log ) {
+		if ( ! self::$_instance instanceof EE_Log) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,11 +74,11 @@ 
 	 */
 	private function __construct() {
 
-		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging ) {
+		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging) {
 			return;
 		}
 
-		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS;
+		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS;
 		$this->_log_file = EE_Registry::instance()->CFG->admin->log_file_name();
 		$this->_log = '';
 		$this->_debug_file = EE_Registry::instance()->CFG->admin->debug_file_name();
@@ -86,15 +86,15 @@ 
 		$this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
 		$this->_remote_log = '';
 
-		add_action( 'admin_init', array( $this, 'verify_filesystem' ), -10 );
-		add_action( 'AHEE_log', array( $this, 'log' ), 10, 4 );
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			add_action( 'shutdown', array( $this, 'write_log' ), 9999 );
+		add_action('admin_init', array($this, 'verify_filesystem'), -10);
+		add_action('AHEE_log', array($this, 'log'), 10, 4);
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			add_action('shutdown', array($this, 'write_log'), 9999);
 			// if WP_DEBUG
-			add_action( 'shutdown', array( $this, 'write_debug' ), 9999 );
+			add_action('shutdown', array($this, 'write_debug'), 9999);
 		}
-		if ( EE_Registry::instance()->CFG->admin->use_remote_logging ) {
-			add_action( 'shutdown', array( $this, 'send_log' ), 9999 );
+		if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			add_action('shutdown', array($this, 'send_log'), 9999);
 		}
 
 	}
@@ -108,14 +108,14 @@ 
 	 */
 	public function verify_filesystem() {
 		try {
-			EE_Registry::instance()->load_helper( 'File' );
-			EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR );
-			EEH_File::ensure_folder_exists_and_is_writable( $this->_logs_folder );
-			EEH_File::add_htaccess_deny_from_all( $this->_logs_folder );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_log_file );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_debug_file );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso logging could not be setup because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Registry::instance()->load_helper('File');
+			EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR);
+			EEH_File::ensure_folder_exists_and_is_writable($this->_logs_folder);
+			EEH_File::add_htaccess_deny_from_all($this->_logs_folder);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_log_file);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_debug_file);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso logging could not be setup because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -132,15 +132,15 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	private function _format_message( $file = '', $function = '', $message = '', $type = '' ) {
-		$msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$msg .= '[' . current_time( 'mysql' ) . '] ';
-		$msg .= ! empty( $file ) ? basename( $file ) : '';
-		$msg .= ! empty( $file ) && ! empty( $function ) ? ' -> ' : '';
-		$msg .= ! empty( $function ) ? $function . '()' : '';
+	private function _format_message($file = '', $function = '', $message = '', $type = '') {
+		$msg = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$msg .= '['.current_time('mysql').'] ';
+		$msg .= ! empty($file) ? basename($file) : '';
+		$msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
+		$msg .= ! empty($function) ? $function.'()' : '';
 		$msg .= PHP_EOL;
-		$type = ! empty( $type ) ? $type : 'log message';
-		$msg .= ! empty( $message ) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+		$type = ! empty($type) ? $type : 'log message';
+		$msg .= ! empty($message) ? "\t".'['.$type.'] '.$message.PHP_EOL : '';
 		return $msg;
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @param string $message
 	 * @param string $type
 	 */
-	public function log( $file = '', $function = '', $message = '', $type = '' ) {
-		$this->_log .= $this->_format_message( $file, $function, $message, $type );
+	public function log($file = '', $function = '', $message = '', $type = '') {
+		$this->_log .= $this->_format_message($file, $function, $message, $type);
 	}
 
 
@@ -168,10 +168,10 @@ 
 	public function write_log() {
 		try {
 			//get existing log file and append new log info
-			$this->_log = EEH_File::get_file_contents( $this->_logs_folder . $this->_log_file ) . $this->_log;
-			EEH_File::write_to_file( $this->_logs_folder . $this->_log_file, $this->_log, 'Event Espresso Log' );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			$this->_log = EEH_File::get_file_contents($this->_logs_folder.$this->_log_file).$this->_log;
+			EEH_File::write_to_file($this->_logs_folder.$this->_log_file, $this->_log, 'Event Espresso Log');
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Could not write to the Event Espresso log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -184,31 +184,31 @@ 
 	 */
 	public function send_log() {
 
-		if ( empty( $this->_remote_logging_url )) {
+		if (empty($this->_remote_logging_url)) {
 			return;
 		}
 
-		$data = 'domain=' . $_SERVER['HTTP_HOST'];
-		$data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-		$data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-		$data .= '&time=' . time();
-		$data .= '&remote_log=' . $this->_log;
-		$data .= '&request_array=' . json_encode( $_REQUEST );
+		$data = 'domain='.$_SERVER['HTTP_HOST'];
+		$data .= '&ip='.$_SERVER['SERVER_ADDR'];
+		$data .= '&server_type='.$_SERVER['SERVER_SOFTWARE'];
+		$data .= '&time='.time();
+		$data .= '&remote_log='.$this->_log;
+		$data .= '&request_array='.json_encode($_REQUEST);
 		$data .= '&action=save';
 
-		if ( defined( 'EELOGGING_PASS' )) {
-			$data .= '&pass=' . EELOGGING_PASS;
+		if (defined('EELOGGING_PASS')) {
+			$data .= '&pass='.EELOGGING_PASS;
 		}
-		if ( defined( 'EELOGGING_KEY' )) {
-			$data .= '&key=' . EELOGGING_KEY;
+		if (defined('EELOGGING_KEY')) {
+			$data .= '&key='.EELOGGING_KEY;
 		}
 
-		$c = curl_init( $this->_remote_logging_url );
-		curl_setopt( $c, CURLOPT_POST, TRUE );
-		curl_setopt( $c, CURLOPT_POSTFIELDS, $data );
-		curl_setopt( $c, CURLOPT_RETURNTRANSFER, TRUE );
-		curl_exec( $c );
-		curl_close( $c );
+		$c = curl_init($this->_remote_logging_url);
+		curl_setopt($c, CURLOPT_POST, TRUE);
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_exec($c);
+		curl_close($c);
 	}
 
 
@@ -219,18 +219,18 @@ 
 	 * previous entries are overwritten
 	 */
 	public function write_debug() {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$this->_debug_log = '';
-			foreach ( $_GET as $key => $value ) {
-				$this->_debug_log .= '$_GET["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_GET as $key => $value) {
+				$this->_debug_log .= '$_GET["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
-			foreach ( $_POST as $key => $value ) {
-				$this->_debug_log .= '$_POST["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_POST as $key => $value) {
+				$this->_debug_log .= '$_POST["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
 			try {
-				EEH_File::write_to_file( $this->_logs_folder . $this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log' );
-			} catch( EE_Error $e ){
-				EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso debug log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+				EEH_File::write_to_file($this->_logs_folder.$this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log');
+			} catch (EE_Error $e) {
+				EE_Error::add_error(sprintf(__('Could not write to the Event Espresso debug log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				return;
 			}
 		}
@@ -242,7 +242,7 @@ 
 	 * __clone
 	 */
 	public function __clone() {
-		trigger_error( __( 'Clone is not allowed.', 'event_espresso' ), E_USER_ERROR );
+		trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

core/EE_Module_Request_Router.core.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 	/**
 	 * 	resolve_route
-	*
+	 *
 	 * 	this method simply takes a valid route, and resolves what module class method the route points to
 	 *
 	 *  @access 	public

Spacing +49 added lines, -49 removed lines

@@ -61,31 +61,31 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    string | NULL
 	 */
-	public function get_route( WP_Query $WP_Query ) {
+	public function get_route(WP_Query $WP_Query) {
 		$this->WP_Query = $WP_Query;
 		// assume this if first route being called
 		$previous_route = FALSE;
 		// but is it really ???
-		if ( ! empty( self::$_previous_routes )) {
+		if ( ! empty(self::$_previous_routes)) {
 			// get last run route
-			$previous_routes = array_values( self::$_previous_routes );
-			$previous_route = array_pop( $previous_routes );
+			$previous_routes = array_values(self::$_previous_routes);
+			$previous_route = array_pop($previous_routes);
 		}
 		//  has another route already been run ?
-		if ( $previous_route ) {
+		if ($previous_route) {
 			// check if  forwarding has been set
-			$current_route = $this->get_forward( $previous_route );
+			$current_route = $this->get_forward($previous_route);
 			try {
 				//check for recursive forwarding
-				if ( isset( self::$_previous_routes[ $current_route ] )) {
+				if (isset(self::$_previous_routes[$current_route])) {
 					throw new EE_Error(
 						sprintf(
-							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.','event_espresso'),
+							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.', 'event_espresso'),
 							$current_route
 						)
 					);
 				}
-			} catch ( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -95,13 +95,13 @@ 
 			// grab all routes
 			$routes = EE_Registry::instance()->CFG->get_routes();
 			//d( $routes );
-			foreach( $routes as $key => $route ) {
+			foreach ($routes as $key => $route) {
 				// check request for module route
-				if ( EE_Registry::instance()->REQ->is_set( $key )) {
+				if (EE_Registry::instance()->REQ->is_set($key)) {
 					//echo '<b style="color:#2EA2CC;">key : <span style="color:#E76700">' . $key . '</span></b><br />';
-					$current_route = sanitize_text_field( EE_Registry::instance()->REQ->get( $key ));
-					if ( $current_route ) {
-						$current_route = array( $key, $current_route );
+					$current_route = sanitize_text_field(EE_Registry::instance()->REQ->get($key));
+					if ($current_route) {
+						$current_route = array($key, $current_route);
 						//echo '<b style="color:#2EA2CC;">current_route : <span style="color:#E76700">' . $current_route . '</span></b><br />';
 						break;
 					}
@@ -109,7 +109,7 @@ 
 			}
 		}
 		// sorry, but I can't read what you route !
-		if ( empty( $current_route )) {
+		if (empty($current_route)) {
 			return NULL;
 		}
 		//add route to previous routes array
@@ -129,46 +129,46 @@ 
 	 *  @param 	string		$current_route
 	 *  @return 	mixed		EED_Module | boolean
 	 */
-	public function resolve_route( $key, $current_route ) {
+	public function resolve_route($key, $current_route) {
 		// get module method that route has been mapped to
-		$module_method = EE_Config::get_route( $current_route, $key );
+		$module_method = EE_Config::get_route($current_route, $key);
 		//EEH_Debug_Tools::printr( $module_method, '$module_method  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify result was returned
-		if ( empty( $module_method )) {
-			$msg = sprintf( __( 'The requested route %s could not be mapped to any registered modules.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($module_method)) {
+			$msg = sprintf(__('The requested route %s could not be mapped to any registered modules.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that result is an array
-		if ( ! is_array( $module_method )) {
-			$msg = sprintf( __( 'The %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($module_method)) {
+			$msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab module name
 		$module_name = $module_method[0];
 		// verify that a class method was registered properly
-		if ( ! isset( $module_method[1] )) {
-			$msg = sprintf( __( 'A class method for the %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($module_method[1])) {
+			$msg = sprintf(__('A class method for the %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab method
 		$method = $module_method[1];
 		// verify that class exists
-		if ( ! class_exists( $module_name )) {
-			$msg = sprintf( __( 'The requested %s class could not be found.', 'event_espresso' ), $module_name );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_name)) {
+			$msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that method exists
-		if ( ! method_exists( $module_name, $method )) {
-			$msg = sprintf( __( 'The class method %s for the %s route is in invalid.', 'event_espresso' ), $method, $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists($module_name, $method)) {
+			$msg = sprintf(__('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// instantiate module and call route method
-		return $this->_module_router( $module_name, $method );
+		return $this->_module_router($module_name, $method);
 	}
 
 
@@ -182,16 +182,16 @@ 
 	 * @param   string  $module_name
 	 * @return    EED_Module | NULL
 	 */
-	public static function module_factory( $module_name ) {
-		if ( $module_name == 'EED_Module' ) {
-			EE_Error::add_error( sprintf( __( 'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function module_factory($module_name) {
+		if ($module_name == 'EED_Module') {
+			EE_Error::add_error(sprintf(__('EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// let's pause to reflect on this...
-		$mod_reflector = new ReflectionClass( $module_name );
+		$mod_reflector = new ReflectionClass($module_name);
 		// ensure that class is actually a module
-		if ( ! $mod_reflector->isSubclassOf( 'EED_Module' )) {
-			EE_Error::add_error( sprintf( __( 'The requested %s module is not of the class EED_Module.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $mod_reflector->isSubclassOf('EED_Module')) {
+			EE_Error::add_error(sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// instantiate and return module class
@@ -209,14 +209,14 @@ 
 	 * @param   string  $method
 	 * @return    EED_Module | NULL
 	 */
-	private function _module_router( $module_name, $method ) {
+	private function _module_router($module_name, $method) {
 		// instantiate module class
-		$module = EE_Module_Request_Router::module_factory( $module_name );
-		if ( $module instanceof EED_Module ) {
+		$module = EE_Module_Request_Router::module_factory($module_name);
+		if ($module instanceof EED_Module) {
 			// and call whatever action the route was for
 			try {
-				call_user_func( array( $module, $method ), $this->WP_Query );
-			} catch ( EE_Error $e ) {
+				call_user_func(array($module, $method), $this->WP_Query);
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -233,8 +233,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_forward( $current_route ) {
-		return EE_Config::get_forward( $current_route );
+	public function get_forward($current_route) {
+		return EE_Config::get_forward($current_route);
 	}
 
 
@@ -246,8 +246,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_view( $current_route ) {
-		return EE_Config::get_view( $current_route );
+	public function get_view($current_route) {
+		return EE_Config::get_view($current_route);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 
 
 

Braces +3 added lines, -1 removed lines

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

core/EE_Network_Config.core.php

Spacing +22 added lines, -22 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Network_Config )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Network_Config)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,15 +74,15 @@ 
 	 *  @return 	void
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Network_Config__construct__begin',$this );
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
 		//set defaults
-		$this->core = apply_filters( 'FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config() );
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
 		$this->addons = array();
 
 		$this->_load_config();
 
 		// construct__end hook
-		do_action( 'AHEE__EE_Network_Config__construct__end',$this );
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 */
 	private function _load_config() {
 		$config = $this->get_config();
-		foreach ( $config as $prop => $settings ) {
-			$prop_class = is_object( $settings ) ? get_class( $this->$prop ) : FALSE;
-			if ( ! empty( $settings ) && ( ! $prop_class || ( $settings instanceof $prop_class ))) {
+		foreach ($config as $prop => $settings) {
+			$prop_class = is_object($settings) ? get_class($this->$prop) : FALSE;
+			if ( ! empty($settings) && ( ! $prop_class || ($settings instanceof $prop_class))) {
 				$this->$prop = $settings;
 			}
 		}
@@ -114,8 +114,8 @@ 
 	 */
 	public function get_config() {
 		// grab network configuration
-		$CFG = get_site_option( 'ee_network_config', array() );
-		$CFG = apply_filters( 'FHEE__EE_Network_Config__get_config__CFG', $CFG );
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
 		return $CFG;
 	}
 
@@ -127,24 +127,24 @@ 
 	 *  @access 	public
 	 *  @return 	boolean success
 	 */
-	public function update_config( $add_success = FALSE, $add_error = TRUE ) {
-		do_action( 'AHEE__EE_Network_Config__update_config__begin',$this );
+	public function update_config($add_success = FALSE, $add_error = TRUE) {
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
 		// compare existing settings with what's already saved'
 		$saved_config = $this->get_config();
 		// update
-		$saved = $saved_config == $this ? TRUE : update_site_option( 'ee_network_config', $this );
-		do_action( 'AHEE__EE_Network_Config__update_config__end', $this, $saved );
+		$saved = $saved_config == $this ? TRUE : update_site_option('ee_network_config', $this);
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso' ) : __( 'Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso' );
-				EE_Error::add_success( $msg );
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso') : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings were not updated.', 'event_espresso' ) : __( 'Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso' );
-				EE_Error::add_error( $msg , __FILE__, __FUNCTION__, __LINE__ );
+			if ($add_error) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings were not updated.', 'event_espresso') : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -158,9 +158,9 @@ 
 	 *  @return 	array
 	 */
 	public function __sleep() {
-		return apply_filters( 'FHEE__EE_Network_Config__sleep',array(
+		return apply_filters('FHEE__EE_Network_Config__sleep', array(
 			'core',
-		) );
+		));
 	}
 
 } //end EE_Network_Config.

Braces +3 added lines, -1 removed lines

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

core/EE_PUE.core.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	/**
 	 * This property is used to hold an array of EE_default_term objects assigned to a custom post type when the post for that post type is published with no terms set for the taxonomy.
-	  *
+	 *
 	 * @var array of EE_Default_Term objects
 	 */
 	protected $_default_terms = array();

Spacing +88 added lines, -88 removed lines

@@ -50,13 +50,13 @@ 
 	public function __construct() {
 //		throw new EE_Error('error');
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//wp have no MONTH_IN_SECONDS constant.  So we approximate our own assuming all months are 4 weeks long.
-		if ( !defined('MONTH_IN_SECONDS' ) )
-			define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		if ( ! defined('MONTH_IN_SECONDS'))
+			define('MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4);
 
-		if(EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 			$this->_uxip_hooks();
 		}
 
@@ -65,12 +65,12 @@ 
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
 
 		//has optin been selected for datacollection?
-		$espresso_data_optin = !empty($ueip_optin) ? $ueip_optin : NULL;
+		$espresso_data_optin = ! empty($ueip_optin) ? $ueip_optin : NULL;
 
-		if ( empty($ueip_has_notified) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_mode::level_2_complete_maintenance ) {
-			add_action('admin_notices', array( $this, 'espresso_data_collection_optin_notice' ), 10 );
-			add_action('admin_enqueue_scripts', array( $this, 'espresso_data_collection_enqueue_scripts' ), 10 );
-			add_action('wp_ajax_espresso_data_optin', array( $this, 'espresso_data_optin_ajax_handler' ), 10 );
+		if (empty($ueip_has_notified) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_mode::level_2_complete_maintenance) {
+			add_action('admin_notices', array($this, 'espresso_data_collection_optin_notice'), 10);
+			add_action('admin_enqueue_scripts', array($this, 'espresso_data_collection_enqueue_scripts'), 10);
+			add_action('wp_ajax_espresso_data_optin', array($this, 'espresso_data_optin_ajax_handler'), 10);
 			update_option('ee_ueip_optin', 'yes');
 			$espresso_data_optin = 'yes';
 		}
@@ -79,80 +79,80 @@ 
 		$extra_stats = array();
 
 		//only collect extra stats if the plugin user has opted in.
-		if ( !empty($espresso_data_optin) && $espresso_data_optin == 'yes' ) {
+		if ( ! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
 			//let's only setup extra data if transient has expired
-			if ( false === ( $transient = get_transient('ee_extra_data') ) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
+			if (false === ($transient = get_transient('ee_extra_data')) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 
 				$current_site = is_multisite() ? get_current_site() : NULL;
-				$site_pre = ! is_main_site() && ! empty($current_site) ? trim( preg_replace('/\b\w\S\w\b/', '', $current_site->domain ), '.' ) . '_' : '';
+				$site_pre = ! is_main_site() && ! empty($current_site) ? trim(preg_replace('/\b\w\S\w\b/', '', $current_site->domain), '.').'_' : '';
 
 
 				//active gateways
 				$active_gateways = get_option('event_espresso_active_gateways');
-				if ( !empty($active_gateways ) ) {
-					foreach ( (array) $active_gateways as $gateway => $ignore ) {
-						$extra_stats[$site_pre . $gateway . '_gateway_active'] = 1;
+				if ( ! empty($active_gateways)) {
+					foreach ((array) $active_gateways as $gateway => $ignore) {
+						$extra_stats[$site_pre.$gateway.'_gateway_active'] = 1;
 					}
 				}
 
-				if ( is_multisite() && is_main_site() ) {
+				if (is_multisite() && is_main_site()) {
 					$extra_stats['is_multisite'] = true;
 				}
 
 				//what is the current active theme?
 				$active_theme = get_option('uxip_ee_active_theme');
-				if ( !empty( $active_theme ) )
-					$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				if ( ! empty($active_theme))
+					$extra_stats[$site_pre.'active_theme'] = $active_theme;
 
 				//event info regarding an all event count and all "active" event count
 				$all_events_count = get_option('uxip_ee4_all_events_count');
-				if ( !empty( $all_events_count ) )
-					$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				if ( ! empty($all_events_count))
+					$extra_stats[$site_pre.'ee4_all_events_count'] = $all_events_count;
 				$active_events_count = get_option('uxip_ee4_active_events_count');
-				if ( !empty( $active_events_count ) )
-					$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				if ( ! empty($active_events_count))
+					$extra_stats[$site_pre.'ee4_active_events_count'] = $active_events_count;
 
 				//datetime stuff
 				$dtt_count = get_option('uxip_ee_all_dtts_count');
-				if ( !empty( $dtt_count ) )
-					$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				if ( ! empty($dtt_count))
+					$extra_stats[$site_pre.'all_dtts_count'] = $dtt_count;
 
 				$dtt_sold = get_option('uxip_ee_dtt_sold');
-				if ( !empty( $dtt_sold ) )
-					$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				if ( ! empty($dtt_sold))
+					$extra_stats[$site_pre.'dtt_sold'] = $dtt_sold;
 
 				//ticket stuff
 				$all_tkt_count = get_option('uxip_ee_all_tkt_count');
-				if ( !empty( $all_tkt_count ) )
-					$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				if ( ! empty($all_tkt_count))
+					$extra_stats[$site_pre.'all_tkt_count'] = $all_tkt_count;
 
 				$free_tkt_count = get_option('uxip_ee_free_tkt_count');
-				if ( !empty( $free_tkt_count ) )
-					$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				if ( ! empty($free_tkt_count))
+					$extra_stats[$site_pre.'free_tkt_count'] = $free_tkt_count;
 
 				$paid_tkt_count = get_option('uxip_ee_paid_tkt_count');
-				if ( !empty( $paid_tkt_count ) )
-					$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				if ( ! empty($paid_tkt_count))
+					$extra_stats[$site_pre.'paid_tkt_count'] = $paid_tkt_count;
 
-				$tkt_sold = get_option('uxip_ee_tkt_sold' );
-				if ( !empty($tkt_sold) )
-					$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				$tkt_sold = get_option('uxip_ee_tkt_sold');
+				if ( ! empty($tkt_sold))
+					$extra_stats[$site_pre.'tkt_sold'] = $tkt_sold;
 
 				//phpversion checking
 				$extra_stats['phpversion'] = function_exists('phpversion') ? phpversion() : 'unknown';
 
 				//set transient
-				set_transient( 'ee_extra_data', $extra_stats, WEEK_IN_SECONDS );
+				set_transient('ee_extra_data', $extra_stats, WEEK_IN_SECONDS);
 			}
 		}
 
 
 
 		// PUE Auto Upgrades stuff
-		if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { //include the file
-			require_once(EE_THIRD_PARTY . 'pue/pue-client.php' );
+		if (is_readable(EE_THIRD_PARTY.'pue/pue-client.php')) { //include the file
+			require_once(EE_THIRD_PARTY.'pue/pue-client.php');
 
-			$api_key = isset( EE_Registry::instance()->NET_CFG->core->site_license_key ) ? EE_Registry::instance()->NET_CFG->core->site_license_key : '';
+			$api_key = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->site_license_key : '';
 			$host_server_url = 'http://eventespresso.com'; //this needs to be the host server where plugin update engine is installed. Note, if you leave this blank then it is assumed the WordPress repo will be used and we'll just check there.
 
 			//Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.  So it's important that you use a key for the version type that is unique and not found in another key.
@@ -164,9 +164,9 @@ 
 			//$plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
 			//..WOULD work!
 			$plugin_slug = array(
-				'free' => array( 'decaf' => 'event-espresso-core-decaf' ),
-				'premium' => array( 'p' => 'event-espresso-core-reg' ),
-				'prerelease' => array( 'beta' => 'event-espresso-core-pr' )
+				'free' => array('decaf' => 'event-espresso-core-decaf'),
+				'premium' => array('p' => 'event-espresso-core-reg'),
+				'prerelease' => array('beta' => 'event-espresso-core-pr')
 				);
 
 
@@ -193,14 +193,14 @@ 
 	 * The purpose of this function is to display information about Event Espresso data collection and a optin selection for extra data collecting by users.
 	 * @return string html.
 	 */
-	 public static function espresso_data_collection_optin_text( $extra = TRUE ) {
-	 	if ( ! $extra ) {
-			 echo '<h4 '. (!$extra ? 'id="UXIP_settings"' : '').'>'.__('User eXperience Improvement Program (UXIP)', 'event_espresso').'</h4>';
-			 echo sprintf( __('%sPlease help us make Event Espresso better and vote for your favorite features.%s The %sUser eXperience Improvement Program (UXIP)%s, has been created so when you use Event Espresso you are voting for the features and settings that are important to you. The UXIP helps us understand how you use our products and services, track problems and in what context. If you opt-out of the UXIP you essentially elect for us to disregard how you use Event Espresso as we build new features and make changes. Participation in the program is completely voluntary but it is enabled by default. The end results of the UXIP are software improvements to better meet your needs. The data we collect will never be sold, traded, or misused in any way. %sPlease see our %sPrivacy Policy%s for more information.', 'event_espresso'), '<p><em>', '</em></p>','<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">','</a>','<br><br>','<a href="http://eventespresso.com/about/privacy-policy/" target="_blank">','</a>' );
+	 public static function espresso_data_collection_optin_text($extra = TRUE) {
+	 	if ( ! $extra) {
+			 echo '<h4 '.( ! $extra ? 'id="UXIP_settings"' : '').'>'.__('User eXperience Improvement Program (UXIP)', 'event_espresso').'</h4>';
+			 echo sprintf(__('%sPlease help us make Event Espresso better and vote for your favorite features.%s The %sUser eXperience Improvement Program (UXIP)%s, has been created so when you use Event Espresso you are voting for the features and settings that are important to you. The UXIP helps us understand how you use our products and services, track problems and in what context. If you opt-out of the UXIP you essentially elect for us to disregard how you use Event Espresso as we build new features and make changes. Participation in the program is completely voluntary but it is enabled by default. The end results of the UXIP are software improvements to better meet your needs. The data we collect will never be sold, traded, or misused in any way. %sPlease see our %sPrivacy Policy%s for more information.', 'event_espresso'), '<p><em>', '</em></p>', '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">', '</a>', '<br><br>', '<a href="http://eventespresso.com/about/privacy-policy/" target="_blank">', '</a>');
 		} else {
-			$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
+			$settings_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), admin_url('admin.php?page=espresso_general_settings'));
 			$settings_url .= '#UXIP_settings';
-			echo sprintf( __( 'The Event Espresso UXIP feature is active on your site. For %smore info%s and to opt-out %sclick here%s.', 'event_espresso' ), '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" traget="_blank">', '</a>', '<a href="' . $settings_url . '" target="_blank">', '</a>' );
+			echo sprintf(__('The Event Espresso UXIP feature is active on your site. For %smore info%s and to opt-out %sclick here%s.', 'event_espresso'), '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" traget="_blank">', '</a>', '<a href="'.$settings_url.'" target="_blank">', '</a>');
 		}
 	}
 
@@ -209,9 +209,9 @@ 
 
 	function espresso_data_collection_optin_notice() {
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
-		if ( $ueip_has_notified ) return;
-		$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
-		$settings_url = $settings_url . '#UXIP_settings';
+		if ($ueip_has_notified) return;
+		$settings_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), admin_url('admin.php?page=espresso_general_settings'));
+		$settings_url = $settings_url.'#UXIP_settings';
 		?>
 		<div class="updated data-collect-optin" id="espresso-data-collect-optin-container">
 			<div id="data-collect-optin-options-container">
@@ -233,8 +233,8 @@ 
 	 * @return void
 	 */
 	function espresso_data_collection_enqueue_scripts() {
-		wp_register_script( 'ee-data-optin-js', EE_GLOBAL_ASSETS_URL . 'scripts/ee-data-optin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'ee-data-optin-css', EE_GLOBAL_ASSETS_URL . 'css/ee-data-optin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee-data-optin-js', EE_GLOBAL_ASSETS_URL.'scripts/ee-data-optin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('ee-data-optin-css', EE_GLOBAL_ASSETS_URL.'css/ee-data-optin.css', array(), EVENT_ESPRESSO_VERSION);
 
 		wp_enqueue_script('ee-data-optin-js');
 		wp_enqueue_style('ee-data-optin-css');
@@ -249,14 +249,14 @@ 
 	function espresso_data_optin_ajax_handler() {
 
 		//verify nonce
-		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) exit();
+		if (isset($_POST['nonce']) && ! wp_verify_nonce($_POST['nonce'], 'ee-data-optin')) exit();
 
 		//made it here so let's save the selection
-		$ueip_optin = isset( $_POST['selection'] ) ? $_POST['selection'] : 'no';
+		$ueip_optin = isset($_POST['selection']) ? $_POST['selection'] : 'no';
 
 		//update_option('ee_ueip_optin', $ueip_optin);
 		EE_Registry::instance()->CFG->core->ee_ueip_has_notified = 1;
-		EE_Registry::instance()->CFG->update_espresso_config( FALSE, FALSE );
+		EE_Registry::instance()->CFG->update_espresso_config(FALSE, FALSE);
 		exit();
 	}
 
@@ -269,22 +269,22 @@ 
 	 */
 	public static function is_update_available($basename = '') {
 
-		$basename = ! empty( $basename ) ? $basename : EE_PLUGIN_BASENAME;
+		$basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
 
 		$update = false;
 
-		$folder = DS . dirname($basename); // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
+		$folder = DS.dirname($basename); // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
 
 		$plugins = get_plugins($folder);
-		$current = get_site_transient( 'update_plugins' );
+		$current = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-			if ( isset( $current->response['plugin_file'] ) )
+		foreach ((array) $plugins as $plugin_file => $plugin_data) {
+			if (isset($current->response['plugin_file']))
 				$update = true;
 		}
 
 		//it's possible that there is an update but an invalid site-license-key is in use
-		if ( get_site_option('pue_json_error_' . $basename ) )
+		if (get_site_option('pue_json_error_'.$basename))
 			$update = true;
 
 		return $update;
@@ -302,9 +302,9 @@ 
 	 * @return void
 	 */
 	public function _uxip_hooks() {
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			add_action('admin_init', array( $this, 'track_active_theme' ) );
-			add_action('admin_init', array( $this, 'track_event_info' ) );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			add_action('admin_init', array($this, 'track_active_theme'));
+			add_action('admin_init', array($this, 'track_event_info'));
 		}
 	}
 
@@ -313,65 +313,65 @@ 
 
 	public function track_active_theme() {
 		//we only check this once a month.
-		if ( false === ( $transient = get_transient( 'ee_active_theme_check' ) ) ) {
+		if (false === ($transient = get_transient('ee_active_theme_check'))) {
 			$theme = wp_get_theme();
-			update_option('uxip_ee_active_theme', $theme->get('Name') );
-			set_transient('ee_active_theme_check', 1, MONTH_IN_SECONDS );
+			update_option('uxip_ee_active_theme', $theme->get('Name'));
+			set_transient('ee_active_theme_check', 1, MONTH_IN_SECONDS);
 		}
 	}
 
 
 	public function track_event_info() {
 		//we only check this once every couple weeks.
-		if ( false === ( $transient = get_transient( 'ee4_event_info_check') ) ) {
+		if (false === ($transient = get_transient('ee4_event_info_check'))) {
 			//first let's get the number for ALL events
 			$EVT = EE_Registry::instance()->load_model('Event');
 			$DTT = EE_Registry::instance()->load_model('Datetime');
 			$TKT = EE_Registry::instance()->load_model('Ticket');
 			$count = $EVT->count();
-			if ( $count > 0 )
+			if ($count > 0)
 				update_option('uxip_ee4_all_events_count', $count);
 
 			//next let's just get the number of ACTIVE events
 			$count_active = $EVT->get_active_events(array(), TRUE);
-			if ( $count_active > 0 )
+			if ($count_active > 0)
 				update_option('uxip_ee4_active_events_count', $count_active);
 
 			//datetimes!
 			$dtt_count = $DTT->count();
-			if ( $dtt_count > 0 )
-				update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			if ($dtt_count > 0)
+				update_option('uxip_ee_all_dtts_count', $dtt_count);
 
 
 			//dttsold
 			$dtt_sold = $DTT->sum(array(), 'DTT_sold');
-			if ( $dtt_sold > 0 )
-				update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			if ($dtt_sold > 0)
+				update_option('uxip_ee_dtt_sold', $dtt_sold);
 
 			//allticketcount
 			$all_tkt_count = $TKT->count();
-			if ( $all_tkt_count > 0 )
-				update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			if ($all_tkt_count > 0)
+				update_option('uxip_ee_all_tkt_count', $all_tkt_count);
 
 			//freetktcount
-			$_where = array( 'TKT_price' => 0 );
+			$_where = array('TKT_price' => 0);
 			$free_tkt_count = $TKT->count(array($_where));
-			if ( $free_tkt_count > 0 )
-				update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			if ($free_tkt_count > 0)
+				update_option('uxip_ee_free_tkt_count', $free_tkt_count);
 
 			//paidtktcount
-			$_where = array( 'TKT_price' => array('>', 0) );
-			$paid_tkt_count = $TKT->count( array( $_where ) );
-			if ( $paid_tkt_count > 0 )
-				update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			$_where = array('TKT_price' => array('>', 0));
+			$paid_tkt_count = $TKT->count(array($_where));
+			if ($paid_tkt_count > 0)
+				update_option('uxip_ee_paid_tkt_count', $paid_tkt_count);
 
 			//tktsold
-			$tkt_sold = $TKT->sum( array(), 'TKT_sold' );
-			if( $tkt_sold > 0 )
-				update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			$tkt_sold = $TKT->sum(array(), 'TKT_sold');
+			if ($tkt_sold > 0)
+				update_option('uxip_ee_tkt_sold', $tkt_sold);
 
 
-			set_transient( 'ee4_event_info_check', 1, WEEK_IN_SECONDS * 2 );
+			set_transient('ee4_event_info_check', 1, WEEK_IN_SECONDS * 2);
 		}
 	}
 

Braces +69 added lines, -43 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -53,8 +55,9 @@ 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
 		//wp have no MONTH_IN_SECONDS constant.  So we approximate our own assuming all months are 4 weeks long.
-		if ( !defined('MONTH_IN_SECONDS' ) )
-			define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		if ( !defined('MONTH_IN_SECONDS' ) ) {
+					define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		}
 
 		if(EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
 			$this->_uxip_hooks();
@@ -101,42 +104,51 @@ 
 
 				//what is the current active theme?
 				$active_theme = get_option('uxip_ee_active_theme');
-				if ( !empty( $active_theme ) )
-					$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				if ( !empty( $active_theme ) ) {
+									$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				}
 
 				//event info regarding an all event count and all "active" event count
 				$all_events_count = get_option('uxip_ee4_all_events_count');
-				if ( !empty( $all_events_count ) )
-					$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				if ( !empty( $all_events_count ) ) {
+									$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				}
 				$active_events_count = get_option('uxip_ee4_active_events_count');
-				if ( !empty( $active_events_count ) )
-					$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				if ( !empty( $active_events_count ) ) {
+									$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				}
 
 				//datetime stuff
 				$dtt_count = get_option('uxip_ee_all_dtts_count');
-				if ( !empty( $dtt_count ) )
-					$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				if ( !empty( $dtt_count ) ) {
+									$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				}
 
 				$dtt_sold = get_option('uxip_ee_dtt_sold');
-				if ( !empty( $dtt_sold ) )
-					$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				if ( !empty( $dtt_sold ) ) {
+									$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				}
 
 				//ticket stuff
 				$all_tkt_count = get_option('uxip_ee_all_tkt_count');
-				if ( !empty( $all_tkt_count ) )
-					$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				if ( !empty( $all_tkt_count ) ) {
+									$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				}
 
 				$free_tkt_count = get_option('uxip_ee_free_tkt_count');
-				if ( !empty( $free_tkt_count ) )
-					$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				if ( !empty( $free_tkt_count ) ) {
+									$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				}
 
 				$paid_tkt_count = get_option('uxip_ee_paid_tkt_count');
-				if ( !empty( $paid_tkt_count ) )
-					$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				if ( !empty( $paid_tkt_count ) ) {
+									$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				}
 
 				$tkt_sold = get_option('uxip_ee_tkt_sold' );
-				if ( !empty($tkt_sold) )
-					$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				if ( !empty($tkt_sold) ) {
+									$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				}
 
 				//phpversion checking
 				$extra_stats['phpversion'] = function_exists('phpversion') ? phpversion() : 'unknown';
@@ -209,7 +221,9 @@ 
 
 	function espresso_data_collection_optin_notice() {
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
-		if ( $ueip_has_notified ) return;
+		if ( $ueip_has_notified ) {
+			return;
+		}
 		$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
 		$settings_url = $settings_url . '#UXIP_settings';
 		?>
@@ -249,7 +263,9 @@ 
 	function espresso_data_optin_ajax_handler() {
 
 		//verify nonce
-		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) exit();
+		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) {
+			exit();
+		}
 
 		//made it here so let's save the selection
 		$ueip_optin = isset( $_POST['selection'] ) ? $_POST['selection'] : 'no';
@@ -279,13 +295,15 @@ 
 		$current = get_site_transient( 'update_plugins' );
 
 		foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-			if ( isset( $current->response['plugin_file'] ) )
-				$update = true;
+			if ( isset( $current->response['plugin_file'] ) ) {
+							$update = true;
+			}
 		}
 
 		//it's possible that there is an update but an invalid site-license-key is in use
-		if ( get_site_option('pue_json_error_' . $basename ) )
-			$update = true;
+		if ( get_site_option('pue_json_error_' . $basename ) ) {
+					$update = true;
+		}
 
 		return $update;
 	}
@@ -329,46 +347,54 @@ 
 			$DTT = EE_Registry::instance()->load_model('Datetime');
 			$TKT = EE_Registry::instance()->load_model('Ticket');
 			$count = $EVT->count();
-			if ( $count > 0 )
-				update_option('uxip_ee4_all_events_count', $count);
+			if ( $count > 0 ) {
+							update_option('uxip_ee4_all_events_count', $count);
+			}
 
 			//next let's just get the number of ACTIVE events
 			$count_active = $EVT->get_active_events(array(), TRUE);
-			if ( $count_active > 0 )
-				update_option('uxip_ee4_active_events_count', $count_active);
+			if ( $count_active > 0 ) {
+							update_option('uxip_ee4_active_events_count', $count_active);
+			}
 
 			//datetimes!
 			$dtt_count = $DTT->count();
-			if ( $dtt_count > 0 )
-				update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			if ( $dtt_count > 0 ) {
+							update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			}
 
 
 			//dttsold
 			$dtt_sold = $DTT->sum(array(), 'DTT_sold');
-			if ( $dtt_sold > 0 )
-				update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			if ( $dtt_sold > 0 ) {
+							update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			}
 
 			//allticketcount
 			$all_tkt_count = $TKT->count();
-			if ( $all_tkt_count > 0 )
-				update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			if ( $all_tkt_count > 0 ) {
+							update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			}
 
 			//freetktcount
 			$_where = array( 'TKT_price' => 0 );
 			$free_tkt_count = $TKT->count(array($_where));
-			if ( $free_tkt_count > 0 )
-				update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			if ( $free_tkt_count > 0 ) {
+							update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			}
 
 			//paidtktcount
 			$_where = array( 'TKT_price' => array('>', 0) );
 			$paid_tkt_count = $TKT->count( array( $_where ) );
-			if ( $paid_tkt_count > 0 )
-				update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			if ( $paid_tkt_count > 0 ) {
+							update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			}
 
 			//tktsold
 			$tkt_sold = $TKT->sum( array(), 'TKT_sold' );
-			if( $tkt_sold > 0 )
-				update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			if( $tkt_sold > 0 ) {
+							update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			}
 
 
 			set_transient( 'ee4_event_info_check', 1, WEEK_IN_SECONDS * 2 );

core/EE_Payment_Processor.core.php

Braces +7 added lines, -7 removed lines

@@ -148,11 +148,11 @@ 
 		EE_Processor_Base::set_IPN( $separate_IPN_request );
 		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
 			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+		} elseif( $payment_method instanceof EE_Payment ){
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		} elseif( $transaction instanceof EE_Transaction ){
 			$obj_for_log = $transaction;
-		}else{
+		} else{
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
@@ -180,7 +180,7 @@ 
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else{
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
@@ -201,11 +201,11 @@ 
 				$payment->save();
 				//  update the TXN
 				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+			} else{
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
 				if($payment_method){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				} elseif($transaction){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
@@ -236,7 +236,7 @@ 
 			foreach( $request_data as $key => $value ) {
 				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
 			}
-		}else{
+		} else{
 			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;

Indentation +2 added lines, -2 removed lines

@@ -13,9 +13,9 @@
  */
 class EE_Payment_Processor extends EE_Processor_Base {
 	/**
-     * 	@var EE_Payment_Processor $_instance
+	 * 	@var EE_Payment_Processor $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance = NULL;
 
 

Spacing +127 added lines, -127 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -42,7 +42,7 @@ 
 	 *@return EE_Payment_Processor
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -61,35 +61,35 @@ 
 	 * @param boolean              				$update_txn  	whether or not to call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()
 	 * @return EE_Payment
 	 */
-	public function process_payment( EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE ) {
+	public function process_payment(EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE) {
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ){
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -105,14 +105,14 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
-			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"),$transaction->ID()));
+		if ( ! $primary_reg instanceof EE_Registration) {
+			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"), $transaction->ID()));
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -139,81 +139,81 @@ 
 	 * @throws Exception
 	 * @return EE_Payment
 	 */
-	public function process_ipn( $_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true ){
-		$_req_data = $this->_remove_unusable_characters( $_req_data );
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
-		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
-			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+	public function process_ipn($_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true) {
+		$_req_data = $this->_remove_unusable_characters($_req_data);
+		EE_Registry::instance()->load_model('Change_Log');
+		EE_Processor_Base::set_IPN($separate_IPN_request);
+		if ($transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method) {
+			$obj_for_log = EEM_Payment::instance()->get_one(array(array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()), 'order_by' => array('PAY_timestamp' => 'desc')));
+		}elseif ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		}elseif ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-		}else{
+		} else {
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_pms = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_pms as $payment_method ){
-					try{
-						$payment = $payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_pms as $payment_method) {
+					try {
+						$payment = $payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
 					"Error occurred while receiving IPN. Transaction: %s, req data: %s. The error was '%s'",
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -227,14 +227,14 @@ 
 	 * @param type $request_data
 	 * @return array|string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		if( is_array( $request_data ) ) {
+	protected function _remove_unusable_characters($request_data) {
+		if (is_array($request_data)) {
 			$return_data = array();
-			foreach( $request_data as $key => $value ) {
-				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+			foreach ($request_data as $key => $value) {
+				$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 			}
-		}else{
-			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
+		} else {
+			$return_data = preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;
 	}
@@ -256,13 +256,13 @@ 
 	 * @return EE_Payment
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO, to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -279,12 +279,12 @@ 
 	 * @internal param float $amount
 	 * @return EE_Payment
 	 */
-	public function process_refund( $payment_method, $payment_to_refund, $refund_info = array() ){
+	public function process_refund($payment_method, $payment_to_refund, $refund_info = array()) {
 		/** @type EE_Payment_Method $payment_method */
 		$payment_method = EEM_Payment_Method::instance()->ensure_is_ID($payment_method);
-		if ( $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->do_direct_refund( $payment_to_refund,$refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+		if ($payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->do_direct_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -326,12 +326,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -341,39 +341,39 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if( $payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base ){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if ($payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved() ? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful' : $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
 			// if this is an IPN, then we want to know the initial TXN status prior to updating the TXN
 			// so that we know whether the status has changed and notifications should be triggered
-			if ( $IPN ) {
+			if ($IPN) {
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-				$transaction_processor->set_old_txn_status( $transaction->status_ID() );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+				$transaction_processor->set_old_txn_status($transaction->status_ID());
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
+			do_action($do_action, $transaction, $payment);
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -387,25 +387,25 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $registrations = array() ) {
+	public function process_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $registrations = array()) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
-			$registrations = $transaction->registrations( array(
+			$registrations = $transaction->registrations(array(
 				array(
 					// only these reg statuses can receive payments
-					'STS_ID'  => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-					'REG_final_price'  => array( '!=', 0 ),
-					'REG_final_price*' => array( '!=', 'REG_paid', true ),
+					'STS_ID'  => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+					'REG_final_price'  => array('!=', 0),
+					'REG_final_price*' => array('!=', 'REG_paid', true),
 				)
-			) );
+			));
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 
@@ -418,18 +418,18 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
+		$available_payment_amount = abs($payment->amount());
 		//EEH_Debug_Tools::printr( $available_payment_amount, '$available_payment_amount', __FILE__, __LINE__ );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
@@ -445,19 +445,19 @@ 
 	 * @param float $available_payment_amount
 	 * @return float
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
 		//EEH_Debug_Tools::printr( $owing, '$owing', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -472,19 +472,19 @@ 
 	 * @param float $payment_amount
 	 * @return float
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -500,21 +500,21 @@ 
 	 * @param float $available_refund_amount - IMPORTANT !!! SEND AVAILABLE REFUND AMOUNT AS A POSITIVE NUMBER
 	 * @return float
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = abs( $available_refund_amount );
+			$available_refund_amount = abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, $registration->paid() );
+			$refund_amount = min($available_refund_amount, $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount = $available_refund_amount - $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = abs( $refund_amount ) * -1;
+			$refund_amount = abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -532,12 +532,12 @@ 
 	 * @param EE_Payment     $payment
 	 * @param bool           $IPN
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction_processor->reg_step_completed( $transaction, 'payment_options' );
+		$payment_options_step_completed = $transaction_processor->reg_step_completed($transaction, 'payment_options');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -550,14 +550,14 @@ 
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
-			$payment_options_step_completed = $transaction_processor->set_reg_step_completed( $transaction, 'payment_options' );
+			$payment_options_step_completed = $transaction_processor->set_reg_step_completed($transaction, 'payment_options');
 		}
 		// DEBUG LOG
 		//$this->log(
@@ -569,11 +569,11 @@ 
 		//	)
 		//);
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($transaction, false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' );
+		$finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -584,9 +584,9 @@ 
 		//	)
 		//);
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+			$finalized = $transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 			// DEBUG LOG
 			//$this->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -599,13 +599,13 @@ 
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			// DEBUG LOG
 			//$this->log( __CLASS__, __FUNCTION__, __LINE__, $transaction );
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		//$this->log(

core/admin/EE_Admin.core.php

Indentation +21 added lines, -21 removed lines

@@ -24,10 +24,10 @@ 
 final class EE_Admin {
 
    /**
-     * 	EE_Admin Object
-     * 	@private _instance
-	 * 	@private 	protected
-     */
+    * 	EE_Admin Object
+    * 	@private _instance
+    * 	@private 	protected
+    */
 	private static $_instance = NULL;
 
 	/**
@@ -56,8 +56,8 @@ 
 
 
    /**
-     * class constructor
-     */
+    * class constructor
+    */
 	protected function __construct() {
 		// define global EE_Admin constants
 		$this->_define_all_constants();
@@ -168,11 +168,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
@@ -463,11 +463,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -624,11 +624,11 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}

Braces +19 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -220,8 +222,9 @@ 
 	 */
 	public function remove_pages_from_nav_menu( $post_type ) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' )
-			return $post_type;
+		if ( $post_type->name !== 'page' ) {
+					return $post_type;
+		}
 
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
@@ -240,8 +243,9 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' )
-			return;
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+					return;
+		}
 
 		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories' ) );
 		$hidden_meta_boxes = array();
@@ -296,8 +300,9 @@ 
 	 * @return string  the (maybe) modified link
 	 */
 	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
-			return $link;
+		if ( ! $post = get_post( $id ) ) {
+					return $link;
+		}
 
 		if ( $post->post_type == 'espresso_attendees' ) {
 			$query_args = array(
@@ -337,7 +342,10 @@ 
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
 				<li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
 						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
 					</a>
 				</li>
@@ -864,8 +872,9 @@ 
 	 */
 	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
 		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) )
-			$config['page_path'] = $page_path;
+		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+					$config['page_path'] = $page_path;
+		}
 			EE_Register_Admin_Page::register( $page_basename, $config );
 	}
 

Spacing +150 added lines, -150 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -62,25 +62,25 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,12 +95,12 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
-		define( 'JQPLOT_URL', EE_GLOBAL_ASSETS_URL . 'scripts/jqplot/' );
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
+		define('JQPLOT_URL', EE_GLOBAL_ASSETS_URL.'scripts/jqplot/');
 	}
 
 
@@ -113,23 +113,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin == $main_file ) {
+		 if ($plugin == $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -144,8 +144,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -157,11 +157,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -176,36 +176,36 @@ 
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'save_post', array( 'EE_Admin', 'parse_post_content_on_save' ), 100, 2 );
-			add_action( 'update_option', array( $this, 'reset_page_for_posts_on_change' ), 100, 3 );
-			add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('save_post', array('EE_Admin', 'parse_post_content_on_save'), 100, 2);
+			add_action('update_option', array($this, 'reset_page_for_posts_on_change'), 100, 3);
+			add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items'), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter('get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 3 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 		}
 
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
 
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -218,9 +218,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' )
+		if ($post_type->name !== 'page')
 			return $post_type;
 
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -240,17 +240,17 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' )
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php')
 			return;
 
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories' ) );
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories'));
 		$hidden_meta_boxes = array();
 
-		foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-			foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-				foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-					if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-						unset( $box['id'] );
+		foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+			foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+				foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+					if (in_array($box['id'], $initial_meta_boxes)) {
+						unset($box['id']);
 					} else {
 						$hidden_meta_boxes[] = $box['id'];
 					}
@@ -259,7 +259,7 @@ 
 		}
 
 		$user = wp_get_current_user();
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -295,17 +295,17 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
+	public function modify_edit_post_link($link, $id, $context) {
+		if ( ! $post = get_post($id))
 			return $link;
 
-		if ( $post->post_type == 'espresso_attendees' ) {
+		if ($post->post_type == 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 				);
 			EE_Registry::instance()->load_helper('URL');
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -317,7 +317,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -336,9 +336,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' == $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -356,13 +356,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -370,18 +370,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -402,10 +402,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 * @param $menuitem
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menuitem ) {
+	private function _setup_extra_nav_menu_pages_items($menuitem) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -437,7 +437,7 @@ 
 			'xfn' => ''
 			);
 
-		foreach ( $keys as $key => $value) {
+		foreach ($keys as $key => $value) {
 			$menu_item->$key = isset($menuitem[$key]) ? $menuitem[$key] : $value;
 		}
 		return $menu_item;
@@ -477,10 +477,10 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'] ) && $_POST['action'] == 'editpost' ) {
-			if ( isset( $_POST['post_type'] ) ) {
-				EE_Registry::instance()->load_core( 'Register_CPTs' );
-				EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action']) && $_POST['action'] == 'editpost') {
+			if (isset($_POST['post_type'])) {
+				EE_Registry::instance()->load_core('Register_CPTs');
+				EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 			}
 		}
 
@@ -496,37 +496,37 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -573,11 +573,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -598,20 +598,20 @@ 
 	 * @param $elements
 	 * @return array
 	 */
-	public function dashboard_glance_items( $elements ) {
+	public function dashboard_glance_items($elements) {
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count();
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $item ) {
-			$elements[] = sprintf( '<a href="%s" title="%s">%s</a>', $item['url'], $item['title'], $item['text'] );
+		foreach ($items as $item) {
+			$elements[] = sprintf('<a href="%s" title="%s">%s</a>', $item['url'], $item['title'], $item['text']);
 		}
 		return $elements;
 	}
@@ -630,14 +630,14 @@ 
 	 * @param $post
 	 * @return    void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		// default post types
-		$post_types = array( 'post' => 0, 'page' => 1 );
+		$post_types = array('post' => 0, 'page' => 1);
 		// add CPTs
 		$CPTs = EE_Register_CPTs::get_CPTs();
-		$post_types = array_merge( $post_types, $CPTs );
+		$post_types = array_merge($post_types, $CPTs);
 		// for default or CPT posts...
-		if ( isset( $post_types[ $post->post_type ] )) {
+		if (isset($post_types[$post->post_type])) {
 			// whether to proceed with update
 			$update_post_shortcodes = FALSE;
 			// post on frontpage ?
@@ -645,32 +645,32 @@ 
 			// critical page shortcodes that we do NOT want added to the Posts page (blog)
 			$critical_shortcodes = EE_Registry::instance()->CFG->core->get_critical_pages_shortcodes_array();
 			// array of shortcodes indexed by post name
-			EE_Registry::instance()->CFG->core->post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			EE_Registry::instance()->CFG->core->post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// empty both arrays
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] = array();
+			EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name] = array();
 			// loop thru shortcodes
-			foreach ( EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+			foreach (EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
 				// convert to UPPERCASE to get actual shortcode
-				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				$EES_Shortcode = strtoupper($EES_Shortcode);
 				// is the shortcode in the post_content ?
-				if ( strpos( $post->post_content, $EES_Shortcode ) !== FALSE ) {
+				if (strpos($post->post_content, $EES_Shortcode) !== FALSE) {
 					// map shortcode to post names and post IDs
-					EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
 					// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-					if ( ! in_array( $EES_Shortcode, $critical_shortcodes )) {
+					if ( ! in_array($EES_Shortcode, $critical_shortcodes)) {
 						// check that posts page is already being tracked
-						if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] )) {
+						if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 							// if not, then ensure that it is properly added
-							EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+							EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts] = array();
 						}
 						// add shortcode to "Posts page" tracking
-						EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = $post_ID;
+						EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = $post_ID;
 					}
 					$update_post_shortcodes = TRUE;
 				}
 			}
-			if ( $update_post_shortcodes ) {
-				EE_Registry::instance()->CFG->update_post_shortcodes( $page_for_posts );
+			if ($update_post_shortcodes) {
+				EE_Registry::instance()->CFG->update_post_shortcodes($page_for_posts);
 			}
 		}
 	}
@@ -688,38 +688,38 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
+	public function check_for_invalid_datetime_formats($value, $option) {
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
+		if ($date_time_format) {
 			// because DateTime chokes on some formats, check first that strtotime can parse it
-			$date_string = strtotime( date( $date_time_format ));
+			$date_string = strtotime(date($date_time_format));
 			// invalid date time formats will evaluate to either "0" or ""
-			if ( empty( $date_string )) {
+			if (empty($date_string)) {
 				// trigger WP settings error
 				add_settings_error(
 					'date_format',
 					'date_format',
 					sprintf(
-						__('The following date time  "%s" ( %s ) can not be properly parsed by PHP due to its format and may cause incompatibility issues with Event Espresso. You will need to choose a more standard date time format in order for everything to operate correctly. %sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ),
-						date( $date_time_format ),
+						__('The following date time  "%s" ( %s ) can not be properly parsed by PHP due to its format and may cause incompatibility issues with Event Espresso. You will need to choose a more standard date time format in order for everything to operate correctly. %sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'),
+						date($date_time_format),
 						$date_time_format,
 						'<br /><span style="color:#D54E21;">',
 						'</span>'
 					)
 				);
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -745,14 +745,14 @@ 
 	 * @param 	$value
 	 * @return 	void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
-		if ( $option == 'page_for_posts' ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
+		if ($option == 'page_for_posts') {
 			global $wpdb;
-			$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-			$old_page_for_posts = $old_value ? $wpdb->get_var( $wpdb->prepare( $SQL, $old_value )) : 'posts';
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value )) : 'posts';
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $new_page_for_posts ] = EE_Registry::instance()->CFG->core->post_shortcodes[ $old_page_for_posts ];
-			EE_Registry::instance()->CFG->update_post_shortcodes( $new_page_for_posts );
+			$SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+			$old_page_for_posts = $old_value ? $wpdb->get_var($wpdb->prepare($SQL, $old_value)) : 'posts';
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+			EE_Registry::instance()->CFG->core->post_shortcodes[$new_page_for_posts] = EE_Registry::instance()->CFG->core->post_shortcodes[$old_page_for_posts];
+			EE_Registry::instance()->CFG->update_post_shortcodes($new_page_for_posts);
 		}
 	}
 
@@ -765,8 +765,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -779,9 +779,9 @@ 
 	 */
 	public function espresso_admin_footer() {
 		return sprintf(
-			__( 'Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso' ),
+			__('Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso'),
 			'<a href="http://eventespresso.com/" title="',
-			'">' . EVENT_ESPRESSO_POWERED_BY . '</a>'
+			'">'.EVENT_ESPRESSO_POWERED_BY.'</a>'
 		);
 	}
 
@@ -801,11 +801,11 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) )
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page'))
 			$config['page_path'] = $page_path;
-			EE_Register_Admin_Page::register( $page_basename, $config );
+			EE_Register_Admin_Page::register($page_basename, $config);
 	}