eventespresso / event-espresso-core

core/EE_Base.core.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 *		@ return void
 	 */	
 	public function __get($a) { return FALSE; }
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { return FALSE; }
 	public function __clone() { return FALSE; }

Braces +3 added lines, -1 removed lines

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

core/EE_Base_Class_Repository.core.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Base_Class_Repository
@@ -39,8 +39,8 @@ 
 	 * @param array $arguments	arrays of arguments that will be passed to the object's save method
 	 * @return bool | int
 	 */
-	public function save( $arguments = array() ) {
-		return $this->persist( 'save', $arguments );
+	public function save($arguments = array()) {
+		return $this->persist('save', $arguments);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return bool | int
 	 */
 	public function save_all() {
-		return $this->persist_all( 'save' );
+		return $this->persist_all('save');
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		$success = $this->_call_user_func_array_on_current( 'delete' );
-		$this->remove( $this->current() );
+		$success = $this->_call_user_func_array_on_current('delete');
+		$this->remove($this->current());
 		return $success;
 	}
 
@@ -86,16 +86,16 @@ 
 	public function delete_all() {
 		$success = true;
 		$this->rewind();
-		while ( $this->valid() ) {
+		while ($this->valid()) {
 			// any db error will result in false being returned
-			$success = $this->_call_user_func_array_on_current( 'delete' ) !== false ? $success : false;
+			$success = $this->_call_user_func_array_on_current('delete') !== false ? $success : false;
 			// can't remove current object because valid() requires it
 			// so just capture current object temporarily
 			$object = $this->current();
 			// advance the pointer
 			$this->next();
 			// THEN remove the object from the repository
-			$this->remove( $object );
+			$this->remove($object);
 		}
 		return $success;
 	}
@@ -113,8 +113,8 @@ 
 	 * @param string $previous_value
 	 * @return bool | int
 	 */
-	public function update_extra_meta( $meta_key, $meta_value, $previous_value = null ) {
-		return $this->_call_user_func_array_on_current( 'update_extra_meta', array( $meta_key, $meta_value, $previous_value ) );
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = null) {
+		return $this->_call_user_func_array_on_current('update_extra_meta', array($meta_key, $meta_value, $previous_value));
 	}
 
 

core/EE_Capabilities.core.php

Indentation +1 added lines, -2 removed lines

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

Spacing +127 added lines, -127 removed lines

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

core/EE_Cart.core.php

Braces +3 added lines, -1 removed lines

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

Spacing +53 added lines, -53 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, ''); /**
  *
  * Event Espresso
  *
@@ -67,24 +67,24 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	 public static function instance( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		if ( ! empty( $grand_total ) ){
-			self::$_instance = new self( $grand_total, $session );
+	 public static function instance(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		if ( ! empty($grand_total)) {
+			self::$_instance = new self($grand_total, $session);
 		}
 		// or maybe retrieve an existing one ?
-		if ( ! self::$_instance instanceof EE_Cart ) {
+		if ( ! self::$_instance instanceof EE_Cart) {
 			// try getting the cart out of the session
 			$saved_cart = $session instanceof EE_Session ? $session->cart() : null;
-			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self( $grand_total, $session );
-			unset( $saved_cart );
+			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
+			unset($saved_cart);
 		}
 		// verify that cart is ok and grand total line item exists
-		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item ) {
-			self::$_instance = new self( $grand_total, $session );
+		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
+			self::$_instance = new self($grand_total, $session);
 		}
 		self::$_instance->get_grand_total();
 		 // once everything is all said and done, save the cart to the EE_Session
-		add_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		return self::$_instance;
 	}
 
@@ -98,11 +98,11 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	 private function __construct( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		 $this->set_session( $session );
-		 if ( $grand_total instanceof EE_Line_Item ) {
-			 $this->set_grand_total_line_item( $grand_total );
+	 private function __construct(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		 do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		 $this->set_session($session);
+		 if ($grand_total instanceof EE_Line_Item) {
+			 $this->set_grand_total_line_item($grand_total);
 		 }
 	 }
 
@@ -114,13 +114,13 @@ 
 	  * @param EE_Session $session
 	  * @return EE_Cart
 	  */
-	 public static function reset( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		 remove_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
-		 if ( $session instanceof EE_Session ) {
+	 public static function reset(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		 remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
+		 if ($session instanceof EE_Session) {
 			 $session->reset_cart();
 		 }
 		 self::$_instance = null;
-		 return self::instance( $grand_total, $session );
+		 return self::instance($grand_total, $session);
 	 }
 
 
@@ -128,8 +128,8 @@ 
 	 /**
 	  * @param EE_Session $session
 	  */
-	 public function set_session( EE_Session $session = null ) {
-		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core( 'Session' );
+	 public function set_session(EE_Session $session = null) {
+		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core('Session');
 	 }
 
 
@@ -139,7 +139,7 @@ 
 	  *  know the grand total line item on it
 	  * @param EE_Line_Item $line_item
 	  */
-	 public function set_grand_total_line_item( EE_Line_Item $line_item ) {
+	 public function set_grand_total_line_item(EE_Line_Item $line_item) {
 		 $this->_grand_total = $line_item;
 	 }
 
@@ -152,11 +152,11 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	public static function get_cart_from_txn( EE_Transaction $transaction, EE_Session $session = null ) {
+	public static function get_cart_from_txn(EE_Transaction $transaction, EE_Session $session = null) {
 		$grand_total = $transaction->total_line_item();
 		$grand_total->get_items();
 		$grand_total->tax_descendants();
-		return EE_Cart::instance( $grand_total, $session );
+		return EE_Cart::instance($grand_total, $session);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
 	 * @return EE_Line_Item
 	 */
-	private function _create_grand_total(){
+	private function _create_grand_total() {
 		$this->_grand_total = EEH_Line_Item::create_total_line_item();
 		return $this->_grand_total;
 	}
@@ -178,7 +178,7 @@ 
 	 *	@return \EE_Line_Item[]
 	 */
 	public function get_tickets() {
-		return EEH_Line_Item::get_ticket_line_items( $this->_grand_total );
+		return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
 	}
 
 
@@ -191,11 +191,11 @@ 
 	 */
 	public function all_ticket_quantity_count() {
 		$tickets = $this->get_tickets();
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return 0;
 		}
 		$count = 0;
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$count = $count + $ticket->get('LIN_quantity');
 		}
 		return $count;
@@ -207,8 +207,8 @@ 
 	 *  Gets all the tax line items
 	 * @return \EE_Line_Item[]
 	 */
-	public function get_taxes(){
-		return EEH_Line_Item::get_taxes_subtotal( $this->_grand_total )->children();
+	public function get_taxes() {
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
 	}
 
 
@@ -217,7 +217,7 @@ 
 	 * Gets the total line item (which is a parent of all other line items) on this cart
 	 * @return EE_Line_Item
 	 */
-	public function get_grand_total(){
+	public function get_grand_total() {
 		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
 	}
 
@@ -230,8 +230,8 @@ 
 	 *	@param int $qty
 	 *	@return TRUE on success, FALSE on fail
 	 */
-	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
-		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1) {
+		EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
 		return $this->save_cart() ? TRUE : FALSE;
 	}
 
@@ -254,7 +254,7 @@ 
 	 *	@return float
 	 */
 	public function get_applied_taxes() {
-		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 	}
 
 
@@ -265,7 +265,7 @@ 
 	 *	@return float
 	 */
 	public function get_cart_grand_total() {
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 		return $this->get_grand_total()->total();
 	}
 
@@ -278,8 +278,8 @@ 
 	 */
 	public function recalculate_all_cart_totals() {
 		$pre_tax_total = $this->get_cart_total_before_tax();
-		$taxes_total = EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
-		$this->_grand_total->set_total( $pre_tax_total + $taxes_total );
+		$taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		$this->_grand_total->set_total($pre_tax_total + $taxes_total);
 		$this->_grand_total->save_this_and_descendants_to_txn();
 		return $this->get_grand_total()->total();
 	}
@@ -292,9 +292,9 @@ 
 	 *	@param array|bool|string $line_item_codes
 	 *	@return int on success, FALSE on fail
 	 */
-	public function delete_items( $line_item_codes = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes );
+	public function delete_items($line_item_codes = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
 	}
 
 
@@ -305,9 +305,9 @@ 
 	 *	@return bool
 	 */
 	public function empty_cart() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_grand_total = $this->_create_grand_total();
-		return $this->save_cart( TRUE );
+		return $this->save_cart(TRUE);
 	}
 
 
@@ -318,8 +318,8 @@ 
 	 *	@return bool
 	 */
 	public function delete_cart() {
-		$deleted = EEH_Line_Item::delete_all_child_items( $this->_grand_total );
-		if ( $deleted ) {
+		$deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
+		if ($deleted) {
 			$deleted += $this->_grand_total->delete();
 			$this->_grand_total = null;
 		}
@@ -334,17 +334,17 @@ 
 	  * @param bool $apply_taxes
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function save_cart( $apply_taxes = TRUE ) {
-		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {
-			EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+	public function save_cart($apply_taxes = TRUE) {
+		if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
+			EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 			//make sure we don't cache the transaction because it can get stale
-			if( $this->_grand_total->get_one_from_cache( 'Transaction' ) instanceof EE_Transaction &&
-				$this->_grand_total->get_one_from_cache( 'Transaction' )->ID()) {
-				$this->_grand_total->clear_cache( 'Transaction', null, true );
+			if ($this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction &&
+				$this->_grand_total->get_one_from_cache('Transaction')->ID()) {
+				$this->_grand_total->clear_cache('Transaction', null, true);
 			}
 		}
-		if ( $this->_session instanceof EE_Session ) {
-			return $this->_session->set_cart( $this );
+		if ($this->_session instanceof EE_Session) {
+			return $this->_session->set_cart($this);
 		} else {
 			return false;
 		}

core/EE_Configurable.core.php

Spacing +13 added lines, -13 removed lines

@@ -52,8 +52,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'modules';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'modules';
 	}
 
 
@@ -70,7 +70,7 @@ 
 	/**
 	 * @param string $config_class
 	 */
-	public function set_config_class( $config_class = '' ) {
+	public function set_config_class($config_class = '') {
 		$this->_config_class = $config_class;
 	}
 
@@ -88,8 +88,8 @@ 
 	/**
 	 * @param mixed $config_name
 	 */
-	public function set_config_name( $config_name ) {
-		$this->_config_name = ! empty( $config_name ) ? $config_name : get_called_class();
+	public function set_config_name($config_name) {
+		$this->_config_name = ! empty($config_name) ? $config_name : get_called_class();
 	}
 
 
@@ -112,8 +112,8 @@ 
 	 * @param 	EE_Config_Base 	$config_obj
 	 * @return 	mixed 	EE_Config_Base | NULL
 	 */
-	protected function _set_config( EE_Config_Base $config_obj = NULL ) {
-		return EE_Config::instance()->set_config( $this->config_section(), $this->config_name(), $this->config_class(), $config_obj );
+	protected function _set_config(EE_Config_Base $config_obj = NULL) {
+		return EE_Config::instance()->set_config($this->config_section(), $this->config_name(), $this->config_class(), $config_obj);
 	}
 
 
@@ -127,12 +127,12 @@ 
 	 * @throws \EE_Error
 	 * @return    mixed    EE_Config_Base | NULL
 	 */
-	public function _update_config( EE_Config_Base $config_obj = NULL ) {
+	public function _update_config(EE_Config_Base $config_obj = NULL) {
 		$config_class = $this->config_class();
-		if ( ! $config_obj instanceof $config_class ) {
-			throw new EE_Error( sprintf( __( 'The "%1$s" class is not an instance of %2$s.', 'event_espresso' ), print_r( $config_obj, TRUE ), $config_class ));
+		if ( ! $config_obj instanceof $config_class) {
+			throw new EE_Error(sprintf(__('The "%1$s" class is not an instance of %2$s.', 'event_espresso'), print_r($config_obj, TRUE), $config_class));
 		}
-		return EE_Config::instance()->update_config( $this->config_section(), $this->config_name(), $config_obj );
+		return EE_Config::instance()->update_config($this->config_section(), $this->config_name(), $config_obj);
 	}
 
 
@@ -143,8 +143,8 @@ 
 	 * @return EE_Config_Base
 	 */
 	public function config() {
-		if ( empty( $this->_config )) {
-			$this->_config = EE_Config::instance()->get_config( $this->config_section(), $this->config_name(), $this->config_class() );
+		if (empty($this->_config)) {
+			$this->_config = EE_Config::instance()->get_config($this->config_section(), $this->config_name(), $this->config_class());
 		}
 		return $this->_config;
 	}

Braces +3 added lines, -1 removed lines

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

core/EE_Data_Mapper.core.php

Indentation +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 
 
    /**
-     * instance of the EE_Data_Mapper Object
-     * @private _instance
-     */
+    * instance of the EE_Data_Mapper Object
+    * @private _instance
+    */
 	private static $_instance = NULL;
 
 

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 	 */	
 	public  function &instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Data_Mapper )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Data_Mapper)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -71,10 +71,10 @@ 
 	 *		@ return void
 	 */
 	final function __destruct() {}
-	final function __call($a,$b) {}
-	public static function __callStatic($a,$b) {}
+	final function __call($a, $b) {}
+	public static function __callStatic($a, $b) {}
 	final function __get($a) {}
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 	final function __isset($a) {}
 	final function __unset($a) {}
 	final function __sleep() {

core/EE_Data_Migration_Manager.core.php

Indentation +8 added lines, -8 removed lines

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

Braces +21 added lines, -21 removed lines

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

Spacing +199 added lines, -199 removed lines

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

core/EE_Encryption.core.php

Braces +3 added lines, -1 removed lines

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

Spacing +63 added lines, -63 removed lines

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

core/EE_Error.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
 if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) {
 	set_error_handler( array( 'EE_Error', 'error_handler' ));

Indentation +166 added lines, -166 removed lines

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

Spacing +243 added lines, -243 removed lines

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