eventespresso / event-espresso-core

core/db_models/EEM_Ticket_Template.model.php

Spacing +14 added lines, -14 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Ticket_Template.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Ticket_Template.class.php');
 
 class EEM_Ticket_Template extends EEM_Base {
 
@@ -38,29 +38,29 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return void
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Ticket Template','event_espresso');
-		$this->plural_item = __('Ticket Templates','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket Template', 'event_espresso');
+		$this->plural_item = __('Ticket Templates', 'event_espresso');
 
 		$this->_tables = array(
 			'Ticket_Template'=> new EE_Primary_Table('esp_ticket_template', 'TTM_ID')
 		);
 		$this->_fields = array(
 			'Ticket_Template'=>array(
-				'TTM_ID'=>new EE_Primary_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso')),
-				'TTM_name'=>new EE_Plain_Text_Field('TTM_name', __('The name of the ticket template','event_espresso'), false, '' ),
-				'TTM_description'=>new EE_Plain_Text_Field('TTM_description', __('The description for the ticket template','event_espresso'), true, '' ),
-				'TTM_file'=>new EE_Plain_Text_Field('TTM_file', __('The file name for the actual template file saved on disk','event_espresso'), true, '' ),
+				'TTM_ID'=>new EE_Primary_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso')),
+				'TTM_name'=>new EE_Plain_Text_Field('TTM_name', __('The name of the ticket template', 'event_espresso'), false, ''),
+				'TTM_description'=>new EE_Plain_Text_Field('TTM_description', __('The description for the ticket template', 'event_espresso'), true, ''),
+				'TTM_file'=>new EE_Plain_Text_Field('TTM_file', __('The file name for the actual template file saved on disk', 'event_espresso'), true, ''),
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_Has_Many_Relation()
 		);
 		$this->_model_chain_to_wp_user = 'Ticket';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event' );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
 		//account for default tickets in the caps
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
+		parent::__construct($timezone);
 	}
 } //end EEM_Ticket_Template class
\ No newline at end of file

Braces +3 added lines, -1 removed lines

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

core/db_models/helpers/EE_Index.php

Spacing +9 added lines, -9 removed lines

@@ -4,18 +4,18 @@ 
  * Parent class for indicating indexes on models. As of writing this, it is only used
  * when deleting model objects that have no primary key, but clearly this can be expanded
  */
