eventespresso / event-espresso-core

core/db_models/relations/EE_HABTM_Relation.php

Doc Comments +2 added lines, -1 removed lines

@@ -17,6 +17,7 @@ 
 	 * get related models across the relation, and add-and-remove the relationships.
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
+	 * @param string $joining_model_name
 	 */
 	function __construct($joining_model_name,$block_deletes = true, $blocking_delete_error_message =''){
 		$this->_joining_model_name = $joining_model_name;
@@ -24,7 +25,7 @@ 
 	}
 	/**
 	 * Gets the joining model's object
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	function get_join_model(){
 		return $this->_get_model($this->_joining_model_name);

Spacing +30 added lines, -30 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
-class EE_HABTM_Relation extends EE_Model_Relation_Base{
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+class EE_HABTM_Relation extends EE_Model_Relation_Base {
 	/**
 	 * Model whicih defines the relation between two other models. Eg, the EE_Event_Question_Group model,
 	 * which joins EE_Event and EE_Question_Group
@@ -18,7 +18,7 @@ 
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($joining_model_name,$block_deletes = true, $blocking_delete_error_message =''){
+	function __construct($joining_model_name, $block_deletes = true, $blocking_delete_error_message = '') {
 		$this->_joining_model_name = $joining_model_name;
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
@@ -26,7 +26,7 @@ 
 	 * Gets the joining model's object
 	 * @return EEM_Base
 	 */
