eventespresso / event-espresso-core

core/EE_Addon.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * Sets addon_name
 	 * @param string $addon_name
-	 * @return boolean
+	 * @return string
 	 */
 	function set_name( $addon_name ) {
 		return $this->_addon_name = $addon_name;

Braces +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 			//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() );

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">';

core/EE_Capabilities.core.php

Doc Comments +3 added lines, -3 removed lines

@@ -557,7 +557,7 @@ 
 	 * @since    4.5.0
 	 *
 	 * @param string $meta_cap     What meta capability is this mapping.
-	 * @param array  $map_values   array {
+	 * @param string[]  $map_values   array {
 	 * 		//array of values that MUST match a count of 4.  It's okay to send an empty string for capabilities that don't get mapped to.
 	 * 		@type $map_values[0] string A string representing the model name. Required.  String's
 	 * 		      	    	       should always be used when Menu Maps are registered via the
@@ -625,8 +625,8 @@ 
 	 * @see EE_Meta_Capability_Map::_map_meta_caps() for docs on params.
 	 * @since 4.6.x
 	 * @param $caps
-	 * @param $cap
-	 * @param $user_id
+	 * @param string $cap
+	 * @param integer $user_id
 	 * @param $args
 	 *
 	 * @return array

Indentation +1 added lines, -2 removed lines

@@ -111,7 +111,6 @@ 
 
 	/**
 	 * This sets the meta caps property.
-
 	 * @since 4.5.0
 	 *
 	 * @return void
@@ -209,7 +208,7 @@ 
 			 * capability mapping which will be used for accessing payment methods owned by
 			 * other users.  This is not fully implemented yet in the payment method ui.
 			 * Currently only the "plural" caps are in active use. (Specific payment method caps are in use as well).
-			**/
+			 **/
 				'ee_manage_gateways',
 				'ee_read_payment_method',
 				'ee_read_payment_methods',

Spacing +126 added lines, -126 removed lines

@@ -7,8 +7,8 @@ 
  * @package Event Espresso
  * @subpackage core, capabilities
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -69,7 +69,7 @@ 
 	 */
 	public static function instance() {
 		//check if instantiated, and if not do so.
-		if ( ! self::$_instance instanceof EE_Capabilities ) {
+		if ( ! self::$_instance instanceof EE_Capabilities) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -98,10 +98,10 @@ 
 	 * @since 4.5.0
 	 * @return void
 	 */
-	public function init_caps( $reset = false ) {
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+	public function init_caps($reset = false) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$this->_caps_map = $this->_init_caps_map();
-			$this->init_role_caps( $reset );
+			$this->init_role_caps($reset);
 			$this->_set_meta_caps();
 		}
 	}
@@ -119,41 +119,41 @@ 
 	private function _set_meta_caps() {
 		$this->_meta_caps = array(
 			//edits
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_event', array( 'Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_venue', array( 'Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_registration', array( 'Registration', '', 'ee_edit_others_registrations', '' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_checkin', array( 'Registration', '', 'ee_edit_others_checkins', '' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_edit_message', array( 'Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_default_ticket', array( 'Ticket', '', 'ee_edit_others_default_tickets', '' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question', array( 'Question', '', '', 'ee_edit_system_questions' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question_group', array( 'Question_Group', '', '', 'ee_edit_system_question_groups' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_payment_method', array( 'Payment_Method', '', 'ee_edit_others_payment_methods', '' ) ),
+			new EE_Meta_Capability_Map_Edit('ee_edit_event', array('Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_venue', array('Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_registration', array('Registration', '', 'ee_edit_others_registrations', '')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_checkin', array('Registration', '', 'ee_edit_others_checkins', '')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_edit_message', array('Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_default_ticket', array('Ticket', '', 'ee_edit_others_default_tickets', '')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question', array('Question', '', '', 'ee_edit_system_questions')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question_group', array('Question_Group', '', '', 'ee_edit_system_question_groups')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_payment_method', array('Payment_Method', '', 'ee_edit_others_payment_methods', '')),
 			//reads
-			new EE_Meta_Capability_Map_Read( 'ee_read_event', array( 'Event', '', 'ee_read_others_events', 'ee_read_private_events' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_venue', array( 'Venue', '', 'ee_read_others_venues', 'ee_read_private_venues' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_registration', array( 'Registration', '', '', 'ee_edit_others_registrations' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_checkin', array( 'Registration', '', '', 'ee_read_others_checkins' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_read_message', array( 'Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_default_ticket', array( 'Ticket', '', '', 'ee_read_others_default_tickets' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_payment_method', array( 'Payment_Method', '', '', 'ee_read_others_payment_methods' ) ),
+			new EE_Meta_Capability_Map_Read('ee_read_event', array('Event', '', 'ee_read_others_events', 'ee_read_private_events')),
+			new EE_Meta_Capability_Map_Read('ee_read_venue', array('Venue', '', 'ee_read_others_venues', 'ee_read_private_venues')),
+			new EE_Meta_Capability_Map_Read('ee_read_registration', array('Registration', '', '', 'ee_edit_others_registrations')),
+			new EE_Meta_Capability_Map_Read('ee_read_checkin', array('Registration', '', '', 'ee_read_others_checkins')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_read_message', array('Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages')),
+			new EE_Meta_Capability_Map_Read('ee_read_default_ticket', array('Ticket', '', '', 'ee_read_others_default_tickets')),
+			new EE_Meta_Capability_Map_Read('ee_read_payment_method', array('Payment_Method', '', '', 'ee_read_others_payment_methods')),
 
 			//deletes
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_event', array( 'Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_venue', array( 'Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_registration', array( 'Registration', '', 'ee_delete_others_registrations', '' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_checkin', array( 'Registration', '', 'ee_delete_others_checkins', '' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_delete_message', array( 'Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_default_ticket', array( 'Ticket', '', 'ee_delete_others_default_tickets', '' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question', array( 'Question', '', '', 'delete_system_questions' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question_group', array( 'Question_Group', '', '', 'delete_system_question_groups' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_payment_method', array( 'Payment_Method', '', 'ee_delete_others_payment_methods', '' ) ),
+			new EE_Meta_Capability_Map_Delete('ee_delete_event', array('Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_venue', array('Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_registration', array('Registration', '', 'ee_delete_others_registrations', '')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_checkin', array('Registration', '', 'ee_delete_others_checkins', '')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_delete_message', array('Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_default_ticket', array('Ticket', '', 'ee_delete_others_default_tickets', '')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question', array('Question', '', '', 'delete_system_questions')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question_group', array('Question_Group', '', '', 'delete_system_question_groups')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_payment_method', array('Payment_Method', '', 'ee_delete_others_payment_methods', '')),
 		);
 
-		$this->_meta_caps = apply_filters( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps );
+		$this->_meta_caps = apply_filters('FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps);
 
 		//add filter for map_meta_caps but only if models can query.
-		if ( EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ) ) ) {
-			add_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10, 4 );
+		if (EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter('map_meta_cap', array($this, 'map_meta_caps'))) {
+			add_filter('map_meta_cap', array($this, 'map_meta_caps'), 10, 4);
 		}
 	}
 
@@ -175,15 +175,15 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
 		//loop through our _meta_caps array
-		foreach ( $this->_meta_caps as $meta_map ) {
-			if ( ! $meta_map instanceof EE_Meta_Capability_Map ) {
+		foreach ($this->_meta_caps as $meta_map) {
+			if ( ! $meta_map instanceof EE_Meta_Capability_Map) {
 				continue;
 			}
 			$meta_map->ensure_is_model();
 
-			$caps = $meta_map->map_meta_caps( $caps, $cap, $user_id, $args );
+			$caps = $meta_map->map_meta_caps($caps, $cap, $user_id, $args);
 		}
 		return $caps;
 	}
@@ -348,7 +348,7 @@ 
 				)
 			);
 
-		$caps = apply_filters( 'FHEE__EE_Capabilities__init_caps_map__caps', $caps );
+		$caps = apply_filters('FHEE__EE_Capabilities__init_caps_map__caps', $caps);
 		return $caps;
 	}
 
@@ -365,26 +365,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function init_role_caps( $reset = false, $custom_map = array() ) {
+	public function init_role_caps($reset = false, $custom_map = array()) {
 
-		$caps_map = empty( $custom_map ) ? $this->_caps_map : $custom_map;
+		$caps_map = empty($custom_map) ? $this->_caps_map : $custom_map;
 
 		//first let's determine if these caps have already been set.
-		$caps_set_before = get_option( self::option_name, array() );
+		$caps_set_before = get_option(self::option_name, array());
 		//if not reset, see what caps are new for each role. if they're new, add them.
-		foreach ( $caps_map as $role => $caps_for_role ) {
-			foreach ( $caps_for_role as $cap ) {
+		foreach ($caps_map as $role => $caps_for_role) {
+			foreach ($caps_for_role as $cap) {
 				//first check we haven't already added this cap before, or it's a reset
-				if ( $reset || ! isset( $caps_set_before[ $role ] ) || ! in_array( $cap, $caps_set_before[ $role ] ) ) {
-					$this->add_cap_to_role( $role, $cap );
-					$caps_set_before[ $role ][] = $cap;
+				if ($reset || ! isset($caps_set_before[$role]) || ! in_array($cap, $caps_set_before[$role])) {
+					$this->add_cap_to_role($role, $cap);
+					$caps_set_before[$role][] = $cap;
 				}
 			}
 		}
 
 		//now let's just save the cap that has been set.
-		update_option( self::option_name, $caps_set_before );
-		do_action( 'AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before );
+		update_option(self::option_name, $caps_set_before);
+		do_action('AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before);
 	}
 
 
@@ -403,10 +403,10 @@ 
 	 * @param bool $grant  Whether to grant access to this cap on this role.
 	 * @return void
 	 */
-	public function add_cap_to_role( $role, $cap, $grant = true ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->add_cap( $cap, $grant );
+	public function add_cap_to_role($role, $cap, $grant = true) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->add_cap($cap, $grant);
 		}
 	}
 
@@ -426,10 +426,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function remove_cap_from_role( $role, $cap ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->remove_cap( $cap );
+	public function remove_cap_from_role($role, $cap) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->remove_cap($cap);
 		}
 	}
 
@@ -450,11 +450,11 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can( $cap, $context, $id = 0 ) {
+	public function current_user_can($cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap__' . $context,  $cap, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id );
-		return ! empty( $id ) ? current_user_can( $filtered_cap, $id ) : current_user_can( $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap__'.$context, $cap, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id);
+		return ! empty($id) ? current_user_can($filtered_cap, $id) : current_user_can($filtered_cap);
 	}
 
 
@@ -471,11 +471,11 @@ 
 	 *
 	 * @return bool Whether user can or not.
 	 */
-	public function user_can( $user, $cap, $context, $id = 0 ) {
+	public function user_can($user, $cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap__' . $context, $cap, $user, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user,  $id );
-		return ! empty( $id ) ? user_can( $user, $filtered_cap, $id ) : user_can( $user, $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap__'.$context, $cap, $user, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user, $id);
+		return ! empty($id) ? user_can($user, $filtered_cap, $id) : user_can($user, $filtered_cap);
 	}
 
 
@@ -495,12 +495,12 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can_for_blog( $blog_id, $cap, $context, $id = 0 ) {
-		$user_can = ! empty( $id ) ? current_user_can_for_blog( $blog_id, $cap, $id ) : current_user_can( $blog_id, $cap );
+	public function current_user_can_for_blog($blog_id, $cap, $context, $id = 0) {
+		$user_can = ! empty($id) ? current_user_can_for_blog($blog_id, $cap, $id) : current_user_can($blog_id, $cap);
 
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can__' . $context, $user_can, $blog_id, $cap, $id );
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id );
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can__'.$context, $user_can, $blog_id, $cap, $id);
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id);
 		return $user_can;
 	}
 
@@ -516,12 +516,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_ee_capabilities( $role = 'administrator' ) {
+	public function get_ee_capabilities($role = 'administrator') {
 		$capabilities = $this->_init_caps_map();
-		if ( empty( $role ) ) {
+		if (empty($role)) {
 			return $capabilities;
 		}
-		return isset( $capabilities[ $role ] ) ? $capabilities[ $role ] : array();
+		return isset($capabilities[$role]) ? $capabilities[$role] : array();
 	}
 }
 
@@ -569,11 +569,11 @@ 
 	 * 	}
 	 * @throws EE_Error
 	 */
-	public function __construct( $meta_cap, $map_values ) {
+	public function __construct($meta_cap, $map_values) {
 		$this->meta_cap = $meta_cap;
 		//verify there are four args in the $map_values array;
-		if ( count( $map_values ) !== 4 ) {
-			throw new EE_Error( sprintf( __( 'Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso' ), '<br>' . print_r( $map_values, true ) ) );
+		if (count($map_values) !== 4) {
+			throw new EE_Error(sprintf(__('Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso'), '<br>'.print_r($map_values, true)));
 		}
 
 		//set properties
@@ -587,8 +587,8 @@ 
 	/**
 	 * Makes it so this object stops filtering caps
 	 */
-	public function remove_filters(){
-		remove_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10 );
+	public function remove_filters() {
+		remove_filter('map_meta_cap', array($this, 'map_meta_caps'), 10);
 	}
 
 
@@ -603,19 +603,19 @@ 
 	 */
 	public function ensure_is_model() {
 		//is it already instantiated?
-		if ( $this->_model instanceof EEM_Base ) {
+		if ($this->_model instanceof EEM_Base) {
 			return;
 		}
 
 		//ensure model name is string
 		$this->_model_name = (string) $this->_model_name;
 		//error proof if the name has EEM in it
-		$this->_model_name = str_replace( 'EEM', '', $this->_model_name );
+		$this->_model_name = str_replace('EEM', '', $this->_model_name);
 
-		$this->_model = EE_Registry::instance()->load_model( $this->_model_name );
+		$this->_model = EE_Registry::instance()->load_model($this->_model_name);
 
-		if ( ! $this->_model instanceof EEM_Base ) {
-			throw new EE_Error( sprintf( __( 'This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso' ), get_class( $this ), $this->_model ) );
+		if ( ! $this->_model instanceof EEM_Base) {
+			throw new EE_Error(sprintf(__('This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso'), get_class($this), $this->_model));
 		}
 	}
 
@@ -631,8 +631,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return $this->_map_meta_caps( $caps, $cap, $user_id, $args );
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
+		return $this->_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 
 
@@ -650,7 +650,7 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	abstract protected function _map_meta_caps( $caps, $cap, $user_id, $args );
+	abstract protected function _map_meta_caps($caps, $cap, $user_id, $args);
 }
 
 
@@ -682,28 +682,28 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
+		if ($obj instanceof EE_CPT_Base) {
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-				if ( empty( $this->published_cap ) ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+				if (empty($this->published_cap)) {
 					$caps[] = $cap;
 				} else {
 					//if obj is published...
-					if ( $obj->status() == 'publish' ) {
+					if ($obj->status() == 'publish') {
 						$caps[] = $this->published_cap;
 					} else {
 						$caps[] = $cap;
@@ -711,21 +711,21 @@ 
 				}
 			} else {
 				//the user is trying to edit someone else's obj
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
-				if ( ! empty( $this->published_cap ) && $obj->status() == 'publish' ) {
+				if ( ! empty($this->published_cap) && $obj->status() == 'publish') {
 					$caps[] = $this->published_cap;
-				} elseif ( ! empty( $this->private_cap ) && $obj->status() == 'private' ) {
+				} elseif ( ! empty($this->private_cap) && $obj->status() == 'private') {
 					$caps[] = $this->private_cap;
 				}
 			}
 		} else {
 			//not a cpt object so handled differently
-			if ( method_exists( $obj, 'wp_user' ) && $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if (method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
 			} else {
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
 			}
@@ -762,8 +762,8 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return parent::_map_meta_caps( $caps, $cap, $user_id, $args );
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
+		return parent::_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 }
 
@@ -795,45 +795,45 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped cap;
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
-			$status_obj = get_post_status_object( $obj->status() );
-			if ( $status_obj->public ) {
+		if ($obj instanceof EE_CPT_Base) {
+			$status_obj = get_post_status_object($obj->status());
+			if ($status_obj->public) {
 				$caps[] = $cap;
 				return $caps;
 			}
 
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
-			} elseif ( $status_obj->private && ! empty( $this->private_cap ) ) {
+			} elseif ($status_obj->private && ! empty($this->private_cap)) {
 				//the user is trying to view someone else's obj
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
 			}
 		} else {
 			//not a cpt object so handled differently
-			if ( method_exists( $obj, 'wp_user' ) && $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if (method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
-			} elseif ( ! empty( $this->private_cap ) ) {
+			} elseif ( ! empty($this->private_cap)) {
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
@@ -870,30 +870,30 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Message_Template_Group ) {
+		if ( ! $obj instanceof EE_Message_Template_Group) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
 		$is_global = $obj->is_global();
 
-		if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-			if ( $is_global ) {
-				$caps[]  = $this->private_cap;
+		if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+			if ($is_global) {
+				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $cap;
 			}
 		} else {
-			if ( $is_global ) {
+			if ($is_global) {
 				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $this->others_cap;
@@ -931,16 +931,16 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
@@ -948,7 +948,7 @@ 
 		$is_system = $obj instanceof EE_Question_Group ? $obj->system_group() : false;
 		$is_system = $obj instanceof EE_Question ? $obj->is_system_question() : $is_system;
 
-		if ( $is_system ) {
+		if ($is_system) {
 			$caps[] = $this->private_cap;
 		} else {
 			$caps[] = $cap;

core/EE_Cart.core.php

Doc Comments +5 added lines, -5 removed lines

@@ -197,7 +197,7 @@ 
 	 *	@access public
 	 *	@param EE_Ticket $ticket
 	 *	@param int $qty
-	 *	@return TRUE on success, FALSE on fail
+	 *	@return boolean on success, FALSE on fail
 	 */
 	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
 		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
@@ -220,7 +220,7 @@ 
 	/**
 	 *	gets the total amount of tax paid for items in this cart
 	 *	@access public
-	 *	@return float
+	 *	@return boolean
 	 */
 	public function get_applied_taxes() {
 		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
@@ -231,7 +231,7 @@ 
 	/**
 	 *	Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
 	 *	@access public
-	 *	@return float
+	 *	@return boolean
 	 */
 	public function get_cart_grand_total() {
 		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
@@ -243,7 +243,7 @@ 
 	/**
 	 *	Gets the total amount to be paid for the items in the cart, including taxes and other modifiers
 	 *	@access public
-	 *	@return float
+	 *	@return boolean
 	 */
 	public function recalculate_all_cart_totals() {
 		$pre_tax_total = $this->get_cart_total_before_tax();
@@ -313,7 +313,7 @@ 
 	  * @save cart to session
 	  * @access public
 	  * @param bool $apply_taxes
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  */
 	public function save_cart( $apply_taxes = TRUE ) {
 		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, ''); /**
  *
  * Event Espresso
  *
@@ -59,24 +59,24 @@ 
 	  * @param EE_Line_Item $grand_total
 	  * @return \EE_Cart
 	  */
-	public static function instance( EE_Line_Item $grand_total = null ) {
+	public static function instance(EE_Line_Item $grand_total = null) {
 		EE_Registry::instance()->load_helper('Line_Item');
 		// rest cart with new grand total ?
-		if ( ! empty( $grand_total ) ){
-			self::$_instance = new self( $grand_total );
+		if ( ! empty($grand_total)) {
+			self::$_instance = new self($grand_total);
 		}
 		// or maybe retrieve an existing one ?
-		if ( ! self::$_instance instanceof EE_Cart ) {
+		if ( ! self::$_instance instanceof EE_Cart) {
 			// try getting the cart out of the session
 			self::$_instance = EE_Registry::instance()->SSN->cart();
 		}
 		// verify that cart is ok and grand total line item exists
-		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item ) {
-			self::$_instance = new self( $grand_total );
+		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
+			self::$_instance = new self($grand_total);
 		}
 		self::$_instance->get_grand_total();
 		// once everything is all said and done, save the cart to the EE_Session
-		add_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		return self::$_instance;
 	}
 
@@ -89,13 +89,13 @@ 
 	  * @param EE_Line_Item $grand_total
 	  * @return \EE_Cart
 	  */
-	 private function __construct( EE_Line_Item $grand_total = NULL ) {
-		 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		 if ( ! defined( 'ESPRESSO_CART' )) {
-			 define( 'ESPRESSO_CART', TRUE );
+	 private function __construct(EE_Line_Item $grand_total = NULL) {
+		 do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		 if ( ! defined('ESPRESSO_CART')) {
+			 define('ESPRESSO_CART', TRUE);
 		 }
-		 if ( $grand_total instanceof EE_Line_Item ) {
-			 $this->set_grand_total_line_item( $grand_total );
+		 if ($grand_total instanceof EE_Line_Item) {
+			 $this->set_grand_total_line_item($grand_total);
 		 }
 	 }
 
@@ -106,11 +106,11 @@ 
 	 * @param EE_Line_Item $grand_total
 	 * @return EE_Cart
 	 */
-	public static function reset( EE_Line_Item $grand_total = NULL ){
-		remove_action( 'shutdown', array( self::$_instance, 'save_cart'), 90 );
+	public static function reset(EE_Line_Item $grand_total = NULL) {
+		remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		EE_Registry::instance()->SSN->reset_cart();
 		self::$_instance = NULL;
-		return self::instance( $grand_total );
+		return self::instance($grand_total);
 	}
 
 
@@ -121,11 +121,11 @@ 
 	  * @param EE_Transaction $transaction
 	  * @return \EE_Cart
 	  */
-	public static function get_cart_from_txn( EE_Transaction $transaction ) {
+	public static function get_cart_from_txn(EE_Transaction $transaction) {
 		$grand_total = $transaction->total_line_item();
 		$grand_total->get_items();
 		$grand_total->tax_descendants();
-		return EE_Cart::instance( $grand_total );
+		return EE_Cart::instance($grand_total);
 	}
 
 
@@ -134,7 +134,7 @@ 
 	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
 	 * @return EE_Line_Item
 	 */
-	private function _create_grand_total(){
+	private function _create_grand_total() {
 		$this->_grand_total = EEH_Line_Item::create_total_line_item();
 		return $this->_grand_total;
 	}
@@ -147,7 +147,7 @@ 
 	 *	@return \EE_Line_Item[]
 	 */
 	public function get_tickets() {
-		return EEH_Line_Item::get_ticket_line_items( $this->_grand_total );
+		return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
 	}
 
 
@@ -160,11 +160,11 @@ 
 	 */
 	public function all_ticket_quantity_count() {
 		$tickets = $this->get_tickets();
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return 0;
 		}
 		$count = 0;
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$count = $count + $ticket->get('LIN_quantity');
 		}
 		return $count;
@@ -176,8 +176,8 @@ 
 	 *  Gets all the tax line items
 	 * @return \EE_Line_Item[]
 	 */
-	public function get_taxes(){
-		return EEH_Line_Item::get_taxes_subtotal( $this->_grand_total )->children();
+	public function get_taxes() {
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
 	}
 
 
@@ -186,7 +186,7 @@ 
 	 * Gets the total line item (which is a parent of all other line items) on this cart
 	 * @return EE_Line_Item
 	 */
-	public function get_grand_total(){
+	public function get_grand_total() {
 		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
 	}
 
@@ -199,8 +199,8 @@ 
 	 *	@param int $qty
 	 *	@return TRUE on success, FALSE on fail
 	 */
-	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
-		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1) {
+		EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
 		return $this->save_cart() ? TRUE : FALSE;
 	}
 
@@ -223,7 +223,7 @@ 
 	 *	@return float
 	 */
 	public function get_applied_taxes() {
-		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 	}
 
 
@@ -234,7 +234,7 @@ 
 	 *	@return float
 	 */
 	public function get_cart_grand_total() {
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 		return $this->get_grand_total()->total();
 	}
 
@@ -247,8 +247,8 @@ 
 	 */
 	public function recalculate_all_cart_totals() {
 		$pre_tax_total = $this->get_cart_total_before_tax();
-		$taxes_total = EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
-		$this->_grand_total->set_total( $pre_tax_total + $taxes_total );
+		$taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		$this->_grand_total->set_total($pre_tax_total + $taxes_total);
 		$this->_grand_total->save_this_and_descendants_to_txn();
 		return $this->get_grand_total()->total();
 	}
@@ -261,9 +261,9 @@ 
 	 *	@param mixed - string or array - line_item_ids
 	 *	@return int on success, FALSE on fail
 	 */
-	public function delete_items( $line_item_codes = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes );
+	public function delete_items($line_item_codes = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
 	}
 
 
@@ -274,9 +274,9 @@ 
 	 *	@return bool
 	 */
 	public function empty_cart() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_grand_total = $this->_create_grand_total();
-		return $this->save_cart( TRUE );
+		return $this->save_cart(TRUE);
 	}
 
 
@@ -287,9 +287,9 @@ 
 	 *	@return bool
 	 */
 	public function delete_cart() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		$deleted = EEH_Line_Item::delete_all_child_items( $this->_grand_total );
-		if ( $deleted ) {
+		EE_Registry::instance()->load_helper('Line_Item');
+		$deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
+		if ($deleted) {
 			$deleted += $this->_grand_total->delete();
 			$this->_grand_total = null;
 		}
@@ -303,7 +303,7 @@ 
 	 *  know the grand total line item on it
 	 * @param EE_Line_Item $line_item
 	 */
-	public function set_grand_total_line_item( EE_Line_Item $line_item ) {
+	public function set_grand_total_line_item(EE_Line_Item $line_item) {
 		$this->_grand_total = $line_item;
 	}
 
@@ -315,16 +315,16 @@ 
 	  * @param bool $apply_taxes
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function save_cart( $apply_taxes = TRUE ) {
-		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {
-			EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+	public function save_cart($apply_taxes = TRUE) {
+		if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
+			EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 			//make sure we don't cache the transaction because it can get stale
-			if( $this->_grand_total->get_one_from_cache( 'Transaction' ) instanceof EE_Transaction &&
-				$this->_grand_total->get_one_from_cache( 'Transaction' )->ID()) {
-				$this->_grand_total->clear_cache( 'Transaction', null, true );
+			if ($this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction &&
+				$this->_grand_total->get_one_from_cache('Transaction')->ID()) {
+				$this->_grand_total->clear_cache('Transaction', null, true);
 			}
 		}
-		return EE_Registry::instance()->SSN->set_cart( $this );
+		return EE_Registry::instance()->SSN->set_cart($this);
 	}
 
 

Braces +3 added lines, -1 removed lines

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

core/EE_Config.core.php

Doc Comments +5 added lines, -5 removed lines

@@ -313,7 +313,7 @@ 
 	 *    update_espresso_config
 	 *
 	 * @access   public
-	 * @return   bool
+	 * @return   boolean|null
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
@@ -381,7 +381,7 @@ 
 	 * @param    string                $name
 	 * @param    string                $config_class
 	 * @param    EE_Config_Base 	$config_obj
-	 * @param    array                 $tests_to_run
+	 * @param    integer[]                 $tests_to_run
 	 * @param    bool                  $display_errors
 	 * @return    bool    TRUE on success, FALSE on fail
 	 */
@@ -1442,7 +1442,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return integer[]
 	 */
 	public function get_critical_pages_array() {
 		return array(
@@ -1455,7 +1455,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function get_critical_pages_shortcodes_array() {
 		return array(
@@ -1778,7 +1778,7 @@ 
 	 *    class constructor
 	 *
 	 * @access    public
-	 * @param null $CNT_ISO
+	 * @param string $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
 	public function __construct( $CNT_ISO = NULL ) {

Braces +6 added lines, -4 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
  *
@@ -160,7 +162,7 @@ 
 		//support removing a module during a request when it previously existed
 		if( $reinstantiate ){
 			return self::instance();
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -1492,7 +1494,7 @@ 
 		}
 		if($query_args){
 			return add_query_arg($query_args,$this->txn_page_url);
-		}else{
+		} else{
 			return $this->txn_page_url;
 		}
 	}
@@ -1509,7 +1511,7 @@ 
 		}
 		if($query_args){
 			return add_query_arg($query_args,$this->thank_you_page_url);
-		}else{
+		} else{
 			return $this->thank_you_page_url;
 		}
 	}

Spacing +397 added lines, -397 removed lines

@@ -128,7 +128,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -145,22 +145,22 @@ 
 	 * not be ready to instantiate EE_Config currently (eg if the site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = FALSE, $reinstantiate = TRUE ){
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = FALSE, $reinstantiate = TRUE) {
+		if ($hard_reset) {
 			self::$_instance->_config_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if( self::$_instance instanceof EE_Config ){
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->shutdown();
 		}
 		self::$_instance = NULL;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if( $reinstantiate ){
+		if ($reinstantiate) {
 			return self::instance();
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @return \EE_Config
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin',$this );
-		$this->_config_option_names = get_option( 'ee_config_option_names', array() );
+		do_action('AHEE__EE_Config__construct__begin', $this);
+		$this->_config_option_names = get_option('ee_config_option_names', array());
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -183,15 +183,15 @@ 
 		// confirm everything loaded correctly and set filtered defaults if not
 		$this->_verify_config();
 		//  register shortcodes and modules
-		add_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_and_modules' ), 999 );
+		add_action('AHEE__EE_System__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_and_modules'), 999);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'shutdown' ), 10 );
+		add_action('shutdown', array($this, 'shutdown'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end',$this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -204,7 +204,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme ) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
+		return isset(self::$_instance->template_settings->current_espresso_theme) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
 
@@ -238,27 +238,27 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
-			$settings = apply_filters( 'FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this );
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->$config = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			$settings = apply_filters('FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this);
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->$config = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->$config->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->$config->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', FALSE ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', FALSE)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -272,40 +272,40 @@ 
 	protected function _verify_config() {
 
 		$this->core = $this->core instanceof EE_Core_Config
-			? $this->core  : new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+			? $this->core : new EE_Core_Config();
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 
 		$this->organization = $this->organization instanceof EE_Organization_Config
-			? $this->organization  : new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+			? $this->organization : new EE_Organization_Config();
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency : new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration : new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin : new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings : new EE_Template_Config();
-		$this->template_settings = apply_filters( 'FHEE__EE_Config___initialize_config__template_settings', $this->template_settings );
+		$this->template_settings = apply_filters('FHEE__EE_Config___initialize_config__template_settings', $this->template_settings);
 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings : new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment : new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway : new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 
 	}
 
@@ -319,7 +319,7 @@ 
 	 */
 	public function get_espresso_config() {
 		// grab espresso configuration
-		return apply_filters( 'FHEE__EE_Config__get_espresso_config__CFG', get_option( 'ee_config', array() ));
+		return apply_filters('FHEE__EE_Config__get_espresso_config__CFG', get_option('ee_config', array()));
 	}
 
 
@@ -332,11 +332,11 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option == 'ee_config' ) {
+		if ($option == 'ee_config') {
 			// run a loose comparison of the old value against the new value for type and properties, but NOT exact instance like WP update_option does
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook, which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above, WP update_option performs an exact instance comparison (===) on any update values passed to it
 				// this happens PRIOR to serialization and any subsequent update. If values are found to match their previous old value, then WP bails before performing any update.
@@ -344,7 +344,7 @@ 
 				// HOWEVER, once the object is serialized and passed off to MySQL to update,
 				// MySQL MAY ALSO NOT perform the update because the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO, which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ));
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -359,11 +359,11 @@ 
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
-		foreach( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, FALSE );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, FALSE);
 			}
 			$this->addons->$addon_name = NULL;
 		}
@@ -379,36 +379,36 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function  update_espresso_config( $add_success = FALSE, $add_error = TRUE ) {
+	public function  update_espresso_config($add_success = FALSE, $add_error = TRUE) {
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin',$this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( 'ee_config', $this );
+		$saved = update_option('ee_config', $this);
 		// if not saved... check if the hook we just added still exists; if it does, it means one of two things:
 		// that update_option bailed at the ( $value === $old_value ) conditional, or...
 		// the db update query returned 0 rows affected (probably because the data  value was the same from it's perspective)
 		// so the existence of the hook means that a negative result from update_option is NOT an error, but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing, then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' )) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
-				EE_Error::add_success( __( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($saved) {
+			if ($add_success) {
+				EE_Error::add_success(__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
-				EE_Error::add_error( __( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ($add_error) {
+				EE_Error::add_error(__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -427,77 +427,77 @@ 
 	 * @param    bool                  $display_errors
 	 * @return    bool    TRUE on success, FALSE on fail
 	 */
-	private function _verify_config_params( $section = '', $name = '', $config_class = '', $config_obj = NULL, $tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ), $display_errors = TRUE ) {
+	private function _verify_config_params($section = '', $name = '', $config_class = '', $config_obj = NULL, $tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8), $display_errors = TRUE) {
 		try {
 			// TEST #1 : check that section was set
-			if ( in_array( 1, $tests_to_run ) && empty( $section )) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'No configuration section has been provided while attempting to save "%s".', 'event_espresso' ), $config_class ));
+			if (in_array(1, $tests_to_run) && empty($section)) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('No configuration section has been provided while attempting to save "%s".', 'event_espresso'), $config_class));
 				}
 				return FALSE;
 			}
 			// TEST #2 : check that settings section exists
-			if ( in_array( 2, $tests_to_run ) && ! isset( $this->{$section} )) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'The "%s" configuration section does not exist.', 'event_espresso' ), $section ));
+			if (in_array(2, $tests_to_run) && ! isset($this->{$section} )) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('The "%s" configuration section does not exist.', 'event_espresso'), $section));
 				}
 				return FALSE;
 			}
 			// TEST #3 : check that section is the proper format
-			if ( in_array( 3, $tests_to_run ) && ! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'The "%s" configuration settings have not been formatted correctly.', 'event_espresso' ), $section ));
+			if (in_array(3, $tests_to_run) && ! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('The "%s" configuration settings have not been formatted correctly.', 'event_espresso'), $section));
 				}
 				return FALSE;
 			}
 			// TEST #4 : check that config section name has been set
-			if ( in_array( 4, $tests_to_run ) && empty( $name )) {
-				if ( $display_errors ) {
-					throw new EE_Error( __( 'No name has been provided for the specific configuration section.', 'event_espresso' ));
+			if (in_array(4, $tests_to_run) && empty($name)) {
+				if ($display_errors) {
+					throw new EE_Error(__('No name has been provided for the specific configuration section.', 'event_espresso'));
 				}
 				return FALSE;
 			}
 			// TEST #5 : check that a config class name has been set
-			if ( in_array( 5, $tests_to_run ) && empty( $config_class )) {
-				if ( $display_errors ) {
-					throw new EE_Error( __( 'No class name has been provided for the specific configuration section.', 'event_espresso' ));
+			if (in_array(5, $tests_to_run) && empty($config_class)) {
+				if ($display_errors) {
+					throw new EE_Error(__('No class name has been provided for the specific configuration section.', 'event_espresso'));
 				}
 				return FALSE;
 			}
 			// TEST #6 : verify config class is accessible
-			if ( in_array( 6, $tests_to_run ) && ! class_exists( $config_class )) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso' ), $config_class ));
+			if (in_array(6, $tests_to_run) && ! class_exists($config_class)) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso'), $config_class));
 				}
 				return FALSE;
 			}
 			// TEST #7 : check that config has even been set
-			if ( in_array( 7, $tests_to_run )) {
-				if ( ! isset( $this->{$section}->{$name} )) {
-					if ( $display_errors ) {
-						throw new EE_Error( sprintf( __( 'No configuration has been set for "%s->%s".', 'event_espresso' ), $section, $name ));
+			if (in_array(7, $tests_to_run)) {
+				if ( ! isset($this->{$section}->{$name} )) {
+					if ($display_errors) {
+						throw new EE_Error(sprintf(__('No configuration has been set for "%s->%s".', 'event_espresso'), $section, $name));
 					}
 					return FALSE;
 				} else {
 					// and make sure it's not serialized
-					$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+					$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 				}
 			}
 			// TEST #8 : check that config is the requested type
-			if ( in_array( 8, $tests_to_run ) && ! $this->{$section}->{$name} instanceof $config_class ) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'The configuration for "%s->%s" is not of the "%s" class.', 'event_espresso' ), $section, $name, $config_class ));
+			if (in_array(8, $tests_to_run) && ! $this->{$section}->{$name} instanceof $config_class) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('The configuration for "%s->%s" is not of the "%s" class.', 'event_espresso'), $section, $name, $config_class));
 				}
 				return FALSE;
 			}
 			// TEST #9 : verify config object
-			if ( in_array( 9, $tests_to_run ) && ! $config_obj instanceof EE_Config_Base ) {
-				if ( $display_errors ) {
-					throw new EE_Error( sprintf( __( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ), print_r( $config_obj, TRUE )));
+			if (in_array(9, $tests_to_run) && ! $config_obj instanceof EE_Config_Base) {
+				if ($display_errors) {
+					throw new EE_Error(sprintf(__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'), print_r($config_obj, TRUE)));
 				}
 				return FALSE;
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -514,8 +514,8 @@ 
 	 * @param        string          $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . $section . '-' . $name;
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.$section.'-'.$name;
 	}
 
 
@@ -529,8 +529,8 @@ 
 	 * @param 	string $name
 	 * @return 	string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class ) ? $config_class : str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ))) . '_Config';
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class) ? $config_class : str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -544,35 +544,35 @@ 
 	 * @param        \EE_Config_Base $config_obj
 	 * @return        \EE_Config_Base|bool
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = NULL ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = NULL) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, NULL, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, NULL, array(1, 2, 3, 4, 5, 6))) {
 			return FALSE;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
-			$this->_config_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
+			$this->_config_option_names[$config_option_name] = $config_class;
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), FALSE )) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), FALSE)) {
 			$config_obj = new $config_class();
 		}
-		$config_set = get_option( $config_option_name );
+		$config_set = get_option($config_option_name);
 
-		if ( $config_set ) {
-			update_option( $config_option_name, $config_obj );
+		if ($config_set) {
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' )) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
-				EE_Error::add_error( sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 		}
@@ -591,37 +591,37 @@ 
 	 * @param bool                      $throw_errors
 	 * @return  bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = TRUE ) {
-		$config_obj = maybe_unserialize( $config_obj );
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = TRUE) {
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 1, 2, 3, 4, 7, 9 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(1, 2, 3, 4, 7, 9))) {
 			return FALSE;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_config_option_names array
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
 			// save new config to db
-			return $this->set_config( $section, $name, $config_class, $config_obj );
+			return $this->set_config($section, $name, $config_class, $config_obj);
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return TRUE;
-			} else if ( update_option( $config_option_name, $config_obj )) {
+			} else if (update_option($config_option_name, $config_obj)) {
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return $this->update_espresso_config();
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The "%s" object stored at"%s" was not successfully updated in the database.', 'event_espresso' ),
+						__('The "%s" object stored at"%s" was not successfully updated in the database.', 'event_espresso'),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -641,33 +641,33 @@ 
 	 * @param 	string 	$config_class
 	 * @return 	mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, NULL, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, NULL, array(1, 2, 3, 4, 5, 6))) {
 			return NULL;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, NULL, array( 7, 8 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, NULL, array(7, 8), FALSE)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ));
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), FALSE)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj =$this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ))) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
-			EE_Error::add_error( sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return NULL;
 	}
@@ -680,9 +680,9 @@ 
 	 * @param 	string 	$config_option_name
 	 * @return 	mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		return maybe_unserialize( get_option( $config_option_name ));
+		return maybe_unserialize(get_option($config_option_name));
 	}
 
 
@@ -695,45 +695,45 @@ 
 	 * @param $page_for_posts
 	 * @return    void
 	 */
-	public function update_post_shortcodes( $page_for_posts = '' ) {
+	public function update_post_shortcodes($page_for_posts = '') {
 		// make sure page_for_posts is set
-		$page_for_posts = ! empty( $page_for_posts ) ? $page_for_posts : EE_Config::get_page_for_posts();
+		$page_for_posts = ! empty($page_for_posts) ? $page_for_posts : EE_Config::get_page_for_posts();
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = $this->core->get_critical_pages_shortcodes_array();
 		// allow others to mess stuff up :D
-		do_action( 'AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts );
+		do_action('AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts);
 		// verify that post_shortcodes is set
-		$this->core->post_shortcodes = isset( $this->core->post_shortcodes ) && is_array( $this->core->post_shortcodes ) ? $this->core->post_shortcodes : array();
+		$this->core->post_shortcodes = isset($this->core->post_shortcodes) && is_array($this->core->post_shortcodes) ? $this->core->post_shortcodes : array();
 		// cycle thru post_shortcodes
-		foreach( $this->core->post_shortcodes as $post_name => $shortcodes ){
+		foreach ($this->core->post_shortcodes as $post_name => $shortcodes) {
 			// are there any shortcodes to track ?
-			if ( ! empty( $shortcodes )) {
+			if ( ! empty($shortcodes)) {
 				// loop thru list of tracked shortcodes
-				foreach( $shortcodes as $shortcode => $post_id ) {
+				foreach ($shortcodes as $shortcode => $post_id) {
 					// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-					if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $page_for_posts ) {
+					if (isset($critical_shortcodes[$post_id]) && $post_name == $page_for_posts) {
 						// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-						unset( $this->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						unset($this->core->post_shortcodes[$post_name][$shortcode]);
 					}
 					// skip the posts page, because we want all shortcodes registered for it
-					if ( $post_name == $page_for_posts ) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// make sure post still exists
-					$post = get_post( $post_id );
-					if ( $post ) {
+					$post = get_post($post_id);
+					if ($post) {
 						// check that the post name matches what we have saved
-						if ( $post->post_name == $post_name ) {
+						if ($post->post_name == $post_name) {
 							// if so, then break before hitting the unset below
 							continue;
 						}
 					}
 					// we don't like missing posts around here >:(
-					unset( $this->core->post_shortcodes[ $post_name ] );
+					unset($this->core->post_shortcodes[$post_name]);
 				}
 			} else {
 				// you got no shortcodes to keep track of !
-				unset( $this->core->post_shortcodes[ $post_name ] );
+				unset($this->core->post_shortcodes[$post_name]);
 			}
 		}
 		//only show errors
@@ -752,14 +752,14 @@ 
 	 *  @return 	string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -775,11 +775,11 @@ 
 	 *  @return 	void
 	 */
 	public function register_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to register with WP and to set hooks for the rest of the system
-		EE_Registry::instance()->shortcodes =$this->_register_shortcodes();
+		EE_Registry::instance()->shortcodes = $this->_register_shortcodes();
 		// allow modules to set hooks for the rest of the system
 		EE_Registry::instance()->modules = $this->_register_modules();
 	}
@@ -793,7 +793,7 @@ 
 	 *  @return 	void
 	 */
 	public function initialize_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to set hooks for the rest of the system
@@ -812,26 +812,26 @@ 
 	 * 	@return void
 	 */
 	public function widgets_init() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		//only init widgets on admin pages when not in complete maintenance, and
 		//on frontend when not in any maintenance mode
-		if (( is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance)  || ! EE_Maintenance_Mode::instance()->level() ) {
+		if ((is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) || ! EE_Maintenance_Mode::instance()->level()) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
-			$widgets_to_register = apply_filters( 'FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register );
+			$widgets_to_register = apply_filters('FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register);
 
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
-			EE_Registry::instance()->widgets = apply_filters( 'FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets );
+			EE_Registry::instance()->widgets = apply_filters('FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets);
 		}
 	}
 
@@ -844,54 +844,54 @@ 
 	 *  @param 	string 	$widget_path - full path up to and including widget folder
 	 *  @return 	void
 	 */
-	public static function register_ee_widget( $widget_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = NULL) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== FALSE ) {
+		if (strpos($widget_path, $widget_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ));
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ));
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget )));
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext )) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso' ),
+				__('The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class )) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->$widget_class = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->$widget_class = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -904,18 +904,18 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$shortcodes_to_register = apply_filters( 'FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register );
-		if ( ! empty( $shortcodes_to_register ) ) {
+		$shortcodes_to_register = apply_filters('FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register);
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes );
+		return apply_filters('FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes);
 	}
 
 
@@ -927,56 +927,56 @@ 
 	 *  @param 	string 		$shortcode_path - full path up to and including shortcode folder
 	 *  @return 	bool
 	 */
-	public static function register_shortcode( $shortcode_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin',$shortcode_path );
+	public static function register_shortcode($shortcode_path = NULL) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== FALSE ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== FALSE) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ));
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0 ? substr( $shortcode_file[0], 4 ) : $shortcode_file[0];
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0 ? substr($shortcode_file[0], 4) : $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ));
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode )));
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext )) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso' ),
+				__('The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso'),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class )) {
-			$msg = sprintf( __( 'The requested %s shortcode class does not exist.', 'event_espresso' ), $shortcode_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($shortcode_class)) {
+			$msg = sprintf(__('The requested %s shortcode class does not exist.', 'event_espresso'), $shortcode_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->$shortcode = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->$shortcode = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return TRUE;
 	}
 
@@ -991,23 +991,23 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$modules_to_register = apply_filters( 'FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register );
+		$modules_to_register = apply_filters('FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register);
 
 
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
-				if ( $module_path != EE_MODULES . 'zzz-copy-this-module-template' && $module_path != EE_MODULES . 'gateways' ) {
+				if ($module_path != EE_MODULES.'zzz-copy-this-module-template' && $module_path != EE_MODULES.'gateways') {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules );
+		return apply_filters('FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules);
 	}
 
 
@@ -1020,54 +1020,54 @@ 
 	 *  @param 	string 		$module_path - full path up to and including module folder
 	 *  @return 	bool
 	 */
-	public static function register_module( $module_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = NULL) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== FALSE ) {
+		if (strpos($module_path, $module_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ));
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ));
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module);
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module )));
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->$module_class = $module_path . $module_class . $module_ext;
-		do_action( 'AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->$module_class );
+		EE_Registry::instance()->modules->$module_class = $module_path.$module_class.$module_ext;
+		do_action('AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->$module_class);
 		return TRUE;
 	}
 
@@ -1081,23 +1081,23 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ));
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $shortcode_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($shortcode_class, 'set_hooks'));
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag )) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ));
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1114,15 +1114,15 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ));
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $module_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($module_class, 'set_hooks'));
 			}
 		}
 	}
@@ -1140,26 +1140,26 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	bool
 	 */
-	public static function register_route( $route = NULL, $module = NULL, $method_name = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->$module_class )) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = NULL, $module = NULL, $method_name = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->$module_class)) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $route )) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! method_exists ( 'EED_' . $module, $method_name )) {
-			$msg = sprintf( __( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists('EED_'.$module, $method_name)) {
+			$msg = sprintf(__('A valid class method for the %s route has not been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return TRUE;
 	}
 
@@ -1173,11 +1173,11 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_route( $route = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin',$route );
-		$route = apply_filters( 'FHEE__EE_Config__get_route',$route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] )) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return NULL;
 	}
@@ -1206,35 +1206,35 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = NULL, $status = 0, $forward = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward',$route,$status,$forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this forward has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_forward($route = NULL, $status = 0, $forward = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this forward has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $forward )) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( is_array( $forward )) {
-			if ( ! isset( $forward[1] )) {
-				$msg = sprintf( __( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ), $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
+				$msg = sprintf(__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'), $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] )) {
-				$msg = sprintf( __( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward[1], $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! method_exists($forward[0], $forward[1])) {
+				$msg = sprintf(__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward[1], $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-		} else if ( ! function_exists( $forward )) {
-			$msg = sprintf( __( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward, $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		} else if ( ! function_exists($forward)) {
+			$msg = sprintf(__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward, $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return TRUE;
 	}
 
@@ -1249,10 +1249,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_forward( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin',$route,$status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_forward($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1269,19 +1269,19 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = NULL, $status = 0, $view = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin',$route,$status,$view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this view has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_view($route = NULL, $status = 0, $view = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this view has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! is_readable( $view )) {
-			$msg = sprintf( __( 'The %s view file could not be found or is not readable due to file permissions.', 'event_espresso' ), $view );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($view)) {
+			$msg = sprintf(__('The %s view file could not be found or is not readable due to file permissions.', 'event_espresso'), $view);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return TRUE;
 	}
 
@@ -1298,10 +1298,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_view( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin',$route,$status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_view', EE_Config::$_module_view_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_view($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_view', EE_Config::$_module_view_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1309,7 +1309,7 @@ 
 
 
 	public function shutdown() {
-		update_option( 'ee_config_option_names', $this->_config_option_names );
+		update_option('ee_config_option_names', $this->_config_option_names);
 	}
 
 
@@ -1325,7 +1325,7 @@ 
  * magic functions in use, except we'll allow them to magically set and get stuff...
  * basically, they should just be well-defined stdClasses
  */
-class EE_Config_Base{
+class EE_Config_Base {
 
 	/**
 	 * Utility function for escaping the value of a property and returning.
@@ -1334,13 +1334,13 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
-			throw new EE_Error( sprintf( __('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso' ), get_class( $this ), $property ) );
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
+			throw new EE_Error(sprintf(__('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso'), get_class($this), $property));
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->$property ) ) {
-			return stripslashes( $this->$property );
+		if (is_string($this->$property)) {
+			return stripslashes($this->$property);
 		}
 		return $this->$property;
 	}
@@ -1349,19 +1349,19 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( is_null( $this->$property ) ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if (is_null($this->$property)) {
 				$this->$property = $value;
 			}
 		}
 
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1453,12 +1453,12 @@ 
 	 */
 	public function __construct() {
 		$current_network_main_site = is_multisite() ? get_current_site() : NULL;
-		$current_main_site_id = !empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		// set default organization settings
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === NULL ? 1 : $this->current_blog_id;
-		$this->ee_ueip_optin = is_main_site() ? get_option( 'ee_ueip_optin', TRUE ) : get_blog_option( $current_main_site_id, 'ee_ueip_optin', TRUE );
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', FALSE ) : TRUE;
+		$this->ee_ueip_optin = is_main_site() ? get_option('ee_ueip_optin', TRUE) : get_blog_option($current_main_site_id, 'ee_ueip_optin', TRUE);
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', FALSE) : TRUE;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1477,7 +1477,7 @@ 
 		$this->event_cpt_slug = __('events', 'event_espresso');
 
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = FALSE;
 			$this->ee_ueip_has_notified = TRUE;
 		}
@@ -1517,8 +1517,8 @@ 
 	 *  @return 	string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
-			$this->reg_page_url = get_permalink( $this->reg_page_id ) . '#checkout';
+		if ( ! $this->reg_page_url) {
+			$this->reg_page_url = get_permalink($this->reg_page_id).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1531,12 +1531,12 @@ 
 	 *  @return 	string
 	 */
 	public function txn_page_url($query_args = array()) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->txn_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
+		} else {
 			return $this->txn_page_url;
 		}
 	}
@@ -1548,12 +1548,12 @@ 
 	 *  @return 	string
 	 */
 	public function thank_you_page_url($query_args = array()) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->thank_you_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
+		} else {
 			return $this->thank_you_page_url;
 		}
 	}
@@ -1564,8 +1564,8 @@ 
 	 *  @return 	string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1593,7 +1593,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -1825,39 +1825,39 @@ 
 	 * @param null $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
-	public function __construct( $CNT_ISO = NULL ) {
+	public function __construct($CNT_ISO = NULL) {
 
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization ) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
-		EE_Registry::instance()->load_helper( 'Activation' );
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
+		EE_Registry::instance()->load_helper('Activation');
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
-		if ( ! empty( $CNT_ISO ) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() ) ) {
+		if ( ! empty($CNT_ISO) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists(EE_Registry::instance()->load_model('Country')->table())) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code(); 	// currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();	// Dollar
-				$this->plural = $country->currency_name_plural(); 	// Dollars
-				$this->sign =  $country->currency_sign(); 			// currency sign: $
-				$this->sign_b4 = $country->currency_sign_before(); 		// currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();	// decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code )) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD'; 	// currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' ); 	// Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' ); 	// Dollars
-			$this->sign =  '$'; 	// currency sign: $
-			$this->sign_b4 = TRUE; 	// currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2; 	// decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.'; 	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ','; 	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = TRUE; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -1997,7 +1997,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ));
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2005,7 +2005,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2110,10 +2110,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = FALSE ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function log_file_name($reset = FALSE) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->log_file_name;
 	}
@@ -2125,10 +2125,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = FALSE ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function debug_file_name($reset = FALSE) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->debug_file_name;
 	}
@@ -2306,21 +2306,21 @@ 
 		// set default map settings
 		$this->use_google_maps = TRUE;
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585; 			// ee_map_width_single
-		$this->event_details_map_height = 362; 			// ee_map_height_single
-		$this->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$this->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$this->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$this->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$this->event_details_map_align = 'center'; 			// ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$this->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300; 			// ee_map_width
-		$this->event_list_map_height = 185; 		// ee_map_height
-		$this->event_list_map_zoom = 12; 			// ee_map_zoom
-		$this->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$this->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$this->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$this->event_list_map_align = 'center'; 			// ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = FALSE; // ee_map_nav_display
+		$this->event_list_nav_size = TRUE; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2331,7 +2331,7 @@ 
 /**
  * stores Events_Archive settings
  */
-class EE_Events_Archive_Config extends EE_Config_Base{
+class EE_Events_Archive_Config extends EE_Config_Base {
 
 	public $display_status_banner;
 	public $display_description;
@@ -2350,7 +2350,7 @@ 
 	/**
 	 *	class constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->display_status_banner = 0;
 		$this->display_description = 1;
 		$this->display_ticket_selector = 0;
@@ -2370,7 +2370,7 @@ 
 /**
  * Stores Event_Single_Config settings
  */
-class EE_Event_Single_Config extends EE_Config_Base{
+class EE_Event_Single_Config extends EE_Config_Base {
 
 	public $display_status_banner_single;
 	public $display_venue;
@@ -2399,7 +2399,7 @@ 
 /**
  * Stores Ticket_Selector_Config settings
  */
-class EE_Ticket_Selector_Config extends EE_Config_Base{
+class EE_Ticket_Selector_Config extends EE_Config_Base {
 	public $show_ticket_sale_columns;
 	public $show_ticket_details;
 	public $show_expired_tickets;
@@ -2453,7 +2453,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2472,8 +2472,8 @@ 
 	 *         @type string $msg 		Any message to be displayed.
 	 * }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ( $input_count >= $this->php->max_input_vars ) && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >=9 ) ) {
+	public function max_input_vars_limit_check($input_count = 0) {
+		if (($input_count >= $this->php->max_input_vars) && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)) {
 			return  __('The number of inputs on this page has been exceeded.  You cannot add anymore items (i.e. tickets, datetimes, custom fields) on this page because of your servers PHP "max_input_vars" setting.', 'event_espresso');
 		} else {
 			return '';
@@ -2509,7 +2509,7 @@ 
  * stores payment gateway info
  * @deprecated
  */
-class EE_Gateway_Config extends EE_Config_Base{
+class EE_Gateway_Config extends EE_Config_Base {
 
 	/**
 	 * Array with keys that are payment gateways slugs, and values are arrays
@@ -2531,9 +2531,9 @@ 
 	 *	class constructor
 	 * @deprecated
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => FALSE );
+		$this->active_gateways = array('Invoice' => FALSE);
 	}
 }
 

Indentation +140 added lines, -140 removed lines

@@ -89,10 +89,10 @@ 
 	public $map_settings = null;
 
 	/**
-	*
-	* @deprecated
-	* @var EE_Gateway_Config
-	*/
+	 *
+	 * @deprecated
+	 * @var EE_Gateway_Config
+	 */
 	public $gateway = null;
 
 	/**
@@ -582,7 +582,7 @@ 
 
 	/**
 	 *    update_config
-         * Important: the config object must ALREADY be set, otherwise this will produce an error.
+	 * Important: the config object must ALREADY be set, otherwise this will produce an error.
 	 *
 	 * @access    public
 	 * @param    string                 $section
@@ -1606,51 +1606,51 @@ 
 class EE_Organization_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $name
-	* eg EE4.1
-	*/
+	 * @var string  $name
+	 * eg EE4.1
+	 */
 	public $name;
 
 	/**
-	* @var string $address_1
-	* eg 123 Onna Road
-	*/
+	 * @var string $address_1
+	 * eg 123 Onna Road
+	 */
 	public $address_1;
 
 	/**
-	* @var string $address_2
-	* eg PO Box 123
-	*/
+	 * @var string $address_2
+	 * eg PO Box 123
+	 */
 	public $address_2;
 
 	/**
-	* @var string $city
-	* eg Inna City
-	*/
+	 * @var string $city
+	 * eg Inna City
+	 */
 	public $city;
 
 	/**
-	* @var int $STA_ID
-	* eg 4
-	*/
+	 * @var int $STA_ID
+	 * eg 4
+	 */
 	public $STA_ID;
 
 	/**
-	* @var string  $CNT_ISO
-	* eg US
-	*/
+	 * @var string  $CNT_ISO
+	 * eg US
+	 */
 	public $CNT_ISO;
 
 	/**
-	* @var string $zip
-	* eg 12345  or V1A 2B3
-	*/
+	 * @var string $zip
+	 * eg 12345  or V1A 2B3
+	 */
 	public $zip;
 
 	/**
-	* @var string  $email
-	* eg support@eventespresso.com
-	*/
+	 * @var string  $email
+	 * eg support@eventespresso.com
+	 */
 	public $email;
 
 
@@ -1669,9 +1669,9 @@ 
 	public $vat;
 
 	/**
-	* @var string  $logo_url
-	* eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
-	*/
+	 * @var string  $logo_url
+	 * eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
+	 */
 	public $logo_url;
 
 
@@ -1765,55 +1765,55 @@ 
 class EE_Currency_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $code
-	* eg 'US'
-	*/
+	 * @var string  $code
+	 * eg 'US'
+	 */
 	public $code;
 
 	/**
-	* @var string $name
-	* eg 'Dollar'
-	*/
+	 * @var string $name
+	 * eg 'Dollar'
+	 */
 	public $name;
 
 	/**
-	* plural name
-	* @var string $plural
-	* eg 'Dollars'
-	*/
+	 * plural name
+	 * @var string $plural
+	 * eg 'Dollars'
+	 */
 	public $plural;
 
 	/**
-	* currency sign
-	* @var string  $sign
-	* eg '$'
-	*/
+	 * currency sign
+	 * @var string  $sign
+	 * eg '$'
+	 */
 	public $sign;
 
 	/**
-	* Whether the currency sign should come before the number or not
-	* @var boolean $sign_b4
-	*/
+	 * Whether the currency sign should come before the number or not
+	 * @var boolean $sign_b4
+	 */
 	public $sign_b4;
 
 	/**
-	* How many digits should come after the decimal place
-	* @var int $dec_plc
-	*/
+	 * How many digits should come after the decimal place
+	 * @var int $dec_plc
+	 */
 	public $dec_plc;
 
 	/**
-	* Symbol to use for decimal mark
-	* @var string $dec_mrk
-	* eg '.'
-	*/
+	 * Symbol to use for decimal mark
+	 * @var string $dec_mrk
+	 * eg '.'
+	 */
 	public $dec_mrk;
 
 	/**
-	* Symbol to use for thousands
-	* @var string $thsnds
-	* eg ','
-	*/
+	 * Symbol to use for thousands
+	 * @var string $thsnds
+	 * eg ','
+	 */
 	public $thsnds;
 
 
@@ -1881,13 +1881,13 @@ 
 	 * 	whether or not to show alternate payment options during the reg process if payment status is pending
 	 * @var boolean $show_pending_payment_options
 	 */
-      public $show_pending_payment_options;
+	  public $show_pending_payment_options;
 
 	/**
 	 * Whether to skip the registration confirmation page
 	 * @var boolean $skip_reg_confirmation
 	 */
-      public $skip_reg_confirmation;
+	  public $skip_reg_confirmation;
 
 	/**
 	 * an array of SPCO reg steps where:
@@ -1898,64 +1898,64 @@ 
 	 * 			"slug" => the URL param used to trigger the reg step
 	 * @var array $reg_steps
 	 */
-      public $reg_steps;
+	  public $reg_steps;
 
 	/**
 	 * Whether registration confirmation should be the last page of SPCO
 	 * @var boolean $reg_confirmation_last
 	 */
-      public $reg_confirmation_last;
+	  public $reg_confirmation_last;
 
 	  /**
 	   * Whether or not to enable the EE Bot Trap
 	   * @var boolean $use_bot_trap
 	   */
-      public $use_bot_trap;
+	  public $use_bot_trap;
 
 	  /**
 	   * Whether or not to encrypt some data sent by the EE Bot Trap
 	   * @var boolean $use_encryption
 	   */
-      public $use_encryption;
+	  public $use_encryption;
 
 	  /**
 	   * Whether or not to use ReCaptcha
 	   * @var boolean $use_captcha
 	   */
-      public $use_captcha;
+	  public $use_captcha;
 
 	  /**
 	   * ReCaptcha Theme
 	   * @var string $recaptcha_theme
 	   * 	options: 'dark	', 'light'
 	   */
-      public $recaptcha_theme;
+	  public $recaptcha_theme;
 
 	  /**
 	   * ReCaptcha Type
 	   * @var string $recaptcha_type
 	   * 	options: 'audio', 'image'
 	   */
-      public $recaptcha_type;
+	  public $recaptcha_type;
 
 	  /**
 	   * ReCaptcha language
 	   * @var string $recaptcha_language
 	   * eg 'en'
 	   */
-      public $recaptcha_language;
+	  public $recaptcha_language;
 
 	  /**
 	   * ReCaptcha public key
 	   * @var string $recaptcha_publickey
 	   */
-      public $recaptcha_publickey;
+	  public $recaptcha_publickey;
 
 	  /**
 	   * ReCaptcha private key
 	   * @var string $recaptcha_privatekey
 	   */
-      public $recaptcha_privatekey;
+	  public $recaptcha_privatekey;
 
 	/**
 	 * ReCaptcha width
@@ -2021,58 +2021,58 @@ 
 class EE_Admin_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_personnel_manager
-	*/
+	 * @var boolean $use_personnel_manager
+	 */
 	public $use_personnel_manager;
 
 	/**
-	* @var boolean $use_dashboard_widget
-	*/
+	 * @var boolean $use_dashboard_widget
+	 */
 	public $use_dashboard_widget;
 
 	/**
-	* @var int $events_in_dashboard
-	*/
+	 * @var int $events_in_dashboard
+	 */
 	public $events_in_dashboard;
 
 	/**
-	* @var boolean $use_event_timezones
-	*/
+	 * @var boolean $use_event_timezones
+	 */
 	public $use_event_timezones;
 
 	/**
-	* @var boolean $use_full_logging
-	*/
+	 * @var boolean $use_full_logging
+	 */
 	public $use_full_logging;
 
 	/**
-	* @var string $log_file_name
-	*/
+	 * @var string $log_file_name
+	 */
 	public $log_file_name;
 
 	/**
-	* @var string $debug_file_name
-	*/
+	 * @var string $debug_file_name
+	 */
 	public $debug_file_name;
 
 	/**
-	* @var boolean $use_remote_logging
-	*/
+	 * @var boolean $use_remote_logging
+	 */
 	public $use_remote_logging;
 
 	/**
-	* @var string $remote_logging_url
-	*/
+	 * @var string $remote_logging_url
+	 */
 	public $remote_logging_url;
 
 	/**
-	* @var boolean $show_reg_footer
-	*/
+	 * @var boolean $show_reg_footer
+	 */
 	public $show_reg_footer;
 
 	/**
-	* @var string $affiliate_id
-	*/
+	 * @var string $affiliate_id
+	 */
 	public $affiliate_id;
 
 
@@ -2146,43 +2146,43 @@ 
 class EE_Template_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $enable_default_style
-	*/
+	 * @var boolean $enable_default_style
+	 */
 	public $enable_default_style;
 
 	/**
-	* @var string $custom_style_sheet
-	*/
+	 * @var string $custom_style_sheet
+	 */
 	public $custom_style_sheet;
 
 	/**
-	* @var boolean $display_address_in_regform
-	*/
+	 * @var boolean $display_address_in_regform
+	 */
 	public $display_address_in_regform;
 
 	/**
-	* @var int $display_description_on_multi_reg_page
-	*/
+	 * @var int $display_description_on_multi_reg_page
+	 */
 	public $display_description_on_multi_reg_page;
 
 	/**
-	* @var boolean $use_custom_templates
-	*/
+	 * @var boolean $use_custom_templates
+	 */
 	public $use_custom_templates;
 
 	/**
-	* @var string $current_espresso_theme
-	*/
+	 * @var string $current_espresso_theme
+	 */
 	public $current_espresso_theme;
 
 	/**
-	* @var EE_Event_Single_Config $EED_Event_Single
-	*/
+	 * @var EE_Event_Single_Config $EED_Event_Single
+	 */
 	public $EED_Event_Single;
 
 	/**
-	* @var EE_Events_Archive_Config $EED_Events_Archive
-	*/
+	 * @var EE_Events_Archive_Config $EED_Events_Archive
+	 */
 	public $EED_Events_Archive;
 
 
@@ -2215,78 +2215,78 @@ 
 class EE_Map_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_google_maps
-	*/
+	 * @var boolean $use_google_maps
+	 */
 	public $use_google_maps;
 
 	/**
-	* @var int $event_details_map_width
-	*/
+	 * @var int $event_details_map_width
+	 */
 	public $event_details_map_width;
 
 	/**
-	* @var int $event_details_map_height
-	*/
+	 * @var int $event_details_map_height
+	 */
 	public $event_details_map_height;
 
 	/**
-	* @var int $event_details_map_zoom
-	*/
+	 * @var int $event_details_map_zoom
+	 */
 	public $event_details_map_zoom;
 
 	/**
-	* @var boolean $event_details_display_nav
-	*/
+	 * @var boolean $event_details_display_nav
+	 */
 	public $event_details_display_nav;
 
 	/**
-	* @var boolean $event_details_nav_size
-	*/
+	 * @var boolean $event_details_nav_size
+	 */
 	public $event_details_nav_size;
 
 	/**
-	* @var string $event_details_control_type
-	*/
+	 * @var string $event_details_control_type
+	 */
 	public $event_details_control_type;
 
 	/**
-	* @var string $event_details_map_align
-	*/
+	 * @var string $event_details_map_align
+	 */
 	public $event_details_map_align;
 
 	/**
-	* @var int $event_list_map_width
-	*/
+	 * @var int $event_list_map_width
+	 */
 	public $event_list_map_width;
 
 	/**
-	* @var int $event_list_map_height
-	*/
+	 * @var int $event_list_map_height
+	 */
 	public $event_list_map_height;
 
 	/**
-	* @var int $event_list_map_zoom
-	*/
+	 * @var int $event_list_map_zoom
+	 */
 	public $event_list_map_zoom;
 
 	/**
-	* @var boolean $event_list_display_nav
-	*/
+	 * @var boolean $event_list_display_nav
+	 */
 	public $event_list_display_nav;
 
 	/**
-	* @var boolean $event_list_nav_size
-	*/
+	 * @var boolean $event_list_nav_size
+	 */
 	public $event_list_nav_size;
 
 	/**
-	* @var string $event_list_control_type
-	*/
+	 * @var string $event_list_control_type
+	 */
 	public $event_list_control_type;
 
 	/**
-	* @var string $event_list_map_align
-	*/
+	 * @var string $event_list_map_align
+	 */
 	public $event_list_map_align;
 
 

core/EE_Deprecated.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -319,7 +319,7 @@
 	}
 
 	/**
-	 * @param $method_name
+	 * @param string $method_name
 	 */
 	public static function doing_it_wrong_call( $method_name ) {
 		EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED );

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage helpers
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * ee_deprecated__registration_checkout__button_text
  *

Spacing +104 added lines, -104 removed lines

@@ -13,7 +13,7 @@ 
  * @param \EE_Checkout $checkout
  * @return string
  */
-function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) {
+function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) {
 	// list of old filters
 	$deprecated_filters = array(
 		'update_registration_details' => true,
@@ -23,16 +23,16 @@ 
 		'proceed_to' => true,
 	);
 	// loop thru and call doing_it_wrong() or remove any that aren't being used
-	foreach ( $deprecated_filters as $deprecated_filter => $on ) {
+	foreach ($deprecated_filters as $deprecated_filter => $on) {
 		// was this filter called ?
-		if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) {
+		if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) {
 			// only display doing_it_wrong() notice to Event Admins during non-AJAX requests
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) {
 				EE_Error::doing_it_wrong(
-					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 					sprintf(
-						__( 'The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ),
-						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+						__('The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'),
+						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 						'<br />',
 						'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
 						'/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php'
@@ -42,24 +42,24 @@ 
 				);
 			}
 		} else {
-			unset( $deprecated_filters[ $deprecated_filter ] );
+			unset($deprecated_filters[$deprecated_filter]);
 		}
 	}
-	if ( ! empty( $deprecated_filters )) {
-
-		if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text );
-		} else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text );
-		} else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text );
+	if ( ! empty($deprecated_filters)) {
+
+		if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text);
+		} else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text);
+		} else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text);
 		}
-		if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) {
-			if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) {
-				$submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text );
+		if ($checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) {
+				$submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text);
 			}
-			if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) {
-				$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name();
+			if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) {
+				$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name();
 			}
 		}
 
@@ -67,7 +67,7 @@ 
 	return $submit_button_text;
 
 }
-add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 );
+add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2);
 
 
 
@@ -78,16 +78,16 @@ 
  * @param \EE_Checkout $checkout
  * @param boolean $status_updates
  */
-function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) {
+function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) {
 	$action_ref = NULL;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
-	if ( $action_ref ) {
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
+	if ($action_ref) {
 
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Transaction_Processor.class.php',
 				'AHEE__EE_Transaction_Processor__finalize',
@@ -98,29 +98,29 @@ 
 			'4.6.0',
 			E_USER_DEPRECATED
 		);
-		switch ( $action_ref ) {
+		switch ($action_ref) {
 			case 'AHEE__EE_Transaction__finalize__new_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request);
 				break;
 			case 'AHEE__EE_Transaction__finalize__all_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request);
 				break;
 		}
 	}
 }
-add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 );
+add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2);
 /**
  * ee_deprecated_finalize_registration
  *
  * @param EE_Registration $registration
  */
-function ee_deprecated_finalize_registration( EE_Registration $registration ) {
-	$action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
-	if ( $action_ref ) {
+function ee_deprecated_finalize_registration(EE_Registration $registration) {
+	$action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
+	if ($action_ref) {
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Registration_Processor.class.php',
 				'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook'
@@ -128,10 +128,10 @@ 
 			'4.6.0',
 			E_USER_DEPRECATED
 		);
-		do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )));
+		do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)));
 	}
 }
-add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 );
+add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1);
 
 
 
