eventespresso / event-espresso-core

core/db_models/helpers/EE_Primary_Key_Index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Used to indicate  a primary key index - ie, a set of fields which, when used in combination,
  * also uniquely identify a model object in the database (in case there is no primary key field).
  */
-class EE_Primary_Key_Index extends EE_Unique_Index{
+class EE_Primary_Key_Index extends EE_Unique_Index {
 	//yep, actually the same as unique index right now
 	
 }

core/db_models/helpers/EE_Primary_Table.php

Spacing +5 added lines, -5 removed lines

@@ -4,8 +4,8 @@ 
  * For defining the main table of the model. This is the table with the model's primary key's field. So for CPT models, this will
  * probably be the wp_posts table (so the table name supplied will be 'posts', as the 'wp_' varies). For models only using one table, this will be that table.
  */
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Primary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Primary_Table extends EE_Table_Base {
 
 	/**
 	 *
@@ -15,14 +15,14 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column = null, $global = false){
-		parent::__construct($table_name, $pk_column, $global );
+	function __construct($table_name, $pk_column = null, $global = false) {
+		parent::__construct($table_name, $pk_column, $global);
 	}
 	/**
 	 * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee "
 	 * @return string
 	 */
-	function get_table_sql(){
+	function get_table_sql() {
 		return " ".$this->get_table_name()." AS ".$this->get_table_alias()." ";
 	}
 

core/db_models/helpers/EE_Secondary_Table.php

Spacing +21 added lines, -21 removed lines

@@ -5,8 +5,8 @@ 
  * table's rows. Ie, it can't have many rows in the secondary table that point to
  * a single row in the primary table
  */
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Secondary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Secondary_Table extends EE_Table_Base {
 	protected $_extra_join_conditions;
 
 	/**
@@ -19,15 +19,15 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column,  $fk_column = null, $extra_join_conditions = null, $global = false ){
+	function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null, $global = false) {
 		$this->_fk_on_table = $fk_column;
 		$this->_extra_join_conditions = $extra_join_conditions;
-		parent::__construct( $table_name, $pk_column, $global );
+		parent::__construct($table_name, $pk_column, $global);
 	}
-	function get_fk_on_table(){
+	function get_fk_on_table() {
 		return $this->_fk_on_table;
 	}
-	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table){
+	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table) {
 		$this->_table_to_join_with = $table;
 	}
 	/**
@@ -35,14 +35,14 @@ 
 	 * @return string of sql like "Event.post_type = 'event'", which gets added to
 	 * the end of the join statement with the primary table
 	 */
-	function get_extra_join_conditions(){
+	function get_extra_join_conditions() {
 		return $this->_extra_join_conditions;
 	}
 	/**
 	 *
 	 * @return EE_Primary_Table
 	 */
-	function get_table_to_join_with(){
+	function get_table_to_join_with() {
 		return $this->_table_to_join_with;
 	}
 	/**
@@ -52,15 +52,15 @@ 
 	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
 	 * @return string of SQL
 	 */
-	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
+	function get_join_sql($primary_table_alias_with_model_chain_prefix) {
 
 		$table_name = $this->get_table_name();
-		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix).$this->get_table_alias();
 		$other_table_pk = $this->get_table_to_join_with()->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -74,14 +74,14 @@ 
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
 	 * @return string
 	 */
-	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){
-		$primary_table_name =$this->get_table_to_join_with()->get_table_name();
-		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column();//$this->get_pk_column();
+	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix) {
+		$primary_table_name = $this->get_table_to_join_with()->get_table_name();
+		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix).$this->get_table_to_join_with()->get_table_alias();
+		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column(); //$this->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -94,7 +94,7 @@ 
 	public function get_select_join_limit_join($limit) {
 		//first get the select
 		$select = $this->get_select_join_limit($limit);
-		$join_sql = $this->get_join_sql( $select );
+		$join_sql = $this->get_join_sql($select);
 		return $join_sql;
 	}
 
@@ -103,12 +103,12 @@ 
 	function get_fully_qualified_fk_column() {
 		$table_alias = $this->get_table_alias();
 		$fk = $this->get_fk_on_table();
-		return $table_alias . '.' . $fk;
+		return $table_alias.'.'.$fk;
 	}
 
 	function get_fully_qualified_pk_on_fk_table() {
 		$table_alias = $this->get_table_to_join_with()->get_table_alias();
 		$pk = $this->get_table_to_join_with()->get_pk_column();
-		return $table_alias . '.' . $pk;
+		return $table_alias.'.'.$pk;
 	}
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,6 @@ 
 	 * creates join statement FROM primary table
 	 * gets SQL like "LEFT JOIN table_name AS table_alias ON other_table_alias.pk = table_alias.fk
 	 *
-	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
 	 * @return string of SQL
 	 */
 	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
@@ -72,6 +71,7 @@ 
 	 * " LEFT JOIN secondary_table_table AS Secondary ON ..." like get_join_sql, this function returns
 	 * " LEFT JOIN primary_table AS Primary ON ...".
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
+	 * @param string $secondary_table_alias_with_model_chain_prefix
 	 * @return string
 	 */
 	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){

core/db_models/helpers/EE_Table_Base.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
  * Base class for defining the tables that comprise models. This is used to store information
  * about the table\s alias, private key, etc.
  */
-abstract class EE_Table_Base{
+abstract class EE_Table_Base {
 	var $_table_name;
 	var $_table_alias;
 	/**
@@ -21,30 +21,30 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column, $global = false ){
+	function __construct($table_name, $pk_column, $global = false) {
 		global $wpdb;
-		if( $global ) {
+		if ($global) {
 			$prefix = $wpdb->base_prefix;
 		} else {
 			$prefix = $wpdb->prefix;
 		}
 		//if they didn't add the prefix, let's add it
-		if( strpos( $table_name, $prefix ) !== 0 ) {
-			$table_name = $prefix . $table_name;
+		if (strpos($table_name, $prefix) !== 0) {
+			$table_name = $prefix.$table_name;
 		}
 		$this->_table_name = $table_name;
 		$this->_pk_column = $pk_column;
 	}
 
-	function _construct_finalize_with_alias($table_alias){
+	function _construct_finalize_with_alias($table_alias) {
 		$this->_table_alias = $table_alias;
 	}
 
-	function get_table_name(){
+	function get_table_name() {
 		return $this->_table_name;
 	}
-	function get_table_alias(){
-		if( ! $this->_table_alias){
+	function get_table_alias() {
+		if ( ! $this->_table_alias) {
 			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
 		}
 		return $this->_table_alias;
@@ -54,7 +54,7 @@ 
 	 *
 	 * @return string name of column of PK
 	 */
-	function get_pk_column(){
+	function get_pk_column() {
 		return $this->_pk_column;
 	}
 
@@ -64,8 +64,8 @@ 
 	 * returns a string with the table alias, a period, and the private key's column.
 	 * @return string
 	 */
-	function get_fully_qualified_pk_column(){
-		$sql =  $this->get_table_alias().".".$this->get_pk_column();
+	function get_fully_qualified_pk_column() {
+		$sql = $this->get_table_alias().".".$this->get_pk_column();
 		return $sql;
 	}
 
@@ -74,9 +74,9 @@ 
 	 * returns the special sql for a inner select with a limit.
 	 * @return string    SQL select
 	 */
-	public function get_select_join_limit( $limit ) {
-		$limit = is_array( $limit ) ? 'LIMIT ' . implode(',', array_map( 'intval', $limit ) ) : 'LIMIT ' . (int) $limit;
-		$SQL = SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+	public function get_select_join_limit($limit) {
+		$limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
+		$SQL = SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
 		return $SQL;
 	}
 }

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_Relation.php

Braces +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		//get its value
 		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());

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);
 	}
 
 
@@ -58,7 +58,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();
@@ -79,7 +79,7 @@ 
 	 */
 	public 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 );
+		$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
@@ -100,15 +100,15 @@ 
 	 * @throws \EE_Error
 	 */
 	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/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