eventespresso / event-espresso-core

core/db_models/EEM_Question_Group.model.php

Spacing +23 added lines, -23 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Group.class.php');
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Group.class.php');
 class EEM_Question_Group extends EEM_Soft_Delete_Base {
 	const system_personal = 1;
 	const system_address = 2;
@@ -30,25 +30,25 @@ 
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question Group','event_espresso');
-		$this->plural_item = __('Question Groups','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question Group', 'event_espresso');
+		$this->plural_item = __('Question Groups', 'event_espresso');
 
 		$this->_tables = array(
-			'Question_Group'=>new EE_Primary_Table('esp_question_group','QSG_ID')
+			'Question_Group'=>new EE_Primary_Table('esp_question_group', 'QSG_ID')
 		);
 		$this->_fields = array(
 			'Question_Group'=>array(
-				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID','event_espresso')),
-				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name','event_espresso'), false, ''),
-				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group','event_espresso'), false, ''),
-				'QSG_desc'=>new EE_Full_HTML_Field('QSG_desc', __('Description of Question Group','event_espresso'), true, ''),
-				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group','event_espresso'), true, 0),
-				'QSG_show_group_name'=>new EE_Boolean_Field('QSG_show_group_name', __('Flag indicating whether to show the group\'s name on the registration page','event_espresso'), false, true),
-				'QSG_show_group_desc'=>new EE_Boolean_Field('QSG_show_group_desc', __('Flag indicating whether to show the group\s description on the registration page','event_espresso'), false, false),
-				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE ),
-				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.','event_espresso'), false, 0),
-				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted','event_espresso'), false, false)
+				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso')),
+				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name', 'event_espresso'), false, ''),
+				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group', 'event_espresso'), false, ''),
+				'QSG_desc'=>new EE_Full_HTML_Field('QSG_desc', __('Description of Question Group', 'event_espresso'), true, ''),
+				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group', 'event_espresso'), true, 0),
+				'QSG_show_group_name'=>new EE_Boolean_Field('QSG_show_group_name', __('Flag indicating whether to show the group\'s name on the registration page', 'event_espresso'), false, true),
+				'QSG_show_group_desc'=>new EE_Boolean_Field('QSG_show_group_desc', __('Flag indicating whether to show the group\s description on the registration page', 'event_espresso'), false, false),
+				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE),
+				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.', 'event_espresso'), false, 0),
+				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -58,11 +58,11 @@ 
 			'WP_User' => 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_admin ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		parent::__construct( $timezone );
+		$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_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QSG_system');
+		parent::__construct($timezone);
 
 	}
 
@@ -75,9 +75,9 @@ 
 	 */
 	public function get_latest_question_group_order() {
 		$columns_to_select = array(
-			'max_order' => array("MAX(QSG_order)","%d")
+			'max_order' => array("MAX(QSG_order)", "%d")
 			);
-		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select );
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
 		return $max[0]['max_order'];
 	}
 

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
  *

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?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) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * Question Group Model
- *
- * @package			Event Espresso
- * @subpackage		includes/models/
- * @author				Michael Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Question Group Model
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/models/
+	 * @author				Michael Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 require_once( EE_CLASSES . 'EE_Question_Option.class.php');
 

core/db_models/EEM_Question_Group_Question.model.php

Spacing +15 added lines, -15 removed lines

@@ -26,26 +26,26 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Group_Question.class.php');
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Group_Question.class.php');
 class EEM_Question_Group_Question extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question Group to Question Link','event_espresso');
