eventespresso / event-espresso-core

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
@@ -39,19 +39,19 @@ 
 	 * @param string $timezone
 	 * @throws \EE_Error
 	 */
-	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, ''),
 			)
 		);
@@ -60,11 +60,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_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');
+}
 require_once ( EE_MODELS . 'EEM_Base.model.php' );
 /**
  *

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;
 	}
 

core/db_models/EEM_Price.model.php

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Price.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Price.class.php');
 /**
  * Price Model
  *
@@ -22,18 +22,18 @@ 
 	 * 		@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_Price
 	 */
-	protected function __construct( $timezone ) {
-		require_once( EE_MODELS . 'EEM_Price_Type.model.php');
-		$this->singular_item = __('Price','event_espresso');
-		$this->plural_item = __('Prices','event_espresso');
+	protected function __construct($timezone) {
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
+		$this->singular_item = __('Price', 'event_espresso');
+		$this->plural_item = __('Prices', 'event_espresso');
 
 		$this->_tables = array(
-			'Price'=>new EE_Primary_Table('esp_price','PRC_ID')
+			'Price'=>new EE_Primary_Table('esp_price', 'PRC_ID')
 		);
 		$this->_fields = array(
 			'Price'=> array(
 				'PRC_ID'=>new EE_Primary_Key_Int_Field('PRC_ID', 'Price ID'),
-				'PRT_ID'=>new EE_Foreign_Key_Int_Field('PRT_ID', 'Price type Id', false,  NULL, 'Price_Type'),
+				'PRT_ID'=>new EE_Foreign_Key_Int_Field('PRT_ID', 'Price type Id', false, NULL, 'Price_Type'),
 				'PRC_amount'=>new EE_Money_Field('PRC_amount', 'Price Amount', false, 0),
 				'PRC_name'=>new EE_Plain_Text_Field('PRC_name', 'Name of Price', false, ''),
 				'PRC_desc'=>new EE_Post_Content_Field('PRC_desc', 'Price Description', false, ''),
@@ -41,8 +41,8 @@ 
 				'PRC_overrides'=>new EE_Integer_Field('PRC_overrides', 'Price ID for a global Price that will be overridden by this Price  ( for replacing default prices )', true, 0),
 				'PRC_order'=>new EE_Integer_Field('PRC_order', 'Order of Application of Price (lower numbers apply first?)', false, 1),
 				'PRC_deleted'=>new EE_Trashed_Flag_Field('PRC_deleted', 'Flag Indicating if this has been deleted or not', false, false),
-				'PRC_parent' => new EE_Integer_Field('PRC_parent', __('Indicates what PRC_ID is the parent of this PRC_ID'), true, 0 ),
-				'PRC_wp_user' => new EE_WP_User_Field('PRC_wp_user', __('Price Creator ID', 'event_espresso'), FALSE ),
+				'PRC_parent' => new EE_Integer_Field('PRC_parent', __('Indicates what PRC_ID is the parent of this PRC_ID'), true, 0),
+				'PRC_wp_user' => new EE_WP_User_Field('PRC_wp_user', __('Price Creator ID', 'event_espresso'), FALSE),
 			)
 		);
 		$this->_model_relations = array(
@@ -51,12 +51,12 @@ 
 			'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_Default_Public('PRC_is_default', 'Ticket.Datetime.Event' );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('PRC_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( 'PRC_is_default', 'Ticket.Datetime.Event');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'PRC_is_default', 'Ticket.Datetime.Event');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'PRC_is_default', 'Ticket.Datetime.Event');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('PRC_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('PRC_is_default', 'Ticket.Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('PRC_is_default', 'Ticket.Datetime.Event');
+		parent::__construct($timezone);
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @param int $EVT_ID
 	 * @return array on success
 	 */
-	public function get_all_event_prices( $EVT_ID = 0 ) {
+	public function get_all_event_prices($EVT_ID = 0) {
 		return $this->get_all(array(
 			array(
 				'EVT_ID'=>$EVT_ID,
-				'Price_Type.PBT_ID'=>array('!=',  EEM_Price_Type::base_type_tax)
+				'Price_Type.PBT_ID'=>array('!=', EEM_Price_Type::base_type_tax)
 			),
 			'order_by'=>$this->_order_by_array_for_get_all_method()
 		));
@@ -114,9 +114,9 @@ 
 	 * 		@return 		array			on success
 	 * 		@return 		boolean		false on fail
 	 */
-	public function get_all_default_prices( $count = FALSE ) {
+	public function get_all_default_prices($count = FALSE) {
 		$_where = array(
-			'Price_Type.PBT_ID'=>array('!=',4),
+			'Price_Type.PBT_ID'=>array('!=', 4),
 			'PRC_deleted' => 0,
 			'PRC_is_default' => 1
 		);
@@ -147,12 +147,12 @@ 
 	public function get_all_prices_that_are_taxes() {
 		$taxes = array();
 		$all_taxes = $this->get_all(array(
-			array( 'Price_Type.PBT_ID'=>  EEM_Price_Type::base_type_tax ),
-			'order_by' => array( 'Price_Type.PRT_order' => 'ASC', 'PRC_order' => 'ASC' )
+			array('Price_Type.PBT_ID'=>  EEM_Price_Type::base_type_tax),
+			'order_by' => array('Price_Type.PRT_order' => 'ASC', 'PRC_order' => 'ASC')
 		));
-		foreach ( $all_taxes as $tax ) {
-			if ( $tax instanceof EE_Price ) {
-				$taxes[ $tax->order() ][ $tax->ID() ] = $tax;
+		foreach ($all_taxes as $tax) {
+			if ($tax instanceof EE_Price) {
+				$taxes[$tax->order()][$tax->ID()] = $tax;
 			}
 		}
 		return $taxes;
@@ -169,18 +169,18 @@ 
 	 * 		@param int $TKT_ID          the id of the event.  If not included then we assume that this is a new ticket.
 	 * 		@return 		boolean			false on fail
 	 */
-	public function get_all_ticket_prices_for_admin( $TKT_ID = 0 ) {
+	public function get_all_ticket_prices_for_admin($TKT_ID = 0) {
 		$array_of_price_objects = array();
-		if ( empty( $TKT_ID )) {
+		if (empty($TKT_ID)) {
 
 			//if there is no tkt, get prices with no tkt ID, are global, are not a tax, and are active
 			//return that list
 			$default_prices = $this->get_all_default_prices();
 
-			if ( $default_prices ) {
+			if ($default_prices) {
 				foreach ($default_prices as $price) {
-					if ( $price instanceof EE_Price ) {
-						$array_of_price_objects[ $price->type() ][] = $price;
+					if ($price instanceof EE_Price) {
+						$array_of_price_objects[$price->type()][] = $price;
 					}
 				}
 				return $array_of_price_objects;
@@ -199,10 +199,10 @@ 
 			));
 		}
 
-		if ( !empty( $ticket_prices ) ) {
-			foreach ( $ticket_prices as $price ) {
-				if ( $price instanceof EE_Price ) {
-					$array_of_price_objects[ $price->type() ][] = $price;
+		if ( ! empty($ticket_prices)) {
+			foreach ($ticket_prices as $price) {
+				if ($price instanceof EE_Price) {
+					$array_of_price_objects[$price->type()][] = $price;
 				}
 			}
 			return $array_of_price_objects;
@@ -222,9 +222,9 @@ 
 	 * @param \EE_Price $price_b
 	 * @return bool false on fail
 	 */
-	public function _sort_event_prices_by_type( EE_Price $price_a, EE_Price $price_b ) {
-		if ( $price_a->type_obj()->order() == $price_b->type_obj()->order() ) {
-			return $this->_sort_event_prices_by_order( $price_a, $price_b );
+	public function _sort_event_prices_by_type(EE_Price $price_a, EE_Price $price_b) {
+		if ($price_a->type_obj()->order() == $price_b->type_obj()->order()) {
+			return $this->_sort_event_prices_by_order($price_a, $price_b);
 		}
 		return $price_a->type_obj()->order() < $price_b->type_obj()->order() ? -1 : 1;
 	}
@@ -239,8 +239,8 @@ 
 	 * @param \EE_Price $price_b
 	 * @return bool false on fail
 	 */
-	public function _sort_event_prices_by_order( EE_Price $price_a, EE_Price $price_b) {
-		if ( $price_a->order() == $price_b->order() ) {
+	public function _sort_event_prices_by_order(EE_Price $price_a, EE_Price $price_b) {
+		if ($price_a->order() == $price_b->order()) {
 			return 0;
 		}
 		return $price_a->order() < $price_b->order() ? -1 : 1;
@@ -255,7 +255,7 @@ 
 	 * 		@param 		int 				$type - PRT_ID
 	 * 		@return 		boolean		false on fail
 	 */
-	public function get_all_prices_that_are_type( $type = 0 ) {
+	public function get_all_prices_that_are_type($type = 0) {
 		return $this->get_all(array(
 			array(
 				'PRT_ID'=>$type
@@ -271,7 +271,7 @@ 
 	 * Of course you don't have to use it, but this is the order we usually want to sort prices by
 	 * @return array which can be used like so: $this->get_all(array(array(...where stuff...),'order_by'=>$this->_order_by_array_for_get_all_method()));
 	 */
-	public function _order_by_array_for_get_all_method(){
+	public function _order_by_array_for_get_all_method() {
 		return array(
 				'PRC_order'=>'ASC',
 				'Price_Type.PRT_order'=>'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');
+}
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 require_once ( EE_CLASSES . 'EE_Price.class.php' );
 /**

core/db_models/EEM_Price_Type.model.php

Indentation +7 added lines, -7 removed lines

@@ -33,11 +33,11 @@ 
 	public $type = NULL;
 
 	/**
-	*	Price Base types
-	*
-	*	@access	private
-	*	@var int
-	*/
+	 *	Price Base types
+	 *
+	 *	@access	private
+	 *	@var int
+	 */
 	public $base_types = null;
 
 	/**
@@ -144,8 +144,8 @@ 
  *
  * @param type $query_params
  * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
-	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
-	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
+ * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
+ * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
  * @return boolean
  */
 	public function delete_permanently($query_params = array(), $allow_blocking = true) {

Spacing +26 added lines, -26 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Price_Type.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Price_Type.class.php');
 
 
 class EEM_Price_Type extends EEM_Soft_Delete_Base {
@@ -45,7 +45,7 @@ 
 	 * values are text-representations of the base type.
 	 * @return array
 	 */
-	public function get_base_types(){
+	public function get_base_types() {
 		return $this->base_types;
 	}
 
@@ -54,7 +54,7 @@ 
 	 * @param type $base_type_int
 	 * @return type
 	 */
-	public function get_base_type_name($base_type_int){
+	public function get_base_type_name($base_type_int) {
 		return $this->base_types[$base_type_int];
 	}
 
@@ -79,27 +79,27 @@ 
 	 * 		@access protected
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->base_types = array(
-			EEM_Price_Type::base_type_base_price => __('Price','event_espresso'),
-			EEM_Price_Type::base_type_discount => __('Discount','event_espresso'),
-			EEM_Price_Type::base_type_surcharge => __('Surcharge','event_espresso'),
-			EEM_Price_Type::base_type_tax => __('Tax','event_espresso') );
-		$this->singular_item = __('Price Type','event_espresso');
-		$this->plural_item = __('Price Types','event_espresso');
+			EEM_Price_Type::base_type_base_price => __('Price', 'event_espresso'),
+			EEM_Price_Type::base_type_discount => __('Discount', 'event_espresso'),
+			EEM_Price_Type::base_type_surcharge => __('Surcharge', 'event_espresso'),
+			EEM_Price_Type::base_type_tax => __('Tax', 'event_espresso') );
+		$this->singular_item = __('Price Type', 'event_espresso');
+		$this->plural_item = __('Price Types', 'event_espresso');
 
 		$this->_tables = array(
-			'Price_Type'=>new EE_Primary_Table('esp_price_type','PRT_ID')
+			'Price_Type'=>new EE_Primary_Table('esp_price_type', 'PRT_ID')
 		);
 		$this->_fields = array(
 			'Price_Type'=>array(
-				'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID','event_espresso')),
-				'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name','event_espresso'), false, ''),
-				'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax','event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types),
-				'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage','event_espresso'), false, false),
-				'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ','event_espresso'), false, 0),
-				'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed','event_espresso'), false, false),
-				'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE ),
+				'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID', 'event_espresso')),
+				'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name', 'event_espresso'), false, ''),
+				'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax', 'event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types),
+				'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage', 'event_espresso'), false, false),
+				'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ', 'event_espresso'), false, 0),
+				'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed', 'event_espresso'), false, false),
+				'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE),
 			)
 		);
 		$this->_model_relations = array(
@@ -107,10 +107,10 @@ 
 			'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] = new EE_Restriction_Generator_Public();
 		//all price types are "default" in terms of capability names
 		$this->_caps_slug = 'default_price_types';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -156,15 +156,15 @@ 
 		$ID = $query_params[0][$this->get_primary_key_field()->get_name()];
 
 		//check if any prices use this price type
-		$prc_query_params = array(array('PRT_ID'=>array('IN',$would_be_deleted_price_type_ids)));
-		if ( $prices = $this->get_all_related($ID,'Price',$prc_query_params)) {
+		$prc_query_params = array(array('PRT_ID'=>array('IN', $would_be_deleted_price_type_ids)));
+		if ($prices = $this->get_all_related($ID, 'Price', $prc_query_params)) {
 			$prices_names_and_ids = array();
-			foreach($prices as $price){
+			foreach ($prices as $price) {
 				/* @var $price EE_Price */
 				$prices_names_and_ids[] = $price->name()."(".$price->ID().")";
 			}
-			$msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type.  If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'),implode(",",$prices_names_and_ids));
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type.  If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'), implode(",", $prices_names_and_ids));
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 

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_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');
+}
 /**
  * EEM_Registration_Payment
  *

core/db_models/EEM_Soft_Delete_Base.model.php

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');
+}
 require_once( EE_MODELS . 'EEM_Base.model.php');
 /**
  * EEM_Soft_Delete_Base
@@ -47,7 +49,7 @@ 
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
 		if($field){
 			return $field->get_name();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
 		}
 	}

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');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,13 +25,13 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		if( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions ){
+		if ( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -42,12 +42,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -67,7 +67,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -77,11 +77,11 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return $this->get_one(
 			$this->alter_query_params_to_restrict_by_ID(
 				$id,
-				array( 'default_where_conditions' => 'default' )
+				array('default_where_conditions' => 'default')
 			)
 		);
 	}
@@ -93,7 +93,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -103,9 +103,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included( $query_params = array() ){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params = array()) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -123,8 +123,8 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		if( ! isset( $query_params[ 'default_where_conditions' ] ) ) {
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
 			$query_params['default_where_conditions'] = 'minimum';
 		}
 		return $query_params;
@@ -137,9 +137,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -159,7 +159,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -169,7 +169,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -179,7 +179,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -197,7 +197,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete_permanently($query_params, $allow_blocking);
 	}
@@ -208,8 +208,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -218,14 +218,14 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
 		if (
 			$this->delete_or_restore(
 				$delete,
-				$this->alter_query_params_to_restrict_by_ID( $ID )
+				$this->alter_query_params_to_restrict_by_ID($ID)
 			)
 		) {
 			return TRUE;
@@ -245,7 +245,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -256,7 +256,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -265,10 +265,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -286,8 +286,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 }