eventespresso / event-espresso-core

core/db_models/EEM_Registration_Payment.model.php

Spacing +9 added lines, -9 removed lines

@@ -15,21 +15,21 @@ 
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 
-		$this->singular_item = __( 'Registration Payment', 'event_espresso' );
-		$this->plural_item 	= __( 'Registration Payments', 'event_espresso' );
+		$this->singular_item = __('Registration Payment', 'event_espresso');
+		$this->plural_item = __('Registration Payments', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration_Payment' => new EE_Primary_Table( 'esp_registration_payment', 'RPY_ID' )
+			'Registration_Payment' => new EE_Primary_Table('esp_registration_payment', 'RPY_ID')
 		);
 
 		$this->_fields = array(
 			'Registration_Payment'=>array(
-				'RPY_ID' 				=> new EE_Primary_Key_Int_Field( 'RPY_ID', __( 'Registration Payment ID', 'event_espresso' )),
-				'REG_ID' 				=> new EE_Foreign_Key_Int_Field( 'REG_ID', __( 'Registration ID', 'event_espresso' ), false, 0, 'Registration' ),
-				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field( 'PAY_ID', __( 'Payment ID', 'event_espresso' ), true, null, 'Payment' ),
-				'RPY_amount' 	=> new EE_Money_Field( 'RPY_amount', __( 'Amount attributed to the registration', 'event_espresso' ), false, 0 ),
+				'RPY_ID' 				=> new EE_Primary_Key_Int_Field('RPY_ID', __('Registration Payment ID', 'event_espresso')),
+				'REG_ID' 				=> new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field('PAY_ID', __('Payment ID', 'event_espresso'), true, null, 'Payment'),
+				'RPY_amount' 	=> new EE_Money_Field('RPY_amount', __('Amount attributed to the registration', 'event_espresso'), false, 0),
 			)
 		);
 
@@ -38,7 +38,7 @@ 
 			'Payment' 		=> new EE_Belongs_To_Relation(),
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

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/EEM_Status.model.php

Indentation +23 added lines, -23 removed lines

@@ -78,7 +78,7 @@ 
 	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
-	     	EEM_Registration::status_id_pending_payment => array(
+		 	EEM_Registration::status_id_pending_payment => array(
 				__('pending payment', 'event_espresso'), //singular
 				__('pending payments', 'event_espresso') //plural
 				),
@@ -203,37 +203,37 @@ 
 	  			__('postponed', 'event_espresso'),
 	  			__('postponed', 'event_espresso')
 	  			)
-	    );
+		);
 
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
 
 		if ( !is_array($statuses) )
 			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
 
-	    $translation = array();
+		$translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
-	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
-	    	} else {
-	    		$translation[$id] = $code;
-	    	}
+		foreach ( $statuses as $id => $code ) {
+			if ( isset( $translation_array[$id] ) ) {
+				$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
+			} else {
+				$translation[$id] = $code;
+			}
 
-	    	//schema
-	    	switch ( $schema ) {
-	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
-	    			break;
-	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
-	    			break;
-	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
-	    			break;
-	    	}
-	    }
+			//schema
+			switch ( $schema ) {
+				case 'lower' :
+					$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+					break;
+				case 'sentence' :
+					$translation[$id] = ucwords( $translation[$id] );
+					break;
+				case 'upper' :
+					$translation[$id] = strtoupper( $translation[$id] );
+					break;
+			}
+		}
 
-	    return $translation;
+		return $translation;
 	}
 
 

Braces +6 added lines, -3 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
  *
@@ -207,8 +209,9 @@ 
 
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( !is_array($statuses) ) {
+					throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		}
 
 	    $translation = array();
 

Spacing +21 added lines, -21 removed lines

@@ -13,7 +13,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Class EEM_Status
@@ -32,32 +32,32 @@ 
 	/**
 	 * @return EEM_Status
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Status','event_espresso');
-		$this->plural_item = __('Stati','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Status', 'event_espresso');
+		$this->plural_item = __('Stati', 'event_espresso');
 		$this->_tables = array(
 			'Status'=> new EE_Primary_Table('esp_status', 'STS_ID')
 		);
 		$this->_fields = array(
 			'Status'=>array(
-				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID','event_espresso')),
-				'STS_code'=>new EE_Plain_Text_Field('STS_code',__('Status Code','event_espresso'),false, ''),
+				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID', 'event_espresso')),
+				'STS_code'=>new EE_Plain_Text_Field('STS_code', __('Status Code', 'event_espresso'), false, ''),
 				'STS_type'=>new EE_Enum_Text_Field(
 					'STS_type',
 					__("Type", "event_espresso"),
 					false,
 					'event',
 					array(
-						'event'=> __("Event", "event_espresso"),//deprecated
+						'event'=> __("Event", "event_espresso"), //deprecated
 						'registration'=>  __("Registration", "event_espresso"),
 						'transaction'=>  __("Transaction", "event_espresso"),
 						'payment'=>  __("Payment", "event_espresso"),
 						'email'=>  __("Email", "event_espresso")
 					)
 				),
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -65,9 +65,9 @@ 
 			'Payment'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @throws EE_Error
 	 * @return array             an array of translated strings for the incoming status id.
 	 */
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -210,30 +210,30 @@ 
 	  			)
 	    );
 
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( ! is_array($statuses))
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
 
 	    $translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
