eventespresso / event-espresso-core

core/db_models/helpers/EE_Unique_Index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Used to indicate  a UNIQUE key index - ie, a set of fields which must be unique
  * for ALL the model objects of this type
  */
-class EE_Unique_Index extends EE_Index{
+class EE_Unique_Index extends EE_Index {
 	//yep, actually the same as index right now
 	
 }

core/db_models/relations/EE_Belongs_To_Any_Relation.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
  * in order to specify which model the foreign key points to (eg, the foreign key may have a value of 34, but is that Transaction with
  * ID 34 or Registration with ID 34? The EE_Any_Foreign_Model_name_Field specifies which of the two). 
  */
-require_once( EE_MODELS . 'relations/EE_Belongs_To_Relation.php');
+require_once(EE_MODELS.'relations/EE_Belongs_To_Relation.php');
 
 class EE_Belongs_To_Any_Relation extends EE_Belongs_To_Relation {
 
@@ -19,8 +19,8 @@ 
 		
 		
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$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_fk_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();
+		$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_fk_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);
 		return $this->_left_join($other_table, 
 				$other_table_alias, 
@@ -58,12 +58,12 @@ 
 	 */
 	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, true);
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//find the field on th eother model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//set that field on the other model to this model's ID
 		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
-		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(),null,true);
+		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(), null, true);
 		$this_model_obj->save();
 		return $other_model_obj;
 	}

core/db_models/relations/EE_Belongs_To_Relation.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
 /**
- * Class EE_Belongs_To_Relation
- *
- * The current model has the foreign key pointing to the other model. Eg, Registration belongs to Transaction
- * (because Registration's TXN_ID field is on Registration, and points to the Transaction's PK)
- *
- * @package            Event Espresso
- * @subpackage    core
- * @author                MIke Nelson
- *
- */
+	 * Class EE_Belongs_To_Relation
+	 *
+	 * The current model has the foreign key pointing to the other model. Eg, Registration belongs to Transaction
+	 * (because Registration's TXN_ID field is on Registration, and points to the Transaction's PK)
+	 *
+	 * @package            Event Espresso
+	 * @subpackage    core
+	 * @author                MIke Nelson
+	 *
+	 */
 class EE_Belongs_To_Relation extends EE_Model_Relation_Base {
 
 	/**

Braces +1 added lines, -1 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
 /**
  * Class EE_Belongs_To_Relation
  *
@@ -36,10 +36,10 @@ 
 		//create the sql string like
 		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$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_fk_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();
+		$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_fk_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);
-		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//find the field on the other model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		if ( $this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()){
+		if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
 			//set that field on the other model to this model's ID
 			$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
 			$this_model_obj->save();
@@ -69,7 +69,7 @@ 
 	 */
 	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, true);
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//find the field on the other model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//set that field on the other model to this model's ID
@@ -86,15 +86,15 @@ 
 	 * @return EE_Base_Class[]
 	 */
 	public function get_all_related($model_obj_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
-		if( $values_already_prepared_by_model_object !== false ) {
-			EE_Error::doing_it_wrong( 'EE_Model_Relation_Base::get_all_related', __( 'The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso' ), '4.8.1' );
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong('EE_Model_Relation_Base::get_all_related', __('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'), '4.8.1');
 		}
 		//get column on this model object which is a foreign key to the other model
 		$fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//get its value
-		if( $model_obj_or_id instanceof EE_Base_Class){
+		if ($model_obj_or_id instanceof EE_Base_Class) {
 			$model_obj = $model_obj_or_id;
-		}else{
+		} else {
 			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
 		}
 		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());

core/db_models/relations/EE_Has_Many_Any_Relation.php

Spacing +9 added lines, -9 removed lines

@@ -7,16 +7,16 @@ 
  * ID 34 or Registration with ID 34? The EE_Any_Foreign_Model_name_Field specifies which of the two).
  *
  */
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
-class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation{
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation {
 
-	function get_join_statement($model_relation_chain){
+	function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$pk_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();
-		$fk_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_fk_field->get_table_alias();
+		$pk_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();
+		$fk_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_fk_field->get_table_alias();
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
 		$field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
 
@@ -25,7 +25,7 @@ 
 				$other_table_fk_field->get_table_column(),
 				$pk_table_alias,
 				$this_table_pk_field->get_table_column(),
-				$fk_table_alias . '.' . $field_with_model_name->get_table_column() . "='" . $this->get_this_model()->get_this_model_name() . "'" )
+				$fk_table_alias.'.'.$field_with_model_name->get_table_column()."='".$this->get_this_model()->get_this_model_name()."'")
 				.$this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
 	}
 	/**
@@ -34,7 +34,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, true);
 
@@ -53,12 +53,12 @@ 
 	 * @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) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //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());
 		 //set that field on the other model to this model's ID
-		 $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);
 		 $other_model_obj->set($this->get_other_model()->get_field_containing_related_model_name()->get_name(), null, true);
 		 $other_model_obj->save();
 		 return $other_model_obj;

core/db_models/relations/EE_Has_Many_Relation.php

Spacing +10 added lines, -10 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_Model_Relation_Base.php');
-class EE_Has_Many_Relation extends EE_Model_Relation_Base{	
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+class EE_Has_Many_Relation extends EE_Model_Relation_Base {	
 	
 	/**
 	 * Object representing the relationship between two models. Has_Many_Relations are where the OTHER model has the foreign key
@@ -15,16 +15,16 @@ 
 	 * @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($block_deletes = true, $blocking_delete_error_message = null){
+	function __construct($block_deletes = true, $blocking_delete_error_message = null) {
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
-	function get_join_statement($model_relation_chain){
+	function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$pk_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();
-		$fk_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_fk_field->get_table_alias();
+		$pk_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();
+		$fk_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_fk_field->get_table_alias();
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
 		
 		return $this->_left_join($fk_table, $fk_table_alias, $other_table_fk_field->get_table_column(), $pk_table_alias, $this_table_pk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
@@ -35,13 +35,13 @@ 
 	 * @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, true);
 		 
 		 //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());
-		 if($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()){
+		 if ($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()) {
 			//set that field on the other model to this model's ID
 			$other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
 			$other_model_obj->save();
@@ -55,12 +55,12 @@ 
 	 * @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) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //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());
 		 //set that field on the other model to this model's ID
-		 $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);
 		 $other_model_obj->save();
 		 return $other_model_obj;
 	 }

core/db_models/relations/EE_Model_Relation_Base.php

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 +46 added lines, -46 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,13 +136,13 @@ 
 	 * @param boolean $values_already_prepared_by_model_object @deprecated since 4.8.1
 	 * @return EE_Base_Class[]
 	 */
