eventespresso / event-espresso-core

core/db_models/EEM_Country.model.php

Indentation +11 added lines, -11 removed lines

@@ -83,11 +83,11 @@ 
 
 
 	/**
-	*		_get_countries
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		_get_countries
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_countries() {
 		if ( ! self::$_all_countries ) {
 			self::$_all_countries = $this->get_all( array( 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array( 0,99999 )));
@@ -96,12 +96,12 @@ 
 	}
 
 	/**
-	*		_get_countries
-	*		Gets and caches the list of active countries. If you know the list of active countries
-	*		has changed during this request, first use EEM_Country::reset() to flush the cache
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		_get_countries
+	 *		Gets and caches the list of active countries. If you know the list of active countries
+	 *		has changed during this request, first use EEM_Country::reset() to flush the cache
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_active_countries() {
 		if ( ! self::$_active_countries ) {
 			self::$_active_countries =  $this->get_all( array( array( 'CNT_active' => TRUE ), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array( 0, 99999 )));

Spacing +34 added lines, -34 removed lines

@@ -36,15 +36,15 @@ 
 	 * Resets the country
 	 * @return EEM_Country
 	 */
-	public static function reset( $timezone = NULL ){
+	public static function reset($timezone = NULL) {
 		self::$_active_countries = NULL;
 		self::$_all_countries = NULL;
-		return parent::reset( $timezone );
+		return parent::reset($timezone);
 	}
 
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Country','event_espresso');
-		$this->plural_item = __('Countries','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Country', 'event_espresso');
+		$this->plural_item = __('Countries', 'event_espresso');
 
 
 		$this->_tables = array(
@@ -52,21 +52,21 @@ 
 		);
 		$this->_fields = array(
 			'Country'=>array(
-				'CNT_active' => new EE_Boolean_Field('CNT_active', __('Country Appears in Dropdown Select Lists','event_espresso'), false, true),
-				'CNT_ISO'=> new EE_Primary_Key_String_Field('CNT_ISO', __('Country ISO Code','event_espresso')),
-				'CNT_ISO3'=>new EE_All_Caps_Text_Field('CNT_ISO3', __('Country ISO3 Code','event_espresso'), false,''),
-				'RGN_ID'=>new EE_Integer_Field('RGN_ID', __('Region ID','event_espresso'), false,0),//should be a foreign key, but no region table exists yet
-				'CNT_name'=>new EE_Plain_Text_Field('CNT_name', __('Country Name','event_espresso'), false,''),
-				'CNT_cur_code'=>new EE_All_Caps_Text_Field('CNT_cur_code', __('Country Currency Code','event_espresso'), false),
-				'CNT_cur_single' => new EE_Plain_Text_Field('CNT_cur_single', __('Currency Name Singular','event_espresso'), false),
-				'CNT_cur_plural' => new EE_Plain_Text_Field('CNT_cur_plural', __('Currency Name Plural','event_espresso'), false),
-				'CNT_cur_sign' => new EE_Plain_Text_Field('CNT_cur_sign', __('Currency Sign','event_espresso'), false),
-				'CNT_cur_sign_b4' => new EE_Boolean_Field('CNT_cur_sign_b4', __('Currency Sign Before Number','event_espresso'), false, true),
-				'CNT_cur_dec_plc' => new EE_Integer_Field('CNT_cur_dec_plc', __('Currency Decimal Places','event_espresso'), false, 2),
-				'CNT_cur_dec_mrk' => new EE_Plain_Text_Field('CNT_cur_dec_mrk', __('Currency Decimal Mark','event_espresso'), false, '.'),
-				'CNT_cur_thsnds' => new EE_Plain_Text_Field('CNT_cur_thsnds', __('Currency Thousands Seperator','event_espresso'), false, ','),
-				'CNT_tel_code' => new EE_Plain_Text_Field('CNT_tel_code', __('Country Telephone Code','event_espresso'), false, ''),
-				'CNT_is_EU' => new EE_Boolean_Field('CNT_is_EU', __('Country is Member of EU','event_espresso'), false, false)
+				'CNT_active' => new EE_Boolean_Field('CNT_active', __('Country Appears in Dropdown Select Lists', 'event_espresso'), false, true),
+				'CNT_ISO'=> new EE_Primary_Key_String_Field('CNT_ISO', __('Country ISO Code', 'event_espresso')),
+				'CNT_ISO3'=>new EE_All_Caps_Text_Field('CNT_ISO3', __('Country ISO3 Code', 'event_espresso'), false, ''),
+				'RGN_ID'=>new EE_Integer_Field('RGN_ID', __('Region ID', 'event_espresso'), false, 0), //should be a foreign key, but no region table exists yet
+				'CNT_name'=>new EE_Plain_Text_Field('CNT_name', __('Country Name', 'event_espresso'), false, ''),
+				'CNT_cur_code'=>new EE_All_Caps_Text_Field('CNT_cur_code', __('Country Currency Code', 'event_espresso'), false),
+				'CNT_cur_single' => new EE_Plain_Text_Field('CNT_cur_single', __('Currency Name Singular', 'event_espresso'), false),
+				'CNT_cur_plural' => new EE_Plain_Text_Field('CNT_cur_plural', __('Currency Name Plural', 'event_espresso'), false),
+				'CNT_cur_sign' => new EE_Plain_Text_Field('CNT_cur_sign', __('Currency Sign', 'event_espresso'), false),
+				'CNT_cur_sign_b4' => new EE_Boolean_Field('CNT_cur_sign_b4', __('Currency Sign Before Number', 'event_espresso'), false, true),
+				'CNT_cur_dec_plc' => new EE_Integer_Field('CNT_cur_dec_plc', __('Currency Decimal Places', 'event_espresso'), false, 2),
+				'CNT_cur_dec_mrk' => new EE_Plain_Text_Field('CNT_cur_dec_mrk', __('Currency Decimal Mark', 'event_espresso'), false, '.'),
+				'CNT_cur_thsnds' => new EE_Plain_Text_Field('CNT_cur_thsnds', __('Currency Thousands Seperator', 'event_espresso'), false, ','),
+				'CNT_tel_code' => new EE_Plain_Text_Field('CNT_tel_code', __('Country Telephone Code', 'event_espresso'), false, ''),
+				'CNT_is_EU' => new EE_Boolean_Field('CNT_is_EU', __('Country is Member of EU', 'event_espresso'), false, false)
 			));
 		$this->_model_relations = array(
 			'Attendee'=>new EE_Has_Many_Relation(),
@@ -74,9 +74,9 @@ 
 			'Venue'=>new EE_Has_Many_Relation(),
 		);
 		//only anyone to view, but only those with the default role can do anything
-		$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);
 	}
 
 