-		$this->plural_item = __('Question Group to Question Links','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question Group to Question Link', 'event_espresso');
+		$this->plural_item = __('Question Group to Question Links', 'event_espresso');
 		$this->_tables = array(
-			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')
+			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question', 'QGQ_ID')
 		);
 		$this->_fields = array(
 			'Question_Group_Question'=>array(
-				'QGQ_ID'=>new EE_Primary_Key_Int_Field('QGQ_ID', __('Question Group to Question Link ID','event_espresso')),
-				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group ID','event_espresso'), false, 0, 'Question_Group'),
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question Id','event_espresso'), false, 0, 'Question'),
-				'QGQ_order' => new EE_Integer_Field('QGQ_order', __('Question Group Question Order', 'event_espresso'), false, 0 )
+				'QGQ_ID'=>new EE_Primary_Key_Int_Field('QGQ_ID', __('Question Group to Question Link ID', 'event_espresso')),
+				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso'), false, 0, 'Question_Group'),
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question Id', 'event_espresso'), false, 0, 'Question'),
+				'QGQ_order' => new EE_Integer_Field('QGQ_order', __('Question Group Question Order', 'event_espresso'), false, 0)
 			)
 		);
 		$this->_model_relations = array(
@@ -55,13 +55,13 @@ 
 
 		$this->_model_chain_to_wp_user = 'Question_Group';
 		//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_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+		$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_Reg_Form('Question_Group.QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
 		//use the caps for question groups
 		$this->_caps_slug = 'question_groups';
-		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_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_Transaction.model.php

Indentation +8 added lines, -8 removed lines

@@ -1,14 +1,14 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 require_once ( EE_MODELS . 'EEM_Base.model.php' );
 /**
- *
- * Transaction Model
- *
- * @package			Event Espresso
- * @subpackage		includes/models/
- * @author				Brent Christensen
- *
- */
+	 *
+	 * Transaction Model
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/models/
+	 * @author				Brent Christensen
+	 *
+	 */
 class EEM_Transaction extends EEM_Base {
 
   	// private instance of the Transaction object

Spacing +37 added lines, -37 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');
 /**
  *
  * Transaction Model
@@ -68,35 +68,35 @@ 
 	 * 		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_Transaction
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Transaction','event_espresso');
-		$this->plural_item = __('Transactions','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Transaction', 'event_espresso');
+		$this->plural_item = __('Transactions', 'event_espresso');
 
 		$this->_tables = array(
-			'Transaction'=>new EE_Primary_Table('esp_transaction','TXN_ID')
+			'Transaction'=>new EE_Primary_Table('esp_transaction', 'TXN_ID')
 		);
 		$this->_fields = array(
 			'Transaction'=>array(
-				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso')),
-				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created','event_espresso'), false, time(), $timezone ),
-				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction','event_espresso'), false, 0),
-				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date','event_espresso'), false, 0),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
-				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data','event_espresso'), true, ''),
-				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt','event_espresso'), true, ''),
+				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso')),
+				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created', 'event_espresso'), false, time(), $timezone),
+				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction', 'event_espresso'), false, 0),
+				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date', 'event_espresso'), false, 0),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
+				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data', 'event_espresso'), true, ''),
+				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt', 'event_espresso'), true, ''),
 				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __("Last Used Payment Method", 'event_espresso'), true, NULL, 'Payment_Method'),
-				'TXN_reg_steps' => new EE_Serialized_Text_Field( 'TXN_reg_steps', __( 'Registration Steps', 'event_espresso' ), FALSE, array() ),
+				'TXN_reg_steps' => new EE_Serialized_Text_Field('TXN_reg_steps', __('Registration Steps', 'event_espresso'), FALSE, array()),
 			)
 		);
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'Payment'=>new EE_Has_Many_Relation(),
 			'Status'=>new EE_Belongs_To_Relation(),
-			'Line_Item'=>new EE_Has_Many_Relation(false),//you can delete a transaction without needing to delete its line items
+			'Line_Item'=>new EE_Has_Many_Relation(false), //you can delete a transaction without needing to delete its line items
 			'Payment_Method'=>new EE_Belongs_To_Relation(),
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -107,19 +107,19 @@ 
 	 * @param string $period
 	 * @return \stdClass[]
 	 */
-	public function get_revenue_per_day_report( $period = '-1 month' ) {
+	public function get_revenue_per_day_report($period = '-1 month') {
 
-		$sql_date = $this->convert_datetime_for_query( 'TXN_timestamp', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
+		$sql_date = $this->convert_datetime_for_query('TXN_timestamp', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
 		$results = $this->_get_all_wpdb_results(
 			array(
 				array(
 					'TXN_timestamp' => array('>=', $sql_date)),
 					'group_by' => 'txnDate',
-					'order_by' => array('TXN_timestamp' => 'DESC' )
+					'order_by' => array('TXN_timestamp' => 'DESC')
 					),
 				OBJECT,
 				array(
-					'txnDate' => array('DATE(Transaction.TXN_timestamp)','%s'),
+					'txnDate' => array('DATE(Transaction.TXN_timestamp)', '%s'),
 					'revenue' => array('SUM(Transaction.TXN_paid)', '%d')
 					));
 		return $results;
@@ -135,22 +135,22 @@ 
 	 * @throws \EE_Error
 	 * @return mixed
 	 */
-	public function get_revenue_per_event_report( $period = 'month' ) {
+	public function get_revenue_per_event_report($period = 'month') {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$date_mod = strtotime( '-1 ' . $period );
+		$date_mod = strtotime('-1 '.$period);
 
 		$SQL = 'SELECT post_title as event_name, SUM(TXN_paid) AS revenue';
-		$SQL .= ' FROM ' . $this->_get_main_table()->get_table_name() . ' txn';
-		$SQL .= ' LEFT JOIN ' . $wpdb->prefix . 'esp_registration reg ON reg.TXN_ID = txn.TXN_ID';
-		$SQL .= ' LEFT JOIN ' . $wpdb->posts . ' evt ON evt.ID = reg.EVT_ID';
+		$SQL .= ' FROM '.$this->_get_main_table()->get_table_name().' txn';
+		$SQL .= ' LEFT JOIN '.$wpdb->prefix.'esp_registration reg ON reg.TXN_ID = txn.TXN_ID';
+		$SQL .= ' LEFT JOIN '.$wpdb->posts.' evt ON evt.ID = reg.EVT_ID';
 		$SQL .= ' WHERE REG_count = 1';
 		$SQL .= ' AND REG_date >= %d';
 		$SQL .= ' GROUP BY event_name';
 		$SQL .= ' ORDER BY event_name';
 		$SQL .= ' LIMIT 0, 24';
 
-		return $this->_do_wpdb_query( 'get_results', array(  $wpdb->prepare( $SQL, $date_mod ) ) );
+		return $this->_do_wpdb_query('get_results', array($wpdb->prepare($SQL, $date_mod)));
 
 	}
 
@@ -166,10 +166,10 @@ 
 	 * @param string $reg_url_link
 	 * @return EE_Transaction
 	 */
-	public function get_transaction_from_reg_url_link( $reg_url_link = '' ){
-		return $this->get_one( array(
+	public function get_transaction_from_reg_url_link($reg_url_link = '') {
+		return $this->get_one(array(
 			array(
-				'Registration.REG_url_link' => ! empty( $reg_url_link ) ? $reg_url_link : EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' )
+				'Registration.REG_url_link' => ! empty($reg_url_link) ? $reg_url_link : EE_Registry::instance()->REQ->get('e_reg_url_link', '')
 			)
 		));
 	}
@@ -189,15 +189,15 @@ 
 	 * @param boolean $save_txn whether or not to save the transaction during this function call
 	 * @return boolean
 	 */
-	public function update_based_on_payments( $transaction_obj_or_id, $save_txn = TRUE ){
+	public function update_based_on_payments($transaction_obj_or_id, $save_txn = TRUE) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this->ensure_is_obj( $transaction_obj_or_id ));
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this->ensure_is_obj($transaction_obj_or_id));
 	}
 
 	/**
@@ -215,17 +215,17 @@ 
 		$time_to_leave_alone = apply_filters(
 			'FHEE__EEM_Transaction__delete_junk_transactions__time_to_leave_alone', WEEK_IN_SECONDS
 		);
-		$query = $wpdb->prepare( '
+		$query = $wpdb->prepare('
 			DELETE
-			FROM '. $this->table() . '
+			FROM '. $this->table().'
 			WHERE
 				STS_ID = %s AND
 				TXN_timestamp < %s',
 			EEM_Transaction::failed_status_code,
 			// use GMT time because that's what TXN_timestamps are in
-			gmdate(  'Y-m-d H:i:s', time() - $time_to_leave_alone )
+			gmdate('Y-m-d H:i:s', time() - $time_to_leave_alone)
 		);
-		return $wpdb->query( $query );
+		return $wpdb->query($query);
 	}
 
 

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_Venue.model.php

Spacing +19 added lines, -19 removed lines

@@ -21,16 +21,16 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Venue extends EEM_CPT_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Venue','event_espresso');
-		$this->plural_item = __('Venues','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Venue', 'event_espresso');
+		$this->plural_item = __('Venues', 'event_espresso');
 		$this->_tables = array(
 			'Venue_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Venue_Meta'=>new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID')
@@ -39,32 +39,32 @@ 
 			'Venue_CPT'=>array(
 				'VNU_ID'=>new EE_Primary_Key_Int_Field('ID', __("Venue ID", "event_espresso")),
 				'VNU_name'=>new EE_Plain_Text_Field('post_title', __("Venue Name", "event_espresso"), false, ''),
-				'VNU_desc'=>new EE_Post_Content_Field('post_content', __("Venue Description", "event_espresso"), false,''),
-				'VNU_identifier'=>new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false,''),
-				'VNU_created'=>new EE_Datetime_Field('post_date', __("Date Venue Created", "event_espresso"), FALSE,time()),
-				'VNU_short_desc'=>new EE_Plain_Text_Field('post_excerpt', __("Short Description of Venue", "event_espresso"), true,''),
-				'VNU_modified'=>new EE_Datetime_Field('post_modified', __("Venue Modified Date", "event_espresso"), FALSE,time()),
-				'VNU_wp_user'=>new EE_WP_User_Field('post_author', __("Venue Creator ID", "event_espresso"), false ),
-				'parent'=>new EE_Integer_Field('post_parent', __("Venue Parent ID", "event_espresso"), false,0),
+				'VNU_desc'=>new EE_Post_Content_Field('post_content', __("Venue Description", "event_espresso"), false, ''),
+				'VNU_identifier'=>new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false, ''),
+				'VNU_created'=>new EE_Datetime_Field('post_date', __("Date Venue Created", "event_espresso"), FALSE, time()),
+				'VNU_short_desc'=>new EE_Plain_Text_Field('post_excerpt', __("Short Description of Venue", "event_espresso"), true, ''),
+				'VNU_modified'=>new EE_Datetime_Field('post_modified', __("Venue Modified Date", "event_espresso"), FALSE, time()),
+				'VNU_wp_user'=>new EE_WP_User_Field('post_author', __("Venue Creator ID", "event_espresso"), false),
+				'parent'=>new EE_Integer_Field('post_parent', __("Venue Parent ID", "event_espresso"), false, 0),
 				'VNU_order'=>new EE_Integer_Field('menu_order', __("Venue order", "event_espresso"), false, 1),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_venues'),// EE_Plain_Text_Field('post_type', __("Venue post type", "event_espresso"), false, 'espresso_venues'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_venues'), // EE_Plain_Text_Field('post_type', __("Venue post type", "event_espresso"), false, 'espresso_venues'),
 				),
 			'Venue_Meta'=>array(
 				'VNUM_ID'=>new EE_DB_Only_Int_Field('VNUM_ID', __("ID of Venue Meta Row", "event_espresso"), false),
 				'VNU_ID_fk'=>new EE_DB_Only_Int_Field('VNU_ID', __("Foreign Key to Venue Post ", "event_espresso"), false),
 				'VNU_address'=>new EE_Plain_Text_Field('VNU_address', __("Venue Address line 1", "event_espresso"), true, ''),
-				'VNU_address2'=>new EE_Plain_Text_Field('VNU_address2', __("Venue Address line 2", "event_espresso"), true,''),
+				'VNU_address2'=>new EE_Plain_Text_Field('VNU_address2', __("Venue Address line 2", "event_espresso"), true, ''),
 				'VNU_city'=>new EE_Plain_Text_Field('VNU_city', __("Venue City", "event_espresso"), true, ''),
 				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __("State ID", "event_espresso"), true, null, 'State'),
 				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __("Country Code", "event_espresso"), true, null, 'Country'),
 				'VNU_zip'=>new EE_Plain_Text_Field('VNU_zip', __("Venue Zip/Postal Code", "event_espresso"), true),
 				'VNU_phone'=>new EE_Plain_Text_Field('VNU_phone', __("Venue Phone", "event_espresso"), true),
-				'VNU_capacity'=>new EE_Infinite_Integer_Field('VNU_capacity', __("Venue Capacity", "event_espresso"), true,INF),
+				'VNU_capacity'=>new EE_Infinite_Integer_Field('VNU_capacity', __("Venue Capacity", "event_espresso"), true, INF),
 				'VNU_url'=>new EE_Plain_Text_Field('VNU_url', __('Venue Website', 'event_espresso'), true),
 				'VNU_virtual_phone'=>new EE_Plain_Text_Field('VNU_virtual_phone', __('Call in Number', 'event_espresso'), true),
-				'VNU_virtual_url'=>new EE_Plain_Text_Field('VNU_virtual_url', __('Virtual URL', 'event_espresso'), true ),
-				'VNU_google_map_link'=>new EE_Plain_Text_Field('VNU_google_map_link', __('Google Map Link', 'event_espresso'), true ),
-				'VNU_enable_for_gmap'=>new EE_Boolean_Field('VNU_enable_for_gmap', __('Show Google Map?', 'event_espresso'), false, false )
+				'VNU_virtual_url'=>new EE_Plain_Text_Field('VNU_virtual_url', __('Virtual URL', 'event_espresso'), true),
+				'VNU_google_map_link'=>new EE_Plain_Text_Field('VNU_google_map_link', __('Google Map Link', 'event_espresso'), true),
+				'VNU_enable_for_gmap'=>new EE_Boolean_Field('VNU_enable_for_gmap', __('Show Google Map?', 'event_espresso'), false, false)
 
 			));
 		$this->_model_relations = array(
@@ -76,8 +76,8 @@ 
 		);
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_venues', 'VNUM_ID');
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		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
  *