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_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/strategies/EE_Default_Where_Conditions.strategy.php

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
  * Strategy to be used for getting default where conditions for EEM_Base children.
  * Should be initialized and set on construction of model
  */
-class EE_Default_Where_Conditions{
+class EE_Default_Where_Conditions {
 	/**
 	 * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
 	 * replaced with the current user's ID (because we don't want to use the current user's ID at time of
@@ -36,7 +36,7 @@ 
 	 * onto any field names
 	 * @param array $custom_where_conditions
 	 */
-	public function __construct( $custom_where_conditions = array() ) {
+	public function __construct($custom_where_conditions = array()) {
 		$this->_where_conditions_provided = $custom_where_conditions;
 	}
 
@@ -45,7 +45,7 @@ 
 	 * for querying of the model.
 	 * @param EEM_Base $model
 	 */
-	function _finalize_construct(EEM_Base $model){
+	function _finalize_construct(EEM_Base $model) {
 		$this->_model = $model;
 	}
 	/**
@@ -60,15 +60,15 @@ 
 	 * @param string $model_relation_chain
 	 * @return array like what's expected in EEM_Base::get_all()'s $query_params[0]
 	 */
-	function get_default_where_conditions( $model_relation_chain = '' ){
-		return $this->prepare_where_conditions_for_querying( array_merge( $this->_get_default_where_conditions(), $this->get_where_conditions_provided() ), $model_relation_chain );
+	function get_default_where_conditions($model_relation_chain = '') {
+		return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
 	}
 	/**
 	 * Gets the default where conditions that are specific to this child of EE_Default_Where_Conditions.
 	 * Adding model relation chains is handled by the public method get_default_where_conditions
 	 * @return array
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		return array();
 	}
 
@@ -82,33 +82,33 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function prepare_where_conditions_for_querying( $where_conditions, $model_relation_chain ) {
+	public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain) {
 		$where_conditions_with_model_relation_chain_prefixes = array();
-		if( ! is_array( $where_conditions ) ){
+		if ( ! is_array($where_conditions)) {
 			$where_conditions = array();
 		}
-		foreach( $where_conditions as $key => $value ) {
-			if( in_array( $key, array( 'OR', 'AND', 'NOT' ) ) ||
-			strpos( $key, 'OR*' )  !== false ||
-					strpos( $key, 'AND*' ) !== false ||
-					strpos( $key, 'NOT*' ) !== false ){
-				$where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying( $value, $model_relation_chain );
-			}else{
-				if($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain)-1] !='.'){
-					$model_relation_chain=$model_relation_chain.".";
+		foreach ($where_conditions as $key => $value) {
+			if (in_array($key, array('OR', 'AND', 'NOT')) ||
+			strpos($key, 'OR*') !== false ||
+					strpos($key, 'AND*') !== false ||
+					strpos($key, 'NOT*') !== false) {
+				$where_conditions_with_model_relation_chain_prefixes[$key] = $this->prepare_where_conditions_for_querying($value, $model_relation_chain);
+			} else {
+				if ($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain) - 1] != '.') {
+					$model_relation_chain = $model_relation_chain.".";
 				}
 				//check for the current user id place holder, and if present change it
-				if( $value === self::current_user_placeholder ){
+				if ($value === self::current_user_placeholder) {
 					$value = get_current_user_id();
 				}
 				//check for user field placeholder
-				if( $key == self::user_field_name_placeholder ) {
-					if( ! $this->_model->wp_user_field_name() ) {
-						throw new EE_Error( sprintf( __( 'There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model', 'event_espresso' ), $this->_model->get_this_model_name() ) );
+				if ($key == self::user_field_name_placeholder) {
+					if ( ! $this->_model->wp_user_field_name()) {
+						throw new EE_Error(sprintf(__('There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model', 'event_espresso'), $this->_model->get_this_model_name()));
 					}
 					$key = $this->_model->wp_user_field_name();
 				}
-				$where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
+				$where_conditions_with_model_relation_chain_prefixes[$model_relation_chain.$key] = $value;
 			}
 		}
 		return $where_conditions_with_model_relation_chain_prefixes;

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		if( $normalized_value ){
 			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){
 				throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url');
-			}else{
+			} else{
 				EE_Registry::instance()->load_helper('URL');
 				if( ! EEH_URL::remote_file_exists(
 						$normalized_value,

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

core/db_models/strategies/EE_Restriction_Generator_Event_Related_Protected.strategy.php

Spacing +14 added lines, -14 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');
 }
 
 /**
@@ -44,8 +44,8 @@ 
 	 * EDIT EVENTS in order to DELETE DATETIMES. If none if provided, assumed to be the same
 	 * as on the primary model.
 	 */
-	public function __construct( $path_to_event_model, $cap_context_on_event_model = null ) {
-		if( substr( $path_to_event_model, -1, 1 ) != '.' ) {
+	public function __construct($path_to_event_model, $cap_context_on_event_model = null) {
+		if (substr($path_to_event_model, -1, 1) != '.') {
 			$path_to_event_model .= '.';
 		}
 		$this->_path_to_event_model = $path_to_event_model;
@@ -59,9 +59,9 @@ 
 	 * @return string one of EEM_Base::valid_cap_contexts()
 	 */
 	protected function action_for_event() {
-		if( $this->_cap_context_on_event_model ) {
+		if ($this->_cap_context_on_event_model) {
 			return $this->_cap_context_on_event_model;
-		}else{
+		} else {
 			return $this->action();
 		}
 	}
@@ -73,7 +73,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()
 			);
@@ -83,17 +83,17 @@ 
 		return 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_for_event() )              => new EE_Return_None_Where_Conditions(),
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event())              => new EE_Return_None_Where_Conditions(),
 			//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_for_event() . '_others' )  => new EE_Default_Where_Conditions(
-				array( $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder )
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_others')  => new EE_Default_Where_Conditions(
+				array($this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder)
 			),
 			//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_for_event() . '_private' ) => new EE_Default_Where_Conditions(
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_private') => new EE_Default_Where_Conditions(
 				array(
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $event_model, $this->action_for_event() . '_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_for_event().'_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')
 					)
 				)
 			),

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 );
 		}
 	}