-	function get_join_model(){
+	function get_join_model() {
 		return $this->_get_model($this->_joining_model_name);
 	}
 	/**
@@ -34,21 +34,21 @@ 
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_to_intermediate_model_statement($model_relation_chain){
+	function get_join_to_intermediate_model_statement($model_relation_chain) {
 		//create sql like
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
 		//remember the model relation chain to the JOIN model, because we'll
 		//need it for get_join_statement()
 		$this->_model_relation_chain_to_join_model = $model_relation_chain;
-		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();//get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		$this_table_pk_field = $this->get_this_model()->get_primary_key_field(); //get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
 
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
 		//phew! ok, we have all the info we need, now we can create the SQL join string
-		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()) . $this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
+		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()).$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
 
 		return $SQL;
 	}
@@ -60,18 +60,18 @@ 
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
 	 * @return string of SQL
 	 */
-	function get_join_statement($model_relation_chain){
-		if( $this->_model_relation_chain_to_join_model === NULL ){
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
+	function get_join_statement($model_relation_chain) {
+		if ($this->_model_relation_chain_to_join_model === NULL) {
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
 		}
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
 		$join_table_fk_field_to_other_table = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 
-		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 		return $SQL;
 	}
 
@@ -84,36 +84,36 @@ 
 	 * @param array             $where_query col=>val pairs that are used as extra conditions for checking existing values and for setting new rows if no exact matches.
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		 //if $where_query exists lets add them to the query_params.
-		 if ( !empty( $where_query ) ) {
+		 if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $query_params = array( $cols_n_values );
+		 $query_params = array($cols_n_values);
 
 
 		 $existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
 		//if there is already an entry in the join table, indicating a relationship, we're done
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
 		 //the other tables, use the joining model directly!
-		 if( ! $existing_entry_in_join_table ){
+		 if ( ! $existing_entry_in_join_table) {
 			$this->get_join_model()->insert($cols_n_values);
 		}
 		return $other_model_obj;
@@ -125,29 +125,29 @@ 
 	 * * @param array           $where_query col=>val pairs that are used as extra conditions for checking existing values and for removing existing rows if exact matches exist.
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		  $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		//if $where_query exists lets add them to the query_params.
-		 if ( !empty( $where_query ) ) {
+		 if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $existing_entry_in_join_table = $this->get_join_model()->delete( array($cols_n_values) );
+		 $existing_entry_in_join_table = $this->get_join_model()->delete(array($cols_n_values));
 		return $other_model_obj;
 	 }
 }

core/db_models/relations/EE_Has_Many_Revision_Relation.php

Doc Comments +3 added lines, -3 removed lines

@@ -32,8 +32,8 @@ 
 	 * this model. IE, there can be many other model objects related to one of this model's objects (but NOT through a JOIN table,
 	 * which is the case for EE_HABTM_Relations). This knows how to join the models,
 	 * get related models across the relation, and add-and-remove the relationships.
-	 * @param string $primary_pk_field See property description for details
-	 * @param string $parent_cpt_field This is the field that is "connected" to the $primary_cpt_field.  See property desc for details.
+	 * @param string $primary_cpt_field See property description for details
+	 * @param string $primary_cpt_field This is the field that is "connected" to the $primary_cpt_field.  See property desc for details.
 	 * @param boolean $block_deletes For this type of relation, we block by default. If there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
@@ -190,7 +190,7 @@ 
 	 /**
 	 * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
 	 *
-	 * @param  EE_Base_Class $this_model_obj
+	 * @param  EE_Base_Class $this_obj
 	 * @param  EE_Base_Class $other_obj
 	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
 	 * @return EE_Base_Class. ($other_obj);

Braces +6 added lines, -4 removed lines

@@ -60,8 +60,9 @@ 
 		 $other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj);
 
 		 //if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) )
-			return $other_model_obj[0];
+		if ( is_array( $other_model_obj ) ) {
+					return $other_model_obj[0];
+		}
 
 		 //find the field on th eother model which is a foreign key to this model
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
@@ -88,8 +89,9 @@ 
 
 
 		//if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) )
-			return $other_model_obj[0];
+		if ( is_array( $other_model_obj ) ) {
+					return $other_model_obj[0];
+		}
 
 
 		 //find the field on th eother model which is a foreign key to this model

Indentation +7 added lines, -7 removed lines

@@ -185,13 +185,13 @@
 
 
 	 /**
-	 * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
-	 *
-	 * @param  EE_Base_Class $this_model_obj
-	 * @param  EE_Base_Class $other_obj
-	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
-	 * @return EE_Base_Class. ($other_obj); 
-	 */
+	  * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
+	  *
+	  * @param  EE_Base_Class $this_model_obj
+	  * @param  EE_Base_Class $other_obj
+	  * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
+	  * @return EE_Base_Class. ($other_obj); 
+	  */
 	protected function _check_for_revision( $this_obj, $other_obj, $remove_relation = FALSE ) {
 		$pk_on_related_model = $this->get_other_model()->get_primary_key_field()->get_name();
 		//now we need to determine if we're in a WP revision save cause if we are we need to do some special handling

Spacing +44 added lines, -44 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * In this relation, the OTHER model ahs the foreign key pointing to this model
  */
-require_once( EE_MODELS . 'relations/EE_Has_Many_Relation.php');
-class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation{	
+require_once(EE_MODELS.'relations/EE_Has_Many_Relation.php');
+class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation {	
 
 
 	/**
@@ -37,7 +37,7 @@ 
 	 * @param boolean $block_deletes For this type of relation, we block by default. If there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($primary_cpt_field, $parent_pk_relation_field, $block_deletes = true, $blocking_delete_error_message = null){
+	function __construct($primary_cpt_field, $parent_pk_relation_field, $block_deletes = true, $blocking_delete_error_message = null) {
 		$this->_primary_cpt_field = $primary_cpt_field;
 		$this->_parent_pk_relation_field = $parent_pk_relation_field;
 		parent::__construct($block_deletes, $blocking_delete_error_message);
@@ -52,7 +52,7 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		 
@@ -60,7 +60,7 @@ 
 		 $other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj);
 
 		 //if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) )
+		if (is_array($other_model_obj))
 			return $other_model_obj[0];
 
 		 //find the field on th eother model which is a foreign key to this model
@@ -80,15 +80,15 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 	 	$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id);
 		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//handle possible revisions
-		$other_model_obj = $this->_check_for_revision( $this_model_obj, $other_model_obj, TRUE );
+		$other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj, TRUE);
 
 
 		//if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) )
+		if (is_array($other_model_obj))
 			return $other_model_obj[0];
 
 
@@ -97,12 +97,12 @@ 
 
 		
 		 //set that field on the other model to this model's ID
-		 if ( $this->_blocking_delete ) {
-		 	$other_model_obj->set($fk_field_on_other_model->get_name(),null,true);
+		 if ($this->_blocking_delete) {
+		 	$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 	$other_model_obj->save();
 		 } else {
 		 	$other_model_obj->delete();
-		 	$other_model_obj->set($fk_field_on_other_model->get_name(),null,true);
+		 	$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 	return $other_model_obj;
 		 }
 		 return $other_model_obj;
@@ -118,14 +118,14 @@ 
 	  * @param  boolean $values_already_prepared_by_model_object 
 	  * @return EE_Base_Class[]                                         
 	  */
-	 public function get_all_related( $model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false ) {
+	 public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
 	 	
 	 	//if this is an autosave then we're going to get things differently
-	 	if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
+	 	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 	 		return $this->_do_autosave_get_all($model_object_or_id, $query_params, $values_already_prepared_by_model_object = false);
 	 	}
 
-	 	return parent::get_all_related( $model_object_or_id, $query_params, $values_already_prepared_by_model_object );
+	 	return parent::get_all_related($model_object_or_id, $query_params, $values_already_prepared_by_model_object);
 	 }
 
 
@@ -138,22 +138,22 @@ 
 	  * @access protected
 	  * @return EE_Base_Class[]        
 	  */
-	 protected function _do_autosave_get_all( $model_object_or_id, $query_params, $values_already_prepared_by_model_object = false ) {
+	 protected function _do_autosave_get_all($model_object_or_id, $query_params, $values_already_prepared_by_model_object = false) {
 
 	 	//first we check if the post_id for the incoming query is for an autosave.  If it isn't that's what we want!
-	 	$model_object_id = $this->_get_model_object_id( $model_object_or_id );
+	 	$model_object_id = $this->_get_model_object_id($model_object_or_id);
 
-	 	$autosave = wp_get_post_autosave( $model_object_id );
+	 	$autosave = wp_get_post_autosave($model_object_id);
 	 	$id_to_use = $autosave ? $autosave->ID : $model_object_id;
 
-	 	$autosave_relations =  parent::get_all_related( $id_to_use, $query_params, $values_already_prepared_by_model_object );
+	 	$autosave_relations = parent::get_all_related($id_to_use, $query_params, $values_already_prepared_by_model_object);
 	 	$parent_ids = $parents = array();
 	 	$return_objs = array();
 		
 		//k this is where things differ because NOW what we're going to do is get the PARENTS for the get all related (and we'll also start setting up the return_objs array containing related that DON'T have parent ids, for those that DON'T have parents to merge with our returned objects);
-		foreach ( $autosave_relations as $a_r ) {
+		foreach ($autosave_relations as $a_r) {
 			$pid = $a_r->parent();
-			if ( !empty( $pid ) ) {
+			if ( ! empty($pid)) {
 				$parent_ids[] = $pid;
 			} else {
 				$return_objs[] = $a_r;
@@ -164,14 +164,14 @@ 
 		$originals = parent::get_all_related($model_object_or_id, $query_params, $values_already_prepared_by_model_object);
 
 		//merge $originals with $return_objs
-		if ( $originals ) {
+		if ($originals) {
 			$return_objs = array_merge($originals, $return_objs);
 		}
 
 		//now we setup the query to get all the parents
-		if ( !empty( $parent_ids ) ) {
+		if ( ! empty($parent_ids)) {
 			$query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name().".".$this->get_this_model()->get_primary_key_field()->get_name();
-			$query_param[0][$query_param_where_this_model_pk] = array('IN', $parent_ids );
+			$query_param[0][$query_param_where_this_model_pk] = array('IN', $parent_ids);
 			$parents = $this->get_other_model()->get_all($query_param);
 		}
 
@@ -179,7 +179,7 @@ 
 
 
 		//now merge parents with our current $return_objs and send back
-		return array_merge( $parents, $return_objs );
+		return array_merge($parents, $return_objs);
 	 }
 
 
@@ -192,42 +192,42 @@ 
 	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
 	 * @return EE_Base_Class. ($other_obj); 
 	 */
-	protected function _check_for_revision( $this_obj, $other_obj, $remove_relation = FALSE ) {
+	protected function _check_for_revision($this_obj, $other_obj, $remove_relation = FALSE) {
 		$pk_on_related_model = $this->get_other_model()->get_primary_key_field()->get_name();
 		//now we need to determine if we're in a WP revision save cause if we are we need to do some special handling
-		if (  $this_obj->post_type() == 'revision' ) {
+		if ($this_obj->post_type() == 'revision') {
 			//first if $other_obj fk = this_obj pk then we know that this is a pk object, let's make sure there is a matching set for the autosave if there is then we save over it, if there isn't then we need to create a new one.
 			$parent_evt_id = $this_obj->parent();
 			/*var_dump($parent_evt_id);
 			var_dump($this_obj);
 			var_dump($other_obj);/**/
 
-			if ( !empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field) ) {
+			if ( ! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
 				//let's do query on this objects model to see if the incoming pk value on the obj matches any parents in this objects table.
-				$has_parent_obj = $this->get_other_model()->get_one( array( array( $this->_parent_pk_relation_field => $other_obj->ID(), $this->_primary_cpt_field => $this_obj->ID() ) ) );
+				$has_parent_obj = $this->get_other_model()->get_one(array(array($this->_parent_pk_relation_field => $other_obj->ID(), $this->_primary_cpt_field => $this_obj->ID())));
 
-				if ( $has_parent_obj ) {
+				if ($has_parent_obj) {
 					//this makes sure the update on the current obj happens to the revision's row NOT the parent row.
 					
-					$other_obj->set( $this->_parent_pk_relation_field, $other_obj->ID());
-					$other_obj->set($pk_on_related_model, $has_parent_obj->ID() );
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($pk_on_related_model, $has_parent_obj->ID());
 					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 
-					if ( !$remove_relation ) {
+					if ( ! $remove_relation) {
 						$other_obj->save();
-						return array( $other_obj ); 
-					} elseif ( $remove_relation && !$this->_blocking_delete) {
+						return array($other_obj); 
+					} elseif ($remove_relation && ! $this->_blocking_delete) {
 						$other_obj->delete();
 						$other_obj->set($this->_parent_pk_relation_field, NULL, true);
 						return array($other_obj);
 					}
 			
 				} else {
-					$other_obj->set( $this->_parent_pk_relation_field, $other_obj->ID() );
-					$other_obj->set( $this->_primary_cpt_field, $this_obj->ID() );
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 					$other_obj->set($pk_on_related_model, NULL, true); //ensure we create a new row for the autosave with parent id the same as the incoming ID.
 					$other_obj->save(); //make sure we insert.
-					return array( $other_obj );
+					return array($other_obj);
 				}
 			}
 
@@ -240,24 +240,24 @@ 
 		} else {
 			
 			//we only need to do the below IF this is not a remove relation
-			if ( !$remove_relation ) {
+			if ( ! $remove_relation) {
 				//okay this is is a normal update/save/remove so, let's make sure the other object is not a revision of the current object.
 				//the other object will likely NOT have the correct fk on it (which is the primary_cpt_field_mame) so we must retrieve from the db to get that first.
 				$existing_other_obj = $this->get_other_model()->get_one_by_ID($other_obj->ID());
 				$potential_revision_id = is_object($existing_other_obj) ? $existing_other_obj->get($this->_primary_cpt_field) : NULL;
 
-				if ( $parent_this_obj_id = wp_is_post_revision($potential_revision_id) ) {
+				if ($parent_this_obj_id = wp_is_post_revision($potential_revision_id)) {
 					//yes the OTHER object is linked to the revision of the parent, not the parent itself. That means we need to make the other_object an attachment of this_obj and then duplicate other_obj for the revision.
-					$other_obj->set($this->_primary_cpt_field, $this_obj->ID() );
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 					$other_obj->save();
 
 					//now create a new other_obj and fill with details from existing object
 					$new_obj = $other_obj;
-					$new_obj->set( $this->_primary_cpt_field, $potential_revision_id );
-					$new_obj->set( $this->_parent_pk_relation_field, $other_obj->ID() );
-					$new_obj->set( $pk_on_related_model, NULL );
+					$new_obj->set($this->_primary_cpt_field, $potential_revision_id);
+					$new_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$new_obj->set($pk_on_related_model, NULL);
 					$new_obj->save();
-					return array( $new_obj );
+					return array($new_obj);
 				}
 
 			}

core/db_models/relations/EE_Model_Relation_Base.php

Doc Comments +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 
 
 	/**
-	 * @param $this_model_name
+	 * @param string $this_model_name
 	 * @param $other_model_name
 	 * @throws EE_Error
 	 */
@@ -67,7 +67,7 @@ 
 
 	/**
 	 * Gets the model where this relation is defined.
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	function get_this_model(){
 		return $this->_get_model($this->_this_model_name);
@@ -78,7 +78,7 @@ 
 	/**
 	 * Gets the model which this relation establishes the relation TO (ie,
 	 * this relation object was defined on get_this_model(), get_other_model() is the other one)
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	function get_other_model(){
 		return $this->_get_model($this->_other_model_name);
@@ -89,7 +89,7 @@ 
 	/**
 	 * Internally used by get_this_model() and get_other_model()
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
-	 * @return EEM_Base
+	 * @return boolean
 	 */
 	protected function _get_model($model_name){
 		$modelInstance = EE_Registry::instance()->load_model( $model_name );
@@ -112,9 +112,9 @@ 
 
 	/**
 	 * @param        $other_table
-	 * @param        $other_table_alias
+	 * @param        string $other_table_alias
 	 * @param        $other_table_column
-	 * @param        $this_table_alias
+	 * @param        string $this_table_alias
 	 * @param        $this_table_join_column
 	 * @param string $extra_join_sql
 	 * @return string
@@ -168,7 +168,7 @@ 
 	 * parameters are specified, then all related model objects will be deleted.
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class $model_object_or_id
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */
@@ -196,7 +196,7 @@ 
 	 * parameters are specified, then all related model objects will be deleted.
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class $model_object_or_id
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */

Braces +7 added lines, -6 removed lines

@@ -104,8 +104,9 @@ 
 	 * @param string $timezone timezone to set.
 	 */
 	public function set_timezone( $timezone ) {
-		if($timezone !== NULL)
-			$this->_timezone = $timezone;
+		if($timezone !== NULL) {
+					$this->_timezone = $timezone;
+		}
 	}
 
 
@@ -213,12 +214,12 @@ 
 				$deleted_count++;
 				if( ! $delete_is_blocked ){
 					$related_model_object->delete_permanently();
-				}else{
+				} else{
 					//delete is blocked
 					//brent and darren, in this case, wanted to just soft delete it then
 					$related_model_object->delete();
 				}
-			}else{
+			} else{
 				//its not a soft-deletable thing anyways. do the normal logic.
 				if( ! $delete_is_blocked ){
 					$this->remove_relation_to($model_object_or_id, $related_model_object);
@@ -241,7 +242,7 @@ 
 	protected function _get_model_object_id($model_object_or_id) {
 		if($model_object_or_id instanceof EE_Base_Class){
 			$model_object_id = $model_object_or_id->ID();
-		}else{
+		} else{
 			$model_object_id = $model_object_or_id;
 		}
 		if( ! $model_object_id){
@@ -316,7 +317,7 @@ 
 	public function get_deletion_error_message(){
 		if($this->_blocking_delete_error_message){
 			return $this->_blocking_delete_error_message;
-		}else{
+		} else{
 //			return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2));
 			return sprintf(
 				__( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),

Spacing +44 added lines, -44 removed lines

@@ -7,7 +7,7 @@ 
  * Once those two models are setup correctly, and the relation object has the names of each, it can
  * magically figure out what tables must be joined on what fields during querying.
  */
-abstract class EE_Model_Relation_Base{
+abstract class EE_Model_Relation_Base {
 	/**
 	 * The model name of which this relation is a component (ie, the model that called new EE_Model_Relation_Base)
 	 * @var string eg Event, Question_Group, Registration
@@ -42,9 +42,9 @@ 
 	 * @param boolean $block_deletes if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($block_deletes, $blocking_delete_error_message){
+	function __construct($block_deletes, $blocking_delete_error_message) {
 		$this->_blocking_delete = $block_deletes;
-		$this->_blocking_delete_error_message=$blocking_delete_error_message;
+		$this->_blocking_delete_error_message = $blocking_delete_error_message;
 	}
 
 
@@ -54,12 +54,12 @@ 
 	 * @param $other_model_name
 	 * @throws EE_Error
 	 */
-	function _construct_finalize_set_models($this_model_name, $other_model_name){
+	function _construct_finalize_set_models($this_model_name, $other_model_name) {
 		$this->_this_model_name = $this_model_name;
 		$this->_other_model_name = $other_model_name;
-		if(is_string($this->_blocking_delete)){
+		if (is_string($this->_blocking_delete)) {
 			throw new EE_Error(sprintf(__("When instantiating the relation of type %s from %s to %s, the \$block_deletes argument should be a boolean, not a string (%s)", "event_espresso"),
-						get_class($this),$this_model_name,$other_model_name,$this->_blocking_delete));
+						get_class($this), $this_model_name, $other_model_name, $this->_blocking_delete));
 		}
 	}
 
@@ -69,7 +69,7 @@ 
 	 * Gets the model where this relation is defined.
 	 * @return EEM_Base
 	 */
-	function get_this_model(){
+	function get_this_model() {
 		return $this->_get_model($this->_this_model_name);
 	}
 
@@ -80,7 +80,7 @@ 
 	 * this relation object was defined on get_this_model(), get_other_model() is the other one)
 	 * @return EEM_Base
 	 */
-	function get_other_model(){
+	function get_other_model() {
 		return $this->_get_model($this->_other_model_name);
 	}
 
@@ -91,9 +91,9 @@ 
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
 	 * @return EEM_Base
 	 */
-	protected function _get_model($model_name){
-		$modelInstance = EE_Registry::instance()->load_model( $model_name );
-		$modelInstance->set_timezone( $this->_timezone );
+	protected function _get_model($model_name) {
+		$modelInstance = EE_Registry::instance()->load_model($model_name);
+		$modelInstance->set_timezone($this->_timezone);
 		return $modelInstance;
 	}
 
@@ -103,8 +103,8 @@ 
 	 * entirely possible that relations may be called from a model and we need to make sure those relations have their timezone set correctly.
 	 * @param string $timezone timezone to set.
 	 */
-	public function set_timezone( $timezone ) {
-		if($timezone !== NULL)
+	public function set_timezone($timezone) {
+		if ($timezone !== NULL)
 			$this->_timezone = $timezone;
 	}
 
@@ -119,8 +119,8 @@ 
 	 * @param string $extra_join_sql
 	 * @return string
 	 */
-	protected function _left_join($other_table,$other_table_alias,$other_table_column,$this_table_alias,$this_table_join_column, $extra_join_sql = ''){
-		return " LEFT JOIN ".$other_table." AS ".$other_table_alias. " ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column. ($extra_join_sql ? " AND $extra_join_sql" : '');
+	protected function _left_join($other_table, $other_table_alias, $other_table_column, $this_table_alias, $this_table_join_column, $extra_join_sql = '') {
+		return " LEFT JOIN ".$other_table." AS ".$other_table_alias." ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column.($extra_join_sql ? " AND $extra_join_sql" : '');
 	}
 
 
@@ -136,10 +136,10 @@ 
 	 * @param boolean $values_already_prepared_by_model_object
 	 * @return EE_Base_Class[]
 	 */
-	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false){
+	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
 		$query_params = $this->_disable_default_where_conditions_on_query_param($query_params);
 		$query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name().".".$this->get_this_model()->get_primary_key_field()->get_name();
-		$model_object_id = $this->_get_model_object_id( $model_object_or_id );
+		$model_object_id = $this->_get_model_object_id($model_object_or_id);
 		$query_params[0][$query_param_where_this_model_pk] = $model_object_id;
 		return $this->get_other_model()->get_all($query_params);
 	}
@@ -151,9 +151,9 @@ 
 	 * @param string $query_params
 	 * @return string
 	 */
-	protected function _disable_default_where_conditions_on_query_param($query_params){
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+	protected function _disable_default_where_conditions_on_query_param($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		return $query_params;
 	}
@@ -169,15 +169,15 @@ 
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */
-	public function delete_all_related($model_object_or_id,$query_params = array()){
+	public function delete_all_related($model_object_or_id, $query_params = array()) {
 		//for each thing we would delete,
-		$related_model_objects = $this->get_all_related($model_object_or_id,$query_params);
+		$related_model_objects = $this->get_all_related($model_object_or_id, $query_params);
 		//determine if it's blocked by anything else before it can be deletedx
 		$deleted_count = 0;
-		foreach($related_model_objects as $related_model_object){
+		foreach ($related_model_objects as $related_model_object) {
 			$delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id);
 			/* @var $model_object_or_id EE_Base_Class */
-			if( ! $delete_is_blocked ){
+			if ( ! $delete_is_blocked) {
 				$this->remove_relation_to($model_object_or_id, $related_model_object);
 				$related_model_object->delete();
 				$deleted_count++;
@@ -197,27 +197,27 @@ 
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */
-	public function delete_related_permanently($model_object_or_id,$query_params = array()){
+	public function delete_related_permanently($model_object_or_id, $query_params = array()) {
 		//for each thing we would delete,
-		$related_model_objects = $this->get_all_related($model_object_or_id,$query_params);
+		$related_model_objects = $this->get_all_related($model_object_or_id, $query_params);
 		//determine if it's blocked by anything else before it can be deletedx
 		$deleted_count = 0;
-		foreach($related_model_objects as $related_model_object){
+		foreach ($related_model_objects as $related_model_object) {
 			$delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id);
 			/* @var $model_object_or_id EE_Base_Class */
-			if( $related_model_object instanceof EE_Soft_Delete_Base_Class ){
+			if ($related_model_object instanceof EE_Soft_Delete_Base_Class) {
 				$this->remove_relation_to($model_object_or_id, $related_model_object);
 				$deleted_count++;
-				if( ! $delete_is_blocked ){
+				if ( ! $delete_is_blocked) {
 					$related_model_object->delete_permanently();
-				}else{
+				} else {
 					//delete is blocked
 					//brent and darren, in this case, wanted to just soft delete it then
 					$related_model_object->delete();
 				}
-			}else{
+			} else {
 				//its not a soft-deletable thing anyways. do the normal logic.
-				if( ! $delete_is_blocked ){
+				if ( ! $delete_is_blocked) {
 					$this->remove_relation_to($model_object_or_id, $related_model_object);
 					$related_model_object->delete();
 					$deleted_count++;
@@ -236,13 +236,13 @@ 
 	 * @return int
 	 */
 	protected function _get_model_object_id($model_object_or_id) {
-		if($model_object_or_id instanceof EE_Base_Class){
+		if ($model_object_or_id instanceof EE_Base_Class) {
 			$model_object_id = $model_object_or_id->ID();
-		}else{
+		} else {
 			$model_object_id = $model_object_or_id;
 		}
-		if( ! $model_object_id){
-			throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"),$this->get_other_model()->get_this_model_name(),$this->get_this_model()->get_this_model_name()));
+		if ( ! $model_object_id) {
+			throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"), $this->get_other_model()->get_this_model_name(), $this->get_this_model()->get_this_model_name()));
 		}
 		return $model_object_id;
 	}
@@ -285,10 +285,10 @@ 
 	 * @param array $where_query_param  like EEM_Base::get_all's $query_params[0] (where conditions)
 	 * @return EE_Base_Class[]
 	 */
-	public function remove_relations($this_obj_or_id,$where_query_param = array()){
-		$related_things = $this->get_all_related($this_obj_or_id,array($where_query_param));
+	public function remove_relations($this_obj_or_id, $where_query_param = array()) {
+		$related_things = $this->get_all_related($this_obj_or_id, array($where_query_param));
 		$objs_removed = array();
-		foreach($related_things as $related_thing){
+		foreach ($related_things as $related_thing) {
 			$objs_removed[] = $this->remove_relation_to($this_obj_or_id, $related_thing);
 		}
 		return $objs_removed;
@@ -301,7 +301,7 @@ 
 	 * related objects exist, returns false.
 	 * @return boolean
 	 */
-	public function block_delete_if_related_models_exist(){
+	public function block_delete_if_related_models_exist() {
 		return $this->_blocking_delete;
 	}
 
@@ -310,13 +310,13 @@ 
 	 * Gets the error message to show
 	 * @return string
 	 */
-	public function get_deletion_error_message(){
-		if($this->_blocking_delete_error_message){
+	public function get_deletion_error_message() {
+		if ($this->_blocking_delete_error_message) {
 			return $this->_blocking_delete_error_message;
-		}else{
+		} else {
 //			return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2));
 			return sprintf(
-				__( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),
+				__('This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),
 				$this->get_this_model()->item_name(1),
 				$this->get_other_model()->item_name(1),
 				$this->get_other_model()->item_name(2)

core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php

Doc Comments +5 added lines, -1 removed lines

@@ -7,6 +7,11 @@ 
 
 	protected $_post_type;
 	protected $_meta_field;
+
+	/**
+	 * @param string $post_type
+	 * @param string $meta_field_to_chk
+	 */
 	function __construct($post_type, $meta_field_to_chk){
 		$this->_post_type = $post_type;
 		$this->_meta_field = $meta_field_to_chk;
@@ -27,7 +32,6 @@ 
 	}
 	/**
 	 * Gets the where default where conditions for a custom post type model
-	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
 	protected function _get_default_where_conditions() {

Spacing +7 added lines, -7 removed lines

@@ -3,11 +3,11 @@ 
 /*
  * Strategy specifically for adding where conditions specific to CPT models.
  */
-class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions {
 
 	protected $_post_type;
 	protected $_meta_field;
-	function __construct($post_type, $meta_field_to_chk){
+	function __construct($post_type, $meta_field_to_chk) {
 		$this->_post_type = $post_type;
 		$this->_meta_field = $meta_field_to_chk;
 	}
@@ -17,10 +17,10 @@ 
 	 * @param string $column column name
 	 * @return EE_Model_Field_Base
 	 */
-	protected function _get_field_on_column($column){
+	protected function _get_field_on_column($column) {
 		$all_fields = $this->_model->field_settings(true);
-		foreach($all_fields as $field_name => $field_obj){
-			if($column == $field_obj->get_table_column()){
+		foreach ($all_fields as $field_name => $field_obj) {
+			if ($column == $field_obj->get_table_column()) {
 				return $field_obj;
 			}
 		}
@@ -34,8 +34,8 @@ 
 		//find post_type field
 		$post_type_field = $this->_get_field_on_column('post_type');
 		$status_field = $this->_get_field_on_column('post_status');
-		return array( $post_type_field->get_name() => $this->_post_type,
-				$status_field->get_name() => array('NOT IN',array('auto-draft','trash'))
+		return array($post_type_field->get_name() => $this->_post_type,
+				$status_field->get_name() => array('NOT IN', array('auto-draft', 'trash'))
 		);
 	}
 }

core/EE_Addon.core.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +13 added lines, -13 removed lines

@@ -2,19 +2,19 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- *
- * Event Espresso
- *
- * Event Registration and Ticketing Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2014 Event Espresso  All Rights Reserved.
- * @ license 		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link 				http://www.eventespresso.com
- * @ since 			4.3
- *
- */
+	 *
+	 * Event Espresso
+	 *
+	 * Event Registration and Ticketing Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2014 Event Espresso  All Rights Reserved.
+	 * @ license 		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link 				http://www.eventespresso.com
+	 * @ since 			4.3
+	 *
+	 */
 
 
 

Spacing +63 added lines, -63 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');
 }
 /**
  *
@@ -73,7 +73,7 @@ 
 	/**
 	 * @param mixed $version
 	 */
-	public function set_version( $version = NULL ) {
+	public function set_version($version = NULL) {
 		$this->_version = $version;
 	}
 
@@ -91,7 +91,7 @@ 
 	/**
 	 * @param mixed $min_core_version
 	 */
-	public function set_min_core_version( $min_core_version = NULL ) {
+	public function set_min_core_version($min_core_version = NULL) {
 		$this->_min_core_version = $min_core_version;
 	}
 
@@ -112,7 +112,7 @@ 
 	 * @param string $addon_name
 	 * @return boolean
 	 */
-	function set_name( $addon_name ) {
+	function set_name($addon_name) {
 		return $this->_addon_name = $addon_name;
 	}
 
@@ -138,7 +138,7 @@ 
 		do_action("AHEE__{$classname}__new_install");
 		do_action("AHEE__EE_Addon__new_install", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -153,16 +153,16 @@ 
 		do_action("AHEE__{$classname}__reactivation");
 		do_action("AHEE__EE_Addon__reactivation", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
-	public function deactivation(){
+	public function deactivation() {
 		$classname = get_class($this);
 //		echo "Deactivating $classname";die;
 		do_action("AHEE__{$classname}__deactivation");
 		do_action("AHEE__EE_Addon__deactivation", $this);
 		//check if the site no longer needs to be in maintenance mode
-		EE_Register_Addon::deregister( $this->name() );
+		EE_Register_Addon::deregister($this->name());
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 	}
 
@@ -176,16 +176,16 @@ 
 	 * This is a resource-intensive job so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
-		if( $verify_schema === '' ) {
+	public function initialize_db_if_no_migrations_required($verify_schema = true) {
+		if ($verify_schema === '') {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
 			//(ie, no 2nd or 3rd arguments), instead of calling the registered callbacks with no arguments, it
 			//calls them with an argument of an empty string (ie ""), which evaluates to false
 			//so we need to treat the empty string as if nothing had been passed, and should instead use the default
 			$verify_schema = true;
 		}
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			if( $verify_schema ) {
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			if ($verify_schema) {
 				$this->initialize_db();
 			}
 			$this->initialize_default_data();
@@ -199,15 +199,15 @@ 
 			 */
 			EE_Registry::instance()->load_helper('Activation');
 			EEH_Activation::initialize_db_content();
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+			update_option('ee_flush_rewrite_rules', TRUE);
 			//in case there are lots of addons being activated at once, let's force garbage collection
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else {
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name());
 		}
 	}
 
@@ -221,20 +221,20 @@ 
 	 */
 	public function initialize_db() {
 		//find the migration script that sets the database to be compatible with the code
-		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() );
-		if( $current_dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name );
-			$current_data_migration_script->set_migrating( FALSE );
+		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name());
+		if ($current_dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name);
+			$current_data_migration_script->set_migrating(FALSE);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if ( $current_data_migration_script->get_errors() ) {
-				foreach( $current_data_migration_script->get_errors() as $error ) {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				foreach ($current_data_migration_script->get_errors() as $error) {
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
 		//if not DMS was found that should be ok. This addon just doesn't require any database changes
-		EE_Data_Migration_Manager::instance()->update_current_database_state_to( array( 'slug' => $this->name(), 'version' => $this->version() ) );
+		EE_Data_Migration_Manager::instance()->update_current_database_state_to(array('slug' => $this->name(), 'version' => $this->version()));
 	}
 
 
@@ -256,7 +256,7 @@ 
 		 * default data)
 		 * @param EE_Addon $addon the addon that called this
 		 */
-		do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this );
+		do_action('AHEE__EE_Addon__initialize_default_data__begin', $this);
 		//override to insert default data. It is safe to use the models here
 		//because the site should not be in maintenance mode
 	}
@@ -275,7 +275,7 @@ 
 		do_action("AHEE__EE_Addon__upgrade", $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -288,7 +288,7 @@ 
 		do_action("AHEE__{$classname}__downgrade");
 		do_action("AHEE__EE_Addon__downgrade", $this);
 		//it's possible there's old default data that needs to be double-checked
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * plugin activation only. In the future, we'll want to do it on plugin updates too
 	 * @return bool
 	 */
-	public function set_db_update_option_name(){
+	public function set_db_update_option_name() {
 		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016');
 		//let's just handle this on the next request, ok? right now we're just not really ready
 		return $this->set_activation_indicator_option();
@@ -327,7 +327,7 @@ 
 	 */
 	public function set_activation_indicator_option() {
 		// let's just handle this on the next request, ok? right now we're just not really ready
-		return update_option( $this->get_activation_indicator_option_name(), TRUE );
+		return update_option($this->get_activation_indicator_option_name(), TRUE);
 	}
 
 
@@ -335,8 +335,8 @@ 
 	 * Gets the name of the wp option which is used to temporarily indicate that this addon was activated
 	 * @return string
 	 */
-	public function get_activation_indicator_option_name(){
-		return 'ee_activation_' . $this->name();
+	public function get_activation_indicator_option_name() {
+		return 'ee_activation_'.$this->name();
 	}
 
 
@@ -346,7 +346,7 @@ 
 	 * Used by EE_System to set the request type of this addon. Should not be used by addon developers
 	 * @param int $req_type
 	 */
-	function set_req_type( $req_type ) {
+	function set_req_type($req_type) {
 		$this->_req_type = $req_type;
 	}
 
@@ -357,7 +357,7 @@ 
 	 * of addons
 	 */
 	function detect_req_type() {
-		if( ! $this->_req_type ){
+		if ( ! $this->_req_type) {
 			$this->detect_activation_or_upgrade();
 		}
 		return $this->_req_type;
@@ -370,36 +370,36 @@ 
 	 * Should only be called once per request
 	 * @return void
 	 */
-	function detect_activation_or_upgrade(){
+	function detect_activation_or_upgrade() {
 		$activation_history_for_addon = $this->get_activation_history();
 //		d($activation_history_for_addon);
 		$request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version());
 		$this->set_req_type($request_type);
 		$classname = get_class($this);
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this);
 				$this->new_install();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this);
 				$this->reactivation();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this);
 				$this->upgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" );
-				do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade");
+				do_action("AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this);
 				$this->downgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_normal:
 			default:
@@ -407,7 +407,7 @@ 
 				break;
 		}
 
-		do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" );
+		do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete");
 	}
 
 	/**
@@ -416,17 +416,17 @@ 
 	 * @param string $current_version_to_add
 	 * @return boolean success
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->get_activation_history();
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = $this->version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// resave
 //		echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history);
-		return update_option( $this->get_activation_history_option_name(), $version_history );
+		return update_option($this->get_activation_history_option_name(), $version_history);
 	}
 
 	/**
@@ -434,8 +434,8 @@ 
 	 * of this addon
 	 * @return string
 	 */
-	function get_activation_history_option_name(){
-		return self::ee_addon_version_history_option_prefix . $this->name();
+	function get_activation_history_option_name() {
+		return self::ee_addon_version_history_option_prefix.$this->name();
 	}
 
 
@@ -444,7 +444,7 @@ 
 	 * Gets the wp option which stores the activation history for this addon
 	 * @return array
 	 */
-	function get_activation_history(){
+	function get_activation_history() {
 		return get_option($this->get_activation_history_option_name(), NULL);
 	}
 
@@ -453,8 +453,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'addons';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'addons';
 	}
 	/**
 	 *	filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc.
@@ -467,14 +467,14 @@ 
 	 * Sets the filepath to the main plugin file
 	 * @param string $filepath
 	 */
-	public function set_main_plugin_file( $filepath ) {
+	public function set_main_plugin_file($filepath) {
 		$this->_main_plugin_file = $filepath;
 	}
 	/**
 	 * gets the filepath to teh main file
 	 * @return string
 	 */
-	public function get_main_plugin_file(){
+	public function get_main_plugin_file() {
 		return $this->_main_plugin_file;
 	}
 
@@ -484,15 +484,15 @@ 
 	 * @return string
 	 */
 	public function get_main_plugin_file_basename() {
-		return plugin_basename( $this->get_main_plugin_file() );
+		return plugin_basename($this->get_main_plugin_file());
 	}
 
 	/**
 	 * Gets the folder name which contains the main plugin file
 	 * @return string
 	 */
-	public function get_main_plugin_file_dirname(){
-		return dirname( $this->get_main_plugin_file() );
+	public function get_main_plugin_file_dirname() {
+		return dirname($this->get_main_plugin_file());
 	}
 
 }

Braces +1 added lines, -1 removed lines

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

core/EE_Capabilities.core.php

Doc Comments +3 added lines, -3 removed lines

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

Indentation +1 added lines, -2 removed lines

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

Spacing +124 added lines, -124 removed lines

@@ -7,8 +7,8 @@ 
  * @package Event Espresso
  * @subpackage core, capabilities
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -69,7 +69,7 @@ 
 	 */
 	public static function instance() {
 		//check if instantiated, and if not do so.
-		if ( ! self::$_instance instanceof EE_Capabilities ) {
+		if ( ! self::$_instance instanceof EE_Capabilities) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -98,10 +98,10 @@ 
 	 * @since 4.5.0
 	 * @return void
 	 */
-	public function init_caps( $reset = false ) {
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+	public function init_caps($reset = false) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$this->_caps_map = $this->_init_caps_map();
-			$this->init_role_caps( $reset );
+			$this->init_role_caps($reset);
 			$this->_set_meta_caps();
 		}
 	}
@@ -119,41 +119,41 @@ 
 	private function _set_meta_caps() {
 		$this->_meta_caps = array(
 			//edits
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_event', array( 'Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_venue', array( 'Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_registration', array( 'Registration', '', 'ee_edit_others_registrations', '' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_checkin', array( 'Registration', '', 'ee_edit_others_checkins', '' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_edit_message', array( 'Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_default_ticket', array( 'Ticket', '', 'ee_edit_others_default_tickets', '' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question', array( 'Question', '', '', 'ee_edit_system_questions' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question_group', array( 'Question_Group', '', '', 'ee_edit_system_question_groups' ) ),
-			new EE_Meta_Capability_Map_Edit( 'ee_edit_payment_method', array( 'Payment_Method', '', 'ee_edit_others_payment_methods', '' ) ),
+			new EE_Meta_Capability_Map_Edit('ee_edit_event', array('Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_venue', array('Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_registration', array('Registration', '', 'ee_edit_others_registrations', '')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_checkin', array('Registration', '', 'ee_edit_others_checkins', '')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_edit_message', array('Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_default_ticket', array('Ticket', '', 'ee_edit_others_default_tickets', '')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question', array('Question', '', '', 'ee_edit_system_questions')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question_group', array('Question_Group', '', '', 'ee_edit_system_question_groups')),
+			new EE_Meta_Capability_Map_Edit('ee_edit_payment_method', array('Payment_Method', '', 'ee_edit_others_payment_methods', '')),
 			//reads
-			new EE_Meta_Capability_Map_Read( 'ee_read_event', array( 'Event', '', 'ee_read_others_events', 'ee_read_private_events' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_venue', array( 'Venue', '', 'ee_read_others_venues', 'ee_read_private_venues' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_registration', array( 'Registration', '', '', 'ee_edit_others_registrations' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_checkin', array( 'Registration', '', '', 'ee_read_others_checkins' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_read_message', array( 'Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_default_ticket', array( 'Ticket', '', '', 'ee_read_others_default_tickets' ) ),
-			new EE_Meta_Capability_Map_Read( 'ee_read_payment_method', array( 'Payment_Method', '', '', 'ee_read_others_payment_methods' ) ),
+			new EE_Meta_Capability_Map_Read('ee_read_event', array('Event', '', 'ee_read_others_events', 'ee_read_private_events')),
+			new EE_Meta_Capability_Map_Read('ee_read_venue', array('Venue', '', 'ee_read_others_venues', 'ee_read_private_venues')),
+			new EE_Meta_Capability_Map_Read('ee_read_registration', array('Registration', '', '', 'ee_edit_others_registrations')),
+			new EE_Meta_Capability_Map_Read('ee_read_checkin', array('Registration', '', '', 'ee_read_others_checkins')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_read_message', array('Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages')),
+			new EE_Meta_Capability_Map_Read('ee_read_default_ticket', array('Ticket', '', '', 'ee_read_others_default_tickets')),
+			new EE_Meta_Capability_Map_Read('ee_read_payment_method', array('Payment_Method', '', '', 'ee_read_others_payment_methods')),
 
 			//deletes
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_event', array( 'Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_venue', array( 'Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_registration', array( 'Registration', '', 'ee_delete_others_registrations', '' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_checkin', array( 'Registration', '', 'ee_delete_others_checkins', '' ) ),
-			new EE_Meta_Capability_Map_Messages_Cap( 'ee_delete_message', array( 'Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_default_ticket', array( 'Ticket', '', 'ee_delete_others_default_tickets', '' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question', array( 'Question', '', '', 'delete_system_questions' ) ),
-			new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question_group', array( 'Question_Group', '', '', 'delete_system_question_groups' ) ),
-			new EE_Meta_Capability_Map_Delete( 'ee_delete_payment_method', array( 'Payment_Method', '', 'ee_delete_others_payment_methods', '' ) ),
+			new EE_Meta_Capability_Map_Delete('ee_delete_event', array('Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_venue', array('Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_registration', array('Registration', '', 'ee_delete_others_registrations', '')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_checkin', array('Registration', '', 'ee_delete_others_checkins', '')),
+			new EE_Meta_Capability_Map_Messages_Cap('ee_delete_message', array('Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_default_ticket', array('Ticket', '', 'ee_delete_others_default_tickets', '')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question', array('Question', '', '', 'delete_system_questions')),
+			new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question_group', array('Question_Group', '', '', 'delete_system_question_groups')),
+			new EE_Meta_Capability_Map_Delete('ee_delete_payment_method', array('Payment_Method', '', 'ee_delete_others_payment_methods', '')),
 		);
 
-		$this->_meta_caps = apply_filters( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps );
+		$this->_meta_caps = apply_filters('FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps);
 
 		//add filter for map_meta_caps but only if models can query.
-		if ( EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ) ) ) {
-			add_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10, 4 );
+		if (EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter('map_meta_cap', array($this, 'map_meta_caps'))) {
+			add_filter('map_meta_cap', array($this, 'map_meta_caps'), 10, 4);
 		}
 	}
 
@@ -175,15 +175,15 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
 		//loop through our _meta_caps array
-		foreach ( $this->_meta_caps as $meta_map ) {
-			if ( ! $meta_map instanceof EE_Meta_Capability_Map ) {
+		foreach ($this->_meta_caps as $meta_map) {
+			if ( ! $meta_map instanceof EE_Meta_Capability_Map) {
 				continue;
 			}
 			$meta_map->ensure_is_model();
 
-			$caps = $meta_map->map_meta_caps( $caps, $cap, $user_id, $args );
+			$caps = $meta_map->map_meta_caps($caps, $cap, $user_id, $args);
 		}
 		return $caps;
 	}
@@ -348,7 +348,7 @@ 
 				)
 			);
 
-		$caps = apply_filters( 'FHEE__EE_Capabilities__init_caps_map__caps', $caps );
+		$caps = apply_filters('FHEE__EE_Capabilities__init_caps_map__caps', $caps);
 		return $caps;
 	}
 
@@ -365,26 +365,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function init_role_caps( $reset = false, $custom_map = array() ) {
+	public function init_role_caps($reset = false, $custom_map = array()) {
 
-		$caps_map = empty( $custom_map ) ? $this->_caps_map : $custom_map;
+		$caps_map = empty($custom_map) ? $this->_caps_map : $custom_map;
 
 		//first let's determine if these caps have already been set.
-		$caps_set_before = get_option( self::option_name, array() );
+		$caps_set_before = get_option(self::option_name, array());
 		//if not reset, see what caps are new for each role. if they're new, add them.
-		foreach ( $caps_map as $role => $caps_for_role ) {
-			foreach ( $caps_for_role as $cap ) {
+		foreach ($caps_map as $role => $caps_for_role) {
+			foreach ($caps_for_role as $cap) {
 				//first check we haven't already added this cap before, or it's a reset
-				if ( $reset || ! isset( $caps_set_before[ $role ] ) || ! in_array( $cap, $caps_set_before[ $role ] ) ) {
-					$this->add_cap_to_role( $role, $cap );
-					$caps_set_before[ $role ][] = $cap;
+				if ($reset || ! isset($caps_set_before[$role]) || ! in_array($cap, $caps_set_before[$role])) {
+					$this->add_cap_to_role($role, $cap);
+					$caps_set_before[$role][] = $cap;
 				}
 			}
 		}
 
 		//now let's just save the cap that has been set.
-		update_option( self::option_name, $caps_set_before );
-		do_action( 'AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before );
+		update_option(self::option_name, $caps_set_before);
+		do_action('AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before);
 	}
 
 
@@ -403,10 +403,10 @@ 
 	 * @param bool $grant  Whether to grant access to this cap on this role.
 	 * @return void
 	 */
-	public function add_cap_to_role( $role, $cap, $grant = true ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->add_cap( $cap, $grant );
+	public function add_cap_to_role($role, $cap, $grant = true) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->add_cap($cap, $grant);
 		}
 	}
 
@@ -426,10 +426,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function remove_cap_from_role( $role, $cap ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->remove_cap( $cap );
+	public function remove_cap_from_role($role, $cap) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->remove_cap($cap);
 		}
 	}
 
@@ -450,11 +450,11 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can( $cap, $context, $id = 0 ) {
+	public function current_user_can($cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap__' . $context,  $cap, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id );
-		return ! empty( $id ) ? current_user_can( $filtered_cap, $id ) : current_user_can( $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap__'.$context, $cap, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id);
+		return ! empty($id) ? current_user_can($filtered_cap, $id) : current_user_can($filtered_cap);
 	}
 
 
@@ -471,11 +471,11 @@ 
 	 *
 	 * @return bool Whether user can or not.
 	 */
-	public function user_can( $user, $cap, $context, $id = 0 ) {
+	public function user_can($user, $cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap__' . $context, $cap, $user, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user,  $id );
-		return ! empty( $id ) ? user_can( $user, $filtered_cap, $id ) : user_can( $user, $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap__'.$context, $cap, $user, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user, $id);
+		return ! empty($id) ? user_can($user, $filtered_cap, $id) : user_can($user, $filtered_cap);
 	}
 
 
@@ -495,12 +495,12 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can_for_blog( $blog_id, $cap, $context, $id = 0 ) {
-		$user_can = ! empty( $id ) ? current_user_can_for_blog( $blog_id, $cap, $id ) : current_user_can( $blog_id, $cap );
+	public function current_user_can_for_blog($blog_id, $cap, $context, $id = 0) {
+		$user_can = ! empty($id) ? current_user_can_for_blog($blog_id, $cap, $id) : current_user_can($blog_id, $cap);
 
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can__' . $context, $user_can, $blog_id, $cap, $id );
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id );
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can__'.$context, $user_can, $blog_id, $cap, $id);
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id);
 		return $user_can;
 	}
 
@@ -516,12 +516,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_ee_capabilities( $role = 'administrator' ) {
+	public function get_ee_capabilities($role = 'administrator') {
 		$capabilities = $this->_init_caps_map();
-		if ( empty( $role ) ) {
+		if (empty($role)) {
 			return $capabilities;
 		}
-		return isset( $capabilities[ $role ] ) ? $capabilities[ $role ] : array();
+		return isset($capabilities[$role]) ? $capabilities[$role] : array();
 	}
 }
 
@@ -569,11 +569,11 @@ 
 	 * 	}
 	 * @throws EE_Error
 	 */
-	public function __construct( $meta_cap, $map_values ) {
+	public function __construct($meta_cap, $map_values) {
 		$this->meta_cap = $meta_cap;
 		//verify there are four args in the $map_values array;
-		if ( count( $map_values ) !== 4 ) {
-			throw new EE_Error( sprintf( __( 'Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso' ), '<br>' . print_r( $map_values, true ) ) );
+		if (count($map_values) !== 4) {
+			throw new EE_Error(sprintf(__('Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso'), '<br>'.print_r($map_values, true)));
 		}
 
 		//set properties
@@ -597,19 +597,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));
 		}
 	}
 
@@ -625,8 +625,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);
 	}
 
 
@@ -644,7 +644,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);
 }
 
 
@@ -676,28 +676,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;
@@ -705,21 +705,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;
 				}
 			}
@@ -756,8 +756,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);
 	}
 }
 
@@ -789,45 +789,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;
@@ -864,30 +864,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;
@@ -925,16 +925,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;
 		}
@@ -942,7 +942,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_Deprecated.core.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +104 added lines, -104 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Indentation +4 added lines, -4 removed lines

@@ -110,10 +110,10 @@
 }
 add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 );
 /**
- * ee_deprecated_finalize_registration
- *
- * @param EE_Registration $registration
- */
+	 * ee_deprecated_finalize_registration
+	 *
+	 * @param EE_Registration $registration
+	 */
 function ee_deprecated_finalize_registration( EE_Registration $registration ) {
 	$action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
 	if ( $action_ref ) {

core/EE_Error.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
 	/**
 	 *    error_handler
 	 * @access public
-	 * @param $code
+	 * @param integer $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -189,7 +189,7 @@ 
 	/**
 	 *    _format_error
 	 * @access private
-	 * @param $code
+	 * @param string $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -936,7 +936,7 @@ 
 	 *
 	 * @access    public
 	 * @param string $return_url
-	 * @return    array
+	 * @return    string
 	 */
 	public static function get_persistent_admin_notices( $return_url = '' ) {
 		$notices = '';
@@ -961,7 +961,7 @@ 
 	 *
 	 * @access 	public
 	 * @param 	bool $force_print
-	 * @return 	void
+	 * @return 	null|string
 	 */
 	private static function _print_scripts( $force_print = FALSE ) {
 		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {

Indentation +174 added lines, -174 removed lines

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

Spacing +234 added lines, -234 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);
 	}
 
 
@@ -562,8 +562,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);
 	}
 
 
@@ -580,8 +580,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);
 	}
 
 
@@ -599,12 +599,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
@@ -612,26 +612,26 @@ 
 				EVENT_ESPRESSO_VERSION
 			);
 		}
-		if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) {
+		if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) {
 			EE_Error::doing_it_wrong(
 				'EE_Error::add_error()',
-				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ),
+				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'),
 				EVENT_ESPRESSO_VERSION
 			);
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $msg );
+		$msg = explode('||', $msg);
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code only on error
-			$error_code = $type == 'errors' ? EE_Error::generate_error_code ( $file, $func, $line ) : '';
-			$error_code =  ! empty( $error_code ) ? '<br/><span class="tiny-text">' . $error_code . '</span>' : '';
+			$error_code = $type == 'errors' ? EE_Error::generate_error_code($file, $func, $line) : '';
+			$error_code = ! empty($error_code) ? '<br/><span class="tiny-text">'.$error_code.'</span>' : '';
 			// add notice
-			self::$_espresso_notices[ $type ][] = $msg . $error_code;
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			self::$_espresso_notices[$type][] = $msg.$error_code;
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -685,7 +685,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;
@@ -698,14 +698,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;
 	}
 
@@ -720,8 +720,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 = '';
@@ -731,44 +731,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;
 		}
 
@@ -782,21 +782,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>';
@@ -809,7 +809,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -819,7 +819,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -839,17 +839,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);
 			}
 		}
 	}
@@ -865,34 +865,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));
 		}
 	}
 
@@ -907,20 +907,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>';
@@ -936,17 +936,17 @@ 
 	 * @param string $return_url
 	 * @return    array
 	 */
-	public static function get_persistent_admin_notices( $return_url = '' ) {
+	public static function get_persistent_admin_notices($return_url = '') {
 		$notices = '';
 		// check for persistent admin notices
-		if ( $persistent_admin_notices = get_option( 'ee_pers_admin_notices', FALSE )) {
+		if ($persistent_admin_notices = get_option('ee_pers_admin_notices', FALSE)) {
 			// load scripts
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'ee_error_js' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('ee_error_js');
 			// and display notices
-			foreach( $persistent_admin_notices as $pan_name => $pan_message ) {
-				$notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url );
+			foreach ($persistent_admin_notices as $pan_name => $pan_message) {
+				$notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url);
 			}
 		}
 		return $notices;
@@ -961,26 +961,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>
 ';
 
 		}
@@ -1014,11 +1014,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;
 	}
 
@@ -1034,38 +1034,38 @@ 
 	*	@ param object $ex
 	*	@ return void
 	*/
-	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
+	public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) {
 
-		if ( ! $ex ) {
+		if ( ! $ex) {
 			return;
 		}
 
-		if ( ! $time ) {
+		if ( ! $time) {
 			$time = time();
 		}
 
-		$exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . ']  Exception Details' . PHP_EOL;
-		$exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL;
-		$exception_log .= 'Code: '. $ex['code'] . PHP_EOL;
-		$exception_log .= 'File: '. $ex['file'] . PHP_EOL;
-		$exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL;
-		$exception_log .= 'Stack trace: ' . PHP_EOL;
-		$exception_log .= $ex['string'] . PHP_EOL;
-		$exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL;
-
-		EE_Registry::instance()->load_helper( 'File' );
+		$exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+		$exception_log .= 'Message: '.$ex['msg'].PHP_EOL;
+		$exception_log .= 'Code: '.$ex['code'].PHP_EOL;
+		$exception_log .= 'File: '.$ex['file'].PHP_EOL;
+		$exception_log .= 'Line No: '.$ex['line'].PHP_EOL;
+		$exception_log .= 'Stack trace: '.PHP_EOL;
+		$exception_log .= $ex['string'].PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL;
+
+		EE_Registry::instance()->load_helper('File');
 		try {
-			EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' );
-			EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' );
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			if ( ! $clear ) {
+			EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs');
+			EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs');
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			if ( ! $clear) {
 				//get existing log file and append new log info
-				$exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log;
+				$exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log;
 			}
-			EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+			EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 			return;
 		}
 
@@ -1088,10 +1088,10 @@ 
 	 * @param  string $version  The version of Event Espresso where the error was added
 	 * @return trigger_error()
 	 */
-	public static function doing_it_wrong( $function, $message, $version ) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
+	public static function doing_it_wrong($function, $message, $version) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			EE_Registry::instance()->load_helper('Debug_Tools');
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version );
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version);
 		}
 	}
 
@@ -1111,13 +1111,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);
 }
 
 

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_Maintenance_Mode.core.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +4 added lines, -4 removed lines

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

Spacing +38 added lines, -38 removed lines

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

Braces +3 added lines, -3 removed lines

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