-class EE_Index{
+class EE_Index {
 	protected $_name;
 	protected $_field_names;
 	protected $_model_name;
-	public function __construct($fields){
+	public function __construct($fields) {
 		$this->_field_names = $fields;
 	}
-	public function _construct_finalize($name,$model_name){
+	public function _construct_finalize($name, $model_name) {
 		$this->_name = $name;
 		$this->_model_name = $model_name;
 	}
-	public function field_names(){
+	public function field_names() {
 		return $this->_field_names;
 	}
 	/**
@@ -23,19 +23,19 @@ 
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
 	 * @return EEM_Base
 	 */
-	protected function _get_model($model_name){
-		$modelInstance=call_user_func("EEM_".$model_name."::instance");
+	protected function _get_model($model_name) {
+		$modelInstance = call_user_func("EEM_".$model_name."::instance");
 		return $modelInstance;
 	}
 	/**
 	 * Gets all the fields for this index
 	 * @return EE_Model_Field_Base[]
 	 */
-	public function fields(){
+	public function fields() {
 		$fields = array();
 		$model = $this->_get_model($this->_model_name);
-		foreach($model->field_settings() as $field_name => $field_obj){
-			if(in_array($field_name,$this->field_names())){
+		foreach ($model->field_settings() as $field_name => $field_obj) {
+			if (in_array($field_name, $this->field_names())) {
 				$fields[$field_name] = $field_obj;
 			}
 		}

core/db_models/helpers/EE_Model_Parser.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * EE_Model_Parser
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * EE_Model_Parser
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 class EE_Model_Parser {
 	const table_alias_model_relation_chain_separator = '__';
 	const table_alias_model_relation_chain_prefix_end = '___';

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 	 * @param string $string_to_pad
 	 * @return string
 	 */
-	public static function pad_with_periods($string_to_pad){
+	public static function pad_with_periods($string_to_pad) {
 		return ".".$string_to_pad.".";
 	}
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param string $string_to_trim
 	 * @return string
 	 */
-	public static function trim_periods($string_to_trim){
-		return trim($string_to_trim,'.');
+	public static function trim_periods($string_to_trim) {
+		return trim($string_to_trim, '.');
 	}
 
 
@@ -40,22 +40,22 @@ 
 	 * @param        $this_model_name
 	 * @return string which can be added onto table aliases to make them unique
 	 */
-	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain,$this_model_name){
+	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name) {
 		//eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event'
 		$model_relation_chain = self::pad_with_periods($model_relation_chain);
 		$this_model_name = self::pad_with_periods($this_model_name);
 		//eg '.Venue.Event_Venue.Event.Registration." and '.Event.'
 		//remove this model name and everything afterwards
-		$pos_of_model_name = strpos($model_relation_chain,$this_model_name);
-		$model_relation_chain = substr($model_relation_chain,0,$pos_of_model_name);
+		$pos_of_model_name = strpos($model_relation_chain, $this_model_name);
+		$model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name);
 		//eg '.Venue.Event_Venue.'
 		//trim periods
 		$model_relation_chain = self::trim_periods($model_relation_chain);
 		//eg 'Venue.Event_Venue'
 		//replace periods with double-underscores
-		$model_relation_chain = str_replace(".",self::table_alias_model_relation_chain_separator,$model_relation_chain);
+		$model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
 		//eg 'Venue__Event_Venue'
-		if($model_relation_chain !=''){
+		if ($model_relation_chain != '') {
 			$model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end;
 		}
 		//eg 'Venue_Event_Venue___'
@@ -66,14 +66,14 @@ 
 	 * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not)
 	 * @return string
 	 */
-	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
+	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
 		//does this actually have a table alias model relation chain prefix?
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
-		if(  $pos !== FALSE){
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== FALSE) {
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else {
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
 		}
 		return $table_alias;
@@ -83,14 +83,14 @@ 
 	 * @param string $table_alias_with_model_relation_chain_prefix
 	 * @return string
 	 */
-	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
+	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
 		//does this actually have a table alias model relation chain prefix?
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
-		if(  $pos !== FALSE){
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
+		if ($pos !== FALSE) {
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else {
 			$prefix = '';
 		}
 		return $prefix;
@@ -105,7 +105,7 @@ 
 	 * @param string $original_query_param
 	 * @return string
 	 */
-	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param){
+	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param) {
 		$relation_chain = self::extract_model_relation_chain($model_name, $original_query_param);
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name);
 		return $table_alias_with_model_relation_chain_prefix;
@@ -119,7 +119,7 @@ 
 	 * @param string $original_query_param
 	 * @return string
 	 */
-	public static function extract_model_relation_chain($model_name,$original_query_param){
+	public static function extract_model_relation_chain($model_name, $original_query_param) {
 		//prefix and postfix both with a period, as this facilitates searching
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
 		$original_query_param = EE_Model_Parser::pad_with_periods($original_query_param);
@@ -127,7 +127,7 @@ 
 		//eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like
 		//"Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string
 		//"Registration.Transaction.Payment"
-		$model_relation_chain = substr($original_query_param, 0,$pos_of_model_string+strlen($model_name));
+		$model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name));
 		return EE_Model_Parser::trim_periods($model_relation_chain);
 	}
 
@@ -142,11 +142,11 @@ 
 	 * @param string $model_relation_chain
 	 * @return string
 	 */
-	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name,$join_model_name,$model_relation_chain){
+	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain) {
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
 		$join_model_name = EE_Model_Parser::pad_with_periods($join_model_name);
 		$model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain);
-		$replaced_with_periods = str_replace($model_name,$join_model_name,$model_relation_chain);
+		$replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain);
 		return EE_Model_Parser::trim_periods($replaced_with_periods);
 	}
 }

Braces +4 added lines, -3 removed lines

@@ -1,5 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * EE_Model_Parser
  *
@@ -73,7 +74,7 @@ 
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else{
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
 		}
 		return $table_alias;
@@ -90,7 +91,7 @@ 
 			//yes
 			//find that triple underscore and remove it and everything before it
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
-		}else{
+		} else{
 			$prefix = '';
 		}
 		return $prefix;

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_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/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