-	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false){
-		if( $values_already_prepared_by_model_object !== false ) {
-			EE_Error::doing_it_wrong( 'EE_Model_Relation_Base::get_all_related', __( 'The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso' ), '4.8.1' );
+	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong('EE_Model_Relation_Base::get_all_related', __('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'), '4.8.1');
 		}
 		$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);
 	}
@@ -154,9 +154,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;
 	}
@@ -172,15 +172,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++;
@@ -200,27 +200,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++;
@@ -239,13 +239,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;
 	}
@@ -288,10 +288,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;
@@ -304,7 +304,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;
 	}
 
@@ -313,13 +313,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)

Doc Comments +7 added lines, -7 removed lines

@@ -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|null $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|null $model_object_or_id
 	 * @param array $query_params
 	 * @return int of how many related models got deleted
 	 */

core/db_models/strategies/EE_Restriction_Generator_Base.strategy.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -53,7 +53,7 @@ 
 	 * @param EEM_Base $model
 	 * @param string $action
 	 */
-	public function _construct_finalize( EEM_Base $model, $action ){
+	public function _construct_finalize(EEM_Base $model, $action) {
 		$this->_model = $model;
 		$this->_action = $action;
 	}
@@ -65,8 +65,8 @@ 
 	 * @return EEM_Base | EEM_Soft_Delete_Base
 	 */
 	public function model() {
-		if( ! $this->_model instanceof EEM_Base ) {
-			throw new EE_Error( sprintf( __( 'Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso' ), get_class( $this ) ) );
+		if ( ! $this->_model instanceof EEM_Base) {
+			throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
 		}
 		return $this->_model;
 	}
@@ -79,8 +79,8 @@ 
 	 * @return string
 	 */
 	public function action() {
-		if( ! $this->_action ) {
-			throw new EE_Error( sprintf( __( 'Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso' ), get_class( $this ) ) );
+		if ( ! $this->_action) {
+			throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
 		}
 		return $this->_action;
 	}
@@ -89,10 +89,10 @@ 
 	 * Returns whether or not _construct_finalize() has been called on this restriction generator object
 	 * @return boolean
 	 */
-	public function construction_finalized(){
-		if( $this->_model instanceof EEM_Base  && $this->_action ){
+	public function construction_finalized() {
+		if ($this->_model instanceof EEM_Base && $this->_action) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -103,10 +103,10 @@ 
 	 * @return array @see EEM_Base::_cap_restrictions
 	 */
 	public function generate_restrictions() {
-		if( $this->_cap_restrictions_generated === false ) {
-			$this->_cap_restrictions_generated = apply_filters( 'FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this );
+		if ($this->_cap_restrictions_generated === false) {
+			$this->_cap_restrictions_generated = apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this);
 		}
-		return apply_filters( 'FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this );
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this);
 	}
 
 	/**
@@ -122,10 +122,10 @@ 
 	 * making restrictions and caching them on itself in case its asked later
 	 * @return boolean
 	 */
-	public function has_generated_cap_restrictions(){
-		if( $this->_cap_restrictions_generated === false ){
+	public function has_generated_cap_restrictions() {
+		if ($this->_cap_restrictions_generated === false) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -139,8 +139,8 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	public static function get_cap_name( $model, $action ) {
-		return apply_filters( 'FHEE__EE_Restriction_Generator__get_cap_name', ( $model->is_wp_core_model() ? '' : 'ee_' ) . $action . '_' . $model->cap_slug(), $model, $action );
+	public static function get_cap_name($model, $action) {
+		return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ($model->is_wp_core_model() ? '' : 'ee_').$action.'_'.$model->cap_slug(), $model, $action);
 	}
 
 	/**
@@ -149,11 +149,11 @@ 
 	 * @param string $action
 	 * @return boolean
 	 */
-	public static function is_cap( $model, $action ) {
-		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
-		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
+	public static function is_cap($model, $action) {
+		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities('administrator');
+		if (in_array(self::get_cap_name($model, $action), $caps_for_admin)) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -164,7 +164,7 @@ 
 	 * @return string
 	 */
 	public static function get_default_restrictions_cap() {
-		return apply_filters( 'FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options' );
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options');
 	}
 }
 

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	public function construction_finalized(){
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function has_generated_cap_restrictions(){
 		if( $this->_cap_restrictions_generated === false ){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -153,7 +153,7 @@ 
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/db_models/strategies/EE_Restriction_Generator_Default_Protected.strategy.php

Spacing +22 added lines, -22 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -40,9 +40,9 @@ 
 	 * @param string $path_to_event_model The model chain to follow to get to the event model, including the event model itself.
 	 * Eg 'Ticket.Datetime.Event'
 	 */
-	public function __construct( $default_field_name, $path_to_event_model ) {
+	public function __construct($default_field_name, $path_to_event_model) {
 		$this->_default_field_name = $default_field_name;
-		if( substr( $path_to_event_model, -1, 1 ) != '.' ) {
+		if (substr($path_to_event_model, -1, 1) != '.') {
 			$path_to_event_model .= '.';
 		}
 		$this->_path_to_event_model = $path_to_event_model;
@@ -57,7 +57,7 @@ 
 	protected function _generate_restrictions( ) {
 		//if there are no standard caps for this model, then for now all we know is
 		//if they need the default cap to access this
-		if ( ! $this->model()->cap_slug() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
@@ -65,37 +65,37 @@ 
 
 		$event_model = EEM_Event::instance();
 
-		$restrictions =  array(
+		$restrictions = array(
 			//first: basically access to non-defaults is essentially controlled by which events are accessible
 			//if they don't have the basic event cap, they can't access ANY non-default items
-			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions( array( $this->_default_field_name => true ) ),
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array($this->_default_field_name => true)),
 			//if they don't have the others event cap, they can't access others' non-default items
-			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others' ) => new EE_Default_Where_Conditions( array(
-				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others' ) => array(
-					$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder ),
-					$this->_default_field_name => true ) ),
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => new EE_Default_Where_Conditions(array(
+				'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => array(
+					$this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder ),
+					$this->_default_field_name => true )),
 			//if they have basic and others, but not private, they can't access others' private non-default items
-			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private' ) => new EE_Default_Where_Conditions(array(
-				'OR*no_' .EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private' ) => array(
-				$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-				$this->_path_to_event_model . 'status' => array( '!=', 'private' ),
-				$this->_default_field_name => true ) ) ),
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => new EE_Default_Where_Conditions(array(
+				'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => array(
+				$this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+				$this->_path_to_event_model.'status' => array('!=', 'private'),
+				$this->_default_field_name => true ) )),
 			//second: access to defaults is controlled by the defaulty capabilities
 			//if they don't have the default capability, restrict access to only non-default items
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_default' )	=> new EE_Default_Where_Conditions( array( $this->_default_field_name => false ) ),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_default')	=> new EE_Default_Where_Conditions(array($this->_default_field_name => false)),
 			//if they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
 			 );
-		if( EE_Restriction_Generator_Base::is_cap(  $this->model(), $this->action() . '_others_default' ) ) {
-			$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others_default' ) ] = new EE_Default_Where_Conditions( array(
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others_default')) {
+			$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default')] = new EE_Default_Where_Conditions(array(
 					//if they don't have the others default cap, they can't access others default items (but they can access
 					//their own default items, and non-default items)
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others_default' ) => array(
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default') => array(
 						'AND' => array(
-							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+							$this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
 							$this->_default_field_name => true
 							),
 						$this->_default_field_name => false
-					) ) );
+					) ));
 		}
 		return $restrictions;
 

core/db_models/strategies/EE_Restriction_Generator_Default_Public.strategy.php

Indentation +4 added lines, -4 removed lines

@@ -21,10 +21,10 @@
  */
 class EE_Restriction_Generator_Default_Public extends EE_Restriction_Generator_Base {
 /**
-	 * Name of the field on this model (or a related model, including the model chain to it)
-	 * that is a boolean indicating whether or not a model object is considered "Default" or not
-	 * @var string
-	 */
+ * Name of the field on this model (or a related model, including the model chain to it)
+ * that is a boolean indicating whether or not a model object is considered "Default" or not
+ * @var string
+ */
 	protected $_default_field_name;
 
 	/**

Spacing +22 added lines, -22 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -40,9 +40,9 @@ 
 	 * @param string $path_to_event_model The model chain to follow to get to the event model, including the event model itself.
 	 * Eg 'Ticket.Datetime.Event'
 	 */
-	public function __construct( $default_field_name, $path_to_event_model ) {
+	public function __construct($default_field_name, $path_to_event_model) {
 		$this->_default_field_name = $default_field_name;
-		if( substr( $path_to_event_model, -1, 1 ) != '.' ) {
+		if (substr($path_to_event_model, -1, 1) != '.') {
 			$path_to_event_model .= '.';
 		}
 		$this->_path_to_event_model = $path_to_event_model;
@@ -55,7 +55,7 @@ 
 	protected function _generate_restrictions() {
 		//if there are no standard caps for this model, then for now all we know
 		//if they need the default cap to access this
-		if ( !$this->model()->cap_slug() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
@@ -66,45 +66,45 @@ 
 		$restrictions = array(
 			//first: basically access to non-defaults is essentially controlled by which events are accessible
 			//if they don't have the basic event cap, they can't access ANY non-default items
-			EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() ) => new EE_Default_Where_Conditions( array(
-				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() ) => array(
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array(
+				'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => array(
 					$this->_default_field_name             => true,
-					$this->_path_to_event_model . 'status' => 'publish'
+					$this->_path_to_event_model.'status' => 'publish'
 				)
-			) ),
+			)),
 			//if they don't have the others event cap, they can only access their own, others' that are for published events, or defaults
-			EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() . '_others' ) => new EE_Default_Where_Conditions(
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => new EE_Default_Where_Conditions(
 				array(
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() . '_others' ) => array(
-						$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => array(
+						$this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
 						$this->_default_field_name => true,
-						$this->_path_to_event_model . 'status' => 'publish'
+						$this->_path_to_event_model.'status' => 'publish'
 					)
 				)
 			),
 			//if they have basic and others, but not private, they can access default, their own, and others' that aren't private
-			EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() . '_private' )   => new EE_Default_Where_Conditions(
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private')   => new EE_Default_Where_Conditions(
 				array(
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action() . '_private' ) => array(
-						$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-						$this->_path_to_event_model . 'status' => array( '!=', 'private' ),
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => array(
+						$this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+						$this->_path_to_event_model.'status' => array('!=', 'private'),
 						$this->_default_field_name => true
 					)
 				)
 			),
 			//second: access to defaults is controlled by the default capabilities
 			//if they don't have the basic default capability, restrict access to only non-default items
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_default' ) => new EE_Default_Where_Conditions(
-				array( $this->_default_field_name => false )
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_default') => new EE_Default_Where_Conditions(
+				array($this->_default_field_name => false)
 			),
 		);
-		if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() . '_others_default' ) ) {
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others_default')) {
 			//if they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
-			$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others_default' ) ] = new EE_Default_Where_Conditions(
+			$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default')] = new EE_Default_Where_Conditions(
 				array(
 					//if they don't have the others default cap, they can't access others default items (but they can access
 					//their own default items, and non-default items)
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others_default' ) => array(
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default') => array(
 						'AND' => array(
 							EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
 							$this->_default_field_name => true