@@ -152,7 +152,7 @@ 
  *
  * @return array
  */
-function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) {
 	$old_default_classnames = array(
 		'EE_Messages_Email_Cancelled_Registration_Defaults',
 		'EE_Messages_Email_Declined_Registration_Defaults',
@@ -168,23 +168,23 @@ 
 
 	$old_class_instance = new stdClass();
 
-	foreach ( $old_default_classnames as $classname ) {
-		$filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	foreach ($old_default_classnames as $classname) {
+		$filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 		}
-		$templates = apply_filters( $filter_ref, $templates, $old_class_instance );
+		$templates = apply_filters($filter_ref, $templates, $old_class_instance);
 	}
 
 	return $templates;
 }
-add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 );
+add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4);
 
 /**
  * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called.
  * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately.
  */
-function ee_deprecated_hooks(){
+function ee_deprecated_hooks() {
 	/**
 	 * @var $hooks array where keys are hook names, and their values are array{
 	 *			@type string $version  when deprecated
@@ -195,26 +195,26 @@ 
 	$hooks = array(
 		'AHEE__EE_System___do_setup_validations' => array(
 			'version' => '4.6.0',
-			'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ),
+			'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'),
 			'still_works' => FALSE
 		)
 	);
-	foreach( $hooks as $name => $deprecation_info ){
-		if( has_action( $name ) ){
+	foreach ($hooks as $name => $deprecation_info) {
+		if (has_action($name)) {
 			EE_Error::doing_it_wrong(
 				$name,
 				sprintf(
-					__('This filter is deprecated. %1$s%2$s','event_espresso'),
-					$deprecation_info[ 'still_works' ] ?  __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ),
-					isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' )
+					__('This filter is deprecated. %1$s%2$s', 'event_espresso'),
+					$deprecation_info['still_works'] ?  __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'),
+					isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso')
 				),
-				isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ),
+				isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso'),
 				E_USER_DEPRECATED
 			);
 		}
 	}
 }
-add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' );
+add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks');
 
 
 
@@ -237,25 +237,25 @@ 
  *
  * @return string                    The default contents for the messenger, message type, context and field.
  */
-function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 	$classnames_to_try = array(
-		get_class( $messenger ) => $messenger,
-		get_class( $message_type ) => $message_type,
+		get_class($messenger) => $messenger,
+		get_class($message_type) => $message_type,
 		'EE_Messages_Base' => $message_type
 		);
 
-	foreach ( $classnames_to_try as $classname => $obj ) {
-		$filter_ref = 'FHEE__' . $classname . '__get_default_field_content';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	foreach ($classnames_to_try as $classname => $obj) {
+		$filter_ref = 'FHEE__'.$classname.'__get_default_field_content';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 		}
-		$contents = apply_filters( $filter_ref, $contents, $obj );
+		$contents = apply_filters($filter_ref, $contents, $obj);
 	}
 
 	return $contents;
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7);
 
 
 
@@ -283,23 +283,23 @@ 
  *
  * @return string                    The path to the file being used.
  */
-function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url,  EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
-	if ( $messenger == 'email' ) {
+	if ($messenger == 'email') {
 		$filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path';
-	} elseif ( $messenger == 'html' ) {
+	} elseif ($messenger == 'html') {
 		$filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path';
 	} else {
 		return $variation_path;
 	}
 
-	if ( has_filter( $filter_ref ) ) {
-		EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	if (has_filter($filter_ref)) {
+		EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
 
-	return apply_filters( $filter_ref, $variation_path, $url, $type );
+	return apply_filters($filter_ref, $variation_path, $url, $type);
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8);
 
 
 
@@ -315,78 +315,78 @@ 
 class EE_Messages_Init extends EE_Base {
 
 	public function __construct() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 	}
 
 	/**
 	 * @param $method_name
 	 */
-	public static function doing_it_wrong_call( $method_name ) {
-		EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED );
+	public static function doing_it_wrong_call($method_name) {
+		EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0', E_USER_DEPRECATED);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
 	public static function set_autoloaders() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 		EED_Messages::set_autoloaders();
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment_reminder( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment_reminder( $transaction );
+	public function payment_reminder($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment_reminder($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment( $transaction, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment( $transaction, $payment );
+	public function payment($transaction, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment($transaction, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function cancelled_registration( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::cancelled_registration( $transaction );
+	public function cancelled_registration($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::cancelled_registration($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function maybe_registration( $transaction, $reg_msg, $from_admin ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin );
+	public function maybe_registration($transaction, $reg_msg, $from_admin) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_resend( $success, $req_data ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_resend( $req_data );
+	public function process_resend($success, $req_data) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_resend($req_data);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_admin_payment( $success, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_admin_payment( $success, $payment );
+	public function process_admin_payment($success, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_admin_payment($success, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function send_newsletter_message( $contacts, $grp_id ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::send_newsletter_message( $contacts, $grp_id );
+	public function send_newsletter_message($contacts, $grp_id) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::send_newsletter_message($contacts, $grp_id);
 	}
 
 
@@ -407,13 +407,13 @@ 
  *
  * @return array additional cpts.
  */
-function ee_deprecated_get_cpts( $cpts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+function ee_deprecated_get_cpts($cpts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10);
 
 
 
@@ -427,10 +427,10 @@ 
  *
  * @return array additional custom taxonomies.
  */
-function ee_deprecated_get_taxonomies( $cts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+function ee_deprecated_get_taxonomies($cts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10);

core/EE_Error.core.php

Doc Comments +4 added lines, -4 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
@@ -936,7 +936,7 @@ 
 	 *
 	 * @access    public
 	 * @param string $return_url
-	 * @return    array
+	 * @return    string
 	 */
 	public static function get_persistent_admin_notices( $return_url = '' ) {
 		$notices = '';
@@ -961,7 +961,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 ) {

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

Spacing +232 added lines, -232 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' ));
@@ -259,7 +259,7 @@ 
 	*	@access public
 	*	@return boolean
 	*/
-    public static function has_error(){
+    public static function has_error() {
 		return self::$_error_count ? TRUE : FALSE;
 	}
 
@@ -270,7 +270,7 @@ 
 	*	@access public
 	*	@echo string
 	*/
-    public function display_errors(){
+    public function display_errors() {
 
 		$trace_details = '';
 
@@ -331,18 +331,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 {
 
@@ -357,50 +357,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>';
 
 
@@ -415,9 +415,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 {
 
@@ -425,24 +425,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>';
 				}
@@ -454,14 +454,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>';
 		}
@@ -469,10 +469,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();
 		}
 
@@ -492,29 +492,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;
 					}
@@ -522,9 +522,9 @@ 
 				}
 
 			}
-			$arg_string = implode( ', ', $args );
+			$arg_string = implode(', ', $args);
 		}
-		if ( $array ) {
+		if ($array) {
 			$arg_string .= ' )';
 		}
 		return $arg_string;
@@ -544,8 +544,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++;
 	}
 
@@ -563,8 +563,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);
 	}
 
 
@@ -581,8 +581,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);
 	}
 
 
@@ -600,12 +600,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
@@ -613,27 +613,27 @@ 
 				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];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code, but only on error
-			if ( WP_DEBUG && $type == 'errors' ) {
-				$msg .= '<br/><span class="tiny-text">' . EE_Error::generate_error_code( $file, $func, $line ) . '</span>';
+			if (WP_DEBUG && $type == 'errors') {
+				$msg .= '<br/><span class="tiny-text">'.EE_Error::generate_error_code($file, $func, $line).'</span>';
 			}
 			// add notice
-			self::$_espresso_notices[ $type ][] = $msg;
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			self::$_espresso_notices[$type][] = $msg;
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -687,7 +687,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;
@@ -700,14 +700,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;
 	}
 
@@ -722,8 +722,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 = '';
@@ -733,44 +733,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 existsing 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;
 		}
 
@@ -784,21 +784,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>';
@@ -811,7 +811,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -821,7 +821,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -841,17 +841,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);
 			}
 		}
 	}
@@ -867,34 +867,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));
 		}
 	}
 
@@ -909,20 +909,20 @@ 
 	* 	@param		string	$return_url	URL to go back to aftger 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>';
@@ -938,17 +938,17 @@ 
 	 * @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
-		if ( $persistent_admin_notices = get_option( 'ee_pers_admin_notices', FALSE )) {
+		if ($persistent_admin_notices = get_option('ee_pers_admin_notices', FALSE)) {
 			// 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;
@@ -963,26 +963,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>
 ';
 
 		}
@@ -1016,11 +1016,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;
 	}
 
@@ -1036,36 +1036,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;
-
-		EE_Registry::instance()->load_helper( 'File' );
+		$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;
+
+		EE_Registry::instance()->load_helper('File');
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			if ( ! $clear ) {
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			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;
 		}
 
@@ -1089,10 +1089,10 @@ 
 	 * @param int     $error_type
 	 * @return void
 	 */
-	public static function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
+	public static function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			EE_Registry::instance()->load_helper('Debug_Tools');
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version, $error_type );
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version, $error_type);
 		}
 	}
 
