eventespresso / event-espresso-core

core/libraries/messages/EE_Message_To_Generate.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 	 * generates an EE_Message using the supplied arguments and some defaults
 	 *
 	 * @param array $properties
-	 * @return string
+	 * @return EE_Message
 	 */
 	protected function _generate_message( $properties = array() ) {
 		$message = EE_Message_Factory::create(

Spacing +18 added lines, -18 removed lines

@@ -105,14 +105,14 @@ 
 	public function __construct(
 		$messenger_name,
 		$message_type_name,
-		$data 	 = array(),
+		$data = array(),
 		$context = '',
 		$preview = false,
 		$status  = EEM_Message::status_incomplete
 	) {
-		$this->_messenger_name 		= $messenger_name;
-		$this->_message_type_name 	= $message_type_name;
-		$this->_data 				= is_array( $data ) ? $data : array( $data );
+		$this->_messenger_name = $messenger_name;
+		$this->_message_type_name = $message_type_name;
+		$this->_data = is_array($data) ? $data : array($data);
 		$this->_context 			= $context;
 		$this->_preview 			= $preview;
 		$this->_status 				= $status;
@@ -170,8 +170,8 @@ 
 	/**
 	 * @param boolean $preview
 	 */
-	public function set_preview( $preview ) {
-		$this->_preview = filter_var( $preview, FILTER_VALIDATE_BOOLEAN );
+	public function set_preview($preview) {
+		$this->_preview = filter_var($preview, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -202,7 +202,7 @@ 
 	 * @param array $properties
 	 * @return string
 	 */
-	protected function _generate_message( $properties = array() ) {
+	protected function _generate_message($properties = array()) {
 		$message = EE_Message_Factory::create(
 			array_merge(
 				array(
@@ -216,12 +216,12 @@ 
 		);
 		// validate the message, and if it's good, set some properties
 		try {
-			$message->is_valid_for_sending_or_generation( true );
+			$message->is_valid_for_sending_or_generation(true);
 			$this->_valid = true;
 			$this->_messenger = $message->messenger_object();
 			$this->_message_type = $message->message_type_object();
 			$this->_send_now = $message->send_now();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->_valid = false;
 			$this->_error_msg[] = $e->getMessage();
 		}
@@ -237,7 +237,7 @@ 
 	 */
 	public function get_EE_Message() {
 		// already set ?
-		if ( $this->_message instanceof EE_Message ) {
+		if ($this->_message instanceof EE_Message) {
 			return $this->_message;
 		}
 		// no? then let's create one
@@ -255,15 +255,15 @@ 
 	 * @param   bool    $preview    Used to indicate that the preview data handler is to be returned.
 	 * @return  string
 	 */
-	public function get_data_handler_class_name( $preview = false ) {
-		if ( $this->_data_handler_class_name === '' && $this->valid() ) {
-			$ref = $preview ? 'Preview' : $this->_message_type->get_data_handler( $this->_data );
+	public function get_data_handler_class_name($preview = false) {
+		if ($this->_data_handler_class_name === '' && $this->valid()) {
+			$ref = $preview ? 'Preview' : $this->_message_type->get_data_handler($this->_data);
 			//make sure internal data is updated.
 			$this->_data = $this->_message_type->get_data();
 
 			//verify
-			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference( $ref );
-			if ( $this->_data_handler_class_name === '' ) {
+			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference($ref);
+			if ($this->_data_handler_class_name === '') {
 				$this->_valid = false;
 			}
 		}
@@ -279,9 +279,9 @@ 
 	 * @param string $data_handler_reference
 	 * @return string
 	 */
-	public static function verify_and_retrieve_class_name_for_data_handler_reference( $data_handler_reference ) {
-		$class_name = 'EE_Messages_' . $data_handler_reference . '_incoming_data';
-		if ( ! class_exists( $class_name ) ) {
+	public static function verify_and_retrieve_class_name_for_data_handler_reference($data_handler_reference) {
+		$class_name = 'EE_Messages_'.$data_handler_reference.'_incoming_data';
+		if ( ! class_exists($class_name)) {
 			EE_Error::add_error(
 				sprintf(
 					__(

core/EE_System.core.php

Indentation +60 added lines, -60 removed lines

@@ -196,14 +196,14 @@ 
 
 
 	/**
-	* detect_if_activation_or_upgrade
-	*
-	* Takes care of detecting whether this is a brand new install or code upgrade,
-	* and either setting up the DB or setting up maintenance mode etc.
-	*
-	* @access public
-	* @return void
-	*/
+	 * detect_if_activation_or_upgrade
+	 *
+	 * Takes care of detecting whether this is a brand new install or code upgrade,
+	 * and either setting up the DB or setting up maintenance mode etc.
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function detect_if_activation_or_upgrade() {
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
@@ -512,11 +512,11 @@ 
 			$query_params =  array( 'page' => 'espresso_about' );
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
-			    $query_params['new_activation'] = TRUE;
+				$query_params['new_activation'] = TRUE;
 			}
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
-			    $query_params['reactivation'] = TRUE;
+				$query_params['reactivation'] = TRUE;
 			}
 			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
 			wp_safe_redirect( $url );
@@ -619,11 +619,11 @@ 
 
 
 	/**
-	* _incompatible_addon_error
-	*
-	* @access public
-	* @return void
-	*/
+	 * _incompatible_addon_error
+	 *
+	 * @access public
+	 * @return void
+	 */
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
 		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
@@ -745,14 +745,14 @@ 
 
 
 	/**
-	* load_controllers
-	*
-	* this is the best place to load any additional controllers that needs access to EE core.
-	* it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
-	*
-	* @access public
-	* @return void
-	*/
+	 * load_controllers
+	 *
+	 * this is the best place to load any additional controllers that needs access to EE core.
+	 * it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function load_controllers() {
 		do_action( 'AHEE__EE_System__load_controllers__start' );
 		// let's get it started
@@ -769,13 +769,13 @@ 
 
 
 	/**
-	* core_loaded_and_ready
-	*
-	* all of the basic EE core should be loaded at this point and available regardless of M-Mode
-	*
-	* @access public
-	* @return void
-	*/
+	 * core_loaded_and_ready
+	 *
+	 * all of the basic EE core should be loaded at this point and available regardless of M-Mode
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function core_loaded_and_ready() {
 		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
 		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
@@ -786,13 +786,13 @@ 
 
 
 	/**
-	* initialize
-	*
-	* this is the best place to begin initializing client code
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize
+	 *
+	 * this is the best place to begin initializing client code
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize() {
 		do_action( 'AHEE__EE_System__initialize' );
 	}
@@ -800,13 +800,13 @@ 
 
 
 	/**
-	* initialize_last
-	*
-	* this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize_last
+	 *
+	 * this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize_last() {
 		do_action( 'AHEE__EE_System__initialize_last' );
 	}
@@ -815,14 +815,14 @@ 
 
 
 	/**
-	* set_hooks_for_shortcodes_modules_and_addons
-	*
-	* this is the best place for other systems to set callbacks for hooking into other parts of EE
-	* this happens at the very beginning of the wp_loaded hookpoint
-	*
-	* @access public
-	* @return void
-	*/
+	 * set_hooks_for_shortcodes_modules_and_addons
+	 *
+	 * this is the best place for other systems to set callbacks for hooking into other parts of EE
+	 * this happens at the very beginning of the wp_loaded hookpoint
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function set_hooks_for_shortcodes_modules_and_addons() {
 //		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
 	}
@@ -831,13 +831,13 @@ 
 
 
 	/**
-	* do_not_cache
-	*
-	* sets no cache headers and defines no cache constants for WP plugins
-	*
-	* @access public
-	* @return void
-	*/
+	 * do_not_cache
+	 *
+	 * sets no cache headers and defines no cache constants for WP plugins
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public static function do_not_cache() {
 		// set no cache constants
 		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
@@ -956,7 +956,7 @@ 
 			//Current post
 			global $post;
 
-	    	if ( $this->registry->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+			if ( $this->registry->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',

Spacing +270 added lines, -270 removed lines

@@ -88,10 +88,10 @@ 
 	 * @param  \EE_Registry        $Registry
 	 * @return \EE_System
 	 */
-	public static function instance( EE_Registry $Registry = null ) {
+	public static function instance(EE_Registry $Registry = null) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_System ) {
-			self::$_instance = new self( $Registry );
+		if ( ! self::$_instance instanceof EE_System) {
+			self::$_instance = new self($Registry);
 		}
 		return self::$_instance;
 	}
@@ -101,11 +101,11 @@ 
 	 * resets the instance and returns it
 	 * @return EE_System
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance->_req_type = NULL;
 
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		EE_Data_Migration_Manager::reset();
@@ -125,28 +125,28 @@ 
 	 * @access private
 	 * @param  \EE_Registry        $Registry
 	 */
-	private function __construct( EE_Registry $Registry ) {
+	private function __construct(EE_Registry $Registry) {
 		$this->registry = $Registry;
-		do_action( 'AHEE__EE_System__construct__begin', $this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-		add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'load_espresso_addons' ) );
+		add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'load_espresso_addons'));
 		// when an ee addon is activated, we want to call the core hook(s) again
 		// because the newly-activated addon didn't get a chance to run at all
-		add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 );
+		add_action('activate_plugin', array($this, 'load_espresso_addons'), 1);
 		// detect whether install or upgrade
-		add_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades', array( $this, 'detect_activations_or_upgrades' ), 3 );
+		add_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades', array($this, 'detect_activations_or_upgrades'), 3);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 5 );
+		add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 5);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 );
+		add_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_modules_and_widgets'), 7);
 		// you wanna get going? I wanna get going... let's get going!
-		add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 9 );
+		add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 9);
 		//other housekeeping
 		//exclude EE critical pages from wp_list_pages
-		add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+		add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 		// ALL EE Addons should use the following hook point to attach their initial setup too
 		// it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads
-		do_action( 'AHEE__EE_System__construct__complete', $this );
+		do_action('AHEE__EE_System__construct__complete', $this);
 	}
 
 
@@ -166,30 +166,30 @@ 
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
 		//load and setup EE_Capabilities
-		$this->registry->load_core( 'Capabilities' );
+		$this->registry->load_core('Capabilities');
 		//caps need to be initialized on every request so that capability maps are set.
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/8674
 		$this->registry->CAP->init_caps();
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		do_action('AHEE__EE_System__load_espresso_addons');
 		//if the WP API basic auth plugin isn't already loaded, load it now.
 		//We want it for mobile apps. Just include the entire plugin
 		//also, don't load the basic auth when a plugin is getting activated, because
 		//it could be the basic auth plugin, and it doesn't check if its methods are already defined
 		//and causes a fatal error
-		if( !function_exists( 'json_basic_auth_handler' )
-			&& ! function_exists( 'json_basic_auth_error' )
+		if ( ! function_exists('json_basic_auth_handler')
+			&& ! function_exists('json_basic_auth_error')
 			&& ! (
-				isset( $_GET[ 'action'] )
-				&& in_array( $_GET[ 'action' ], array( 'activate', 'activate-selected' ) )
+				isset($_GET['action'])
+				&& in_array($_GET['action'], array('activate', 'activate-selected'))
 			)
 			&& ! (
-				isset( $_GET['activate' ] )
-				&& $_GET['activate' ] === 'true'
+				isset($_GET['activate'])
+				&& $_GET['activate'] === 'true'
 			)
 		) {
-			include_once EE_THIRD_PARTY . 'wp-api-basic-auth' . DS . 'basic-auth.php';
+			include_once EE_THIRD_PARTY.'wp-api-basic-auth'.DS.'basic-auth.php';
 		}
 	}
 
@@ -205,10 +205,10 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function detect_activations_or_upgrades(){
+	public function detect_activations_or_upgrades() {
 		//first off: let's make sure to handle core
 		$this->detect_if_activation_or_upgrade();
-		foreach($this->registry->addons as $addon){
+		foreach ($this->registry->addons as $addon) {
 			//detect teh request type for that addon
 			$addon->detect_activation_or_upgrade();
 		}
@@ -229,41 +229,41 @@ 
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
 		// load M-Mode class
-		$this->registry->load_core( 'Maintenance_Mode' );
+		$this->registry->load_core('Maintenance_Mode');
 		// check if db has been updated, or if its a brand-new installation
 
 		$espresso_db_update = $this->fix_espresso_db_upgrade_option();
-		$request_type =  $this->detect_req_type($espresso_db_update);
+		$request_type = $this->detect_req_type($espresso_db_update);
 		//EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ );
 
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade');
 				//migrations may be required now that we've upgraded
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 //				echo "done upgrade";die;
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade');
 				//its possible migrations are no longer required
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_normal:
 			default:
 //				$this->_maybe_redirect_to_ee_about();
 				break;
 		}
-		do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' );
+		do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete');
 	}
 
 	/**
@@ -271,10 +271,10 @@ 
 	 * initializing the database later during the request
 	 * @param array $espresso_db_update
 	 */
-	protected function _handle_core_version_change( $espresso_db_update ){
-		$this->update_list_of_installed_versions( $espresso_db_update );
+	protected function _handle_core_version_change($espresso_db_update) {
+		$this->update_list_of_installed_versions($espresso_db_update);
 		//get ready to verify the DB is ok (provided we aren't in maintenance mode, of course)
-		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'));
 	}
 
 
@@ -289,44 +289,44 @@ 
 	 * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table
 	 * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction
 	 */
-	private function fix_espresso_db_upgrade_option($espresso_db_update = null){
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update );
-		if( ! $espresso_db_update){
-			$espresso_db_update = get_option( 'espresso_db_update' );
+	private function fix_espresso_db_upgrade_option($espresso_db_update = null) {
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update);
+		if ( ! $espresso_db_update) {
+			$espresso_db_update = get_option('espresso_db_update');
 		}
 		// check that option is an array
-		if( ! is_array( $espresso_db_update )) {
+		if ( ! is_array($espresso_db_update)) {
 			// if option is FALSE, then it never existed
-			if ( $espresso_db_update === FALSE ) {
+			if ($espresso_db_update === FALSE) {
 				// make $espresso_db_update an array and save option with autoload OFF
-				$espresso_db_update =  array();
-				add_option( 'espresso_db_update', $espresso_db_update, '', 'no' );
+				$espresso_db_update = array();
+				add_option('espresso_db_update', $espresso_db_update, '', 'no');
 			} else {
 				// option is NOT FALSE but also is NOT an array, so make it an array and save it
-				$espresso_db_update =  array( $espresso_db_update=>array() );
-				update_option( 'espresso_db_update', $espresso_db_update );
+				$espresso_db_update = array($espresso_db_update=>array());
+				update_option('espresso_db_update', $espresso_db_update);
 			}
-		}else{
+		} else {
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
-			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
-				if(is_int($should_be_version_string) && ! is_array($should_be_array)){
+			foreach ($espresso_db_update as $should_be_version_string => $should_be_array) {
+				if (is_int($should_be_version_string) && ! is_array($should_be_array)) {
 					//the key is an int, and the value IS NOT an array
 					//so it must be numerically-indexed, where values are versions installed...
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else {
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
 			}
 			$espresso_db_update = $corrected_db_update;
-			update_option( 'espresso_db_update', $espresso_db_update );
+			update_option('espresso_db_update', $espresso_db_update);
 
 		}
 
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update );
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update);
 		return $espresso_db_update;
 	}
 
@@ -346,34 +346,34 @@ 
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){
+	public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) {
 		$request_type = $this->detect_req_type();
 		//only initialize system if we're not in maintenance mode.
-		if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			update_option('ee_flush_rewrite_rules', TRUE);
 
-			if( $verify_schema ) {
+			if ($verify_schema) {
 				EEH_Activation::initialize_db_and_folders();
 			}
 			EEH_Activation::initialize_db_content();
 			EEH_Activation::system_initialization();
-			if( $initialize_addons_too ) {
+			if ($initialize_addons_too) {
 				$this->initialize_addons();
 			}
-		}else{
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
+		} else {
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core');
 		}
-		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
-			add_action( 'AHEE__EE_System__load_CPTs_and_session__start', array( $this, 'redirect_to_about_ee' ), 9 );
+		if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) {
+			add_action('AHEE__EE_System__load_CPTs_and_session__start', array($this, 'redirect_to_about_ee'), 9);
 		}
 	}
 
 	/**
 	 * Initializes the db for all registered addons
 	 */
-	public function initialize_addons(){
+	public function initialize_addons() {
 		//foreach registered addon, make sure its db is up-to-date too
-		foreach($this->registry->addons as $addon){
+		foreach ($this->registry->addons as $addon) {
 			$addon->initialize_db_if_no_migrations_required();
 		}
 	}
@@ -385,16 +385,16 @@ 
 	 * @param 	string 	$current_version_to_add 	version to be added to the version history
 	 * @return 	boolean success as to whether or not this option was changed
 	 */
-	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->fix_espresso_db_upgrade_option($version_history);
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = espresso_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());
 		// re-save
-		return update_option( 'espresso_db_update', $version_history );
+		return update_option('espresso_db_update', $version_history);
 	}
 
 
@@ -411,10 +411,10 @@ 
 	 *                            but still know if this is a new install or not
 	 * @return int one of the constants on EE_System::req_type_
 	 */
-	public function detect_req_type( $espresso_db_update = NULL ){
-		if ( $this->_req_type === NULL ){
-			$espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
-			$this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() );
+	public function detect_req_type($espresso_db_update = NULL) {
+		if ($this->_req_type === NULL) {
+			$espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
+			$this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version());
 		}
 		return $this->_req_type;
 	}
@@ -430,39 +430,39 @@ 
 	 * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version())
 	 * @return int one of the constants on EE_System::req_type_*
 	 */
-	public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){
-		$version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to );
-		if( $activation_history_for_addon ){
+	public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) {
+		$version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to);
+		if ($activation_history_for_addon) {
 			//it exists, so this isn't a completely new install
 			//check if this version already in that list of previously installed versions
-			if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) {
+			if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) {
 				//it a version we haven't seen before
-				if( $version_is_higher === 1 ){
+				if ($version_is_higher === 1) {
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else {
 					$req_type = EE_System::req_type_downgrade;
 				}
-				delete_option( $activation_indicator_option_name );
+				delete_option($activation_indicator_option_name);
 			} else {
 				// its not an update. maybe a reactivation?
-				if( get_option( $activation_indicator_option_name, FALSE ) ){
-					if ( $version_is_higher === -1 ){
+				if (get_option($activation_indicator_option_name, FALSE)) {
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
-					delete_option( $activation_indicator_option_name );
+					delete_option($activation_indicator_option_name);
 				} else {
 					//we've seen this version before and the activation indicate doesn't show it was just activated
-					if ( $version_is_higher === -1 ){
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}
@@ -470,7 +470,7 @@ 
 		} else {
 			//brand new install
 			$req_type = EE_System::req_type_new_activation;
-			delete_option( $activation_indicator_option_name );
+			delete_option($activation_indicator_option_name);
 		}
 		return $req_type;
 	}
@@ -488,30 +488,30 @@ 
 	 *		0 if $version_to_upgrade_to MATCHES (reactivation or normal request);
 	 *		1 if $version_to_upgrade_to is HIGHER (upgrade) ;
 	 */
-	protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){
+	protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) {
 		//find the most recently-activated version
 		$most_recently_active_version_activation = '1970-01-01 00:00:00';
 		$most_recently_active_version = '0.0.0.dev.000';
-		if( is_array( $activation_history_for_addon ) ){
-			foreach( $activation_history_for_addon as $version => $times_activated ){
+		if (is_array($activation_history_for_addon)) {
+			foreach ($activation_history_for_addon as $version => $times_activated) {
 				//check there is a record of when this version was activated. Otherwise,
 				//mark it as unknown
-				if( ! $times_activated ){
-					$times_activated = array( 'unknown-date');
+				if ( ! $times_activated) {
+					$times_activated = array('unknown-date');
 				}
-				if( is_string( $times_activated ) ){
-					$times_activated = array( $times_activated );
+				if (is_string($times_activated)) {
+					$times_activated = array($times_activated);
 				}
-				foreach( $times_activated as $an_activation ){
-					if( $an_activation != 'unknown-date' &&
-							$an_activation > $most_recently_active_version_activation  ){
+				foreach ($times_activated as $an_activation) {
+					if ($an_activation != 'unknown-date' &&
+							$an_activation > $most_recently_active_version_activation) {
 						$most_recently_active_version = $version;
 						$most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation;
 					}
 				}
 			}
 		}
-		return version_compare( $version_to_upgrade_to, $most_recently_active_version );
+		return version_compare($version_to_upgrade_to, $most_recently_active_version);
 	}
 
 
@@ -521,24 +521,24 @@ 
 	 * @return void
 	 */
 	public function redirect_to_about_ee() {
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		//if current user is an admin and it's not an ajax request
 		if (
-			$this->registry->CAP->current_user_can( 'manage_options', 'espresso_about_default' )
-			&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-			&& ! isset( $notices[ 'errors' ] )
+			$this->registry->CAP->current_user_can('manage_options', 'espresso_about_default')
+			&& ! (defined('DOING_AJAX') && DOING_AJAX)
+			&& ! isset($notices['errors'])
 		) {
-			$query_params =  array( 'page' => 'espresso_about' );
+			$query_params = array('page' => 'espresso_about');
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) {
 			    $query_params['new_activation'] = TRUE;
 			}
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) {
 			    $query_params['reactivation'] = TRUE;
 			}
-			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
-			wp_safe_redirect( $url );
+			$url = add_query_arg($query_params, admin_url('admin.php'));
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -552,31 +552,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
-		$this->registry->load_core( 'EE_Load_Textdomain' );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
+		$this->registry->load_core('EE_Load_Textdomain');
 		//load textdomain
 		EE_Load_Textdomain::load_textdomain();
 		// load and setup EE_Config and EE_Network_Config
-		$this->registry->load_core( 'Config' );
-		$this->registry->load_core( 'Network_Config' );
+		$this->registry->load_core('Config');
+		$this->registry->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( $this->registry->CFG->admin->use_full_logging ) {
-			$this->registry->load_core( 'Log' );
+		if ($this->registry->CFG->admin->use_full_logging) {
+			$this->registry->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -585,23 +585,23 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$short_name = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$short_name = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
-				$non_abstract_db_models[ $short_name ] = $classname;
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
+				$non_abstract_db_models[$short_name] = $classname;
 			}
-			$model_names[ $short_name ] = $classname;
+			$model_names[$short_name] = $classname;
 		}
-		$this->registry->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
-		$this->registry->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models );
+		$this->registry->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
+		$this->registry->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models);
 	}
 
 
@@ -611,8 +611,8 @@ 
 	 * @return void
 	 */
 	private function _maybe_brew_regular() {
-		if (( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+		if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) {
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 		}
 	}
 
@@ -629,9 +629,9 @@ 
 	 * @return void
 	 */
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -645,19 +645,19 @@ 
 	*/
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
-		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
-		if ( ! empty( $class_names )) {
-			$msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' );
+		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons');
+		if ( ! empty($class_names)) {
+			$msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso');
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>';
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>';
 			}
 			$msg .= '</ul>';
-			$msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' );
+			$msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso');
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -674,26 +674,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
-		do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+	public function brew_espresso() {
+		do_action('AHEE__EE_System__brew_espresso__begin', $this);
 		// load some final core systems
-		add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-		add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 );
-		add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-		add_action( 'init', array( $this, 'load_controllers' ), 7 );
-		add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-		add_action( 'init', array( $this, 'initialize' ), 10 );
-		add_action( 'init', array( $this, 'initialize_last' ), 100 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action('admin_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 );
-
-		if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE )  ) {
+		add_action('init', array($this, 'set_hooks_for_core'), 1);
+		add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3);
+		add_action('init', array($this, 'load_CPTs_and_session'), 5);
+		add_action('init', array($this, 'load_controllers'), 7);
+		add_action('init', array($this, 'core_loaded_and_ready'), 9);
+		add_action('init', array($this, 'initialize'), 10);
+		add_action('init', array($this, 'initialize_last'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100);
+
+		if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) {
 			// pew pew pew
-			$this->registry->load_core( 'PUE' );
-			do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+			$this->registry->load_core('PUE');
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 		}
-		do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+		do_action('AHEE__EE_System__brew_espresso__complete', $this);
 	}
 
 
@@ -707,7 +707,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -716,15 +716,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== FALSE ) {
-						unset( $_GET['activate'] );
-						espresso_deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== FALSE) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -741,10 +741,10 @@ 
 	 */
 	public function perform_activations_upgrades_and_migrations() {
 		//first check if we had previously attempted to setup EE's directories but failed
-		if( EEH_Activation::upload_directories_incomplete() ) {
+		if (EEH_Activation::upload_directories_incomplete()) {
 			EEH_Activation::create_upload_directories();
 		}
-		do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 	}
 
 
@@ -756,10 +756,10 @@ 
 	 *  	@return 	void
 	 */
 	public function load_CPTs_and_session() {
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		$this->registry->load_core( 'Register_CPTs' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		$this->registry->load_core('Register_CPTs');
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -774,16 +774,16 @@ 
 	* @return void
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			$this->registry->load_core( 'Front_Controller', array(), false, true );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			EE_Registry::instance()->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			$this->registry->load_core('Front_Controller', array(), false, true);
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			EE_Registry::instance()->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -797,9 +797,9 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
-		$this->registry->load_core( 'Session' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
+		$this->registry->load_core('Session');
 		//		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
 	}
 
@@ -814,7 +814,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 	}
 
 
@@ -828,7 +828,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -860,21 +860,21 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx and Google Chrome
-		add_filter( 'nocache_headers', array( 'EE_System', 'extra_nocache_headers' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'extra_nocache_headers'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -886,7 +886,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function extra_nocache_headers ( $headers ) {
+	public static function extra_nocache_headers($headers) {
 		// for NGINX
 		$headers['X-Accel-Expires'] = 0;
 		// plus extra for Google Chrome since it doesn't seem to respect "no-cache", but WILL respect "no-store"
@@ -915,14 +915,14 @@ 
 	 * @param  WP_Admin_Bar $admin_bar
 	 * @return void
 	 */
-	public function espresso_toolbar_items( WP_Admin_Bar $admin_bar ) {
+	public function espresso_toolbar_items(WP_Admin_Bar $admin_bar) {
 
 		// if in full M-Mode, or its an AJAX request, or user is NOT an admin
-		if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! $this->registry->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) {
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! $this->registry->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) {
 			return;
 		}
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$menu_class = 'espresso_menu_item_class';
 		//we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
 		//because they're only defined in each of their respective constructors
@@ -934,20 +934,20 @@ 
 		//Top Level
 		$admin_bar->add_menu(array(
 				'id' => 'espresso-toolbar',
-				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>',
+				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>',
 				'href' => $events_admin_url,
 				'meta' => array(
 						'title' => __('Event Espresso', 'event_espresso'),
-						'class' => $menu_class . 'first'
+						'class' => $menu_class.'first'
 				),
 		));
 
 		//Events
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Events', 'event_espresso' ),
+					'title' => __('Events', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('Events', 'event_espresso'),
@@ -958,13 +958,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) {
 			//Events Add New
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-new',
 					'parent' => 'espresso-toolbar-events',
 					'title' => __('Add New', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Add New', 'event_espresso'),
 							'target' => '',
@@ -973,18 +973,18 @@ 
 			));
 		}
 
-		if ( is_single() && ( get_post_type() == 'espresso_events' ) ) {
+		if (is_single() && (get_post_type() == 'espresso_events')) {
 
 			//Current post
 			global $post;
 
-	    	if ( $this->registry->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+	    	if ($this->registry->CAP->current_user_can('ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID)) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',
 						'parent' => 'espresso-toolbar-events',
 						'title' => __('Edit Event', 'event_espresso'),
-						'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$post->ID ), $events_admin_url ),
+						'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$post->ID), $events_admin_url),
 						'meta' => array(
 								'title' => __('Edit Event', 'event_espresso'),
 								'target' => '',
@@ -996,11 +996,11 @@ 
 		}
 
 		//Events View
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-view',
 					'parent' => 'espresso-toolbar-events',
-					'title' => __( 'View', 'event_espresso' ),
+					'title' => __('View', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('View', 'event_espresso'),
@@ -1010,12 +1010,12 @@ 
 			));
 		}
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) {
 			//Events View All
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-all',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'All', 'event_espresso' ),
+					'title' => __('All', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('All', 'event_espresso'),
@@ -1026,13 +1026,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) {
 			//Events View Today
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-today',
 					'parent' => 'espresso-toolbar-events-view',
 					'title' => __('Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1042,13 +1042,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) {
 			//Events View This Month
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-month',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'This Month', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1058,11 +1058,11 @@ 
 		}
 
 		//Registration Overview
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Registrations', 'event_espresso' ),
+					'title' => __('Registrations', 'event_espresso'),
 					'href' => $reg_admin_url,
 					'meta' => array(
 							'title' => __('Registrations', 'event_espresso'),
@@ -1073,12 +1073,12 @@ 
 		}
 
 		//Registration Overview Today
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ),
+					'title' => __('Today', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1088,14 +1088,14 @@ 
 		}
 
 		//Registration Overview Today Completed
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Approved', 'event_espresso' ),
+							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1103,14 +1103,14 @@ 
 		}
 
 		//Registration Overview Today Pending\
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-pending',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Pending', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Pending Payment', 'event_espresso' ),
+							'title' => __('Pending Payment', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1118,14 +1118,14 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-not-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Not Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1133,12 +1133,12 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-cancelled',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'title' => __('Cancelled', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1148,12 +1148,12 @@ 
 		}
 
 		//Registration Overview This Month
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'This Month', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1163,12 +1163,12 @@ 
 		}
 
 		//Registration Overview This Month Approved
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
@@ -1178,12 +1178,12 @@ 
 		}
 
 		//Registration Overview This Month Pending
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-pending',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Pending', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Pending', 'event_espresso'),
 							'target' => '',
@@ -1193,14 +1193,14 @@ 
 		}
 
 		//Registration Overview This Month Not Approved
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-not-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Not Approved', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1209,12 +1209,12 @@ 
 
 
 		//Registration Overview This Month Cancelled
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-cancelled',
 					'parent' => 'espresso-toolbar-registrations-month',
 					'title' => __('Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1224,11 +1224,11 @@ 
 		}
 
 		//Extensions & Services
-		if ( $this->registry->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-extensions-and-services',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Extensions & Services', 'event_espresso' ),
+					'title' => __('Extensions & Services', 'event_espresso'),
 					'href' => $extensions_admin_url,
 					'meta' => array(
 							'title' => __('Extensions & Services', 'event_espresso'),
@@ -1250,8 +1250,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, $this->registry->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, $this->registry->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -1271,15 +1271,15 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// jquery_validate loading is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-			if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+			if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 				// register jQuery Validate and additional methods
-				wp_register_script( 'jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery' ), '1.15.0', TRUE );
-				wp_register_script( 'jquery-validate-extra-methods', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js', array( 'jquery', 'jquery-validate' ), '1.15.0', TRUE );
+				wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+				wp_register_script('jquery-validate-extra-methods', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.additional-methods.min.js', array('jquery', 'jquery-validate'), '1.15.0', TRUE);
 			}
-			wp_register_script( 'select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true );
-			wp_register_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
+			wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
+			wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
 		}
 	}
 

Braces +11 added lines, -9 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');
+}
 /**
  *
  * EE_System
@@ -306,7 +308,7 @@ 
 				$espresso_db_update =  array( $espresso_db_update=>array() );
 				update_option( 'espresso_db_update', $espresso_db_update );
 			}
-		}else{
+		} else{
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
 			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
@@ -316,7 +318,7 @@ 
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else{
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
@@ -360,7 +362,7 @@ 
 			if( $initialize_addons_too ) {
 				$this->initialize_addons();
 			}
-		}else{
+		} else{
 			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
 		}
 		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
@@ -439,7 +441,7 @@ 
 				//it a version we haven't seen before
 				if( $version_is_higher === 1 ){
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else{
 					$req_type = EE_System::req_type_downgrade;
 				}
 				delete_option( $activation_indicator_option_name );
@@ -448,10 +450,10 @@ 
 				if( get_option( $activation_indicator_option_name, FALSE ) ){
 					if ( $version_is_higher === -1 ){
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					} elseif( $version_is_higher === 0 ){
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else{//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 					delete_option( $activation_indicator_option_name );
@@ -459,10 +461,10 @@ 
 					//we've seen this version before and the activation indicate doesn't show it was just activated
 					if ( $version_is_higher === -1 ){
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					} elseif( $version_is_higher === 0 ){
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else{//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}

core/libraries/messages/validators/email/EE_Messages_Email_Pending_Approval_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Pending_Approval_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'pending_approval';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -47,9 +47,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Not_Approved_Registration_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Not_Approved_Registration_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'not_approved_registration';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Registration_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Registration_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'registration';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -47,9 +47,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Payment_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Registration_Summary_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -18,11 +18,11 @@ 
 class EE_Messages_Email_Registration_Summary_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'registration_summary';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -35,9 +35,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *
@@ -37,8 +38,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Payment_Refund_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Refund_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_refund';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/EE_Messages_Validator.core.php

Braces +43 added lines, -26 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages_Validator class
@@ -121,13 +122,14 @@ 
 	 */
 	public function __construct( $fields, $context ) {
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
-			throw new EE_Error(
+		if ( empty($this->_m_name ) || empty( $this->_mt_name) ) {
+					throw new EE_Error(
 				__(
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
 					'event_espresso'
 				)
 			);
+		}
 		$this->_fields = $fields;
 		$this->_context = $context;
 
@@ -228,8 +230,10 @@ 
 		$groups_per_field = array();
 
 		foreach ( $msgr_validator as $field => $config ) {
-			if ( empty($config) || !isset($config['shortcodes']) )
-				continue;  //Nothing to see here.
+			if ( empty($config) || !isset($config['shortcodes']) ) {
+							continue;
+			}
+			//Nothing to see here.
 			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
 			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
 		}
@@ -268,8 +272,9 @@ 
 			$required = isset($config['required'])
 				? array_intersect($config['required'], array_keys($mt_codes))
 				: true;
-			if ( empty($required) )
-				continue;
+			if ( empty($required) ) {
+							continue;
+			}
 
 			//If we have an override then we use it to indicate the codes we want.
 			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
@@ -310,8 +315,9 @@ 
 			$specific_excludes = $this->get_specific_shortcode_excludes();
 			if ( isset( $specific_excludes[$field] ) ) {
 				foreach( $specific_excludes[$field] as $sex ) {
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
+					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) ) {
+											unset( $this->_validators[$field]['shortcodes'][$sex] );
+					}
 				}
 			}
 
@@ -385,10 +391,13 @@ 
 			//get the translated field label!
 			//first check if it's in the main fields list
 			if ( isset( $template_fields[$field] ) ) {
-				if ( empty( $template_fields[$field] ) )
-					$field_label = $field; //most likely the field is found in the 'extra' array.
-				else
-					$field_label = $template_fields[$field]['label'];
+				if ( empty( $template_fields[$field] ) ) {
+									$field_label = $field;
+				}
+				//most likely the field is found in the 'extra' array.
+				else {
+									$field_label = $template_fields[$field]['label'];
+				}
 			}
 
 			// if field label is empty OR is equal to the current field
@@ -402,8 +411,9 @@ 
 
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
 						// which means it contains the label for this field.
-						if ( $name == 'main' && $main_field == $field_label )
-							$field_label = $values['label'];
+						if ( $name == 'main' && $main_field == $field_label ) {
+													$field_label = $values['label'];
+						}
 					}
 				}
 			}
@@ -439,8 +449,8 @@ 
 			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
 				switch ( $this->_validators[$field]['type'] ) {
 					case 'number' :
-						if ( !is_numeric($value) )
-							$err_msg .= sprintf(
+						if ( !is_numeric($value) ) {
+													$err_msg .= sprintf(
 								__(
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
 									'event_espresso'
@@ -450,11 +460,12 @@ 
 								'<p>',
 								'</p >'
 							);
+						}
 						break;
 					case 'email' :
 						$valid_email = $this->_validate_email($value);
-						if ( !$valid_email )
-							$err_msg .= htmlentities(
+						if ( !$valid_email ) {
+													$err_msg .= htmlentities(
 								sprintf(
 									__(
 										'The %1$s field has at least one string that is not a valid email address record.  Valid emails are in the format: "Name <email@something.com>" or "email@something.com" and multiple emails can be separated by a comma.'
@@ -463,6 +474,7 @@ 
 
 								)
 							);
+						}
 						break;
 					default :
 						break;
@@ -539,7 +551,10 @@ 
 			}
 		}
 
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
+		if ( empty( $diff ) ) {
+			return FALSE;
+		}
+		//there is no diff, we have no invalid shortcodes, so return
 
 		//made it here? then let's assemble the error message
 		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
@@ -561,8 +576,9 @@ 
 
 		// empty strings will validate because this is how a message template
 		// for a particular context can be "turned off" (if there is no email then no message)
-		if ( empty( $value ) )
-			return $validate;
+		if ( empty( $value ) ) {
+					return $validate;
+		}
 
 		// first determine if there ARE any shortcodes.
 		// If there are shortcodes and then later we find that there were no other valid emails
@@ -579,8 +595,9 @@ 
 		// its possible that this message is being "turned off" for a particular context
 
 
-		if ( !empty($or_val) && empty($value) )
-			return $validate;
+		if ( !empty($or_val) && empty($value) ) {
+					return $validate;
+		}
 
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
 		$value = trim( trim($value), ',' );
@@ -601,12 +618,12 @@ 
 			//either its of type "bob@whatever.com", or its of type "fname lname <few@few.few>"
 			if(is_email($email)){
 				continue;
-			}else{
+			} else{
 				$matches = array();
 				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
 				if( $validate && is_email($matches[2])){
 					continue;
-				}else{
+				} else{
 					return false;
 				}
 			}

Spacing +100 added lines, -100 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -119,9 +119,9 @@ 
 	 * @param       $context
 	 * @throws \EE_Error
 	 */
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
+		if (empty($this->_m_name) || empty($this->_mt_name))
 			throw new EE_Error(
 				__(
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
@@ -167,14 +167,14 @@ 
 	 */
 	private function _load_objects() {
 		//load messenger
-		$messenger = ucwords( str_replace( '_', ' ', $this->_m_name ) );
-		$messenger = str_replace( ' ', '_', $messenger );
-		$messenger = 'EE_' . $messenger . '_messenger';
+		$messenger = ucwords(str_replace('_', ' ', $this->_m_name));
+		$messenger = str_replace(' ', '_', $messenger);
+		$messenger = 'EE_'.$messenger.'_messenger';
 
-		if ( ! class_exists( $messenger ) ) {
+		if ( ! class_exists($messenger)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no messenger class for the given string (%s)', 'event_espresso' ),
+					__('There is no messenger class for the given string (%s)', 'event_espresso'),
 					$this->_m_name
 				)
 			);
@@ -183,14 +183,14 @@ 
 		$this->_messenger = new $messenger();
 
 		//load message type
-		$message_type = ucwords( str_replace( '_', ' ', $this->_mt_name ) );
-		$message_type = str_replace( ' ', '_', $message_type );
-		$message_type = 'EE_' . $message_type . '_message_type';
+		$message_type = ucwords(str_replace('_', ' ', $this->_mt_name));
+		$message_type = str_replace(' ', '_', $message_type);
+		$message_type = 'EE_'.$message_type.'_message_type';
 
-		if ( !class_exists( $message_type ) ) {
+		if ( ! class_exists($message_type)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no message type class for the given string (%s)', 'event_espresso' ),
+					__('There is no message type class for the given string (%s)', 'event_espresso'),
 					$this->_mt_name
 				)
 			);
@@ -227,25 +227,25 @@ 
 		$shortcode_groups = $mt_codes;
 		$groups_per_field = array();
 
-		foreach ( $msgr_validator as $field => $config ) {
-			if ( empty($config) || !isset($config['shortcodes']) )
-				continue;  //Nothing to see here.
-			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
-			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
+		foreach ($msgr_validator as $field => $config) {
+			if (empty($config) || ! isset($config['shortcodes']))
+				continue; //Nothing to see here.
+			$groups_per_field[$field] = array_intersect($config['shortcodes'], $mt_codes);
+			$shortcode_groups = array_merge($config['shortcodes'], $shortcode_groups);
 		}
 
-		$shortcode_groups = array_unique( $shortcode_groups);
+		$shortcode_groups = array_unique($shortcode_groups);
 
 		// okay now we've got our groups.
 		// Let's get the codes from the objects into an array indexed by group for easy retrieval later.
 		$codes_from_objs = array();
 
-		foreach ( $shortcode_groups as $group ) {
-			$ref = ucwords( str_replace('_', ' ', $group ) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_Shortcodes';
-			if ( class_exists( $classname ) ) {
-				$a = new ReflectionClass( $classname );
+		foreach ($shortcode_groups as $group) {
+			$ref = ucwords(str_replace('_', ' ', $group));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_Shortcodes';
+			if (class_exists($classname)) {
+				$a = new ReflectionClass($classname);
 				$obj = $a->newInstance();
 				$codes_from_objs[$group] = $obj->get_shortcodes();
 			}
@@ -254,8 +254,8 @@ 
 
 		//let's just replace the $mt shortcode group indexes with the actual shortcodes (unique)
 		$final_mt_codes = array();
-		foreach ( $mt_codes as $group ) {
-			$final_mt_codes = array_merge( $final_mt_codes, $codes_from_objs[$group] );
+		foreach ($mt_codes as $group) {
+			$final_mt_codes = array_merge($final_mt_codes, $codes_from_objs[$group]);
 		}
 
 		$mt_codes = $final_mt_codes;
@@ -263,60 +263,60 @@ 
 
 		// k now in this next loop we're going to loop through $msgr_validator again
 		// and setup the _validators property from the data we've setup so far.
-		foreach ( $msgr_validator as $field => $config ) {
+		foreach ($msgr_validator as $field => $config) {
 			//if required shortcode is not in our list of codes for the given field, then we skip this field.
 			$required = isset($config['required'])
 				? array_intersect($config['required'], array_keys($mt_codes))
 				: true;
-			if ( empty($required) )
+			if (empty($required))
 				continue;
 
 			//If we have an override then we use it to indicate the codes we want.
-			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
-					$this->_valid_shortcodes_modifier[ $context ][ $field ],
+			if (isset($this->_valid_shortcodes_modifier[$context][$field])) {
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
+					$this->_valid_shortcodes_modifier[$context][$field],
 					$codes_from_objs
 				);
 			}
 
 			//if we have specific shortcodes for a field then we need to use them
-			else if ( isset( $groups_per_field[$field] ) ) {
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
-					$groups_per_field[ $field ],
+			else if (isset($groups_per_field[$field])) {
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
+					$groups_per_field[$field],
 					$codes_from_objs
 				);
 			}
 
 			//if empty config then we're assuming we're just going to use the shortcodes from the message type context
-			else if ( empty( $config ) ) {
+			else if (empty($config)) {
 				$this->_validators[$field]['shortcodes'] = $mt_codes;
 			}
 
 			//if we have specific shortcodes then we need to use them
-			else if ( isset($config['specific_shortcodes'] ) ) {
+			else if (isset($config['specific_shortcodes'])) {
 				$this->_validators[$field]['shortcodes'] = $config['specific_shortcodes'];
 			}
 
 			//otherwise the shortcodes are what is set by the messenger for that field
 			else {
-				foreach ( $config['shortcodes'] as $group ) {
+				foreach ($config['shortcodes'] as $group) {
 					$this->_validators[$field]['shortcodes'] = isset($this->_validators[$field]['shortcodes'])
-						? array_merge( $this->_validators[$field]['shortcodes'], $codes_from_objs[$group] )
+						? array_merge($this->_validators[$field]['shortcodes'], $codes_from_objs[$group])
 						: $codes_from_objs[$group];
 				}
 			}
 
 			//now let's just make sure that any excluded specific shortcodes are removed.
 			$specific_excludes = $this->get_specific_shortcode_excludes();
-			if ( isset( $specific_excludes[$field] ) ) {
-				foreach( $specific_excludes[$field] as $sex ) {
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
+			if (isset($specific_excludes[$field])) {
+				foreach ($specific_excludes[$field] as $sex) {
+					if (isset($this->_validators[$field]['shortcodes'][$sex]))
+						unset($this->_validators[$field]['shortcodes'][$sex]);
 				}
 			}
 
 			//hey! don't forget to include the type if present!
-			$this->_validators[$field]['type'] = isset( $config['type'] ) ? $config['type'] : NULL;
+			$this->_validators[$field]['type'] = isset($config['type']) ? $config['type'] : NULL;
 		}
 	}
 
@@ -344,7 +344,7 @@ 
 	public function get_specific_shortcode_excludes() {
 		//specific validator filter
 		$shortcode_excludes = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_specific_shortcode_excludes;',
+			'FHEE__'.get_class($this).'__get_specific_shortcode_excludes;',
 			$this->_specific_shortcode_excludes,
 			$this->_context
 		);
@@ -372,20 +372,20 @@ 
 		//some defaults
 		$template_fields = $this->_messenger->get_template_fields();
 		//loop through the fields and check!
-		foreach ( $this->_fields as $field => $value ) {
+		foreach ($this->_fields as $field => $value) {
 			$this->_errors[$field] = array();
 			$err_msg = '';
 			$field_label = '';
 			//if field is not present in the _validators array then we continue
-			if ( !isset( $this->_validators[$field] ) ) {
-				unset( $this->_errors[$field] );
+			if ( ! isset($this->_validators[$field])) {
+				unset($this->_errors[$field]);
 				continue;
 			}
 
 			//get the translated field label!
 			//first check if it's in the main fields list
-			if ( isset( $template_fields[$field] ) ) {
-				if ( empty( $template_fields[$field] ) )
+			if (isset($template_fields[$field])) {
+				if (empty($template_fields[$field]))
 					$field_label = $field; //most likely the field is found in the 'extra' array.
 				else
 					$field_label = $template_fields[$field]['label'];
@@ -393,16 +393,16 @@ 
 
 			// if field label is empty OR is equal to the current field
 			// then we need to loop through the 'extra' fields in the template_fields config (if present)
-			if ( isset( $template_fields['extra'] ) && ( empty($field_label) ) || $field_label == $field ) {
-				foreach( $template_fields['extra'] as $main_field => $secondary_field ) {
-					foreach ( $secondary_field as $name => $values ) {
-						if ( $name == $field ) {
+			if (isset($template_fields['extra']) && (empty($field_label)) || $field_label == $field) {
+				foreach ($template_fields['extra'] as $main_field => $secondary_field) {
+					foreach ($secondary_field as $name => $values) {
+						if ($name == $field) {
 							$field_label = $values['label'];
 						}
 
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
 						// which means it contains the label for this field.
-						if ( $name == 'main' && $main_field == $field_label )
+						if ($name == 'main' && $main_field == $field_label)
 							$field_label = $values['label'];
 					}
 				}
@@ -410,27 +410,27 @@ 
 
 			//field is present. Let's validate shortcodes first (but only if shortcodes present).
 			if (
-				isset( $this->_validators[ $field ][ 'shortcodes' ] )
-				&& ! empty( $this->_validators[ $field ][ 'shortcodes' ] )
+				isset($this->_validators[$field]['shortcodes'])
+				&& ! empty($this->_validators[$field]['shortcodes'])
 			) {
-				$invalid_shortcodes = $this->_invalid_shortcodes( $value, $this->_validators[$field]['shortcodes'] );
+				$invalid_shortcodes = $this->_invalid_shortcodes($value, $this->_validators[$field]['shortcodes']);
 				// if true then that means there is a returned error message
 				// that we'll need to add to the _errors array for this field.
-				if ( $invalid_shortcodes ) {
+				if ($invalid_shortcodes) {
 					$v_s = array_keys($this->_validators[$field]['shortcodes']);
 					$err_msg = sprintf(
 						__(
 							'%3$sThe following shortcodes were found in the "%1$s" field that ARE not valid: %2$s%4$s',
 							'event_espresso'
 						),
-						'<strong>' . $field_label . '</strong>',
+						'<strong>'.$field_label.'</strong>',
 						$invalid_shortcodes,
 						'<p>',
 						'</p >'
 					);
 					$err_msg .= sprintf(
-						__( '%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso' ),
-						implode( ', ', $v_s ),
+						__('%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso'),
+						implode(', ', $v_s),
 						'<strong>',
 						'</strong>'
 					);
@@ -438,10 +438,10 @@ 
 			}
 
 			//if there's a "type" to be validated then let's do that too.
-			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
-				switch ( $this->_validators[$field]['type'] ) {
+			if (isset($this->_validators[$field]['type']) && ! empty($this->_validators[$field]['type'])) {
+				switch ($this->_validators[$field]['type']) {
 					case 'number' :
-						if ( !is_numeric($value) )
+						if ( ! is_numeric($value))
 							$err_msg .= sprintf(
 								__(
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
@@ -455,7 +455,7 @@ 
 						break;
 					case 'email' :
 						$valid_email = $this->_validate_email($value);
-						if ( !$valid_email )
+						if ( ! $valid_email)
 							$err_msg .= htmlentities(
 								sprintf(
 									__(
@@ -472,23 +472,23 @@ 
 			}
 
 			//if $err_msg isn't empty let's setup the _errors array for this field.
-			if ( !empty($err_msg ) ) {
+			if ( ! empty($err_msg)) {
 				$this->_errors[$field]['msg'] = $err_msg;
 			} else {
-				unset( $this->_errors[$field] );
+				unset($this->_errors[$field]);
 			}
 		}
 
 		// if we have ANY errors, then we want to make sure we return the values
 		// for ALL the fields so the user doesn't have to retype them all.
-		if ( !empty( $this->_errors ) ) {
-			foreach ( $this->_fields as $field => $value ) {
+		if ( ! empty($this->_errors)) {
+			foreach ($this->_fields as $field => $value) {
 				$this->_errors[$field]['value'] = stripslashes($value);
 			}
 		}
 
 		//return any errors or just TRUE if everything validates
-		return empty( $this->_errors ) ? TRUE : $this->_errors;
+		return empty($this->_errors) ? TRUE : $this->_errors;
 	}
 
 
@@ -501,10 +501,10 @@ 
 	 * @param  array $codes_from_objs All the codes available.
 	 * @return array                   an array of actual shortcodes (that will be used for validation).
 	 */
-	private function _reassemble_valid_shortcodes_from_group( $groups, $codes_from_objs ) {
+	private function _reassemble_valid_shortcodes_from_group($groups, $codes_from_objs) {
 		$shortcodes = array();
-		foreach ( $groups as $group ) {
-			$shortcodes = array_merge( $shortcodes, $codes_from_objs[$group] );
+		foreach ($groups as $group) {
+			$shortcodes = array_merge($shortcodes, $codes_from_objs[$group]);
 		}
 		return $shortcodes;
 	}
@@ -523,29 +523,29 @@ 
 	 */
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
 		//first we need to go through the string and get the shortcodes in the string
-		preg_match_all( '/(\[.+?\])/', $value, $matches );
+		preg_match_all('/(\[.+?\])/', $value, $matches);
 		$incoming_shortcodes = (array) $matches[0];
 
 		//get a diff of the shortcodes in the string vs the valid shortcodes
-		$diff = array_diff( $incoming_shortcodes, array_keys($valid_shortcodes) );
+		$diff = array_diff($incoming_shortcodes, array_keys($valid_shortcodes));
 
 		//we need to account for custom codes so let's loop through the diff and remove any of those type of codes
-		foreach ( $diff as $ind => $code ) {
-			if ( preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code ) ) {
+		foreach ($diff as $ind => $code) {
+			if (preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code)) {
 				//strip the shortcode so we just have the BASE string (i.e. [ANSWER_*] )
 				$dynamic_sc = preg_replace('/(_\*+.+)/', '_*]', $code);
 				//does this exist in the $valid_shortcodes?  If so then unset.
-				if ( isset( $valid_shortcodes[$dynamic_sc] ) ) {
-					unset( $diff[$ind] );
+				if (isset($valid_shortcodes[$dynamic_sc])) {
+					unset($diff[$ind]);
 				}
 			}
 		}
 
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
+		if (empty($diff)) return FALSE; //there is no diff, we have no invalid shortcodes, so return
 
 		//made it here? then let's assemble the error message
-		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
-		$invalid_shortcodes = '<strong>' . $invalid_shortcodes . '</strong>';
+		$invalid_shortcodes = implode('</strong>,<strong>', $diff);
+		$invalid_shortcodes = '<strong>'.$invalid_shortcodes.'</strong>';
 		return $invalid_shortcodes;
 	}
 
@@ -557,13 +557,13 @@ 
 	 * @param  string $value incoming value to validate
 	 * @return bool        true if the string validates, false if it doesn't
 	 */
-	protected function _validate_email( $value ) {
+	protected function _validate_email($value) {
 		$validate = TRUE;
 		$or_val = $value;
 
 		// empty strings will validate because this is how a message template
 		// for a particular context can be "turned off" (if there is no email then no message)
-		if ( empty( $value ) )
+		if (empty($value))
 			return $validate;
 
 		// first determine if there ARE any shortcodes.
@@ -581,19 +581,19 @@ 
 		// its possible that this message is being "turned off" for a particular context
 
 
-		if ( !empty($or_val) && empty($value) )
+		if ( ! empty($or_val) && empty($value))
 			return $validate;
 
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
-		$value = trim( trim($value), ',' );
+		$value = trim(trim($value), ',');
 
 
 		//next we need to split up the string if its comma delimited.
 		$emails = explode(',', $value);
 		$empty = FALSE; //used to indicate that there is an empty comma.
 		//now let's loop through the emails and do our checks
-		foreach ( $emails as $email ) {
-			if ( empty($email) ) {
+		foreach ($emails as $email) {
+			if (empty($email)) {
 				$empty = TRUE;
 				continue;
 			}
@@ -601,20 +601,20 @@ 
 			//trim whitespace
 			$email = trim($email);
 			//either its of type "bob@whatever.com", or its of type "fname lname <few@few.few>"
-			if(is_email($email)){
+			if (is_email($email)) {
 				continue;
-			}else{
+			} else {
 				$matches = array();
-				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
-				if( $validate && is_email($matches[2])){
+				$validate = preg_match('/(.*)<(.+)>/', $email, $matches) ? TRUE : FALSE;
+				if ($validate && is_email($matches[2])) {
 					continue;
-				}else{
+				} else {
 					return false;
 				}
 			}
 		}
 
-		$validate = $empty && !$has_shortcodes ? FALSE : $validate;
+		$validate = $empty && ! $has_shortcodes ? FALSE : $validate;
 
 		return $validate;
 
@@ -630,7 +630,7 @@ 
 	 * @throws Exception
 	 * @return mixed
 	 */
-	public function __get( $property ) {
+	public function __get($property) {
 		$expected_properties_map = array(
 			/**
 			 * @deprecated 4.9.0
@@ -642,15 +642,15 @@ 
 			'_MSGTYP' => '_message_type'
 		);
 
-		if ( isset( $expected_properties_map[ $property ] ) ) {
-			return $this->{$expected_properties_map[ $property ]};
+		if (isset($expected_properties_map[$property])) {
+			return $this->{$expected_properties_map[$property]};
 		}
 
 		throw new Exception(
 			sprintf(
-				__( 'The property %1$s being requested on %2$s does not exist', 'event_espresso' ),
+				__('The property %1$s being requested on %2$s does not exist', 'event_espresso'),
 				$property,
-				get_class( $this )
+				get_class($this)
 			)
 		);
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -519,7 +519,7 @@
 	 *
 	 * @param  string $value            string to evaluate
 	 * @param  array  $valid_shortcodes array of shortcodes that are acceptable.
-	 * @return mixed (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
+	 * @return false|string (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
 	 */
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
 		//first we need to go through the string and get the shortcodes in the string