+	    foreach ($statuses as $id => $code) {
+	    	if (isset($translation_array[$id])) {
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
 	    	} else {
 	    		$translation[$id] = $code;
 	    	}
 
 	    	//schema
-	    	switch ( $schema ) {
+	    	switch ($schema) {
 	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
 	    			break;
 	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
+	    			$translation[$id] = ucwords($translation[$id]);
 	    			break;
 	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
+	    			$translation[$id] = strtoupper($translation[$id]);
 	    			break;
 	    	}
 	    }

core/db_models/EEM_Term.model.php

Spacing +48 added lines, -48 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -20,58 +20,58 @@ 
 	/**
 	 *__construct
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term','event_espresso');
-		$this->plural_item = __('Terms','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
 		$this->_tables = array(
 			'Term'=> new EE_Primary_Table('terms', 'term_id')
 		);
 		$this->_fields = array(
 			'Term'=>array(
-				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID','event_espresso')),
-				'name'=>new EE_Plain_Text_Field('name',__('Term Name','event_espresso'),false, ''),
-				'slug'=>new EE_Slug_Field('slug', __('Term Slug','event_espresso'), false),
+				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'=>new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'=>new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
 				'term_group'=>new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0)
 			));
 		$this->_model_relations = array(
 			'Term_Taxonomy'=>new EE_Has_Many_Relation(),
 		);
 		$path_to_tax_model = 'Term_Taxonomy';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected( $path_to_tax_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected($path_to_tax_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
 
-		$path_to_tax_model = $path_to_tax_model . '.';
+		$path_to_tax_model = $path_to_tax_model.'.';
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type')
 				));
 
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type')
 				));
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -82,20 +82,20 @@ 
 	 *
 	 * @access public
 	 */
-	public function get_all_ee_categories( $show_uncategorized = FALSE ) {
+	public function get_all_ee_categories($show_uncategorized = FALSE) {
 
 		$where_params = array(
 			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-			'NOT' => array( 'name' => __( 'Uncategorized', 'event_espresso' ))
+			'NOT' => array('name' => __('Uncategorized', 'event_espresso'))
 		);
 
-		if ( $show_uncategorized ) {
-			unset( $where_params['NOT'] );
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
 		}
 
-	 	return EEM_Term::instance()->get_all( array(
+	 	return EEM_Term::instance()->get_all(array(
 			$where_params,
-			'order_by' => array( 'name' => 'ASC' )
+			'order_by' => array('name' => 'ASC')
 		));
 	}
 
@@ -108,8 +108,8 @@ 
 	 * @param string $post_type
 	 * @return array
 	 */
-	public function get_all_CPT_post_tags( $post_type = '' ) {
-		switch( $post_type ) {
+	public function get_all_CPT_post_tags($post_type = '') {
+		switch ($post_type) {
 			case 'espresso_events' :
 				return $this->get_all_event_post_tags();
 				break;
@@ -119,7 +119,7 @@ 
 			default :
 				$event_tags = $this->get_all_event_post_tags();
 				$venue_tags = $this->get_all_venue_post_tags();
-				return array_merge( $event_tags, $venue_tags );
+				return array_merge($event_tags, $venue_tags);
 		}
 		return array();
 	}
@@ -132,19 +132,19 @@ 
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
 	public function get_all_event_post_tags() {
-	 	$post_tags = EEM_Term::instance()->get_all( array(
+	 	$post_tags = EEM_Term::instance()->get_all(array(
 			array(
 				'Term_Taxonomy.taxonomy' => 'post_tag',
 				'Term_Taxonomy.Event.post_type' => 'espresso_events',
 			),
-			'order_by' => array( 'name' => 'ASC' ),
-			'force_join' => array( 'Term_Taxonomy.Event' )
+			'order_by' => array('name' => 'ASC'),
+			'force_join' => array('Term_Taxonomy.Event')
 		));
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_events';
+			$post_tags[$key]->post_type[] = 'espresso_events';
 		}
 		return $post_tags;
 //		return array( 'espresso_events' => $post_tags );
@@ -158,19 +158,19 @@ 
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
 	public function get_all_venue_post_tags() {
-		$post_tags = EEM_Term::instance()->get_all( array(
+		$post_tags = EEM_Term::instance()->get_all(array(
 			array(
 				'Term_Taxonomy.taxonomy' => 'post_tag',
 				'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
 			),
-			'order_by' => array( 'name' => 'ASC' ),
-			'force_join' => array( 'Term_Taxonomy' )
+			'order_by' => array('name' => 'ASC'),
+			'force_join' => array('Term_Taxonomy')
 		));
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+			$post_tags[$key]->post_type[] = 'espresso_venues';
 		}
 		return $post_tags;
 //		return array( 'espresso_venues' => $post_tags );

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/EEM_Ticket_Price.model.php

Spacing +11 added lines, -11 removed lines

@@ -22,8 +22,8 @@ 
  * ------------------------------------------------------------------------
  */
 
-require_once ( EE_CLASSES . 'EE_Ticket_Price.class.php' );
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_CLASSES.'EE_Ticket_Price.class.php');
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Ticket_Price extends EEM_Base {
 
@@ -37,12 +37,12 @@ 
 	 * 		@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 Price','event_espresso');
-		$this->plural_item = __('Ticket Prices','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket Price', 'event_espresso');
+		$this->plural_item = __('Ticket Prices', 'event_espresso');
 
 		$this->_tables = array(
-			'Ticket_Price'=>new EE_Primary_Table('esp_ticket_price','TKP_ID')
+			'Ticket_Price'=>new EE_Primary_Table('esp_ticket_price', 'TKP_ID')
 		);
 		$this->_fields = array(
 			'Ticket_Price'=> array(
@@ -56,14 +56,14 @@ 
 			'Price'=>new EE_Belongs_To_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');
+		$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');
 		//follow the caps of the ticket
 		$this->_caps_slug = 'tickets';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 

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/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/EEM_WP_User.model.php

Spacing +18 added lines, -18 removed lines

@@ -22,24 +22,24 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('WP_User','event_espresso');
-		$this->plural_item = __('WP_Users','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('WP_User', 'event_espresso');
+		$this->plural_item = __('WP_Users', 'event_espresso');
 		global $wpdb;
 		$this->_tables = array(
-			'WP_User'=> new EE_Primary_Table( $wpdb->users, 'ID', true)
+			'WP_User'=> new EE_Primary_Table($wpdb->users, 'ID', true)
 		);
 		$this->_fields = array(
 			'WP_User'=>array(
-				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID','event_espresso')),
-				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login','event_espresso'), false, '' ),
-				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password','event_espresso'), false, '' ),
-				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name','event_espresso'), false, ''),
-				'user_email' => new EE_Email_Field('user_email', __( 'User Email', 'event_espresso' ), false),
-				'user_registered' => new EE_Datetime_Field( 'user_registered', __( 'Date User Registered', 'event_espresso' ), false, current_time('timestamp'), $timezone ),
-				'user_activation_key' => new EE_Plain_Text_Field( 'user_activation_key', __( 'User Activation Key', 'event_espresso' ), false, '' ),
-				'user_status' => new EE_Integer_Field( 'user_status', __( 'User Status', 'event_espresso' ), false, 0 ),
-				'display_name' => new EE_Plain_Text_Field( 'display_name', __( 'Display Name', 'event_espresso' ), false, '' )
+				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
+				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login', 'event_espresso'), false, ''),
+				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password', 'event_espresso'), false, ''),
+				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name', 'event_espresso'), false, ''),
+				'user_email' => new EE_Email_Field('user_email', __('User Email', 'event_espresso'), false),
+				'user_registered' => new EE_Datetime_Field('user_registered', __('Date User Registered', 'event_espresso'), false, current_time('timestamp'), $timezone),
+				'user_activation_key' => new EE_Plain_Text_Field('user_activation_key', __('User Activation Key', 'event_espresso'), false, ''),
+				'user_status' => new EE_Integer_Field('user_status', __('User Status', 'event_espresso'), false, 0),
+				'display_name' => new EE_Plain_Text_Field('display_name', __('Display Name', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Attendee' => new EE_Has_Many_Relation(),
@@ -55,14 +55,14 @@ 
 		);
 		$this->_wp_core_model = true;
 		$this->_caps_slug = 'users';
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ) {
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list';
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User();
 		}
 		//@todo: account for create_users controls whether they can create users at all
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**

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/fields/EE_All_Caps_Text_Field.php

Spacing +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@ 
 /**
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_All_Caps_Text_Field extends EE_Text_Field_Base{
-	function get_wpdb_data_type(){
+class EE_All_Caps_Text_Field extends EE_Text_Field_Base {
+	function get_wpdb_data_type() {
 		return '%s';
 	}
 	
@@ -13,6 +13,6 @@ 
 	 * @return string
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		return strtoupper( sanitize_key($value_inputted_for_field_on_model_object));
+		return strtoupper(sanitize_key($value_inputted_for_field_on_model_object));
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_Any_Foreign_Model_Name_Field.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
 /**
  * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to.
  * Note: the array of model names on this field should match the array of model names on the
@@ -8,8 +8,8 @@ 
  * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')),
  * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction')));
  */
-class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name{
-	function get_wpdb_data_type(){
+class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name {
+	function get_wpdb_data_type() {
 		return '%s';
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_DB_Only_Field_Base.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * special default values for them, or some other column-specific functionality. So we can add them as fields,
  * but db-only ones
  */
-abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base{
+abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base {
 	/**
 	 * All these children classes are for the db-only (meaning, we should select them
 	 * on get_all queries, update, delete, and will still want to set their default value