@@ -89,8 +89,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_countries() {
-		if ( ! self::$_all_countries ) {
-			self::$_all_countries = $this->get_all( array( 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array( 0,99999 )));
+		if ( ! self::$_all_countries) {
+			self::$_all_countries = $this->get_all(array('order_by'=>array('CNT_name'=>'ASC'), 'limit'=> array(0, 99999)));
 		}
 		return self::$_all_countries;
 	}
@@ -103,8 +103,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_active_countries() {
-		if ( ! self::$_active_countries ) {
-			self::$_active_countries =  $this->get_all( array( array( 'CNT_active' => TRUE ), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array( 0, 99999 )));
+		if ( ! self::$_active_countries) {
+			self::$_active_countries = $this->get_all(array(array('CNT_active' => TRUE), 'order_by'=>array('CNT_name'=>'ASC'), 'limit'=>array(0, 99999)));
 		}
 		return self::$_active_countries;
 	}
@@ -114,15 +114,15 @@ 
 	 * @param string $country_ISO
 	 * @return string
 	 */
-	public function get_country_name_by_ISO( $country_ISO ){
-		if( isset( self::$_all_countries[ $country_ISO ] ) &&
-				self::$_all_countries[ $country_ISO ] instanceof EE_Country ){
-			return self::$_all_countries[ $country_ISO ]->name();
+	public function get_country_name_by_ISO($country_ISO) {
+		if (isset(self::$_all_countries[$country_ISO]) &&
+				self::$_all_countries[$country_ISO] instanceof EE_Country) {
+			return self::$_all_countries[$country_ISO]->name();
 		}
-		$names = $this->get_col( array( array( 'CNT_ISO' => $country_ISO ), 'limit' => 1), 'CNT_name' );
-		if( is_array( $names ) && ! empty( $names ) ){
-			return reset( $names );
-		}else{
+		$names = $this->get_col(array(array('CNT_ISO' => $country_ISO), 'limit' => 1), 'CNT_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		} else {
 			return '';
 		}
 	}

Braces +4 added lines, -2 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');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/db_models/EEM_Currency_Payment_Method.model.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,22 +25,22 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEM_Currency_Payment_Method extends EEM_Base{
+class EEM_Currency_Payment_Method extends EEM_Base {
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Currency Usable by Payment Method','event_espresso');
-		$this->plural_item = __('Currencies Usable by Payment Methods','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Currency Usable by Payment Method', 'event_espresso');
+		$this->plural_item = __('Currencies Usable by Payment Methods', 'event_espresso');
 		$this->_tables = array(
-			'Currency_Payment_Method'=>new EE_Primary_Table('esp_currency_payment_method','CPM_ID')
+			'Currency_Payment_Method'=>new EE_Primary_Table('esp_currency_payment_method', 'CPM_ID')
 		);
 		$this->_fields = array(
 			'Currency_Payment_Method'=>array(
-				'CPM_ID'=>new EE_Primary_Key_Int_Field('CPM_ID', __('Currency to Payment Method LInk ID','event_espresso')),
-				'CUR_code'=>new EE_Foreign_Key_String_Field('CUR_code', __('Currency Code','event_espresso'), false, 0, 'Currency'),
-				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __('Paymetn Method ID','event_espresso'), false, 0, 'Payment_Method')
+				'CPM_ID'=>new EE_Primary_Key_Int_Field('CPM_ID', __('Currency to Payment Method LInk ID', 'event_espresso')),
+				'CUR_code'=>new EE_Foreign_Key_String_Field('CUR_code', __('Currency Code', 'event_espresso'), false, 0, 'Currency'),
+				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __('Paymetn Method ID', 'event_espresso'), false, 0, 'Payment_Method')
 			)
 		);
 		$this->_model_relations = array(
@@ -48,9 +48,9 @@ 
 			'Payment_Method'=>new EE_Belongs_To_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();
 		$this->_caps_slug = 'payment_methods';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 }
 

Braces +2 added lines, -1 removed lines

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

core/db_models/EEM_Datetime_Ticket.model.php

Spacing +13 added lines, -13 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Datetime_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Datetime_Ticket.class.php');
 
 class EEM_Datetime_Ticket extends EEM_Base {
 
@@ -37,28 +37,28 @@ 
 	 *		@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 = __('Datetime Ticket','event_espresso');
-		$this->plural_item = __('Datetime Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Datetime Ticket', 'event_espresso');
+		$this->plural_item = __('Datetime Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Datetime_Ticket'=> new EE_Primary_Table('esp_datetime_ticket', 'DTK_ID')
 		);
 		$this->_fields = array(
 			'Datetime_Ticket'=>array(
-				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID','event_espresso')),
-				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime','event_espresso'), false, 0, 'Datetime' ),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket','event_espresso'), false, 0, 'Ticket' )
+				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID', 'event_espresso')),
+				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime', 'event_espresso'), false, 0, 'Datetime'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket', 'event_espresso'), false, 0, 'Ticket')
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_Belongs_To_Relation(),
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 } //end EEM_Datetime_Ticket 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_Event_Message_Template.model.php

Indentation +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@
  */
  if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
  /**
- *	EEM_Event_Message_Template
- *	Model for relation table between EEM_Message_Template_Group and EEM_Event
- *
- * @package		Event Espresso
- * @subpackage 	models
- * @since 			4.3.0
- * @author			 Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+  *	EEM_Event_Message_Template
+  *	Model for relation table between EEM_Message_Template_Group and EEM_Event
+  *
+  * @package		Event Espresso
+  * @subpackage 	models
+  * @since 			4.3.0
+  * @author			 Darren Ethier
+  *
+  * ------------------------------------------------------------------------
+  */
 require_once( EE_MODELS . 'EEM_Base.model.php' );
 
 class EEM_Event_Message_Template extends EEM_Base {

Spacing +23 added lines, -23 removed lines

@@ -17,7 +17,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Event_Message_Template extends EEM_Base {
 
@@ -30,29 +30,29 @@ 
 	 * @access private
 	 * @return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __('Event Message Template','event_espresso');
-		$this->plural_item = __('Event Message Templates','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Event Message Template', 'event_espresso');
+		$this->plural_item = __('Event Message Templates', 'event_espresso');
 
 		$this->_tables = array(
 			'Event_Message_Template'=> new EE_Primary_Table('esp_event_message_template', 'EMT_ID')
 		);
 		$this->_fields = array(
 			'Event_Message_Template'=>array(
-				'EMT_ID'=>new EE_Primary_Key_Int_Field('EMT_ID', __('Event Message Template ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('The ID to the Event','event_espresso'), false, 0, 'Event' ),
-				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('The ID to the Message Template Group','event_espresso'), false, 0, 'Message_Template_Group' )
+				'EMT_ID'=>new EE_Primary_Key_Int_Field('EMT_ID', __('Event Message Template ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('The ID to the Event', 'event_espresso'), false, 0, 'Event'),
+				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('The ID to the Message Template Group', 'event_espresso'), false, 0, 'Message_Template_Group')
 			));
 		$this->_model_relations = array(
 			'Event'=>new EE_Belongs_To_Relation(),
 			'Message_Template_Group'=>new EE_Belongs_To_Relation()
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 * @param  int    $GRP_ID The MTP group we want attached events for.
 	 * @return  array               An array of event ids.
 	 */
-	public function get_attached_event_ids( $GRP_ID ) {
-		$event_ids = $this->_get_all_wpdb_results( array( array( 'GRP_ID' => $GRP_ID ) ), ARRAY_N, 'EVT_ID' );
-		$event_ids = call_user_func_array( 'array_merge', $event_ids );
+	public function get_attached_event_ids($GRP_ID) {
+		$event_ids = $this->_get_all_wpdb_results(array(array('GRP_ID' => $GRP_ID)), ARRAY_N, 'EVT_ID');
+		$event_ids = call_user_func_array('array_merge', $event_ids);
 		return $event_ids;
 	}
 
@@ -81,17 +81,17 @@ 
 	 *                         	       GRPIDs.
 	 * @return int 		       How many rows were deleted.
 	 */
-	public function delete_event_group_relations( $GRP_IDs = array(), $EVT_IDs = array() ) {
-		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) )
-			throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+	public function delete_event_group_relations($GRP_IDs = array(), $EVT_IDs = array()) {
+		if (empty($GRP_IDs) && empty($EVT_IDs))
+			throw new EE_Error(sprintf(__('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso'), __METHOD__));
 
-		if ( !empty( $GRP_IDs ) )
-			$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		if ( ! empty($GRP_IDs))
+			$where['GRP_ID'] = array('IN', (array) $GRP_IDs);
 
-		if ( !empty( $EVT_IDs ) )
-			$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		if ( ! empty($EVT_IDs))
+			$where['EVT_ID'] = array('IN', (array) $EVT_IDs);
 
-		return $this->delete( array( $where ), FALSE );
+		return $this->delete(array($where), FALSE);
 	}
 
 } //end class EEM_Event_Message_Template

Braces +12 added lines, -7 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage 	models
  * @since 			4.3.0
  */
- if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+ if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+ 	exit('No direct script access allowed');
+ }
  /**
  *	EEM_Event_Message_Template
  *	Model for relation table between EEM_Message_Template_Group and EEM_Event
@@ -82,14 +84,17 @@ 
 	 * @return int 		       How many rows were deleted.
 	 */
 	public function delete_event_group_relations( $GRP_IDs = array(), $EVT_IDs = array() ) {
-		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) )
-			throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+		if ( empty( $GRP_IDs ) && empty( $EVT_IDs ) ) {
+					throw new EE_Error( sprintf( __('%s requires either an array of GRP_IDs or EVT_IDs or both, but both cannot be empty.', 'event_espresso' ), __METHOD__ ) );
+		}
 
-		if ( !empty( $GRP_IDs ) )
-			$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		if ( !empty( $GRP_IDs ) ) {
+					$where['GRP_ID'] = array( 'IN', (array) $GRP_IDs );
+		}
 
-		if ( !empty( $EVT_IDs ) )
-			$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		if ( !empty( $EVT_IDs ) ) {
+					$where['EVT_ID'] = array( 'IN', (array) $EVT_IDs );
+		}
 
 		return $this->delete( array( $where ), FALSE );
 	}

core/db_models/EEM_Event_Question_Group.model.php

Spacing +15 added lines, -15 removed lines

@@ -5,24 +5,24 @@ 
  * You'll need to use each's EE_Has_Many_Relation relation to this model. Eg, when querying for question groups which apply to primary attendees,
  * you'd do a query like EEM_Question_Group::instance()->get_all(array(array('Event_Question_Group.EQG_primary'=>1)));
  */
-require_once( EE_CLASSES . 'EE_Event_Question_Group.class.php');
+require_once(EE_CLASSES.'EE_Event_Question_Group.class.php');
 
-class EEM_Event_Question_Group extends EEM_Base{
+class EEM_Event_Question_Group extends EEM_Base {
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Event to Question Group Link','event_espresso');
-		$this->plural_item = __('Event to Question Group Links','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Event to Question Group Link', 'event_espresso');
+		$this->plural_item = __('Event to Question Group Links', 'event_espresso');
 		$this->_tables = array(
-			'Event_Question_Group'=>new EE_Primary_Table('esp_event_question_group','EQG_ID')
+			'Event_Question_Group'=>new EE_Primary_Table('esp_event_question_group', 'EQG_ID')
 		);
 		$this->_fields = array(
 			'Event_Question_Group'=>array(
-				'EQG_ID'=>new EE_Primary_Key_Int_Field('EQG_ID', __('Event to Question Group Link ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group Id','event_espresso'), false, 0, 'Question_Group'),
-				'EQG_primary'=>new EE_Boolean_Field('EQG_primary', __('Flag indicating question is only for primary attendees','event_espresso'), false, false)
+				'EQG_ID'=>new EE_Primary_Key_Int_Field('EQG_ID', __('Event to Question Group Link ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group Id', 'event_espresso'), false, 0, 'Question_Group'),
+				'EQG_primary'=>new EE_Boolean_Field('EQG_primary', __('Flag indicating question is only for primary attendees', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -30,11 +30,11 @@ 
 			'Question_Group'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 
 

core/db_models/EEM_Event_Venue.model.php

Spacing +14 added lines, -14 removed lines

@@ -5,22 +5,22 @@ 
  * You'll need to use each's EE_Has_Many_Relation relation to this model. Eg, when querying for question groups which apply to primary attendees,
  * you'd do a query like EEM_Question_Group::instance()->get_all(array(array('Event_Question_Group.EQG_primary'=>1)));
  */
-class EEM_Event_Venue extends EEM_Base{
+class EEM_Event_Venue extends EEM_Base {
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Event to Question Group Link','event_espresso');
-		$this->plural_item = __('Event to Question Group Links','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Event to Question Group Link', 'event_espresso');
+		$this->plural_item = __('Event to Question Group Links', 'event_espresso');
 		$this->_tables = array(
-			'Event_Venue'=>new EE_Primary_Table('esp_event_venue','EVV_ID')
+			'Event_Venue'=>new EE_Primary_Table('esp_event_venue', 'EVV_ID')
 		);
 		$this->_fields = array(
 			'Event_Venue'=>array(
-				'EVV_ID'=>new EE_Primary_Key_Int_Field('EVV_ID', __('Event to Venue Link ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'VNU_ID'=>new EE_Foreign_Key_Int_Field('VNU_ID', __('Venue ID','event_espresso'), false, 0, 'Venue'),
-				'EVV_primary'=>new EE_Boolean_Field('EVV_primary', __("Flag indicating venue is primary one for event", "event_espresso"), false,true)
+				'EVV_ID'=>new EE_Primary_Key_Int_Field('EVV_ID', __('Event to Venue Link ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'VNU_ID'=>new EE_Foreign_Key_Int_Field('VNU_ID', __('Venue ID', 'event_espresso'), false, 0, 'Venue'),
+				'EVV_primary'=>new EE_Boolean_Field('EVV_primary', __("Flag indicating venue is primary one for event", "event_espresso"), false, true)
 
 			)
 		);
@@ -29,11 +29,11 @@ 
 			'Venue'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 
 

core/db_models/EEM_Message_Template.model.php

Indentation +24 added lines, -24 removed lines

@@ -1,30 +1,30 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for Wordpress
- *
- * @package		Event Espresso
- * @author		Seth Shoultes
- * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
- * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
- * @link		http://www.eventespresso.com
- * @version		4.1
- *
- * ------------------------------------------------------------------------
- *
- * EEM_Message_Template
- *
- *
- *
- * @package		Event Espresso
- * @subpackage	includes/models/EEM_Message_Template.model.php
- * @author		Darren Ethier
- *
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for Wordpress
+	 *
+	 * @package		Event Espresso
+	 * @author		Seth Shoultes
+	 * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
+	 * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
+	 * @link		http://www.eventespresso.com
+	 * @version		4.1
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EEM_Message_Template
+	 *
+	 *
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/models/EEM_Message_Template.model.php
+	 * @author		Darren Ethier
+	 *
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EEM_Message_Template extends EEM_Base {
 	//private instance of the EEM_Message_Template object
 	protected static $_instance = NULL;

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * Event Espresso
@@ -36,19 +36,19 @@ 
 	 * 		@access protected
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Message Template','event_espresso');
-		$this->plural_item = __('Message Templates','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Message Template', 'event_espresso');
+		$this->plural_item = __('Message Templates', 'event_espresso');
 
 		$this->_tables = array(
-			'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID' )
+			'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID')
 		);
 		$this->_fields = array(
 			'Message_Template'=> array(
 				'MTP_ID'=> new EE_Primary_Key_Int_Field('MTP_ID', __('Message Template ID', 'event_espresso')),
-				'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso'), FALSE, 0, 'Message_Template_Group' ),
-				'MTP_template_field'=>new EE_Plain_Text_Field('MTP_template_field', __('Field Name for this Template', 'event_espresso'), false, 'default' ),
-				'MTP_context'=>new EE_Plain_Text_Field('MTP_context', __('Message Type Context for this field', 'event_espresso'),false,'admin' ),
+				'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso'), FALSE, 0, 'Message_Template_Group'),
+				'MTP_template_field'=>new EE_Plain_Text_Field('MTP_template_field', __('Field Name for this Template', 'event_espresso'), false, 'default'),
+				'MTP_context'=>new EE_Plain_Text_Field('MTP_context', __('Message Type Context for this field', 'event_espresso'), false, 'admin'),
 				'MTP_content'=>new EE_Serialized_Text_Field('MTP_content', __('The field content for the template', 'event_espresso'), false, ''),
 				)
 		);
@@ -57,11 +57,11 @@ 
 			'Message_Template_Group' => new EE_Belongs_To_Relation()
 			);
 		$this->_model_chain_to_wp_user = 'Message_Template_Group';
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ){
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global( 'Message_Template_Group.MTP_is_global');
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
 		}
 		$this->_caps_slug = 'messages';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

Braces +2 added lines, -1 removed lines

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

core/db_models/EEM_Message_Template_Group.model.php

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -288,7 +289,9 @@ 
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
 				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+					if ( $name == 'main' ) {
+						continue;
+					}
 					$assembled_fields[$name] = $val;
 				}
 				continue;

Doc Comments +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 	 * @param        $messenger
 	 * @param string $orderby
 	 * @param string $order
-	 * @return array all (including trashed or inactive) message template group objects for the given messenger
+	 * @return EE_Base_Class[] all (including trashed or inactive) message template group objects for the given messenger
 	 */
 	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
 		return $this->get_all_deleted_and_undeleted(
@@ -343,7 +343,7 @@ 
 	/**
 	 * This sends things to the validator for the given messenger and message type.
 	 *
-	 * @param  array $fields the incoming fields to check.
+	 * @param  string $fields the incoming fields to check.
 	 *                       Note this array is in the formatted fields from the form fields setup.
 	 *                       So we need to reformat this into an array of expected field refs by the validator.
 	 *                       Note also that this is not only the fields for the Message Template Group

Indentation +8 added lines, -8 removed lines

@@ -1,14 +1,14 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * EEM_Message_Template_Group
- *
- * @package		Event Espresso
- * @subpackage	includes/models/EEM_Message_Template_Group.model.php
- * @author		Darren Ethier
- *
- *
- */
+	 * EEM_Message_Template_Group
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/models/EEM_Message_Template_Group.model.php
+	 * @author		Darren Ethier
+	 *
+	 *
+	 */
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 

Spacing +61 added lines, -61 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * EEM_Message_Template_Group
@@ -9,7 +9,7 @@ 
  *
  *
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 
 	// private instance of the EEM_Message_Template_Group object
@@ -17,7 +17,7 @@ 
 
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->singular_item = __('Message Template Group', 'event_espresso');
 		$this->plural_item = __('Message Template Groups', 'event_espresso');
 		$this->_tables = array(
@@ -26,11 +26,11 @@ 
 		$this->_fields = array(
 			'Message_Template_Group' => array(
 				'GRP_ID' => new EE_Primary_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso')),
-				'MTP_name' => new EE_Plain_Text_Field( 'MTP_name', __('The name of the template group', 'event_espresso'), FALSE, '' ),
-				'MTP_description' => new EE_Simple_HTML_Field( 'MTP_description', __('A brief description about this template.', 'event_espresso' ), FALSE, '' ),
-				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id() ),
-				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email' ),
-				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'),false,'registration'),
+				'MTP_name' => new EE_Plain_Text_Field('MTP_name', __('The name of the template group', 'event_espresso'), FALSE, ''),
+				'MTP_description' => new EE_Simple_HTML_Field('MTP_description', __('A brief description about this template.', 'event_espresso'), FALSE, ''),
+				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id()),
+				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email'),
+				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'), false, 'registration'),
 				'MTP_is_global'=>new EE_Boolean_Field('MTP_is_global', __('Flag indicating if Template Group is Global', 'event_espresso'), false, true),
 				'MTP_is_override'=>new EE_Boolean_Field('MTP_is_override', __('Flag indicating if Template Group overrides any other Templates for the messenger/messagetype combination', 'event_espresso'), false, false),
 				'MTP_deleted'=>new EE_Trashed_Flag_Field('MTP_deleted', __('Flag indicating whether this has been trashed', 'event_espresso'), false, false),
@@ -43,12 +43,12 @@ 
 			'Event' => new EE_HABTM_Relation('Event_Message_Template'),
 			'WP_User' => new EE_Belongs_To_Relation()
 		);
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ){
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global( 'MTP_is_global');
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('MTP_is_global');
 		}
 		$this->_caps_slug = 'messages';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -71,8 +71,8 @@ 
 		$limit = null,
 		$count = false
 	) {
-		$query_params = array( array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit );
-		return $count ? $this->count_deleted( $query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		$query_params = array(array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit);
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -86,9 +86,9 @@ 
 	 * @param string $order
 	 * @return array all (including trashed or inactive) message template group objects for the given messenger
 	 */
-	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
+	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC') {
 		return $this->get_all_deleted_and_undeleted(
-			array( array( 'MTP_messenger' => $messenger ), 'order_by' => array( $orderby => $order ) )
+			array(array('MTP_messenger' => $messenger), 'order_by' => array($orderby => $order))
 		);
 	}
 
@@ -99,18 +99,18 @@ 
 	 * @param  array  $_where any existing where conditions to append these to.
 	 * @return array          original where conditions or original with additional filters.
 	 */
-	protected function _maybe_mtp_filters( $_where = array() ) {
+	protected function _maybe_mtp_filters($_where = array()) {
 		//account for messenger or message type filters
 		if (
-			isset( $_REQUEST[ 'ee_messenger_filter_by' ] )
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'none_selected'
-			&& $_REQUEST[ 'ee_messenger_filter_by' ] != 'all'
+			isset($_REQUEST['ee_messenger_filter_by'])
+			&& $_REQUEST['ee_messenger_filter_by'] != 'none_selected'
+			&& $_REQUEST['ee_messenger_filter_by'] != 'all'
 		) {
-			$_where['MTP_messenger'] =  $_REQUEST['ee_messenger_filter_by'] ;
+			$_where['MTP_messenger'] = $_REQUEST['ee_messenger_filter_by'];
 		}
 
 		if (
-			isset( $_REQUEST['ee_message_type_filter_by'])
+			isset($_REQUEST['ee_message_type_filter_by'])
 			&& $_REQUEST['ee_message_type_filter_by'] != 'none_selected'
 		) {
 			$_where['MTP_message_type'] = $_REQUEST['ee_message_type_filter_by'];
@@ -141,7 +141,7 @@ 
 		$global = true,
 		$user_check = false
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
@@ -156,9 +156,9 @@ 
 			$_where['MTP_user_id'] = get_current_user_id();
 		}
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all($query_params);
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -173,14 +173,14 @@ 
 	 * @param bool   $count
 	 * @return mixed array on success, FALSE on fail
 	 */
-	public function get_all_message_templates( $orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false ) {
+	public function get_all_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = null, $count = false) {
 		$_where = $this->_maybe_mtp_filters();
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
 		$r_templates = $count
-			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE )
-			: $this->get_all_deleted_and_undeleted( $query_params );
+			? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE)
+			: $this->get_all_deleted_and_undeleted($query_params);
 
 		return $r_templates;
 	}
@@ -194,10 +194,10 @@ 
 	 * @param  array  $query_params same as EEM_Base::get_all()
 	 * @return  EE_Message_Template_Group[]
 	 */
-	public function get_all_custom_templates_by_event( $EVT_ID, $query_params = array() ) {
-		$where = array_merge( $query_params, array( 'Event.EVT_ID' => $EVT_ID ) );
+	public function get_all_custom_templates_by_event($EVT_ID, $query_params = array()) {
+		$where = array_merge($query_params, array('Event.EVT_ID' => $EVT_ID));
 		return $this->get_all(
-			array( $where )
+			array($where)
 		);
 	}
 
@@ -222,13 +222,13 @@ 
 		$count = false,
 		$global = true
 	) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -264,9 +264,9 @@ 
 			'MTP_is_active' => $active
 		);
 
-		$query_params = array( $_where, 'order_by' => array($orderby=>$order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby=>$order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -300,13 +300,13 @@ 
 			'MTP_is_global' => TRUE,
 		);
 
-		if ( $active != 'all' ) {
+		if ($active != 'all') {
 			$_where['MTP_is_active'] = $active;
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count( $query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @param  array  $query_params same as EEM_Base->get_all()
 	 * @return EE_Message_Template_Group[]
 	 */
-	public function get_custom_message_template_by_m_and_mt( $messenger, $message_type, $query_params = array() ) {
+	public function get_custom_message_template_by_m_and_mt($messenger, $message_type, $query_params = array()) {
 		return $this->get_all(
 			array_merge(
 				$query_params,
@@ -356,14 +356,14 @@ 
 		$assembled_fields = array();
 
 		//let's loop through all the fields and set them up in the right format
-		foreach ( $fields as $index => $value ) {
+		foreach ($fields as $index => $value) {
 			// first let's figure out if the value['content'] in the current index is an array.
 			//  If it is then this is special fields that are used in parsing special shortcodes (i.e. 'attendee_list').
-			if ( is_array($value['content']) ) {
+			if (is_array($value['content'])) {
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
-				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+				foreach ($value['content'] as $name => $val) {
+					if ($name == 'main') continue;
 					$assembled_fields[$name] = $val;
 				}
 				continue;
@@ -375,15 +375,15 @@ 
 
 		// now we've got the assembled_fields.
 		// We need to setup the string for the appropriate validator class and call that.
-		$m_ref = ucwords( str_replace('_',' ', $messenger ) );
-		$m_ref = str_replace( ' ', '_', $m_ref );
-		$mt_ref = ucwords( str_replace('_', ' ', $message_type ) );
-		$mt_ref = str_replace( ' ', '_', $mt_ref );
+		$m_ref = ucwords(str_replace('_', ' ', $messenger));
+		$m_ref = str_replace(' ', '_', $m_ref);
+		$mt_ref = ucwords(str_replace('_', ' ', $message_type));
+		$mt_ref = str_replace(' ', '_', $mt_ref);
 
-		$classname = 'EE_Messages_' . $m_ref . '_' . $mt_ref . '_Validator';
+		$classname = 'EE_Messages_'.$m_ref.'_'.$mt_ref.'_Validator';
 
-		if ( !class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso');
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
 			$msg[] = sprintf(
 				__(
 					'The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class',
@@ -391,11 +391,11 @@ 
 				),
 				$classname
 			);
-			throw new EE_Error( implode( '||', $msg ) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$a = new ReflectionClass( $classname );
-		$_VLD = $a->newInstance( $assembled_fields, $context );
+		$a = new ReflectionClass($classname);
+		$_VLD = $a->newInstance($assembled_fields, $context);
 		$result = $_VLD->validate();
 		return $result;
 	}
@@ -414,18 +414,18 @@ 
 	 *
 	 * @return int  count of updated records.
 	 */
-	public function deactivate_message_template_groups_for( $messenger_names = array(), $message_type_names = array() ) {
+	public function deactivate_message_template_groups_for($messenger_names = array(), $message_type_names = array()) {
 		$query_args = array();
-		if ( empty( $messenger_names ) && empty( $message_type_names ) ) {
+		if (empty($messenger_names) && empty($message_type_names)) {
 			return 0;
 		}
-		if ( ! empty( $messenger_names ) ) {
-			$query_args[ 0 ][ 'MTP_messenger' ] = array( 'IN', (array) $messenger_names );
+		if ( ! empty($messenger_names)) {
+			$query_args[0]['MTP_messenger'] = array('IN', (array) $messenger_names);
 		}
-		if ( ! empty( $message_type_names ) ) {
-			$query_args[ 0 ][ 'MTP_message_type' ] = array( 'IN', (array) $message_type_names );
+		if ( ! empty($message_type_names)) {
+			$query_args[0]['MTP_message_type'] = array('IN', (array) $message_type_names);
 		}
-		return $this->update( array( 'MTP_is_active' => false ), $query_args );
+		return $this->update(array('MTP_is_active' => false), $query_args);
 	}
 
 

core/db_models/EEM_Payment.model.php

Indentation +8 added lines, -8 removed lines

@@ -17,8 +17,8 @@ 
 
 
 /**
-	 * Status id in esp_status table that represents an approved payment
-	 */
+ * Status id in esp_status table that represents an approved payment
+ */
 	const status_id_approved = 'PAP';
 
 
@@ -111,14 +111,14 @@ 
 
 
 	/**
-	*		retrieve  all payments from db for a particular transaction, optionally with
+	 *		retrieve  all payments from db for a particular transaction, optionally with
 	 *		a particular status
-	*
-	* 		@access		public
-	* 		@param		$TXN_ID
+	 *
+	 * 		@access		public
+	 * 		@param		$TXN_ID
 	 *		@param	string	$status_of_payment one of EEM_Payment::status_id_*, like 'PAP','PCN',etc. If none is provided, gets payments with any status
-	*		@return		EE_Payment[]
-	*/
+	 *		@return		EE_Payment[]
+	 */
 	public function get_payments_for_transaction( $TXN_ID = FALSE, $status_of_payment = null ) {
 		// all payments for a TXN ordered chronologically
 		$query_params = array( array( 'TXN_ID' => $TXN_ID ), 'order_by' => array( 'PAY_timestamp' => 'ASC' ));

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
  *

Spacing +51 added lines, -51 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');
 /**
  *
  * Payment Model
@@ -9,7 +9,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Payment extends EEM_Base implements EEMI_Payment{
+class EEM_Payment extends EEM_Base implements EEMI_Payment {
 
   	// private instance of the Payment object
 	protected static $_instance = NULL;
@@ -57,28 +57,28 @@ 
 	 *		@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 EEM_Payment
 	 */
-	protected function __construct( $timezone ) {
+	protected function __construct($timezone) {
 
-		$this->singular_item = __('Payment','event_espresso');
-		$this->plural_item = __('Payments','event_espresso');
+		$this->singular_item = __('Payment', 'event_espresso');
+		$this->plural_item = __('Payments', 'event_espresso');
 
 		$this->_tables = array(
-			'Payment'=>new EE_Primary_Table('esp_payment','PAY_ID')
+			'Payment'=>new EE_Primary_Table('esp_payment', 'PAY_ID')
 		);
 		$this->_fields = array(
 			'Payment'=>array(
-				'PAY_ID'=>new EE_Primary_Key_Int_Field('PAY_ID', __('Payment ID','event_espresso')),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Payment::status_id_failed, 'Status'),
-				'PAY_timestamp'=> new EE_Datetime_Field('PAY_timestamp', __('Timestamp of when payment was attempted','event_espresso'), false, EE_Datetime_Field::now, $timezone ),
-				'PAY_source'=>new EE_All_Caps_Text_Field('PAY_source', __('User-friendly description of payment','event_espresso'), false, 'CART'),
-				'PAY_amount'=>new EE_Money_Field('PAY_amount', __('Amount Payment should be for','event_espresso'), false, 0),
+				'PAY_ID'=>new EE_Primary_Key_Int_Field('PAY_ID', __('Payment ID', 'event_espresso')),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Payment::status_id_failed, 'Status'),
+				'PAY_timestamp'=> new EE_Datetime_Field('PAY_timestamp', __('Timestamp of when payment was attempted', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
+				'PAY_source'=>new EE_All_Caps_Text_Field('PAY_source', __('User-friendly description of payment', 'event_espresso'), false, 'CART'),
+				'PAY_amount'=>new EE_Money_Field('PAY_amount', __('Amount Payment should be for', 'event_espresso'), false, 0),
 				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __("Payment Method ID", 'event_espresso'), false, NULL, 'Payment_Method'),
-				'PAY_gateway_response'=>new EE_Plain_Text_Field('PAY_gateway_response', __('Response from Gateway about the payment','event_espresso'), false, ''),
-				'PAY_txn_id_chq_nmbr'=>new EE_Plain_Text_Field('PAY_txn_id_chq_nmbr', __('Gateway Transaction ID or Cheque Number','event_espresso'), true, ''),
-				'PAY_po_number'=>new EE_Plain_Text_Field('PAY_po_number', __('Purchase or Sales Number','event_espresso'), true, ''),
-				'PAY_extra_accntng'=>new EE_Simple_HTML_Field('PAY_extra_accntng', __('Extra Account Info','event_espresso'), true, ''),
-				'PAY_details'=>new EE_Serialized_Text_Field('PAY_details', __('Full Gateway response about payment','event_espresso'), true, ''),
+				'PAY_gateway_response'=>new EE_Plain_Text_Field('PAY_gateway_response', __('Response from Gateway about the payment', 'event_espresso'), false, ''),
+				'PAY_txn_id_chq_nmbr'=>new EE_Plain_Text_Field('PAY_txn_id_chq_nmbr', __('Gateway Transaction ID or Cheque Number', 'event_espresso'), true, ''),
+				'PAY_po_number'=>new EE_Plain_Text_Field('PAY_po_number', __('Purchase or Sales Number', 'event_espresso'), true, ''),
+				'PAY_extra_accntng'=>new EE_Simple_HTML_Field('PAY_extra_accntng', __('Extra Account Info', 'event_espresso'), true, ''),
+				'PAY_details'=>new EE_Serialized_Text_Field('PAY_details', __('Full Gateway response about payment', 'event_espresso'), true, ''),
 				'PAY_redirect_url'=>new EE_Plain_Text_Field('PAY_redirect_url', __("Redirect URL", 'event_espresso'), true),
 				'PAY_redirect_args'=>new EE_Serialized_Text_Field('PAY_redirect_args', __("Key-Value POST vars to send along with redirect", 'event_espresso'), true)
 			)
@@ -88,11 +88,11 @@ 
 			'Status'=> new EE_Belongs_To_Relation(),
 			'Payment_Method'=>new EE_Belongs_To_Relation(),
 			'Registration_Payment' => new EE_Has_Many_Relation(),
-			'Registration' => new EE_HABTM_Relation( 'Registration_Payment' ),
+			'Registration' => new EE_HABTM_Relation('Registration_Payment'),
 		);
 		$this->_model_chain_to_wp_user = 'Payment_Method';
 		$this->_caps_slug = 'transactions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @param string $PAY_txn_id_chq_nmbr
 	 * @return EE_Payment
 	 */
-	public function get_payment_by_txn_id_chq_nmbr( $PAY_txn_id_chq_nmbr ){
+	public function get_payment_by_txn_id_chq_nmbr($PAY_txn_id_chq_nmbr) {
 		return $this->get_one(array(array('PAY_txn_id_chq_nmbr'=>$PAY_txn_id_chq_nmbr)));
 	}
 
@@ -120,15 +120,15 @@ 
 	 *		@param	string	$status_of_payment one of EEM_Payment::status_id_*, like 'PAP','PCN',etc. If none is provided, gets payments with any status
 	*		@return		EE_Payment[]
 	*/
-	public function get_payments_for_transaction( $TXN_ID = FALSE, $status_of_payment = null ) {
+	public function get_payments_for_transaction($TXN_ID = FALSE, $status_of_payment = null) {
 		// all payments for a TXN ordered chronologically
-		$query_params = array( array( 'TXN_ID' => $TXN_ID ), 'order_by' => array( 'PAY_timestamp' => 'ASC' ));
+		$query_params = array(array('TXN_ID' => $TXN_ID), 'order_by' => array('PAY_timestamp' => 'ASC'));
 		// if provided with a status, search specifically for that status. Otherwise get them all
-		if ( $status_of_payment ){
+		if ($status_of_payment) {
 			$query_params[0]['STS_ID'] = $status_of_payment;
 		}
 		// retrieve payments
-		return $this->get_all ( $query_params );
+		return $this->get_all($query_params);
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Payment[]
 	 */
-	public function get_approved_payments_for_transaction( $TXN_ID = 0 ) {
-		return $this->get_payments_for_transaction( $TXN_ID, EEM_Payment::status_id_approved );
+	public function get_approved_payments_for_transaction($TXN_ID = 0) {
+		return $this->get_payments_for_transaction($TXN_ID, EEM_Payment::status_id_approved);
 
 	}
 
@@ -160,36 +160,36 @@ 
 	 *
 	 * @return EE_Payment[]
 	 */
-	public function get_payments_made_between_dates( $start_date = '', $end_date = '', $format = '', $timezone = '' ) {
-		$timezone = empty( $timezone ) ? EEH_DTT_Helper::get_timezone() : $timezone;
+	public function get_payments_made_between_dates($start_date = '', $end_date = '', $format = '', $timezone = '') {
+		$timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
 		//if $start_date or $end date, verify $format is included.
-		if ( ( ! empty( $start_date ) || ! empty( $end_date ) ) && empty( $format ) ) {
-			throw new EE_Error( __('You included a start date and/or a end date for this method but did not include a format string.  The format string is needed for setting up the query', 'event_espresso' ) );
+		if (( ! empty($start_date) || ! empty($end_date)) && empty($format)) {
+			throw new EE_Error(__('You included a start date and/or a end date for this method but did not include a format string.  The format string is needed for setting up the query', 'event_espresso'));
 		}
-		$now = new DateTime( 'now' );
+		$now = new DateTime('now');
 		// setup timezone objects once
-		$modelDateTimeZone = new DateTimeZone( $this->_timezone );
-		$passedDateTimeZone = new DateTimeZone( $timezone );
+		$modelDateTimeZone = new DateTimeZone($this->_timezone);
+		$passedDateTimeZone = new DateTimeZone($timezone);
 		// setup start date
-		$start_date = ! empty( $start_date ) ? date_create_from_format( $format, $start_date, $passedDateTimeZone ) : $now;
-		$start_date->setTimeZone( $modelDateTimeZone );
-		$start_date = $start_date->format( 'Y-m-d' ) . ' 00:00:00';
-		$start_date = strtotime( $start_date );
+		$start_date = ! empty($start_date) ? date_create_from_format($format, $start_date, $passedDateTimeZone) : $now;
+		$start_date->setTimeZone($modelDateTimeZone);
+		$start_date = $start_date->format('Y-m-d').' 00:00:00';
+		$start_date = strtotime($start_date);
 		// setup end date
-		$end_date = ! empty( $end_date ) ? date_create_from_format( $format, $end_date, $passedDateTimeZone ) : $now;
-		$end_date->setTimeZone( $modelDateTimeZone );
-		$end_date = $end_date->format('Y-m-d') . ' 23:59:59';
-		$end_date = strtotime( $end_date );
+		$end_date = ! empty($end_date) ? date_create_from_format($format, $end_date, $passedDateTimeZone) : $now;
+		$end_date->setTimeZone($modelDateTimeZone);
+		$end_date = $end_date->format('Y-m-d').' 23:59:59';
+		$end_date = strtotime($end_date);
 
 		// make sure our start date is the lowest value and vice versa
-		$start = min( $start_date, $end_date );
-		$end = max( $start_date, $end_date );
+		$start = min($start_date, $end_date);
+		$end = max($start_date, $end_date);
 
 		//yes we generated the date and time string in utc but we WANT this start date and time used in the set timezone on the model.
-		$start_date = $this->convert_datetime_for_query( 'PAY_timestamp', date( 'Y-m-d', $start ) . ' 00:00:00', 'Y-m-d H:i:s', $this->get_timezone() );
-		$end_date = $this->convert_datetime_for_query( 'PAY_timestamp', date( 'Y-m-d', $end) . ' 23:59:59' , 'Y-m-d H:i:s', $this->get_timezone() );
+		$start_date = $this->convert_datetime_for_query('PAY_timestamp', date('Y-m-d', $start).' 00:00:00', 'Y-m-d H:i:s', $this->get_timezone());
+		$end_date = $this->convert_datetime_for_query('PAY_timestamp', date('Y-m-d', $end).' 23:59:59', 'Y-m-d H:i:s', $this->get_timezone());
 
-		return $this->get_all(array(array('PAY_timestamp'=>array('>=',$start_date),'PAY_timestamp*'=>array('<=',$end_date))));
+		return $this->get_all(array(array('PAY_timestamp'=>array('>=', $start_date), 'PAY_timestamp*'=>array('<=', $end_date))));
 	}
 
 	/**
@@ -199,35 +199,35 @@ 
 	 * returns a string for the approved status
 	 * @return 	string
 	 */
-	function approved_status(){
+	function approved_status() {
 		return self::status_id_approved;
 	}
 	/**
 	 * returns a string for the pending status
 	 * @return 	string
 	 */
-	function pending_status(){
+	function pending_status() {
 		return self::status_id_pending;
 	}
 	/**
 	 * returns a string for the cancelled status
 	 * @return 	string
 	 */
-	function cancelled_status(){
+	function cancelled_status() {
 		return self::status_id_cancelled;
 	}
 	/**
 	 * returns a string for the failed status
 	 * @return 	string
 	 */
-	function failed_status(){
+	function failed_status() {
 		return self::status_id_failed;
 	}
 	/**
 	 * returns a string for the declined status
 	 * @return 	string
 	 */
-	function declined_status(){
+	function declined_status() {
 		return self::status_id_declined;
 	}