@@ -1112,13 +1112,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);
 }
 
 

Indentation +165 added lines, -165 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;
@@ -255,22 +255,22 @@ 
 
 
 	/**
-	*	has_error
-	*	@access public
-	*	@return boolean
-	*/
-    public static function has_error(){
+	 *	has_error
+	 *	@access public
+	 *	@return boolean
+	 */
+	public static function has_error(){
 		return self::$_error_count ? TRUE : FALSE;
 	}
 
 
 
 	/**
-	*	display_errors
-	*	@access public
-	*	@echo string
-	*/
-    public function display_errors(){
+	 *	display_errors
+	 *	@access public
+	 *	@echo string
+	 */
+	public function display_errors(){
 
 		$trace_details = '';
 
@@ -342,7 +342,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 {
 
@@ -394,7 +394,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>
@@ -406,7 +406,7 @@ 
 
 				}
 
-	            $trace_details .= '
+				$trace_details .= '
 			 </table>
 			</div>';
 
@@ -486,12 +486,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 = '';
@@ -535,15 +535,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++;
@@ -554,15 +554,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 );
 	}
@@ -572,15 +572,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 );
 	}
@@ -590,16 +590,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(
@@ -643,11 +643,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;
 	}
@@ -657,11 +657,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;
 	}
@@ -671,11 +671,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;
 	}
