eventespresso / event-espresso-core

core/EE_Addon.core.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +84 added lines, -84 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -95,7 +95,7 @@ 
 	 *    class constructor
 	 */
 	public function __construct() {
-		add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $this, 'admin_init' ) );
+		add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($this, 'admin_init'));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	/**
 	 * @param mixed $version
 	 */
-	public function set_version( $version = NULL ) {
+	public function set_version($version = NULL) {
 		$this->_version = $version;
 	}
 
@@ -121,7 +121,7 @@ 
 	/**
 	 * @param mixed $min_core_version
 	 */
-	public function set_min_core_version( $min_core_version = NULL ) {
+	public function set_min_core_version($min_core_version = NULL) {
 		$this->_min_core_version = $min_core_version;
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $addon_name
 	 * @return boolean
 	 */
-	function set_name( $addon_name ) {
+	function set_name($addon_name) {
 		return $this->_addon_name = $addon_name;
 	}
 
@@ -170,7 +170,7 @@ 
 	/**
 	 * @param string $plugin_basename
 	 */
-	public function set_plugin_basename( $plugin_basename ) {
+	public function set_plugin_basename($plugin_basename) {
 
 		$this->_plugin_basename = $plugin_basename;
 	}
@@ -190,7 +190,7 @@ 
 	/**
 	 * @param string $plugin_slug
 	 */
-	public function set_plugin_slug( $plugin_slug ) {
+	public function set_plugin_slug($plugin_slug) {
 
 		$this->_plugin_slug = $plugin_slug;
 	}
@@ -210,7 +210,7 @@ 
 	/**
 	 * @param string $plugin_action_slug
 	 */
-	public function set_plugin_action_slug( $plugin_action_slug ) {
+	public function set_plugin_action_slug($plugin_action_slug) {
 
 		$this->_plugin_action_slug = $plugin_action_slug;
 	}
@@ -230,9 +230,9 @@ 
 	/**
 	 * @param array $plugins_page_row
 	 */
-	public function set_plugins_page_row( $plugins_page_row = array() ) {
+	public function set_plugins_page_row($plugins_page_row = array()) {
 		// sigh.... check for example content that I stupidly merged to master and remove it if found
-		if ( ! is_array( $plugins_page_row ) && strpos( $plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>' ) !== false ) {
+		if ( ! is_array($plugins_page_row) && strpos($plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>') !== false) {
 			$plugins_page_row = '';
 		}
 		$this->_plugins_page_row = $plugins_page_row;
@@ -251,7 +251,7 @@ 
 		do_action("AHEE__{$classname}__new_install");
 		do_action("AHEE__EE_Addon__new_install", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -266,16 +266,16 @@ 
 		do_action("AHEE__{$classname}__reactivation");
 		do_action("AHEE__EE_Addon__reactivation", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
-	public function deactivation(){
+	public function deactivation() {
 		$classname = get_class($this);
 //		echo "Deactivating $classname";die;
 		do_action("AHEE__{$classname}__deactivation");
 		do_action("AHEE__EE_Addon__deactivation", $this);
 		//check if the site no longer needs to be in maintenance mode
-		EE_Register_Addon::deregister( $this->name() );
+		EE_Register_Addon::deregister($this->name());
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 	}
 
@@ -289,16 +289,16 @@ 
 	 * This is a resource-intensive job so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
-		if( $verify_schema === '' ) {
+	public function initialize_db_if_no_migrations_required($verify_schema = true) {
+		if ($verify_schema === '') {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
 			//(ie, no 2nd or 3rd arguments), instead of calling the registered callbacks with no arguments, it
 			//calls them with an argument of an empty string (ie ""), which evaluates to false
 			//so we need to treat the empty string as if nothing had been passed, and should instead use the default
 			$verify_schema = true;
 		}
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			if( $verify_schema ) {
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			if ($verify_schema) {
 				$this->initialize_db();
 			}
 			$this->initialize_default_data();
@@ -312,15 +312,15 @@ 
 			 */
 			EE_Registry::instance()->load_helper('Activation');
 			EEH_Activation::initialize_db_content();
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+			update_option('ee_flush_rewrite_rules', TRUE);
 			//in case there are lots of addons being activated at once, let's force garbage collection
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else {
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name());
 		}
 	}
 
@@ -334,20 +334,20 @@ 
 	 */
 	public function initialize_db() {
 		//find the migration script that sets the database to be compatible with the code
-		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() );
-		if( $current_dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name );
-			$current_data_migration_script->set_migrating( FALSE );
+		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name());
+		if ($current_dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name);
+			$current_data_migration_script->set_migrating(FALSE);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if ( $current_data_migration_script->get_errors() ) {
-				foreach( $current_data_migration_script->get_errors() as $error ) {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				foreach ($current_data_migration_script->get_errors() as $error) {
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
 		//if not DMS was found that should be ok. This addon just doesn't require any database changes
-		EE_Data_Migration_Manager::instance()->update_current_database_state_to( array( 'slug' => $this->name(), 'version' => $this->version() ) );
+		EE_Data_Migration_Manager::instance()->update_current_database_state_to(array('slug' => $this->name(), 'version' => $this->version()));
 	}
 
 
@@ -369,7 +369,7 @@ 
 		 * default data)
 		 * @param EE_Addon $addon the addon that called this
 		 */
-		do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this );
+		do_action('AHEE__EE_Addon__initialize_default_data__begin', $this);
 		//override to insert default data. It is safe to use the models here
 		//because the site should not be in maintenance mode
 	}
@@ -388,7 +388,7 @@ 
 		do_action("AHEE__EE_Addon__upgrade", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -401,7 +401,7 @@ 
 		do_action("AHEE__{$classname}__downgrade");
 		do_action("AHEE__EE_Addon__downgrade", $this);
 		//it's possible there's old default data that needs to be double-checked
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * plugin activation only. In the future, we'll want to do it on plugin updates too
 	 * @return bool
 	 */
-	public function set_db_update_option_name(){
+	public function set_db_update_option_name() {
 		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016');
 		//let's just handle this on the next request, ok? right now we're just not really ready
 		return $this->set_activation_indicator_option();
@@ -440,7 +440,7 @@ 
 	 */
 	public function set_activation_indicator_option() {
 		// let's just handle this on the next request, ok? right now we're just not really ready
-		return update_option( $this->get_activation_indicator_option_name(), TRUE );
+		return update_option($this->get_activation_indicator_option_name(), TRUE);
 	}
 
 
@@ -448,8 +448,8 @@ 
 	 * Gets the name of the wp option which is used to temporarily indicate that this addon was activated
 	 * @return string
 	 */
-	public function get_activation_indicator_option_name(){
-		return 'ee_activation_' . $this->name();
+	public function get_activation_indicator_option_name() {
+		return 'ee_activation_'.$this->name();
 	}
 
 
@@ -459,7 +459,7 @@ 
 	 * Used by EE_System to set the request type of this addon. Should not be used by addon developers
 	 * @param int $req_type
 	 */
-	function set_req_type( $req_type ) {
+	function set_req_type($req_type) {
 		$this->_req_type = $req_type;
 	}
 
@@ -470,7 +470,7 @@ 
 	 * of addons
 	 */
 	function detect_req_type() {
-		if( ! $this->_req_type ){
+		if ( ! $this->_req_type) {
 			$this->detect_activation_or_upgrade();
 		}
 		return $this->_req_type;
@@ -483,36 +483,36 @@ 
 	 * Should only be called once per request
 	 * @return void
 	 */
-	function detect_activation_or_upgrade(){
+	function detect_activation_or_upgrade() {
 		$activation_history_for_addon = $this->get_activation_history();
 //		d($activation_history_for_addon);
 		$request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version());
 		$this->set_req_type($request_type);
 		$classname = get_class($this);
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this);
 				$this->new_install();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this);
 				$this->reactivation();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this);
 				$this->upgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this);
 				$this->downgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_normal:
 			default:
@@ -520,7 +520,7 @@ 
 				break;
 		}
 
-		do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" );
+		do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete");
 	}
 
 	/**
@@ -529,17 +529,17 @@ 
 	 * @param string $current_version_to_add
 	 * @return boolean success
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->get_activation_history();
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = $this->version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// resave
 //		echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history);
-		return update_option( $this->get_activation_history_option_name(), $version_history );
+		return update_option($this->get_activation_history_option_name(), $version_history);
 	}
 
 	/**
@@ -547,8 +547,8 @@ 
 	 * of this addon
 	 * @return string
 	 */
-	function get_activation_history_option_name(){
-		return self::ee_addon_version_history_option_prefix . $this->name();
+	function get_activation_history_option_name() {
+		return self::ee_addon_version_history_option_prefix.$this->name();
 	}
 
 
@@ -557,7 +557,7 @@ 
 	 * Gets the wp option which stores the activation history for this addon
 	 * @return array
 	 */
-	function get_activation_history(){
+	function get_activation_history() {
 		return get_option($this->get_activation_history_option_name(), NULL);
 	}
 
@@ -566,8 +566,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'addons';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'addons';
 	}
 	/**
 	 *	filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc.
@@ -580,14 +580,14 @@ 
 	 * Sets the filepath to the main plugin file
 	 * @param string $filepath
 	 */
-	public function set_main_plugin_file( $filepath ) {
+	public function set_main_plugin_file($filepath) {
 		$this->_main_plugin_file = $filepath;
 	}
 	/**
 	 * gets the filepath to teh main file
 	 * @return string
 	 */
-	public function get_main_plugin_file(){
+	public function get_main_plugin_file() {
 		return $this->_main_plugin_file;
 	}
 
@@ -597,15 +597,15 @@ 
 	 * @return string
 	 */
 	public function get_main_plugin_file_basename() {
-		return plugin_basename( $this->get_main_plugin_file() );
+		return plugin_basename($this->get_main_plugin_file());
 	}
 
 	/**
 	 * Gets the folder name which contains the main plugin file
 	 * @return string
 	 */
-	public function get_main_plugin_file_dirname(){
-		return dirname( $this->get_main_plugin_file() );
+	public function get_main_plugin_file_dirname() {
+		return dirname($this->get_main_plugin_file());
 	}
 
 
@@ -614,11 +614,11 @@ 
 	 *
 *@return string
 	 */
-	public function admin_init(){
+	public function admin_init() {
 		// is admin and not in M-Mode ?
-		if ( is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2 );
-			add_filter( 'after_plugin_row_' . $this->_plugin_basename, array( $this, 'after_plugin_row' ), 10, 3 );
+		if (is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 2);
+			add_filter('after_plugin_row_'.$this->_plugin_basename, array($this, 'after_plugin_row'), 10, 3);
 		}
 	}
 
@@ -633,10 +633,10 @@ 
 	 * @param $file
 	 * @return array
 	 */
-	public function plugin_action_links( $links, $file ) {
-		if ( $file == $this->plugin_basename() && $this->plugin_action_slug() != '' ) {
+	public function plugin_action_links($links, $file) {
+		if ($file == $this->plugin_basename() && $this->plugin_action_slug() != '') {
 			// before other links
-			array_unshift( $links, '<a href="admin.php?page=' . $this->plugin_action_slug() . '">' . __( 'Settings' ) . '</a>' );
+			array_unshift($links, '<a href="admin.php?page='.$this->plugin_action_slug().'">'.__('Settings').'</a>');
 		}
 		return $links;
 	}
@@ -654,17 +654,17 @@ 
 	 * @param $status
 	 * @return string
 	 */
-	public function after_plugin_row( $plugin_file, $plugin_data, $status ) {
+	public function after_plugin_row($plugin_file, $plugin_data, $status) {
 
 		$after_plugin_row = '';
-		if ( $plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '' ) {
+		if ($plugin_file == $this->plugin_basename() && $this->get_plugins_page_row() != '') {
 			$class = $status ? 'active' : 'inactive';
 			$plugins_page_row = $this->get_plugins_page_row();
-			$link_text = isset( $plugins_page_row[ 'link_text' ] ) ? $plugins_page_row[ 'link_text' ] : '';
-			$link_url = isset( $plugins_page_row[ 'link_url' ] ) ? $plugins_page_row[ 'link_url' ] : '';
-			$description = isset( $plugins_page_row[ 'description' ] ) ? $plugins_page_row[ 'description' ] : $plugins_page_row;
-			if ( ! empty( $link_text ) && ! empty( $link_url ) && ! empty( $description )) {
-				$after_plugin_row .= '<tr id="' . sanitize_title( $plugin_file ) . '-ee-addon" class="' . $class . '">';
+			$link_text = isset($plugins_page_row['link_text']) ? $plugins_page_row['link_text'] : '';
+			$link_url = isset($plugins_page_row['link_url']) ? $plugins_page_row['link_url'] : '';
+			$description = isset($plugins_page_row['description']) ? $plugins_page_row['description'] : $plugins_page_row;
+			if ( ! empty($link_text) && ! empty($link_url) && ! empty($description)) {
+				$after_plugin_row .= '<tr id="'.sanitize_title($plugin_file).'-ee-addon" class="'.$class.'">';
 				$after_plugin_row .= '<th class="check-column" scope="row"></th>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-title-td plugin-title column-primary">';
 				$after_plugin_row .= '<style>
@@ -706,7 +706,7 @@ 
 </style>';
 				$after_plugin_row .= '
 <p class="ee-addon-upsell-info-dv">
-	<a class="ee-button" href="' . $link_url . '">' . $link_text . ' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
+	<a class="ee-button" href="' . $link_url.'">'.$link_text.' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
 </p>';
 				$after_plugin_row .= '</td>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-desc-td column-description desc">';

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
 
 
 	/**
-	 * @param mixed $min_core_version
+	 * @param string $min_core_version
 	 */
 	public function set_min_core_version( $min_core_version = NULL ) {
 		$this->_min_core_version = $min_core_version;
@@ -140,7 +140,7 @@ 
 	/**
 	 * Sets addon_name
 	 * @param string $addon_name
-	 * @return boolean
+	 * @return string
 	 */
 	function set_name( $addon_name ) {
 		return $this->_addon_name = $addon_name;

core/EE_Base.core.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *		@ override magic methods
 	 *		@ return void
 	 */	
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __get($a) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { 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_Encryption.core.php

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

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
  *
@@ -29,8 +29,8 @@ 
 	 * @return \EE_Encryption
 	 */
   private function __construct() {
-		define( 'ESPRESSO_ENCRYPT', true );
-		if ( ! function_exists( 'mcrypt_encrypt' ) ) {
+		define('ESPRESSO_ENCRYPT', true);
+		if ( ! function_exists('mcrypt_encrypt')) {
 			$this->_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;
@@ -59,15 +59,15 @@ 
 	 */
 	public  function get_encryption_key() {
 		// if encryption key has not been set
-		if ( empty( $this->_encryption_key )) {
+		if (empty($this->_encryption_key)) {
 			// retrieve encryption_key from db
-			$this->_encryption_key = get_option( 'ee_encryption_key', '' );
+			$this->_encryption_key = get_option('ee_encryption_key', '');
 			// WHAT?? No encryption_key in the db ??
-			if ( $this->_encryption_key == '' ) {
+			if ($this->_encryption_key == '') {
 				// 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 !
 				$this->_encryption_key = $new_key;
 			}
@@ -83,15 +83,15 @@ 
 	 * @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 $text_string;
 		}
-		if ( $this->_use_mcrypt ) {
-			$encrypted_text = $this->m_encrypt( $text_string );
+		if ($this->_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;
 	}
@@ -104,16 +104,16 @@ 
 	 * @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 $encrypted_text;
 		}
 		// if PHP's mcrypt functions are installed then we'll use them
-		if ( $this->_use_mcrypt ) {
-			$decrypted_text = $this->m_decrypt( $encrypted_text );
+		if ($this->_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;
  	}
@@ -128,15 +128,15 @@ 
 	 * @internal param $string - the text to be encoded
 	 * @return string
 	 */
-	public function base64_url_encode ( $text_string = '' ) {
+	public function base64_url_encode($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $text_string;
 		}
 		// 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;
 	}
 
@@ -150,15 +150,15 @@ 
 	 * @internal param $string - the text to be decoded
 	 * @return string
 	 */
-	public function base64_url_decode ( $encoded_string = '' ) {
+	public function base64_url_decode($encoded_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $encoded_string )  {
+		if ( ! $encoded_string) {
 			return $encoded_string;
 		}
 		// 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;
 	}
 
@@ -171,19 +171,19 @@ 
 	 * @internal param $string - the text to be encrypted
 	 * @return string
 	 */
-	private function m_encrypt  ( $text_string = '' ) {
+	private function m_encrypt($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $text_string;
 		}
 		// 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, $this->get_encryption_key(), $text_string, MCRYPT_MODE_ECB, $iv );
+		$encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->get_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;
 	}
 
@@ -196,19 +196,19 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function m_decrypt  ( $encrypted_text = '' )  {
+	private function m_decrypt($encrypted_text = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return $encrypted_text;
 		}
 		// 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, $this->get_encryption_key(), $encrypted_text, MCRYPT_MODE_ECB, $iv );
-		$decrypted_text = trim ( $decrypted_text );
+		$decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->get_encryption_key(), $encrypted_text, MCRYPT_MODE_ECB, $iv);
+		$decrypted_text = trim($decrypted_text);
 		return $decrypted_text;
 	}
 
@@ -222,18 +222,18 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_encrypt ( $text_string = '' ) {
+	private function acme_encrypt($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $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 );
+		$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);
 		}
-		$encrypted = base64_encode( join( '', $string_bits ) );
+		$encrypted = base64_encode(join('', $string_bits));
 		return $encrypted;
 	}
 
@@ -247,19 +247,19 @@ 
 	 * @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 );
-		$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 );
+		$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);
+		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;
 	}
 
@@ -273,13 +273,13 @@ 
 	 * @internal param $string - number of characters for random string
 	 * @return string
 	 */
-	public function generate_random_string ( $length = 40 ) {
-		$iterations = ceil ( $length / 40 );
+	public function generate_random_string($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;
 	}
 

core/EE_Error.core.php

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
  *

Indentation +170 added lines, -170 removed lines

@@ -18,52 +18,52 @@ 
 
 
 	/**
-	* 	name of the file to log exceptions to
-	* 	@access	private
-    *	@var string
-	*/
+	 * 	name of the file to log exceptions to
+	 * 	@access	private
+	 *	@var string
+	 */
 	private static $_exception_log_file = 'espresso_error_log.txt';
 
 	/**
-	* 	the exception
-	* 	@access	private
-    *	@var object
-	*/
+	 * 	the exception
+	 * 	@access	private
+	 *	@var object
+	 */
 	private $_exception;
 
 	/**
-	* 	stores details for all exception
-	* 	@access	private
-    *	@var array
-	*/
+	 * 	stores details for all exception
+	 * 	@access	private
+	 *	@var array
+	 */
 	private static $_all_exceptions = array();
 
 	/**
-	* 	tracks number of errors
-	* 	@access	private
-    *	@var int
-	*/
+	 * 	tracks number of errors
+	 * 	@access	private
+	 *	@var int
+	 */
 	private static $_error_count = 0;
 
 	/**
-	* 	has JS been loaded ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has JS been loaded ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_js_loaded = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_action_added = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
 
 
@@ -71,10 +71,10 @@ 
 
 
 	/**
-	*	@override default exception handling
-	*	@access public
-	*	@echo string
-	*/
+	 *	@override default exception handling
+	 *	@access public
+	 *	@echo string
+	 */
 	function __construct( $message, $code = 0, Exception $previous = NULL ) {
 		if ( version_compare( phpversion(), '5.3.0', '<' )) {
 			parent::__construct( $message, $code );
@@ -173,10 +173,10 @@ 
 
 
 	/**
-	*	fatal_error_handler
-	*	@access public
-	*	@return void
-	*/
+	 *	fatal_error_handler
+	 *	@access public
+	 *	@return void
+	 */
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
 		if ( $last_error['type'] === E_ERROR ) {
@@ -221,11 +221,11 @@ 
 
 
 	/**
-	*	_add_actions
-	*	@access public
-	*	@return void
-	*/
-    public function get_error() {
+	 *	_add_actions
+	 *	@access public
+	 *	@return void
+	 */
+	public function get_error() {
 
 		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
 			throw $this;
@@ -261,27 +261,27 @@ 
 	 * @param bool $check_stored
 	 * @return bool
 	 */
-    public static function has_error( $check_stored = false ){
-	    $has_error = self::$_error_count ? true : false;
-	    if ( $check_stored && ! $has_error ) {
-		    $notices = (array) get_option( 'ee_notices', array() );
-		    foreach ( $notices as $type => $notice ) {
-			    if ( $type === 'errors' && $notice ) {
-				    return true;
-			    }
-		    }
-	    }
-	    return $has_error;
-    }
+	public static function has_error( $check_stored = false ){
+		$has_error = self::$_error_count ? true : false;
+		if ( $check_stored && ! $has_error ) {
+			$notices = (array) get_option( 'ee_notices', array() );
+			foreach ( $notices as $type => $notice ) {
+				if ( $type === 'errors' && $notice ) {
+					return true;
+				}
+			}
+		}
+		return $has_error;
+	}
 
 
 
 	/**
-	*	display_errors
-	*	@access public
-	*	@echo string
-	*/
-    public function display_errors(){
+	 *	display_errors
+	 *	@access public
+	 *	@echo string
+	 */
+	public function display_errors(){
 
 		$trace_details = '';
 
@@ -353,7 +353,7 @@ 
 			// process trace info
 			if ( empty( $ex['trace'] )) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+				$trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
 
 			} else {
 
@@ -405,7 +405,7 @@ 
 					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
 					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
 
-		              $trace_details .= '
+					  $trace_details .= '
 					<tr>
 						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
 						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
@@ -417,7 +417,7 @@ 
 
 				}
 
-	            $trace_details .= '
+				$trace_details .= '
 			 </table>
 			</div>';
 
@@ -497,12 +497,12 @@ 
 
 
 	/**
-	*	generate string from exception trace args
-	*
-	*	@access private
-	*	@ param array $arguments
-	*	@ return string
-	*/
+	 *	generate string from exception trace args
+	 *
+	 *	@access private
+	 *	@ param array $arguments
+	 *	@ return string
+	 */
 	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
 
 		$arg_string = '';
@@ -546,15 +546,15 @@ 
 
 
 	/**
-	* 	add error message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add error message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'errors', $msg, $file, $func, $line );
 		self::$_error_count++;
@@ -582,15 +582,15 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'success', $msg, $file, $func, $line );
 	}
@@ -600,15 +600,15 @@ 
 
 
 	/**
-	* 	add attention message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add attention message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'attention', $msg, $file, $func, $line );
 	}
@@ -618,16 +618,16 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$type	whether the message is for a success or error notification
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$type	whether the message is for a success or error notification
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		if ( empty( $msg )) {
 			EE_Error::doing_it_wrong(
@@ -686,11 +686,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing success messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing success messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_success() {
 		self::$_espresso_notices['success'] = FALSE;
 	}
@@ -700,11 +700,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing attention messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing attention messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_attention() {
 		self::$_espresso_notices['attention'] = FALSE;
 	}
@@ -714,11 +714,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing error messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing error messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_errors() {
 		self::$_espresso_notices['errors'] = FALSE;
 	}
@@ -726,24 +726,24 @@ 
 
 
 	/**
-	*	reset_notices
-	*	@access private
-	*	@return void
-	*/
+	 *	reset_notices
+	 *	@access private
+	 *	@return void
+	 */
 	public static function reset_notices(){
-    	self::$_espresso_notices['success'] = FALSE;
-    	self::$_espresso_notices['attention'] = FALSE;
-    	self::$_espresso_notices['errors'] = FALSE;
-    }
+		self::$_espresso_notices['success'] = FALSE;
+		self::$_espresso_notices['attention'] = FALSE;
+		self::$_espresso_notices['errors'] = FALSE;
+	}
 
 
 
 	/**
-	*	has_errors
-	*	@access public
-	*	@return int
-	*/
-    public static function has_notices(){
+	 *	has_errors
+	 *	@access public
+	 *	@return int
+	 */
+	public static function has_notices(){
 		$has_notices = 0;
 		// check for success messages
 		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
@@ -774,15 +774,15 @@ 
 
 
 	/**
-	* 	compile all error or success messages into one string
-	*	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
-	*
-	*	@access public
-	* 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
-	* 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
-	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
-	* 	@return 		array
-	*/
+	 * 	compile all error or success messages into one string
+	 *	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
+	 *
+	 *	@access public
+	 * 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
+	 * 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
+	 * 	@param		boolean		$remove_empty		whether or not to unset empty messages
+	 * 	@return 		array
+	 */
 	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -894,14 +894,14 @@ 
 
 
 	/**
-	* 	add_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
-	* 	@param		string	$pan_message	the message to be stored persistently until dismissed
-	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
-	* 	@return 		void
-	*/
+	 * 	add_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
+	 * 	@param		string	$pan_message	the message to be stored persistently until dismissed
+	 * 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
+	 * 	@return 		void
+	 */
 	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
 		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
 			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
@@ -1064,11 +1064,11 @@ 
 
 
 	/**
-	* 	enqueue_error_scripts
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	enqueue_error_scripts
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function enqueue_error_scripts() {
 		self::_print_scripts();
 	}
@@ -1076,15 +1076,15 @@ 
 
 
 	/**
-	*	create error code from filepath, function name,
-	*	and line number where exception or error was thrown
-	*
-	*	@access public
-	*	@param string $file
-	*	@param string $func
-	*	@param string $line
-	*	@return string
-	*/
+	 *	create error code from filepath, function name,
+	 *	and line number where exception or error was thrown
+	 *
+	 *	@access public
+	 *	@param string $file
+	 *	@param string $func
+	 *	@param string $line
+	 *	@return string
+	 */
 	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
 		$file = explode( '.', basename( $file ));
 		$error_code = ! empty( $file[0] ) ? $file[0] : '';
@@ -1098,13 +1098,13 @@ 
 
 
 	/**
-	*	write exception details to log file
-	*
-	*	@access public
-	*	@ param timestamp $time
-	*	@ param object $ex
-	*	@ return void
-	*/
+	 *	write exception details to log file
+	 *
+	 *	@access public
+	 *	@ param timestamp $time
+	 *	@ param object $ex
+	 *	@ return void
+	 */
 	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
 
 		if ( ! $ex ) {

Spacing +247 added lines, -247 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) {
-	set_error_handler( array( 'EE_Error', 'error_handler' ));
-	register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' ));
+if (defined('WP_DEBUG') && WP_DEBUG === TRUE && defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS === TRUE) {
+	set_error_handler(array('EE_Error', 'error_handler'));
+	register_shutdown_function(array('EE_Error', 'fatal_error_handler'));
 }
 /**
  *
@@ -64,7 +64,7 @@ 
 	* 	@access	private
     *	@var boolean
 	*/
-	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
+	private static $_espresso_notices = array('success' => FALSE, 'errors' => FALSE, 'attention' => FALSE);
 
 
 
@@ -75,11 +75,11 @@ 
 	*	@access public
 	*	@echo string
 	*/
-	function __construct( $message, $code = 0, Exception $previous = NULL ) {
-		if ( version_compare( phpversion(), '5.3.0', '<' )) {
-			parent::__construct( $message, $code );
+	function __construct($message, $code = 0, Exception $previous = NULL) {
+		if (version_compare(phpversion(), '5.3.0', '<')) {
+			parent::__construct($message, $code);
 		} else {
-			parent::__construct( $message, $code, $previous );
+			parent::__construct($message, $code, $previous);
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	 * @param $line
 	 * @return void
 	 */
-	public static function error_handler( $code, $message, $file, $line ) {
-		$type = EE_Error::error_type( $code );
+	public static function error_handler($code, $message, $file, $line) {
+		$type = EE_Error::error_type($code);
 		$site = site_url();
-		switch ( $site ) {
+		switch ($site) {
 			case 'http://ee4.eventespresso.com/' :
 			case 'http://ee4decaf.eventespresso.com/' :
 			case 'http://ee4hf.eventespresso.com/' :
@@ -110,16 +110,16 @@ 
 				$to = 'developers@eventespresso.com';
 				break;
 			default :
-				$to = get_option( 'admin_email' );
+				$to = get_option('admin_email');
 		}
-		$subject = $type . ' ' . $message . ' in ' . EVENT_ESPRESSO_VERSION . ' on ' . site_url();
-		$msg = EE_Error::_format_error( $type, $message, $file, $line );
-		if ( function_exists( 'wp_mail' )) {
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
-			wp_mail( $to, $subject, $msg );
+		$subject = $type.' '.$message.' in '.EVENT_ESPRESSO_VERSION.' on '.site_url();
+		$msg = EE_Error::_format_error($type, $message, $file, $line);
+		if (function_exists('wp_mail')) {
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
+			wp_mail($to, $subject, $msg);
 		}
 		echo '<div id="message" class="espresso-notices error"><p>';
-		echo $type . ': ' . $message . '<br />' . $file . ' line ' . $line;
+		echo $type.': '.$message.'<br />'.$file.' line '.$line;
 		echo '<br /></p></div>';
 	}
 
@@ -132,8 +132,8 @@ 
 	 * @param $code
 	 * @return string
 	 */
-	public static function error_type( $code ) {
-		switch( $code ) {
+	public static function error_type($code) {
+		switch ($code) {
 			case E_ERROR: // 1 //
 			return 'E_ERROR';
 			case E_WARNING: // 2 //
@@ -179,8 +179,8 @@ 
 	*/
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
-		if ( $last_error['type'] === E_ERROR ) {
-			EE_Error::error_handler( E_ERROR, $last_error['message'], $last_error['file'], $last_error['line'] );
+		if ($last_error['type'] === E_ERROR) {
+			EE_Error::error_handler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
 		}
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param $line
 	 * @return string
 	 */
-	private static function _format_error( $code, $message, $file, $line ) {
+	private static function _format_error($code, $message, $file, $line) {
 		$html  = "<table cellpadding='5'><thead bgcolor='#f8f8f8'><th>Item</th><th align='left'>Details</th></thead><tbody>";
 		$html .= "<tr valign='top'><td><b>Code</b></td><td>$code</td></tr>";
 		$html .= "<tr valign='top'><td><b>Error</b></td><td>$message</td></tr>";
@@ -213,7 +213,7 @@ 
 	 * @param $content_type
 	 * @return string
 	 */
-	public static function set_content_type( $content_type ) {
+	public static function set_content_type($content_type) {
 		return 'text/html';
 	}
 
@@ -227,24 +227,24 @@ 
 	*/
     public function get_error() {
 
-		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
+		if (apply_filters('FHEE__EE_Error__get_error__show_normal_exceptions', FALSE)) {
 			throw $this;
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $this->getMessage() );
+		$msg = explode('||', $this->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 
 		// add details to _all_exceptions array
 		$x_time = time();
-		self::$_all_exceptions[ $x_time ]['name'] 	= get_class( $this );
-		self::$_all_exceptions[ $x_time ]['file'] 		= $this->getFile();
-		self::$_all_exceptions[ $x_time ]['line'] 		= $this->getLine();
-		self::$_all_exceptions[ $x_time ]['msg'] 	= $msg;
-		self::$_all_exceptions[ $x_time ]['code'] 	= $this->getCode();
-		self::$_all_exceptions[ $x_time ]['trace'] 	= $this->getTrace();
-		self::$_all_exceptions[ $x_time ]['string'] 	= $this->getTraceAsString();
+		self::$_all_exceptions[$x_time]['name'] = get_class($this);
+		self::$_all_exceptions[$x_time]['file'] 		= $this->getFile();
+		self::$_all_exceptions[$x_time]['line'] 		= $this->getLine();
+		self::$_all_exceptions[$x_time]['msg'] = $msg;
+		self::$_all_exceptions[$x_time]['code'] = $this->getCode();
+		self::$_all_exceptions[$x_time]['trace'] 	= $this->getTrace();
+		self::$_all_exceptions[$x_time]['string'] = $this->getTraceAsString();
 		self::$_error_count++;
 
 		//add_action( 'shutdown', array( $this, 'display_errors' ));
@@ -261,12 +261,12 @@ 
 	 * @param bool $check_stored
 	 * @return bool
 	 */
-    public static function has_error( $check_stored = false ){
+    public static function has_error($check_stored = false) {
 	    $has_error = self::$_error_count ? true : false;
-	    if ( $check_stored && ! $has_error ) {
-		    $notices = (array) get_option( 'ee_notices', array() );
-		    foreach ( $notices as $type => $notice ) {
-			    if ( $type === 'errors' && $notice ) {
+	    if ($check_stored && ! $has_error) {
+		    $notices = (array) get_option('ee_notices', array());
+		    foreach ($notices as $type => $notice) {
+			    if ($type === 'errors' && $notice) {
 				    return true;
 			    }
 		    }
@@ -281,7 +281,7 @@ 
 	*	@access public
 	*	@echo string
 	*/
-    public function display_errors(){
+    public function display_errors() {
 
 		$trace_details = '';
 
@@ -342,18 +342,18 @@ 
 </style>
 <div id="ee-error-message" class="error">';
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 
 		// cycle thru errors
-		foreach ( self::$_all_exceptions as $time => $ex ) {
+		foreach (self::$_all_exceptions as $time => $ex) {
 
 			// process trace info
-			if ( empty( $ex['trace'] )) {
+			if (empty($ex['trace'])) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+	            $trace_details .= __('Sorry, but no trace information was available for this exception.', 'event_espresso');
 
 			} else {
 
@@ -368,50 +368,50 @@ 
 					<th scope="col" align="left">Method( arguments )</th>
 				</tr>';
 
-				$last_on_stack = count( $ex['trace'] ) - 1;
+				$last_on_stack = count($ex['trace']) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $ex['trace'] );
+				$sorted_trace = array_reverse($ex['trace']);
 
-				foreach ( $sorted_trace as $nmbr => $trace ) {
+				foreach ($sorted_trace as $nmbr => $trace) {
 
-					$file = isset( $trace['file'] ) ? $trace['file'] : '' ;
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 ? ' odd' : '';
 
-					if ( empty( $file ) && ! empty( $class )) {
-						$a = new ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function )) {
-							$b = new ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
 
-					if ( $nmbr == $last_on_stack ) {
+					if ($nmbr == $last_on_stack) {
 						$file = $ex['file'] != '' ? $ex['file'] : $file;
 						$line = $ex['line'] != '' ? $ex['line'] : $line;
-						$error_code = self::generate_error_code ( $file, $trace['function'], $line );
+						$error_code = self::generate_error_code($file, $trace['function'], $line);
 					}
 
-					$nmbr_dsply = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line_dsply = ! empty( $line ) ? $line : '&nbsp;';
-					$file_dsply = ! empty( $file ) ? $file : '&nbsp;';
-					$class_dsply = ! empty( $class ) ? $class : '&nbsp;';
-					$type_dsply = ! empty( $type ) ? $type : '&nbsp;';
-					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
-					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
+					$nmbr_dsply = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line_dsply = ! empty($line) ? $line : '&nbsp;';
+					$file_dsply = ! empty($file) ? $file : '&nbsp;';
+					$class_dsply = ! empty($class) ? $class : '&nbsp;';
+					$type_dsply = ! empty($type) ? $type : '&nbsp;';
+					$function_dsply = ! empty($function) ? $function : '&nbsp;';
+					$args_dsply = ! empty($args) ? '( '.$args.' )' : '';
 
 		              $trace_details .= '
 					<tr>
-						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
-						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $file_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $class_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $type_dsply . $function_dsply . $args_dsply . '</td>
+						<td align="right" class="' . $zebra.'">'.$nmbr_dsply.'</td>
+						<td align="right" class="' . $zebra.'">'.$line_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$file_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$class_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$type_dsply.$function_dsply.$args_dsply.'</td>
 					</tr>';
 
 
@@ -426,9 +426,9 @@ 
 			$ex['code'] = $ex['code'] ? $ex['code'] : $error_code;
 
 			// add generic non-identifying messages for non-privileged uesrs
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 
-				$output .= '<span class="ee-error-user-msg-spn">' . trim( $ex['msg'] )  . '</span> &nbsp; <sup>' . $ex['code'] . '</sup><br />';
+				$output .= '<span class="ee-error-user-msg-spn">'.trim($ex['msg']).'</span> &nbsp; <sup>'.$ex['code'].'</sup><br />';
 
 			} else {
 
@@ -436,24 +436,24 @@ 
 				$output .= '
 		<div class="ee-error-dev-msg-dv">
 			<p class="ee-error-dev-msg-pg">
-				<strong class="ee-error-dev-msg-str">An ' . $ex['name'] . ' exception was thrown!</strong>  &nbsp; <span>code: ' . $ex['code'] . '</span><br />
-				<span class="big-text">"' . trim( $ex['msg'] ) . '"</span><br/>
-				<a id="display-ee-error-trace-' . self::$_error_count . $time . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-' . self::$_error_count . $time . '">
-					' . __( 'click to view backtrace and class/method details', 'event_espresso' ) . '
+				<strong class="ee-error-dev-msg-str">An ' . $ex['name'].' exception was thrown!</strong>  &nbsp; <span>code: '.$ex['code'].'</span><br />
+				<span class="big-text">"' . trim($ex['msg']).'"</span><br/>
+				<a id="display-ee-error-trace-' . self::$_error_count.$time.'" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-'.self::$_error_count.$time.'">
+					' . __('click to view backtrace and class/method details', 'event_espresso').'
 				</a><br />
 				<span class="small-text lt-grey-text">'.$ex['file'].' &nbsp; ( line no: '.$ex['line'].' )</span>
 			</p>
-			<div id="ee-error-trace-' . self::$_error_count . $time . '-dv" class="ee-error-trace-dv" style="display: none;">
+			<div id="ee-error-trace-' . self::$_error_count.$time.'-dv" class="ee-error-trace-dv" style="display: none;">
 				' . $trace_details;
 
-				if ( ! empty( $class )) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #666; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #666; background:#f9f9f9;">
 						<h3>Class Details</h3>';
-						$a = new ReflectionClass( $class );
+						$a = new ReflectionClass($class);
 						$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -465,14 +465,14 @@ 
 
 			}
 
-			$this->write_to_error_log( $time, $ex );
+			$this->write_to_error_log($time, $ex);
 
 		}
 
 		// remove last linebreak
-		$output = substr( $output, 0, ( count( $output ) - 7 ));
+		$output = substr($output, 0, (count($output) - 7));
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
@@ -480,10 +480,10 @@ 
 		$output .= '
 </div>';
 
-		$output .= self::_print_scripts( TRUE );
+		$output .= self::_print_scripts(TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			echo json_encode( array( 'error' => $output ));
+		if (defined('DOING_AJAX')) {
+			echo json_encode(array('error' => $output));
 			exit();
 		}
 
@@ -503,29 +503,29 @@ 
 	*	@ param array $arguments
 	*	@ return string
 	*/
-	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
+	private function _convert_args_to_string($arguments = array(), $array = FALSE) {
 
 		$arg_string = '';
-		if ( ! empty( $arguments )) {
+		if ( ! empty($arguments)) {
 
 			$args = array();
 
-			foreach ( $arguments as $arg ) {
+			foreach ($arguments as $arg) {
 
-				if ( ! empty( $arg )) {
+				if ( ! empty($arg)) {
 
-					if ( is_string( $arg )) {
-						$args[] = " '" . $arg . "'";
-					} elseif ( is_array( $arg )) {
-						$args[] = 'ARRAY(' . $this->_convert_args_to_string( $arg, TRUE );
-					} elseif ( is_null( $arg )) {
+					if (is_string($arg)) {
+						$args[] = " '".$arg."'";
+					} elseif (is_array($arg)) {
+						$args[] = 'ARRAY('.$this->_convert_args_to_string($arg, TRUE);
+					} elseif (is_null($arg)) {
 						$args[] = ' NULL';
-					} elseif ( is_bool( $arg )) {
-						$args[] = ( $arg ) ? ' TRUE' : ' FALSE';
-					} elseif ( is_object( $arg )) {
-						$args[] = ' OBJECT ' . get_class( $arg );
-					} elseif ( is_resource( $arg )) {
-						$args[] = get_resource_type( $arg );
+					} elseif (is_bool($arg)) {
+						$args[] = ($arg) ? ' TRUE' : ' FALSE';
+					} elseif (is_object($arg)) {
+						$args[] = ' OBJECT '.get_class($arg);
+					} elseif (is_resource($arg)) {
+						$args[] = get_resource_type($arg);
 					} else {
 						$args[] = $arg;
 					}
@@ -533,9 +533,9 @@ 
 				}
 
 			}
-			$arg_string = implode( ', ', $args );
+			$arg_string = implode(', ', $args);
 		}
-		if ( $array ) {
+		if ($array) {
 			$arg_string .= ' )';
 		}
 		return $arg_string;
@@ -555,8 +555,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'errors', $msg, $file, $func, $line );
+	public static function add_error($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('errors', $msg, $file, $func, $line);
 		self::$_error_count++;
 	}
 
@@ -569,11 +569,11 @@ 
 	 * @param string $line
 	 * @throws EE_Error
 	 */
-	public static function throw_exception_if_debugging( $msg = null, $file = null, $func = null, $line = null ) {
-		if( WP_DEBUG ) {
-			throw new EE_Error( $msg );
-		} else  {
-			EE_Error::add_error( $msg, $file, $func, $line );
+	public static function throw_exception_if_debugging($msg = null, $file = null, $func = null, $line = null) {
+		if (WP_DEBUG) {
+			throw new EE_Error($msg);
+		} else {
+			EE_Error::add_error($msg, $file, $func, $line);
 		}
 	}
 
@@ -591,8 +591,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'success', $msg, $file, $func, $line );
+	public static function add_success($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('success', $msg, $file, $func, $line);
 	}
 
 
@@ -609,8 +609,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'attention', $msg, $file, $func, $line );
+	public static function add_attention($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('attention', $msg, $file, $func, $line);
 	}
 
 
@@ -628,12 +628,12 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		if ( empty( $msg )) {
+	private static function _add_notice($type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		if (empty($msg)) {
 			EE_Error::doing_it_wrong(
-				'EE_Error::add_' . $type . '()',
+				'EE_Error::add_'.$type.'()',
 				sprintf(
-					__( 'Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso' ),
+					__('Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso'),
 					$type,
 					$file,
 					$line
@@ -641,17 +641,17 @@ 
 				EVENT_ESPRESSO_VERSION
 			);
 		}
-		if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) {
+		if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) {
 			EE_Error::doing_it_wrong(
 				'EE_Error::add_error()',
-				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ),
+				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'),
 				EVENT_ESPRESSO_VERSION
 			);
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $msg );
+		$msg = explode('||', $msg);
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		/**
 		 * Do an action so other code can be triggered when a notice is created
 		 * @param string $type can be 'errors', 'attention', or 'success'
@@ -661,22 +661,22 @@ 
 		 * @param string $func function where error was generated
 		 * @param string $line line where error was generated
 		 */
-		do_action( 'AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line );
+		do_action('AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line);
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code
-			$notice_code = EE_Error::generate_error_code( $file, $func, $line );
-			if ( WP_DEBUG && $type == 'errors' ) {
-				$msg .= '<br/><span class="tiny-text">' . $notice_code . '</span>';
+			$notice_code = EE_Error::generate_error_code($file, $func, $line);
+			if (WP_DEBUG && $type == 'errors') {
+				$msg .= '<br/><span class="tiny-text">'.$notice_code.'</span>';
 			}
 			// add notice. Index by code if it's not blank
-			if( $notice_code ) {
-				self::$_espresso_notices[ $type ][ $notice_code ] = $msg;
+			if ($notice_code) {
+				self::$_espresso_notices[$type][$notice_code] = $msg;
 			} else {
-				self::$_espresso_notices[ $type ][] = $msg;
+				self::$_espresso_notices[$type][] = $msg;
 			}
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -730,7 +730,7 @@ 
 	*	@access private
 	*	@return void
 	*/
-	public static function reset_notices(){
+	public static function reset_notices() {
     	self::$_espresso_notices['success'] = FALSE;
     	self::$_espresso_notices['attention'] = FALSE;
     	self::$_espresso_notices['errors'] = FALSE;
@@ -743,14 +743,14 @@ 
 	*	@access public
 	*	@return int
 	*/
-    public static function has_notices(){
+    public static function has_notices() {
 		$has_notices = 0;
 		// check for success messages
-		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
+		$has_notices = self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success']) ? 3 : $has_notices;
 		// check for attention messages
-		$has_notices = self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ? 2 : $has_notices;
+		$has_notices = self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention']) ? 2 : $has_notices;
 		// check for error messages
-		$has_notices = self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ? 1 : $has_notices;
+		$has_notices = self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors']) ? 1 : $has_notices;
 		return $has_notices;
 	}
 
@@ -765,9 +765,9 @@ 
 	 */
 	public static function get_vanilla_notices() {
 		return array(
-			'success' => isset( self::$_espresso_notices['success'] ) ? self::$_espresso_notices['success'] : array(),
-			'attention' => isset( self::$_espresso_notices['attention'] )  ? self::$_espresso_notices['attention'] : array(),
-			'errors' => isset( self::$_espresso_notices['errors'] ) ? self::$_espresso_notices['errors'] : array(),
+			'success' => isset(self::$_espresso_notices['success']) ? self::$_espresso_notices['success'] : array(),
+			'attention' => isset(self::$_espresso_notices['attention']) ? self::$_espresso_notices['attention'] : array(),
+			'errors' => isset(self::$_espresso_notices['errors']) ? self::$_espresso_notices['errors'] : array(),
 		);
 	}
 
@@ -783,8 +783,8 @@ 
 	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
 	* 	@return 		array
 	*/
-	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	public static function get_notices($format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success_messages = '';
 		$attention_messages = '';
@@ -794,44 +794,44 @@ 
 		// EEH_Debug_Tools::printr( self::$_espresso_notices, 'espresso_notices  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 		// either save notices to the db
-		if ( $save_to_transient ) {
-			update_option( 'ee_notices', self::$_espresso_notices );
+		if ($save_to_transient) {
+			update_option('ee_notices', self::$_espresso_notices);
 			return;
 		}
 		// grab any notices that have been previously saved
-		if ( $notices = get_option( 'ee_notices', FALSE )) {
-			foreach ( $notices as $type => $notice ) {
-				if ( is_array( $notice ) && ! empty( $notice )) {
+		if ($notices = get_option('ee_notices', FALSE)) {
+			foreach ($notices as $type => $notice) {
+				if (is_array($notice) && ! empty($notice)) {
 					// make sure that existing notice type is an array
-					self::$_espresso_notices[ $type ] =  is_array( self::$_espresso_notices[ $type ] ) && ! empty( self::$_espresso_notices[ $type ] ) ? self::$_espresso_notices[ $type ] : array();
+					self::$_espresso_notices[$type] = is_array(self::$_espresso_notices[$type]) && ! empty(self::$_espresso_notices[$type]) ? self::$_espresso_notices[$type] : array();
 					// merge stored notices with any newly created ones
-					self::$_espresso_notices[ $type ] = array_merge( self::$_espresso_notices[ $type ], $notice );
+					self::$_espresso_notices[$type] = array_merge(self::$_espresso_notices[$type], $notice);
 					$print_scripts = TRUE;
 				}
 			}
 			// now clear any stored notices
-			update_option( 'ee_notices', FALSE );
+			update_option('ee_notices', FALSE);
 		}
 
 		// check for success messages
-		if ( self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] )) {
+		if (self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success'])) {
 			// combine messages
-			$success_messages .= implode( self::$_espresso_notices['success'], '<br />' );
+			$success_messages .= implode(self::$_espresso_notices['success'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for attention messages
-		if ( self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ) {
+		if (self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention'])) {
 			// combine messages
-			$attention_messages .= implode( self::$_espresso_notices['attention'], '<br />' );
+			$attention_messages .= implode(self::$_espresso_notices['attention'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for error messages
-		if ( self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ) {
-			$error_messages .= count( self::$_espresso_notices['errors'] ) > 1 ? __( 'The following errors have occurred:<br />', 'event_espresso' ) : __( 'An error has occurred:<br />', 'event_espresso' );
+		if (self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors'])) {
+			$error_messages .= count(self::$_espresso_notices['errors']) > 1 ? __('The following errors have occurred:<br />', 'event_espresso') : __('An error has occurred:<br />', 'event_espresso');
 			// combine messages
-			$error_messages .= implode( self::$_espresso_notices['errors'], '<br />' );
+			$error_messages .= implode(self::$_espresso_notices['errors'], '<br />');
 			$print_scripts = TRUE;
 		}
 
@@ -845,21 +845,21 @@ 
 				$css_id = is_admin() ? 'message' : 'espresso-notices-success';
 				$css_class = is_admin() ? 'updated fade' : 'success fade-away';
 				//showMessage( $success_messages );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $success_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$success_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($attention_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-attention';
 				$css_class = is_admin() ? 'updated ee-notices-attention' : 'attention fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $attention_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$attention_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($error_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-error';
 				$css_class = is_admin() ? 'error' : 'error fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $error_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$error_messages.'</p>'.$close.'</div>';
 			}
 
 			$notices .= '</div>';
@@ -872,7 +872,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -882,7 +882,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -902,17 +902,17 @@ 
 	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
 	* 	@return 		void
 	*/
-	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function add_persistent_admin_notice($pan_name = '', $pan_message, $force_update = FALSE) {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			//maybe initialize persistent_admin_notices
-			if ( empty( $persistent_admin_notices )) {
-				add_option( 'ee_pers_admin_notices', array(), '', 'no' );
+			if (empty($persistent_admin_notices)) {
+				add_option('ee_pers_admin_notices', array(), '', 'no');
 			}
-			$pan_name = sanitize_key( $pan_name );
-			if ( ! array_key_exists( $pan_name, $persistent_admin_notices ) || $force_update ) {
-				$persistent_admin_notices[ $pan_name ] = $pan_message;
-				update_option( 'ee_pers_admin_notices', $persistent_admin_notices );
+			$pan_name = sanitize_key($pan_name);
+			if ( ! array_key_exists($pan_name, $persistent_admin_notices) || $force_update) {
+				$persistent_admin_notices[$pan_name] = $pan_message;
+				update_option('ee_pers_admin_notices', $persistent_admin_notices);
 			}
 		}
 	}
@@ -928,34 +928,34 @@ 
 	 * @param bool          $return_immediately
 	 * @return        void
 	 */
-	public static function dismiss_persistent_admin_notice( $pan_name = '', $purge = FALSE, $return_immediately = FALSE ) {
-		$pan_name = EE_Registry::instance()->REQ->is_set( 'ee_nag_notice' ) ? EE_Registry::instance()->REQ->get( 'ee_nag_notice' ) : $pan_name;
-		if ( ! empty( $pan_name )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function dismiss_persistent_admin_notice($pan_name = '', $purge = FALSE, $return_immediately = FALSE) {
+		$pan_name = EE_Registry::instance()->REQ->is_set('ee_nag_notice') ? EE_Registry::instance()->REQ->get('ee_nag_notice') : $pan_name;
+		if ( ! empty($pan_name)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			// check if notice we wish to dismiss is actually in the $persistent_admin_notices array
-			if ( is_array( $persistent_admin_notices ) && isset( $persistent_admin_notices[ $pan_name ] )) {
+			if (is_array($persistent_admin_notices) && isset($persistent_admin_notices[$pan_name])) {
 				// completely delete nag notice, or just NULL message so that it can NOT be added again ?
-				if ( $purge ) {
-					unset( $persistent_admin_notices[ $pan_name ] );
+				if ($purge) {
+					unset($persistent_admin_notices[$pan_name]);
 				} else {
-					$persistent_admin_notices[ $pan_name ] = NULL;
+					$persistent_admin_notices[$pan_name] = NULL;
 				}
-				if ( update_option( 'ee_pers_admin_notices', $persistent_admin_notices ) === FALSE ) {
-					EE_Error::add_error( sprintf( __( 'The persistent admin notice for "%s" could not be deleted.', 'event_espresso' ), $pan_name ), __FILE__, __FUNCTION__, __LINE__ );
+				if (update_option('ee_pers_admin_notices', $persistent_admin_notices) === FALSE) {
+					EE_Error::add_error(sprintf(__('The persistent admin notice for "%s" could not be deleted.', 'event_espresso'), $pan_name), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
-		if ( $return_immediately ) {
+		if ($return_immediately) {
 			return;
-		} else if ( EE_Registry::instance()->REQ->ajax ) {
+		} else if (EE_Registry::instance()->REQ->ajax) {
 			// grab any notices and concatenate into string
-			echo json_encode( array( 'errors' => implode( '<br />', EE_Error::get_notices( FALSE ))));
+			echo json_encode(array('errors' => implode('<br />', EE_Error::get_notices(FALSE))));
 			exit();
 		} else {
 			// save errors to a transient to be displayed on next request (after redirect)
-			EE_Error::get_notices( FALSE, TRUE );
-			$return_url = EE_Registry::instance()->REQ->is_set( 'return_url' ) ? EE_Registry::instance()->REQ->get( 'return_url' ) : '';
-			wp_safe_redirect( urldecode( $return_url ));
+			EE_Error::get_notices(FALSE, TRUE);
+			$return_url = EE_Registry::instance()->REQ->is_set('return_url') ? EE_Registry::instance()->REQ->get('return_url') : '';
+			wp_safe_redirect(urldecode($return_url));
 		}
 	}
 
@@ -970,20 +970,20 @@ 
 	 * @param  string $return_url  URL to go back to after nag notice is dismissed
 	 * @return string
 	 */
-	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
+	public static function display_persistent_admin_notices($pan_name = '', $pan_message = '', $return_url = '') {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
 			$args = array(
 				'nag_notice' => $pan_name,
-				'return_url' => urlencode( $return_url ),
+				'return_url' => urlencode($return_url),
 				'ajax_url' => WP_AJAX_URL,
-				'unknown_error' => __( 'An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso' )
+				'unknown_error' => __('An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso')
 			);
-			wp_localize_script( 'espresso_core', 'ee_dismiss', $args );
+			wp_localize_script('espresso_core', 'ee_dismiss', $args);
 			return '
-			<div id="' . $pan_name . '" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
-				<p>' . $pan_message . '</p>
-				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name . '">
-					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__( 'Dismiss', 'event_espresso' ) .'
+			<div id="' . $pan_name.'" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
+				<p>' . $pan_message.'</p>
+				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name.'">
+					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__('Dismiss', 'event_espresso').'
 				</a>
 				<div style="clear:both;"></div>
 			</div>';
@@ -1000,24 +1000,24 @@ 
 	 * @param string $return_url
 	 * @return    array
 	 */
-	public static function get_persistent_admin_notices( $return_url = '' ) {
+	public static function get_persistent_admin_notices($return_url = '') {
 		$notices = '';
 		// check for persistent admin notices
 		//filter the list though so plugins can notify the admin in a different way if they want
 		$persistent_admin_notices = apply_filters(
 			'FHEE__EE_Error__get_persistent_admin_notices',
-			get_option( 'ee_pers_admin_notices', FALSE ),
+			get_option('ee_pers_admin_notices', FALSE),
 			'ee_pers_admin_notices',
 			$return_url
 		);
-		if ( $persistent_admin_notices ) {
+		if ($persistent_admin_notices) {
 			// load scripts
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'ee_error_js' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('ee_error_js');
 			// and display notices
-			foreach( $persistent_admin_notices as $pan_name => $pan_message ) {
-				$notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url );
+			foreach ($persistent_admin_notices as $pan_name => $pan_message) {
+				$notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url);
 			}
 		}
 		return $notices;
@@ -1032,26 +1032,26 @@ 
 	 * @param 	bool $force_print
 	 * @return 	void
 	 */
-	private static function _print_scripts( $force_print = FALSE ) {
-		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' )) {
+	private static function _print_scripts($force_print = FALSE) {
+		if ((did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts')) && ! $force_print) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return;
-			} else if ( wp_script_is( 'ee_error_js', 'registered' )) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js','ee_settings', array( 'wp_debug'=>WP_DEBUG ));
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug'=>WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 
 		}
@@ -1085,11 +1085,11 @@ 
 	*	@param string $line
 	*	@return string
 	*/
-	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
-		$file = explode( '.', basename( $file ));
-		$error_code = ! empty( $file[0] ) ? $file[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	public static function generate_error_code($file = '', $func = '', $line = '') {
+		$file = explode('.', basename($file));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -1105,36 +1105,36 @@ 
 	*	@ param object $ex
 	*	@ return void
 	*/
-	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
+	public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) {
 
-		if ( ! $ex ) {
+		if ( ! $ex) {
 			return;
 		}
 
-		if ( ! $time ) {
+		if ( ! $time) {
 			$time = time();
 		}
 
-		$exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . ']  Exception Details' . PHP_EOL;
-		$exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL;
-		$exception_log .= 'Code: '. $ex['code'] . PHP_EOL;
-		$exception_log .= 'File: '. $ex['file'] . PHP_EOL;
-		$exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL;
-		$exception_log .= 'Stack trace: ' . PHP_EOL;
-		$exception_log .= $ex['string'] . PHP_EOL;
-		$exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL;
+		$exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+		$exception_log .= 'Message: '.$ex['msg'].PHP_EOL;
+		$exception_log .= 'Code: '.$ex['code'].PHP_EOL;
+		$exception_log .= 'File: '.$ex['file'].PHP_EOL;
+		$exception_log .= 'Line No: '.$ex['line'].PHP_EOL;
+		$exception_log .= 'Stack trace: '.PHP_EOL;
+		$exception_log .= $ex['string'].PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL;
 
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' );
-			if ( ! $clear ) {
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs');
+			if ( ! $clear) {
 				//get existing log file and append new log info
-				$exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log;
+				$exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log;
 			}
-			EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+			EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 			return;
 		}
 
@@ -1170,8 +1170,8 @@ 
 		$applies_when = '',
 		$error_type = null
 	) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version, $applies_when, $error_type );
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version, $applies_when, $error_type);
 		}
 	}
 
@@ -1205,13 +1205,13 @@ 
  */
 function espresso_error_enqueue_scripts() {
 	// js for error handling
-	wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE );
-	wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE );
+	wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE);
+	wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE);
 }
-if ( is_admin() ) {
-	add_action( 'admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+if (is_admin()) {
+	add_action('admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 } else {
-	add_action( 'wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+	add_action('wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 }
 
 

Doc Comments +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
 	/**
 	 *    error_handler
 	 * @access public
-	 * @param $code
+	 * @param integer $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -189,7 +189,7 @@ 
 	/**
 	 *    _format_error
 	 * @access private
-	 * @param $code
+	 * @param string $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -223,7 +223,7 @@ 
 	/**
 	*	_add_actions
 	*	@access public
-	*	@return void
+	*	@return string|null
 	*/
     public function get_error() {
 
@@ -998,7 +998,7 @@ 
 	 *
 	 * @access    public
 	 * @param string $return_url
-	 * @return    array
+	 * @return    string
 	 */
 	public static function get_persistent_admin_notices( $return_url = '' ) {
 		$notices = '';
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @access 	public
 	 * @param 	bool $force_print
-	 * @return 	void
+	 * @return 	null|string
 	 */
 	private static function _print_scripts( $force_print = FALSE ) {
 		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
@@ -1179,7 +1179,7 @@ 
 
 	/**
 	 * Like get_notices, but returns an array of all the notices of the given type.
-	 * @return array {
+	 * @return boolean {
 	 *	@type array $success all the success messages
 	 *	@type array $errors all the error messages
 	 *	@type array $attention all the attention messages

core/EE_Log.core.php

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

Spacing +56 added lines, -56 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,11 +108,11 @@ 
 	 */
 	public function verify_filesystem() {
 		try {
-			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 );
-			EEH_File::add_htaccess_deny_from_all( $this->_logs_folder );
-		} 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__ );
+			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);
+			EEH_File::add_htaccess_deny_from_all($this->_logs_folder);
+		} 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;
 		}
 	}
@@ -129,15 +129,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;
 	}
 
@@ -152,8 +152,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);
 	}
 
 
@@ -165,10 +165,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;
 		}
 	}
@@ -181,31 +181,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);
 	}
 
 
@@ -216,18 +216,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;
 			}
 		}
@@ -239,7 +239,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);
 	}
 
 

core/EE_Network_Config.core.php

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
  *

Spacing +32 added lines, -32 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;
@@ -73,15 +73,15 @@ 
 	 *  @access 	private
 	 */
 	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);
 	}
 
 
@@ -94,25 +94,25 @@ 
 	 */
 	private function _load_config() {
 		//load network config start hook
-		do_action( 'AHEE__EE_Network_Config___load_config__start', $this );
+		do_action('AHEE__EE_Network_Config___load_config__start', $this);
 		$config = $this->get_config();
-		foreach ( $config as $config_prop => $settings ) {
-			if ( is_object( $settings ) && property_exists( $this, $config_prop ) ) {
-				$this->{$config_prop} = apply_filters( 'FHEE__EE_Network_Config___load_config__config_settings', $settings, $config_prop, $this );
-				if ( method_exists( $settings, 'populate' ) ) {
+		foreach ($config as $config_prop => $settings) {
+			if (is_object($settings) && property_exists($this, $config_prop)) {
+				$this->{$config_prop} = apply_filters('FHEE__EE_Network_Config___load_config__config_settings', $settings, $config_prop, $this);
+				if (method_exists($settings, 'populate')) {
 					$this->{$config_prop}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config_prop}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Network_Config___load_config__update_network_config', false ) ) {
+		if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
 			$this->update_config();
 		}
 
 		//load network config end hook
-		do_action( 'AHEE__EE_Network_Config___load_config__end', $this );
+		do_action('AHEE__EE_Network_Config___load_config__end', $this);
 	}
 
 
@@ -126,8 +126,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;
 	}
 
@@ -141,39 +141,39 @@ 
 	 * @param bool $add_error
 	 * @return bool 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);
 
 		//need to bust cache for comparing original if this is a multisite install
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			global $current_site;
-			$cache_key = $current_site->id . ':ee_network_config';
-			wp_cache_delete( $cache_key, 'site-options' );
+			$cache_key = $current_site->id.':ee_network_config';
+			wp_cache_delete($cache_key, 'site-options');
 		}
 
 		//we have to compare existing saved config with config in memory because if there is no difference that means
 		//that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
 		//there were 0 records updated because of no change vs false because some error produced problems with the update.
-		$original = get_site_option( 'ee_network_config' );
+		$original = get_site_option('ee_network_config');
 
-		if ( $original == $this ) {
+		if ($original == $this) {
 			return true;
 		}
 		// update
-		$saved = update_site_option( 'ee_network_config', $this );
+		$saved = update_site_option('ee_network_config', $this);
 
-		do_action( 'AHEE__EE_Network_Config__update_config__end', $this, $saved );
+		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;
 		}
@@ -187,9 +187,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.

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_invoice_settings.dmsstage.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -56,39 +56,39 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
-		if( ! $invoice_settings ){
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
-			$invoice_settings[ 'template_invoice_email' ] = '';
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
-			unset( $invoice_settings[ 'pdf_instructions' ] );
-			unset( $invoice_settings[ 'payable_to' ] );
-			unset( $invoice_settings[ 'payment_address' ] );
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
-			EE_Config::instance()->update_espresso_config(false,false);
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
+		if ( ! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
-				EE_Error::add_persistent_admin_notice( 'invoice_css_not_updated', sprintf( __( 'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings[ 'invoice_css' ] ), FALSE );
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
+				EE_Error::add_persistent_admin_notice('invoice_css_not_updated', sprintf(__('You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings['invoice_css']), FALSE);
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
-				EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 			}
 
 		}

core/data_migration_scripts/EE_DMS_Core_4_2_0.dms.php

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

Spacing +47 added lines, -47 removed lines

@@ -14,18 +14,18 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_2_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_2_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_2_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_2_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_2_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
-class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -35,26 +35,26 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.2.0.P", "event_espresso");
 		$this->_priority = 10;
 		$this->_migration_stages = array(
 			new EE_DMS_4_2_0_question_group_questions(),
 			new EE_DMS_4_2_0_datetime_fields(),
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if ( version_compare( $version_string, '4.2.0', '<=' ) && version_compare( $version_string, '4.1.0', '>=' ) ) {
+		if (version_compare($version_string, '4.2.0', '<=') && version_compare($version_string, '4.1.0', '>=')) {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -64,14 +64,14 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -111,7 +111,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -134,7 +134,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -151,41 +151,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -201,7 +201,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -228,7 +228,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -336,8 +336,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -349,12 +349,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -365,28 +365,28 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -419,8 +419,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -494,7 +494,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -516,7 +516,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 }

core/data_migration_scripts/EE_DMS_Core_4_3_0.dms.php

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

Spacing +58 added lines, -58 removed lines

@@ -13,18 +13,18 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_3_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_3_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_3_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_3_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_3_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
-class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -34,7 +34,7 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.3.0.P", "event_espresso");
 		$this->_priority = 10;
 		$this->_migration_stages = array(
@@ -42,18 +42,18 @@ 
 			new EE_DMS_4_3_0_event_message_templates(),
 			new EE_DMS_4_3_0_critical_page_shortcode_tracking()
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if ( version_compare( $version_string, '4.3.0', '<=' ) && version_compare( $version_string, '4.2.0', '>=' ) ) {
+		if (version_compare($version_string, '4.3.0', '<=') && version_compare($version_string, '4.2.0', '>=')) {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.2
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -63,14 +63,14 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -109,7 +109,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -132,7 +132,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -149,41 +149,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -199,7 +199,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -211,7 +211,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_message_template_group', 'EVT_ID' );
+		$this->_get_table_manager()->dropIndex('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -226,7 +226,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -235,7 +235,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -344,8 +344,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -357,12 +357,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -373,29 +373,29 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -428,8 +428,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -503,7 +503,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -525,7 +525,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -541,34 +541,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $this->_get_table_analysis()->tableExists( $ticket_table ) ) {
+		if ($this->_get_table_analysis()->tableExists($ticket_table)) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( $this->_get_table_analysis()->tableExists( $ticket_price_table ) ) {
+		if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}