@@ -683,24 +683,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;
@@ -714,14 +714,14 @@ 
 
 
 	/**
-	* 	compile all error or success messages into one string
-	*
-	*	@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
+	 *
+	 *	@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__, '' );
 
@@ -833,14 +833,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() );
@@ -904,9 +904,9 @@ 
 	 * 	display_persistent_admin_notices
 	 *
 	 *  	@access 	public
-	* 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
-	* 	@param		string	$pan_name	the message to be stored persistently until dismissed
-	* 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
+	 * 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
+	 * 	@param		string	$pan_name	the message to be stored persistently until dismissed
+	 * 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
 	 *  	@return 		string
 	 */
 	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
@@ -995,11 +995,11 @@ 
 
 
 	/**
-	* 	enqueue_error_scripts
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	enqueue_error_scripts
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function enqueue_error_scripts() {
 		self::_print_scripts();
 	}
@@ -1007,15 +1007,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] : '';
@@ -1029,13 +1029,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 ) {

core/EE_Maintenance_Mode.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 	 *   returns TRUE if M-Mode is engaged and the current request is not for the admin
 	 *
 	 * @access    public
-	 * @return    string
+	 * @return    boolean
 	 */
 	public static function disable_frontend_for_maintenance() {
 		return ! is_admin() && EE_Maintenance_Mode::instance()->level() ? TRUE : FALSE;

Indentation +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
 	 */
 	const option_name_maintenance_mode = 'ee_maintenance_mode';
    /**
-     * 	EE_Maintenance_Mode Object
-     * 	@var EE_Maintenance_Mode $_instance
-	 * 	@access 	private
-     */
+    * 	EE_Maintenance_Mode Object
+    * 	@var EE_Maintenance_Mode $_instance
+    * 	@access 	private
+    */
 	private static $_instance = NULL;
 
 	/**

Braces +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
 			current_user_can('administrator') && //when the user is an admin
 			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1
 			$maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
-		}else{
+		} else{
 			$maintenance_mode_level = $real_maintenance_mode_level;
 		}
 		return $maintenance_mode_level;
@@ -156,12 +156,12 @@ 
 		if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
 			update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
 			return true;
-		}elseif( $this->level() == self::level_2_complete_maintenance ){
+		} elseif( $this->level() == self::level_2_complete_maintenance ){
 			//we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
 			//then we shouldn't be in mm2. (Maybe an addon got deactivated?)
 			update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance );
 			return false;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +37 added lines, -37 removed lines

@@ -73,7 +73,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Maintenance_Mode )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Maintenance_Mode)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -83,7 +83,7 @@ 
 	 * Resets maintenance mode (mostly just re-checks whether or not we should be in maintenance mode)
 	 * @return EE_Maintenance_Mode
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::instance()->set_maintenance_mode_if_db_old();
 		return self::instance();
 	}
@@ -98,11 +98,11 @@ 
 	 */
 	private function __construct() {
 		// if M-Mode level 2 is engaged, we still need basic assets loaded
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_assets_required_for_m_mode' ));
+		add_action('wp_enqueue_scripts', array($this, 'load_assets_required_for_m_mode'));
 		// shut 'er down down for maintenance ?
-		add_filter( 'the_content', array( $this, 'the_content' ), 999 );
+		add_filter('the_content', array($this, 'the_content'), 999);
 		// add powered by EE msg
-		add_action( 'shutdown', array( $this, 'display_maintenance_mode_notice' ), 10 );
+		add_action('shutdown', array($this, 'display_maintenance_mode_notice'), 10);
 	}
 
 
@@ -112,8 +112,8 @@ 
 	 * retrieves the maintenance mode option value from the db
 	 * @return int
 	 */
-	public function real_level(){
-		return get_option( self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance );
+	public function real_level() {
+		return get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 * thinks their tables are present and up-to-date).
 	 * @return boolean
 	 */
-	public function models_can_query(){
+	public function models_can_query() {
 		return $this->real_level() != EE_Maintenance_Mode::level_2_complete_maintenance;
 	}
 
@@ -134,14 +134,14 @@ 
 	 * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode
 	 * @return int
 	 */
-	public function level(){
+	public function level() {
 		$real_maintenance_mode_level = $this->real_level();
 		//if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend
-		if( ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests
+		if (( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests
 			current_user_can('administrator') && //when the user is an admin
-			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1
+			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance) {//and we're in level 1
 			$maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
-		}else{
+		} else {
 			$maintenance_mode_level = $real_maintenance_mode_level;
 		}
 		return $maintenance_mode_level;
@@ -151,17 +151,17 @@ 
 	 * Determines if we need to put EE in maintenance mode because the database needs updating
 	 * @return boolean true if DB is old and maintenance mode was triggered; false otherwise
 	 */
-	public function set_maintenance_mode_if_db_old(){
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
-		if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
+	public function set_maintenance_mode_if_db_old() {
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
+		if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
 			update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
 			return true;
-		}elseif( $this->level() == self::level_2_complete_maintenance ){
+		}elseif ($this->level() == self::level_2_complete_maintenance) {
 			//we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
 			//then we shouldn't be in mm2. (Maybe an addon got deactivated?)
-			update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance );
+			update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance);
 			return false;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -171,8 +171,8 @@ 
 	 * @param int $level
 	 * @return void
 	 */
-	public function set_maintenance_level($level){
-		do_action( 'AHEE__EE_Maintenance_Mode__set_maintenance_level', $level );
+	public function set_maintenance_level($level) {
+		do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level);
 		update_option(self::option_name_maintenance_mode, intval($level));
 	}
 
@@ -199,11 +199,11 @@ 
 	 *  @return 	string
 	 */
 	public function load_assets_required_for_m_mode() {
-		if ( $this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is( 'espresso_core', 'enqueued' )) {
-			wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+		if ($this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is('espresso_core', 'enqueued')) {
+			wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 			wp_enqueue_style('espresso_default');
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
 		}
 	}
 
@@ -218,9 +218,9 @@ 
 	 * @param    string $template_path
 	 * @return    string
 	 */
-	public static function template_include( $template_path ) {
-		EE_Registry::instance()->load_helper( 'Template' );
-		$template_located = EEH_Template::locate_template( EE_TEMPLATES . 'maintenance_mode.template.php', FALSE, FALSE );
+	public static function template_include($template_path) {
+		EE_Registry::instance()->load_helper('Template');
+		$template_located = EEH_Template::locate_template(EE_TEMPLATES.'maintenance_mode.template.php', FALSE, FALSE);
 		return $template_located ? $template_located : $template_path;
 	}
 
@@ -235,12 +235,12 @@ 
 	 * @param    string $the_content
 	 * @return    string
 	 */
-	public function the_content( $the_content ) {
+	public function the_content($the_content) {
 		// check if M-mode is engaged and for EE shortcode
-		if ( $this->level() && strpos( $the_content, '[ESPRESSO_' )) {
+		if ($this->level() && strpos($the_content, '[ESPRESSO_')) {
 			// this can eventually be moved to a template, or edited via admin. But for now...
 			$the_content = sprintf(
-				__( '%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso' ),
+				__('%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso'),
 				'<h2>',
 				'</h2><p>',
 				'</p>'
@@ -264,16 +264,16 @@ 
 		// check if M-mode is engaged and for EE shortcode
 		if (
 			$this->real_level() &&
-			current_user_can( 'administrator' ) &&
+			current_user_can('administrator') &&
 			! is_admin() &&
-			! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+			! (defined('DOING_AJAX') && DOING_AJAX)
 			&& EE_Registry::instance()->REQ->is_espresso_page()
 		) {
 			printf(
-				__( '%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso' ),
+				__('%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso'),
 				'<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="',
 				'">&times;</a><p>',
-				' &raquo; <a href="' . add_query_arg( array( 'page' => 'espresso_maintenance_settings' ), admin_url( 'admin.php' )) . '">',
+				' &raquo; <a href="'.add_query_arg(array('page' => 'espresso_maintenance_settings'), admin_url('admin.php')).'">',
 				'</a></p></div>'
 			);
 		}
@@ -291,9 +291,9 @@ 
 	 *		@ return void
 	 */
 	final function __destruct() {}
-	final function __call($a,$b) {}
+	final function __call($a, $b) {}
 	final function __get($a) {}
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 	final function __isset($a) {}
 	final function __unset($a) {}
 	final function __sleep() {
@@ -304,7 +304,7 @@ 
 	final function __invoke() {}
 	final function __set_state() {}
 	final function __clone() {}
-	final static function __callStatic($a,$b) {}
+	final static function __callStatic($a, $b) {}
 
 }
 // End of file EE_Maintenance_Mode.core.php

core/EE_Registry.core.php

Doc Comments +10 added lines, -9 removed lines

@@ -214,6 +214,7 @@ 
 
 	/**
 	 * @param mixed string | EED_Module $module
+	 * @param boolean|string $module
 	 */
 	public function add_module( $module ) {
 		if ( $module instanceof EED_Module ) {
@@ -245,7 +246,7 @@ 
 	 * @param string $class_name - simple class name ie: session
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function load_core ( $class_name, $arguments = array(), $load_only = FALSE ) {
 		$core_paths = apply_filters(
@@ -269,7 +270,7 @@ 
 	 * @access    public
 	 * @param string $class_name - class name for the DMS ie: EE_DMS_Core_4_2_0
 	 * @param mixed  $arguments
-	 * @return EE_Data_Migration_Script_Base
+	 * @return boolean
 	 */
 	public function load_dms ( $class_name, $arguments = array() ) {
 		// retrieve instantiated class
@@ -286,7 +287,7 @@ 
 	 *	@param bool   $from_db    - some classes are instantiated from the db and thus call a different method to instantiate
 	 *	@param bool   $cache      if you don't want the class to be stored in the internal cache (non-persistent) then set this to FALSE (ie. when instantiating model objects from client in a loop)
 	 *	@param bool   $load_only      whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
-	 *	@return EE_Base_Class
+	 *	@return boolean
 	 */
 	public function load_class ( $class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) {
 		$paths = apply_filters('FHEE__EE_Registry__load_class__paths',array(
@@ -307,7 +308,7 @@ 
 	 * @param string $class_name - simple class name ie: price
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return EEH_Base
+	 * @return boolean
 	 */
 	public function load_helper ( $class_name, $arguments = array(), $load_only = TRUE ) {
 		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS ) );
@@ -324,7 +325,7 @@ 
 	 * @param string $class_name - simple class name ie: session
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function load_lib ( $class_name, $arguments = array(), $load_only = FALSE ) {
 		$paths = array(
@@ -346,7 +347,7 @@ 
 	 * @param string $class_name - simple class name ie: price
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	public function load_model ( $class_name, $arguments = array(), $load_only = FALSE ) {
 		$paths = apply_filters('FHEE__EE_Registry__load_model__paths',array(
@@ -365,7 +366,7 @@ 
 	 * @param string $class_name - simple class name ie: price
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function load_model_class ( $class_name, $arguments = array(), $load_only = TRUE ) {
 		$paths = array(
@@ -401,7 +402,7 @@ 
 	 * @param string $type         - file type - core? class? helper? model?
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function load_file ( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE ) {
 		// retrieve instantiated class
@@ -418,7 +419,7 @@ 
 	 * @param string $type         - file type - core? class? helper? model?
 	 * @param mixed  $arguments
 	 * @param bool   $load_only
-	 * @return EE_Addon
+	 * @return boolean
 	 */
 	public function load_addon ( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE ) {
 		// retrieve instantiated class

Spacing +119 added lines, -119 removed lines

@@ -156,7 +156,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Registry )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Registry)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -171,14 +171,14 @@ 
 	 * @return EE_Registry
 	 */
 	private function __construct() {
-		$this->load_core( 'Base' );
+		$this->load_core('Base');
 		// class library
 		$this->LIB = new StdClass();
 		$this->addons = new StdClass();
 		$this->modules = new StdClass();
 		$this->shortcodes = new StdClass();
 		$this->widgets = new StdClass();
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ));
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -191,10 +191,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER['HTTPS'] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings['ajax_url'] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings['wp_debug'] = defined( 'WP_DEBUG' ) ? WP_DEBUG : FALSE;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : FALSE;
 	}
 
 
@@ -205,14 +205,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -220,15 +220,15 @@ 
 	/**
 	 * @param mixed string | EED_Module $module
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' )) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
-			$this->modules->{$module} = EE_Module_Request_Router::module_factory( $module );
+			$this->modules->{$module} = EE_Module_Request_Router::module_factory($module);
 		}
 	}
 
@@ -238,8 +238,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL;
 	}
 
 
@@ -252,18 +252,18 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_core ( $class_name, $arguments = array(), $load_only = FALSE ) {
+	public function load_core($class_name, $arguments = array(), $load_only = FALSE) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS
+				EE_CORE.'data_migration_scripts'.DS
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_' , $class_name, 'core', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -276,9 +276,9 @@ 
 	 * @param mixed  $arguments
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function load_dms ( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_' , $class_name, 'dms', $arguments, FALSE, FALSE, FALSE );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, FALSE, FALSE, FALSE);
 	}
 
 
@@ -293,14 +293,14 @@ 
 	 *	@param bool   $load_only      whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
 	 *	@return EE_Base_Class
 	 */
-	public function load_class ( $class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) {
-		$paths = apply_filters('FHEE__EE_Registry__load_class__paths',array(
+	public function load_class($class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
 		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -314,10 +314,10 @@ 
 	 * @param bool   $load_only
 	 * @return EEH_Base
 	 */
-	public function load_helper ( $class_name, $arguments = array(), $load_only = TRUE ) {
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS ) );
+	public function load_helper($class_name, $arguments = array(), $load_only = TRUE) {
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -331,16 +331,16 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_lib ( $class_name, $arguments = array(), $load_only = FALSE ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = FALSE) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, 'lib', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -353,13 +353,13 @@ 
 	 * @param bool   $load_only
 	 * @return EEM_Base
 	 */
-	public function load_model ( $class_name, $arguments = array(), $load_only = FALSE ) {
-		$paths = apply_filters('FHEE__EE_Registry__load_model__paths',array(
+	public function load_model($class_name, $arguments = array(), $load_only = FALSE) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
 		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_' , $class_name, 'model', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -372,15 +372,15 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_model_class ( $class_name, $arguments = array(), $load_only = TRUE ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = TRUE) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, '', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -392,8 +392,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ){
-		return isset( $this->models[ $model_name ] ) ? TRUE : FALSE;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? TRUE : FALSE;
 	}
 
 
@@ -408,9 +408,9 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_file ( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -425,9 +425,9 @@ 
 	 * @param bool   $load_only
 	 * @return EE_Addon
 	 */
-	public function load_addon ( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -445,15 +445,15 @@ 
 	 * @internal param string $file_path - file path including file name
 	 * @return bool | object
 	 */
-	private function _load ( $file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) {
+	private function _load($file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ));
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix != 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ));
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
 
 		$class_abbreviations = array(
@@ -466,56 +466,56 @@ 
 		);
 
 		// check if class has already been loaded, and return it if it has been
-		if ( isset( $class_abbreviations[ $class_name ] ) && ! is_null( $this->$class_abbreviations[ $class_name ] )) {
-			return $this->$class_abbreviations[ $class_name ];
-		} else if ( isset ( $this->{$class_name} )) {
+		if (isset($class_abbreviations[$class_name]) && ! is_null($this->$class_abbreviations[$class_name])) {
+			return $this->$class_abbreviations[$class_name];
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->$class_name )) {
+		} else if (isset ($this->LIB->$class_name)) {
 			return $this->LIB->$class_name;
-		} else if ( $class_prefix == 'addon' && isset ( $this->addons->$class_name )) {
+		} else if ($class_prefix == 'addon' && isset ($this->addons->$class_name)) {
 			return $this->addons->$class_name;
 		}
 
 		// assume all paths lead nowhere
 		$path = FALSE;
 		// make sure $file_paths is an array
-		$file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths );
+		$file_paths = is_array($file_paths) ? $file_paths : array($file_paths);
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] )) {
-				$path = $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				$path = $file_paths[$key];
 				break;
 			}
 		}
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
-					sprintf (
-						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s','event_espresso'),
-						trim( $type, '.' ),
+				throw new EE_Error(
+					sprintf(
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, FALSE ) === FALSE ) {
+			if (class_exists($class_name, FALSE) === FALSE) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__('The %s file %s does not appear to contain the %s Class.','event_espresso'),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -523,7 +523,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 
@@ -531,38 +531,38 @@ 
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = new ReflectionClass( $class_name );
+			$reflector = new ReflectionClass($class_name);
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only ) {
+			if ($reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only) {
 //				$instantiation_mode = 0;
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				return TRUE;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 //				$instantiation_mode = 1;
-				$class_obj =  call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 //				$instantiation_mode = 2;
-				$class_obj =  call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' )) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 //				$instantiation_mode = 3;
-				$class_obj =  call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 //				$instantiation_mode = 4;
-				$class_obj =  $reflector->newInstance( $arguments );
-			} else if ( ! $load_only ) {
+				$class_obj = $reflector->newInstance($arguments);
+			} else if ( ! $load_only) {
 				// heh ? something's not right !
 //				$instantiation_mode = 5;
 				throw new EE_Error(
 					sprintf(
-						__('The %s file %s could not be instantiated.','event_espresso'),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 
@@ -574,15 +574,15 @@ 
 //	EEH_Debug_Tools::printr( $class_obj, '$class_obj  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 
-		if ( isset( $class_obj )) {
+		if (isset($class_obj)) {
 			// return newly instantiated class
-			if ( isset( $class_abbreviations[ $class_name ] )) {
-				$this->$class_abbreviations[ $class_name ] = $class_obj;
-			} else if ( EEH_Class_Tools::has_property( $this, $class_name )) {
+			if (isset($class_abbreviations[$class_name])) {
+				$this->$class_abbreviations[$class_name] = $class_obj;
+			} else if (EEH_Class_Tools::has_property($this, $class_name)) {
 				$this->{$class_name} = $class_obj;
-			} else if ( $class_prefix == 'addon' && $cache  ) {
+			} else if ($class_prefix == 'addon' && $cache) {
 				$this->addons->$class_name = $class_obj;
-			} else if ( !$from_db && $cache  ) {
+			} else if ( ! $from_db && $cache) {
 				$this->LIB->$class_name = $class_obj;
 			}
 			return $class_obj;
@@ -607,7 +607,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call($a,$b) {}
+	final function __call($a, $b) {}
 
 
 
@@ -622,7 +622,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 
 
 
@@ -662,7 +662,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic($a,$b) {}
+	final static function __callStatic($a, $b) {}
 
 	/**
 	 * Gets the addon by its name/slug (not classname. For that, just
@@ -670,9 +670,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ){
-		foreach($this->addons as $addon){
-			if( $addon->name() == $name){
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() == $name) {
 				return $addon;
 			}
 		}
@@ -683,10 +683,10 @@ 
 	 *
 	 * @return EE_Addon[] where the KEYS are the addon's name()
 	 */
-	public function get_addons_by_name(){
+	public function get_addons_by_name() {
 		$addons = array();
-		foreach($this->addons as $addon){
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -701,14 +701,14 @@ 
 	 * @return EEM_Base
 	 * @throws EE_Error
 	 */
-	public function reset_model( $model_name ){
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->$model_class_name = $model::reset();
-		}else{
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+		} else {
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->$model_class_name;
 	}
@@ -724,15 +724,15 @@ 
 	 * currently reinstantiate the singletons at the moment)
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = FALSE, $reinstantiate = TRUE ){
+	public static function reset($hard = FALSE, $reinstantiate = TRUE) {
 		$instance = self::instance();
 		$instance->load_helper('Activation');
 		EEH_Activation::reset();
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
 		$instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset();
 		$instance->LIB = new stdClass();
-		foreach( array_keys( $instance->non_abstract_db_models ) as $model_name ){
-			$instance->reset_model( $model_name );
+		foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+			$instance->reset_model($model_name);
 		}
 		return $instance;
 	}
@@ -743,9 +743,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $shortname => $classname ) {
-			if( is_subclass_of(  $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $shortname ] = $classname;
+		foreach ($this->non_abstract_db_models as $shortname => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$shortname] = $classname;
 			}
 		}
 		return $cpt_models;

Indentation +31 added lines, -31 removed lines

@@ -11,25 +11,25 @@ 
 final class EE_Registry {
 
 	/**
-	* 	EE_Registry Object
-	* 	@var EE_Registry $_instance
-	* 	@access 	private
-	*/
+	 * 	EE_Registry Object
+	 * 	@var EE_Registry $_instance
+	 * 	@access 	private
+	 */
 	private static $_instance = NULL;
 
 
 	/**
-	* 	EE_Cart Object
-	* 	@access 	public
-	*	@var 	EE_Cart $CART
-	*/
+	 * 	EE_Cart Object
+	 * 	@access 	public
+	 *	@var 	EE_Cart $CART
+	 */
 	public $CART = NULL;
 
 	/**
-	* 	EE_Config Object
-	* 	@access 	public
-	*	@var 	EE_Config $CFG
-	*/
+	 * 	EE_Config Object
+	 * 	@access 	public
+	 *	@var 	EE_Config $CFG
+	 */
 	public $CFG = NULL;
 
 
@@ -44,9 +44,9 @@ 
 
 
 	/**
-	* 	StdClass object for storing library classes in
-	* 	@public LIB
-	*/
+	 * 	StdClass object for storing library classes in
+	 * 	@public LIB
+	 */
 	public $LIB = NULL;
 
 	/**
@@ -57,10 +57,10 @@ 
 	public $REQ = NULL;
 
 	/**
-	* 	EE_Session Object
-	* 	@access 	public
-	* 	@var 	EE_Session	 $SSN
-	*/
+	 * 	EE_Session Object
+	 * 	@access 	public
+	 * 	@var 	EE_Session	 $SSN
+	 */
 	public $SSN = NULL;
 
 
@@ -127,21 +127,21 @@ 
 
 
 	/**
-	* 	$i18n_js_strings - internationalization for JS strings
-	*  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
-	*  	in js file:  var translatedString = eei18n.string_key;
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$i18n_js_strings - internationalization for JS strings
+	 *  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
+	 *  	in js file:  var translatedString = eei18n.string_key;
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public static $i18n_js_strings = array();
 
 	/**
-	* 	$main_file - path to espresso.php
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$main_file - path to espresso.php
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public $main_file;
 
 

Braces +1 added lines, -1 removed lines

@@ -707,7 +707,7 @@
 		//get that model reset it and make sure we nuke the old reference to it
 		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
 			$this->LIB->$model_class_name = $model::reset();
-		}else{
+		} else{
 			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
 		}
 		return $this->LIB->$model_class_name;

core/EE_Request_Handler.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -271,7 +271,7 @@ 
 	 *    is_espresso_page
 	 *
 	 * @access    public
-	 * @param null $value
+	 * @param boolean $value
 	 * @return    mixed
 	 */
 	public function set_espresso_page( $value = null ) {
@@ -307,7 +307,7 @@ 
 	 *    setter
 	 *
 	 * @access    public
-	 * @param      $key
+	 * @param      string $key
 	 * @param      $value
 	 * @param bool $override_ee
 	 * @return    void
@@ -352,7 +352,7 @@ 
 	 *    remove param
 	 *
 	 * @access    public
-	 * @param $key
+	 * @param string $key
 	 * @return    void
 	 */
 	public function un_set( $key ) {
@@ -392,7 +392,7 @@ 
 	 *    add_output
 	 *
 	 * @access    public
-	 * @param $string
+	 * @param string $string
 	 * @return    void
 	 */
 	public function add_output( $string ) {

Spacing +76 added lines, -76 removed lines

@@ -65,18 +65,18 @@ 
 	 * @param WP $wp
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( $wp = null ) {
+	public function __construct($wp = null) {
 		//if somebody forgot to provide us with WP, that's ok because its global
-		if ( ! $wp instanceof WP ){
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		// grab request vars
 		$this->_params = $_REQUEST;
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
-		$this->set_request_vars( $wp );
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
+		$this->set_request_vars($wp);
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -88,14 +88,14 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function set_request_vars( $wp = null ) {
-		if ( ! is_admin() ) {
+	public function set_request_vars($wp = null) {
+		if ( ! is_admin()) {
 			// set request post_id
-			$this->set( 'post_id', $this->get_post_id_from_request( $wp ));
+			$this->set('post_id', $this->get_post_id_from_request($wp));
 			// set request post name
-			$this->set( 'post_name', $this->get_post_name_from_request( $wp ));
+			$this->set('post_name', $this->get_post_name_from_request($wp));
 			// set request post_type
-			$this->set( 'post_type', $this->get_post_type_from_request( $wp ));
+			$this->set('post_type', $this->get_post_type_from_request($wp));
 			// true or false ? is this page being used by EE ?
 			$this->set_espresso_page();
 		}
@@ -110,20 +110,20 @@ 
 	 * @param WP $wp
 	 * @return int
 	 */
-	public function get_post_id_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_id_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_id = null;
-		if ( isset( $wp->query_vars['p'] )) {
+		if (isset($wp->query_vars['p'])) {
 			$post_id = $wp->query_vars['p'];
 		}
-		if ( ! $post_id && isset( $wp->query_vars['page_id'] )) {
+		if ( ! $post_id && isset($wp->query_vars['page_id'])) {
 			$post_id = $wp->query_vars['page_id'];
 		}
-		if ( ! $post_id && isset( $wp->request )) {
-			if ( is_numeric( basename( $wp->request ))) {
-				$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request)) {
+			if (is_numeric(basename($wp->request))) {
+				$post_id = basename($wp->request);
 			}
 		}
 		return $post_id;
@@ -138,35 +138,35 @@ 
 	 * @param WP $wp
 	 * @return string
 	 */
-	public function get_post_name_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_name_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_name = null;
-		if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) {
+		if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) {
 			$post_name = $wp->query_vars['name'];
 		}
-		if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) {
+		if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) {
 			$post_name = $wp->query_vars['pagename'];
 		}
-		if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) {
-			$possible_post_name = basename( $wp->request );
-			if ( ! is_numeric( $possible_post_name )) {
+		if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) {
+			$possible_post_name = basename($wp->request);
+			if ( ! is_numeric($possible_post_name)) {
 				/** @type WPDB $wpdb */
 				global $wpdb;
 				$SQL = "SELECT ID from $wpdb->posts WHERE post_status='publish' AND post_name=%s";
-				$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name ));
-				if ( $possible_post_name ) {
+				$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+				if ($possible_post_name) {
 					$post_name = $possible_post_name;
 				}
 			}
 		}
-		if ( ! $post_name && $this->get( 'post_id' )) {
+		if ( ! $post_name && $this->get('post_id')) {
 			/** @type WPDB $wpdb */
 			global $wpdb;
 			$SQL = "SELECT post_name from $wpdb->posts WHERE post_status='publish' AND ID=%d";
-			$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' )));
-			if( $possible_post_name ) {
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id')));
+			if ($possible_post_name) {
 				$post_name = $possible_post_name;
 			}
 		}
@@ -182,11 +182,11 @@ 
 	 * @param WP $wp
 	 * @return mixed
 	 */
-	public function get_post_type_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_type_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null;
+		return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null;
 	}
 
 
@@ -196,18 +196,18 @@ 
 	 * @param  WP $wp
 	 * @return bool|string|void
 	 */
-	public function get_current_page_permalink( $wp = null ) {
-		$post_id = $this->get_post_id_from_request( $wp );
-		if ( $post_id ) {
-			$current_page_permalink = get_permalink( $post_id );
+	public function get_current_page_permalink($wp = null) {
+		$post_id = $this->get_post_id_from_request($wp);
+		if ($post_id) {
+			$current_page_permalink = get_permalink($post_id);
 		} else {
-			if ( ! $wp instanceof WP ) {
+			if ( ! $wp instanceof WP) {
 				global $wp;
 			}
-			if ( $wp->request ) {
-				$current_page_permalink = site_url( $wp->request );
+			if ($wp->request) {
+				$current_page_permalink = site_url($wp->request);
 			} else {
-				$current_page_permalink = esc_url( site_url( $_SERVER[ 'REQUEST_URI' ] ) );
+				$current_page_permalink = esc_url(site_url($_SERVER['REQUEST_URI']));
 			}
 		}
 		return $current_page_permalink;
@@ -224,41 +224,41 @@ 
 	public function test_for_espresso_page() {
 		global $wp;
 		/** @type EE_CPT_Strategy $EE_CPT_Strategy */
-		$EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		$EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy');
 		$espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies();
-		if ( is_array( $espresso_CPT_taxonomies ) ) {
-			foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) {
-				if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) {
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) {
+				if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) {
 					return true;
 				}
 			}
 		}
 		// load espresso CPT endpoints
 		$espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints();
-		$post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints );
-		$post_types = (array)$this->get( 'post_type' );
-		foreach ( $post_types as $post_type ) {
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		$post_types = (array) $this->get('post_type');
+		foreach ($post_types as $post_type) {
 			// was a post name passed ?
-			if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) {
+			if (isset($post_type_CPT_endpoints[$post_type])) {
 				// kk we know this is an espresso page, but is it a specific post ?
-				if ( ! $this->get( 'post_name' ) ) {
+				if ( ! $this->get('post_name')) {
 					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-					$post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null;
+					$post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null;
 					// if the post type matches on of our then set the endpoint
-					if ( $post_name ) {
-						$this->set( 'post_name', $post_name );
+					if ($post_name) {
+						$this->set('post_name', $post_name);
 					}
 				}
 				return true;
 			}
 		}
-		if ( $this->get( 'post_name' )) {
+		if ($this->get('post_name')) {
 			// load all pages using espresso shortcodes
-			$post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			$post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// make sure core pages are included
-			$espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes );
+			$espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes);
 			// was a post name passed ?
-			if (  isset( $espresso_pages[ $this->get( 'post_name' ) ] )) {
+			if (isset($espresso_pages[$this->get('post_name')])) {
 				 return true;
 			}
 		}
@@ -274,7 +274,7 @@ 
 	 * @param null $value
 	 * @return    mixed
 	 */
-	public function set_espresso_page( $value = null ) {
+	public function set_espresso_page($value = null) {
 		$value = $value ? $value : $this->test_for_espresso_page();
 		$this->_params['is_espresso_page'] = $value;
 	}
@@ -288,7 +288,7 @@ 
 	 *  @return 	mixed
 	 */
 	public function is_espresso_page() {
-		return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false;
+		return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false;
 	}
 
 
@@ -312,10 +312,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = false ) {
+	public function set($key, $value, $override_ee = false) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -329,8 +329,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = null ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = null) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -342,8 +342,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? true : false;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? true : false;
 	}
 
 
@@ -355,8 +355,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -369,8 +369,8 @@ 
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
 	}
 
 
@@ -395,7 +395,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -417,8 +417,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -428,7 +428,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }
 
 
 

Braces +3 added lines, -1 removed lines

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