eventespresso / event-espresso-core

core/db_models/EEM_Datetime_Ticket.model.php

Spacing +13 added lines, -13 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Datetime_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Datetime_Ticket.class.php');
 
 class EEM_Datetime_Ticket extends EEM_Base {
 
@@ -37,28 +37,28 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return void
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Datetime Ticket','event_espresso');
-		$this->plural_item = __('Datetime Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Datetime Ticket', 'event_espresso');
+		$this->plural_item = __('Datetime Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Datetime_Ticket'=> new EE_Primary_Table('esp_datetime_ticket', 'DTK_ID')
 		);
 		$this->_fields = array(
 			'Datetime_Ticket'=>array(
-				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID','event_espresso')),
-				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime','event_espresso'), false, 0, 'Datetime' ),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket','event_espresso'), false, 0, 'Ticket' )
+				'DTK_ID'=>new EE_Primary_Key_Int_Field('DTK_ID', __('Datetime Ticket ID', 'event_espresso')),
+				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', __('The ID to the Datetime', 'event_espresso'), false, 0, 'Datetime'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('The ID to the Ticket', 'event_espresso'), false, 0, 'Ticket')
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_Belongs_To_Relation(),
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Datetime.Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Datetime.Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 } //end EEM_Datetime_Ticket class
\ No newline at end of file

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Event.model.php

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');
+}
 require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
 /**
  *
@@ -349,8 +351,9 @@ 
 			 	$questions[ $qg->ID() ] = $qg->model_field_array();
 			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
 			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
-			 			continue;
+			 		if ( $qst->is_system_question() ) {
+			 					 			continue;
+			 		}
 			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();

Indentation +43 added lines, -43 removed lines

@@ -179,11 +179,11 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_question_groups() {
 		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
 			array( 'QSG_deleted' => FALSE ),
@@ -197,12 +197,12 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 *		@return 		array
+	 */
 	public function get_all_event_question_groups( $EVT_ID = 0 ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -218,13 +218,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		boolean	$for_primary_attendee
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		boolean	$for_primary_attendee
+	 *		@return 		array
+	 */
 	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -241,13 +241,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		EE_Registration 	$registration
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		EE_Registration 	$registration
+	 *		@return 		array
+	 */
 	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
 
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
@@ -275,12 +275,12 @@ 
 
 
 	/**
-	*		get_question_target_db_column
-	*
-	* 		@access		public
-	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
-	*		@return 		array
-	*/
+	 *		get_question_target_db_column
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QSG_IDs  csv list of $QSG IDs
+	 *		@return 		array
+	 */
 	public function get_questions_in_groups( $QSG_IDs = '' ) {
 
 		if ( empty( $QSG_IDs )) {
@@ -306,12 +306,12 @@ 
 
 
 	/**
-	*		get_options_for_question
-	*
-	* 		@access		public
-	* 		@param		string		$QST_IDs  csv list of $QST IDs
-	*		@return 		array
-	*/
+	 *		get_options_for_question
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QST_IDs  csv list of $QST IDs
+	 *		@return 		array
+	 */
 	public function get_options_for_question( $QST_IDs ) {
 
 		if ( empty( $QST_IDs )) {
@@ -396,12 +396,12 @@ 
 
 
 	/**
-	*		_get_question_target_db_column
-	*
-	* 		@access		private
-	* 		@param		$QST
-	*		@return 		string		string
-	*/
+	 *		_get_question_target_db_column
+	 *
+	 * 		@access		private
+	 * 		@param		$QST
+	 *		@return 		string		string
+	 */
 	private function _generate_question_input_name( $QST ) {
 
 		if ( $QST->QST_system ) {

Spacing +161 added lines, -161 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
+require_once(EE_MODELS.'EEM_CPT_Base.model.php');
 /**
  *
  * EEM_Event Model
@@ -11,7 +11,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Event  extends EEM_CPT_Base{
+class EEM_Event  extends EEM_CPT_Base {
 
 	/**
 	 * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the event
@@ -51,15 +51,15 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of EEM_Event already exists
-		if ( ! self::$_instance instanceof EEM_Event ) {
+		if ( ! self::$_instance instanceof EEM_Event) {
 			// instantiate Espresso_model
-			self::$_instance = new self( $timezone );
+			self::$_instance = new self($timezone);
 		}
 		//we might have a timezone set, let set_timezone decide what to do with it
-		self::$_instance->set_timezone( $timezone );
+		self::$_instance->set_timezone($timezone);
 		// EEM_Event object
 		return self::$_instance;
 	}
@@ -70,12 +70,12 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	protected function __construct($timezone = null){
+	protected function __construct($timezone = null) {
 
-		EE_Registry::instance()->load_model( 'Registration' );
+		EE_Registry::instance()->load_model('Registration');
 
-		$this->singular_item = __('Event','event_espresso');
-		$this->plural_item = __('Events','event_espresso');
+		$this->singular_item = __('Event', 'event_espresso');
+		$this->plural_item = __('Events', 'event_espresso');
 
 		// to remove Cancelled events from the frontend, copy the following filter to your functions.php file
 		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
@@ -89,57 +89,57 @@ 
 			array(
 				EEM_Event::cancelled => array(
 					'label' => __('Cancelled', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE)
 				),
 				EEM_Event::postponed => array(
 					'label' => __('Postponed', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE)
 				),
 				EEM_Event::sold_out => array(
 					'label' => __('Sold Out', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE)
 				)
 			)
 		);
 
-		self::$_default_reg_status = empty( self::$_default_reg_status ) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
+		self::$_default_reg_status = empty(self::$_default_reg_status) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
 
 		$this->_tables = array(
-			'Event_CPT'=>new EE_Primary_Table( 'posts','ID' ),
-			'Event_Meta'=> new EE_Secondary_Table( 'esp_event_meta', 'EVTM_ID', 'EVT_ID' )
+			'Event_CPT'=>new EE_Primary_Table('posts', 'ID'),
+			'Event_Meta'=> new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID')
 		);
 
 		$this->_fields = array(
 			'Event_CPT'=>array(
-				'EVT_ID'=>new EE_Primary_Key_Int_Field( 'ID', __( 'Post ID for Event','event_espresso' )),
-				'EVT_name'=>new EE_Plain_Text_Field( 'post_title', __( 'Event Name','event_espresso' ), FALSE, '' ),
-				'EVT_desc'=>new EE_Post_Content_Field( 'post_content', __( 'Event Description', 'event_espresso' ), FALSE, '' ),
-				'EVT_slug'=>new EE_Slug_Field( 'post_name', __( 'Event Slug', 'event_espresso' ), FALSE, '' ),
-				'EVT_created'=>new EE_Datetime_Field( 'post_date', __( 'Date/Time Event Created', 'event_espresso' ), FALSE, time()),
-				'EVT_short_desc'=>new EE_Simple_HTML_Field( 'post_excerpt', __( 'Event Short Description', 'event_espresso' ), FALSE,'' ),
-				'EVT_modified'=>new EE_Datetime_Field( 'post_modified', __( 'Date/Time Event Modified', 'event_espresso' ), FALSE, time()),
-				'EVT_wp_user'=>new EE_WP_User_Field( 'post_author', __( 'Event Creator ID', 'event_espresso'), FALSE),
-				'parent'=>new EE_Integer_Field( 'post_parent', __( 'Event Parent ID', 'event_espresso' ), FALSE, 0 ),
-				'EVT_order'=>new EE_Integer_Field( 'menu_order', __( 'Event Menu Order', 'event_espresso' ), FALSE, 1 ),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'),// EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
-				'status' => new EE_WP_Post_Status_Field( 'post_status', __( 'Event Status', 'event_espresso' ), FALSE, 'draft', $this->_custom_stati )
+				'EVT_ID'=>new EE_Primary_Key_Int_Field('ID', __('Post ID for Event', 'event_espresso')),
+				'EVT_name'=>new EE_Plain_Text_Field('post_title', __('Event Name', 'event_espresso'), FALSE, ''),
+				'EVT_desc'=>new EE_Post_Content_Field('post_content', __('Event Description', 'event_espresso'), FALSE, ''),
+				'EVT_slug'=>new EE_Slug_Field('post_name', __('Event Slug', 'event_espresso'), FALSE, ''),
+				'EVT_created'=>new EE_Datetime_Field('post_date', __('Date/Time Event Created', 'event_espresso'), FALSE, time()),
+				'EVT_short_desc'=>new EE_Simple_HTML_Field('post_excerpt', __('Event Short Description', 'event_espresso'), FALSE, ''),
+				'EVT_modified'=>new EE_Datetime_Field('post_modified', __('Date/Time Event Modified', 'event_espresso'), FALSE, time()),
+				'EVT_wp_user'=>new EE_WP_User_Field('post_author', __('Event Creator ID', 'event_espresso'), FALSE),
+				'parent'=>new EE_Integer_Field('post_parent', __('Event Parent ID', 'event_espresso'), FALSE, 0),
+				'EVT_order'=>new EE_Integer_Field('menu_order', __('Event Menu Order', 'event_espresso'), FALSE, 1),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'), // EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
+				'status' => new EE_WP_Post_Status_Field('post_status', __('Event Status', 'event_espresso'), FALSE, 'draft', $this->_custom_stati)
 			),
 			'Event_Meta'=>array(
-				'EVTM_ID'=> new EE_DB_Only_Float_Field( 'EVTM_ID', __( 'Event Meta Row ID','event_espresso' ), FALSE ),
-				'EVT_ID_fk'=>new EE_DB_Only_Int_Field( 'EVT_ID', __( 'Foreign key to Event ID from Event Meta table', 'event_espresso' ), FALSE ),
-				'EVT_display_desc'=>new EE_Boolean_Field( 'EVT_display_desc', __( 'Display Description Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_display_ticket_selector'=>new EE_Boolean_Field( 'EVT_display_ticket_selector', __( 'Display Ticket Selector Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_visible_on'=>new EE_Datetime_Field( 'EVT_visible_on', __( 'Event Visible Date', 'event_espresso' ), TRUE, time()),
-				'EVT_additional_limit'=>new EE_Integer_Field( 'EVT_additional_limit', __( 'Limit of Additional Registrations on Same Transaction', 'event_espresso' ), TRUE, 10 ),
+				'EVTM_ID'=> new EE_DB_Only_Float_Field('EVTM_ID', __('Event Meta Row ID', 'event_espresso'), FALSE),
+				'EVT_ID_fk'=>new EE_DB_Only_Int_Field('EVT_ID', __('Foreign key to Event ID from Event Meta table', 'event_espresso'), FALSE),
+				'EVT_display_desc'=>new EE_Boolean_Field('EVT_display_desc', __('Display Description Flag', 'event_espresso'), FALSE, 1),
+				'EVT_display_ticket_selector'=>new EE_Boolean_Field('EVT_display_ticket_selector', __('Display Ticket Selector Flag', 'event_espresso'), FALSE, 1),
+				'EVT_visible_on'=>new EE_Datetime_Field('EVT_visible_on', __('Event Visible Date', 'event_espresso'), TRUE, time()),
+				'EVT_additional_limit'=>new EE_Integer_Field('EVT_additional_limit', __('Limit of Additional Registrations on Same Transaction', 'event_espresso'), TRUE, 10),
 				'EVT_default_registration_status'=>new EE_Enum_Text_Field(
-					'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
+					'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
 				),
-				'EVT_member_only'=>new EE_Boolean_Field( 'EVT_member_only', __( 'Member-Only Event Flag', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __( 'Event Phone Number', 'event_espresso' ), FALSE ),
-				'EVT_allow_overflow'=>new EE_Boolean_Field(  'EVT_allow_overflow', __( 'Allow Overflow on Event', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_timezone_string'=>new EE_Plain_Text_Field( 'EVT_timezone_string', __( 'Timezone (name) for Event times', 'event_espresso' ), FALSE ),
-				'EVT_external_URL'=>new EE_Plain_Text_Field( 'EVT_external_URL', __( 'URL of Event Page if hosted elsewhere', 'event_espresso' ), TRUE ),
-				'EVT_donations'=>new EE_Boolean_Field( 'EVT_donations', __( 'Accept Donations?', 'event_espresso' ), FALSE, FALSE )
+				'EVT_member_only'=>new EE_Boolean_Field('EVT_member_only', __('Member-Only Event Flag', 'event_espresso'), FALSE, FALSE),
+				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __('Event Phone Number', 'event_espresso'), FALSE),
+				'EVT_allow_overflow'=>new EE_Boolean_Field('EVT_allow_overflow', __('Allow Overflow on Event', 'event_espresso'), FALSE, FALSE),
+				'EVT_timezone_string'=>new EE_Plain_Text_Field('EVT_timezone_string', __('Timezone (name) for Event times', 'event_espresso'), FALSE),
+				'EVT_external_URL'=>new EE_Plain_Text_Field('EVT_external_URL', __('URL of Event Page if hosted elsewhere', 'event_espresso'), TRUE),
+				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __('Accept Donations?', 'event_espresso'), FALSE, FALSE)
 
 			));
 
@@ -154,8 +154,8 @@ 
 			'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();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
 	}
 
 
@@ -163,14 +163,14 @@ 
 	/**
 	 * @param string $default_reg_status
 	 */
-	public static function set_default_reg_status( $default_reg_status ) {
+	public static function set_default_reg_status($default_reg_status) {
 		self::$_default_reg_status = $default_reg_status;
 		//if EEM_Event has already been instantiated, then we need to reset the `EVT_default_reg_status` field to use the new default.
-		if ( self::$_instance instanceof EEM_Event ) {
+		if (self::$_instance instanceof EEM_Event) {
 			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status'] = new EE_Enum_Text_Field(
-				'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), false, $default_reg_status, EEM_Registration::reg_status_array()
+				'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), false, $default_reg_status, EEM_Registration::reg_status_array()
 			);
-			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize( 'Event_Meta', 'EVT_default_registration_status', 'EEM_Event' );
+			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize('Event_Meta', 'EVT_default_registration_status', 'EEM_Event');
 		}
 	}
 
@@ -183,9 +183,9 @@ 
 	*		@return 		array
 	*/
 	public function get_all_question_groups() {
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
-			array( 'QSG_deleted' => FALSE ),
-			'order_by' => array( 'QSG_order' => 'ASC' )
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
+			array('QSG_deleted' => FALSE),
+			'order_by' => array('QSG_order' => 'ASC')
 		));
 	}
 
@@ -201,13 +201,13 @@ 
 	* 		@param		int $EVT_ID
 	*		@return 		array
 	*/
-	public function get_all_event_question_groups( $EVT_ID = 0 ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_all_event_question_groups($EVT_ID = 0) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID)
 		));
 	}
 
@@ -223,13 +223,13 @@ 
 	* 		@param		boolean	$for_primary_attendee
 	*		@return 		array
 	*/
-	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = TRUE) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee)
 		));
 	}
 
@@ -246,10 +246,10 @@ 
 	* 		@param		EE_Registration 	$registration
 	*		@return 		array
 	*/
-	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
+	public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration) {
 
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -259,7 +259,7 @@ 
 			'QSG_deleted' => FALSE
 		);
 
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
 			$where_params,
 			'order_by' => array('QSG_order' => 'ASC')
 		));
@@ -279,16 +279,16 @@ 
 	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
 	*		@return 		array
 	*/
-	public function get_questions_in_groups( $QSG_IDs = '' ) {
+	public function get_questions_in_groups($QSG_IDs = '') {
 
-		if ( empty( $QSG_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Group IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QSG_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question Group IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question')->get_all(array(
 			array(
-				'Question_Group.QSG_ID' => array( 'IN', $QSG_IDs ),
+				'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
 				'QST_deleted' => FALSE,
 				'QST_admin_only' => is_admin()
 			),
@@ -310,16 +310,16 @@ 
 	* 		@param		string		$QST_IDs  csv list of $QST IDs
 	*		@return 		array
 	*/
-	public function get_options_for_question( $QST_IDs ) {
+	public function get_options_for_question($QST_IDs) {
 
-		if ( empty( $QST_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QST_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question_Option' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Option')->get_all(array(
 			array(
-				'Question.QST_ID' => array( 'IN', $QST_IDs ),
+				'Question.QST_ID' => array('IN', $QST_IDs),
 				'QSO_deleted' => FALSE
 			),
 			'order_by' => 'QSO_ID'
@@ -339,46 +339,46 @@ 
 	 * @throws EE_Error
 	 * @return 	array
 	 */
-	public function assemble_array_of_groups_questions_and_options( EE_Registration $registration, $EVT_ID = 0 ) {
+	public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0) {
 
-		if ( empty( $EVT_ID ) ) {
-			throw new EE_Error( __( 'An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso' ) );
+		if (empty($EVT_ID)) {
+			throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso'));
 		}
 
 		$questions = array();
 
 		// get all question groups for event
-		$qgs = $this->get_question_groups_for_event( $EVT_ID, $registration );
-		if ( !empty( $qgs ) ) {
-			foreach ( $qgs as $qg ) {
+		$qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
+		if ( ! empty($qgs)) {
+			foreach ($qgs as $qg) {
 			 	$qsts = $qg->questions();
-			 	$questions[ $qg->ID() ] = $qg->model_field_array();
-			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
-			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
+			 	$questions[$qg->ID()] = $qg->model_field_array();
+			 	$questions[$qg->ID()]['QSG_questions'] = array();
+			 	foreach ($qsts as $qst) {
+			 		if ($qst->is_system_question())
 			 			continue;
-			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
+			 		$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID())));
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();
 			 		$ans_id = $answer->ID();
-			 		$qst_name = !empty( $ans_id ) ?  '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+			 		$qst_name = ! empty($ans_id) ? '['.$qst_name.']['.$ans_id.']' : '['.$qst_name.']';
 			 		$input_name = '';
-			 		$input_id = sanitize_key( $qst->display_text() );
+			 		$input_id = sanitize_key($qst->display_text());
 			 		$input_class = '';
 			 		$questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
-		 			$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_name'] = 'qstn' . $input_name . $qst_name;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_id'] = $input_id . '-' . $qstn_id;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_class'] = $input_class;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'] = array();
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['qst_obj'] = $qst;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['ans_obj'] = $answer;
+		 			$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'.$input_name.$qst_name;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id.'-'.$qstn_id;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
 					//leave responses as-is, don't convert stuff into html entities please!
-					$questions[ $qg->ID() ][ 'QSG_questions'][ $qst->ID() ][ 'htmlentities' ] = false;
-					if ( $qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN' ) {
-						$QSOs = $qst->options(TRUE,$answer->value());
-						if ( is_array( $QSOs ) ) {
-							foreach ( $QSOs as $QSO_ID => $QSO ) {
-								$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'][ $QSO_ID ] = $QSO->model_field_array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['htmlentities'] = false;
+					if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
+						$QSOs = $qst->options(TRUE, $answer->value());
+						if (is_array($QSOs)) {
+							foreach ($QSOs as $QSO_ID => $QSO) {
+								$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
 							}
 						}
 					}
@@ -402,9 +402,9 @@ 
 	* 		@param		$QST
 	*		@return 		string		string
 	*/
-	private function _generate_question_input_name( $QST ) {
+	private function _generate_question_input_name($QST) {
 
-		if ( $QST->QST_system ) {
+		if ($QST->QST_system) {
 			$qst_name = $QST->QST_system;
 /*			switch( $QST->QST_system ) {
 
@@ -471,36 +471,36 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_active_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_active_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if already have where params for DTT_EVT_start or DTT_EVT_end then append these conditions
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start******'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start******'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
-			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		} else {
-			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY"
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -515,30 +515,30 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array               EE_Event objects
 	 */
-	public function get_upcoming_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_upcoming_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY"
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -550,54 +550,54 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_expired_events( $query_params, $count = FALSE ) {
+	public function get_expired_events($query_params, $count = FALSE) {
 
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 		$exclude_query = $query_params;
-		if ( isset( $exclude_query[0] ) ) {
-			unset( $exclude_query[0] );
+		if (isset($exclude_query[0])) {
+			unset($exclude_query[0]);
 		}
-		$exclude_query[0] = array( 'Datetime.DTT_EVT_end' => array( '>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) );
+		$exclude_query[0] = array('Datetime.DTT_EVT_end' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')));
 		//first get all events that have datetimes where its not expired.
-		$event_ids = $this->_get_all_wpdb_results( $exclude_query, OBJECT_K, 'Event_CPT.ID' );
-		$event_ids = array_keys( $event_ids );
+		$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Event_CPT.ID');
+		$event_ids = array_keys($event_ids);
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
 		$and_condition = array(
-			'Datetime.DTT_EVT_end' => array( '<', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ),
-			'EVT_ID' =>  array( 'NOT IN', $event_ids )
+			'Datetime.DTT_EVT_end' => array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')),
+			'EVT_ID' =>  array('NOT IN', $event_ids)
 			);
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$and_condition['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$and_condition['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$and_condition['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		//merge remaining $where params with the and conditions.
-		$where_params['AND'] = array_merge( $and_condition, $where_params );
+		$where_params['AND'] = array_merge($and_condition, $where_params);
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY"
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -608,40 +608,40 @@ 
 	 * @param  boolean $count        whether to return the count or not (default FALSE)
 	 * @return EE_Event[]            array of EE_Event objects
 	 */
-	public function get_inactive_events( $query_params, $count = FALSE ) {
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+	public function get_inactive_events($query_params, $count = FALSE) {
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//let's add in specific query_params for inactive events.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
-		$where_params['AND']['status'] = array( '!=', 'publish' );
+		$where_params['AND']['status'] = array('!=', 'publish');
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$where_params['AND']['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$where_params['AND']['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$where_params['AND']['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY"
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -649,13 +649,13 @@ 
 	 * This is just injecting into the parent add_relationship_to so we do special handling on price relationships because we don't want to override any existing global default prices but instead insert NEW prices that get attached to the event.
 	 * See parent for param descriptions
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 
-		if ( $relationName == 'Price' ) {
+		if ($relationName == 'Price') {
 			//let's get the PRC object for the given ID to make sure that we aren't dealing with a default
 			$prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
 			//if EVT_ID = 0, then this is a default
-			if ( $prc_chk->get('EVT_ID') == 0 ) {
+			if ($prc_chk->get('EVT_ID') == 0) {
 				//let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
 				$prc_chk->set('PRC_ID', 0);
 			}
@@ -665,7 +665,7 @@ 
 		}
 
 		//otherwise carry on as normal
-		return parent::add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query);
+		return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
 	}
 
 

core/db_models/EEM_Event_Message_Template.model.php

Indentation +10 added lines, -10 removed lines

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

Spacing +23 added lines, -23 removed lines

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

Braces +12 added lines, -7 removed lines

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

core/db_models/EEM_Event_Question_Group.model.php

Spacing +15 added lines, -15 removed lines

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

core/db_models/EEM_Event_Venue.model.php

Spacing +14 added lines, -14 removed lines

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

core/db_models/EEM_Message_Template.model.php

Indentation +24 added lines, -24 removed lines

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

Spacing +11 added lines, -11 removed lines

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

Braces +2 added lines, -1 removed lines

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

core/db_models/EEM_Message_Template_Group.model.php

Braces +5 added lines, -2 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +8 added lines, -8 removed lines

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

Spacing +61 added lines, -61 removed lines

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

core/db_models/EEM_Payment.model.php

Indentation +8 added lines, -8 removed lines

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

Braces +3 added lines, -1 removed lines

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

Spacing +51 added lines, -51 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Payment Model
@@ -9,7 +9,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Payment extends EEM_Base implements EEMI_Payment{
+class EEM_Payment extends EEM_Base implements EEMI_Payment {
 
   	// private instance of the Payment object
 	protected static $_instance = NULL;
@@ -57,28 +57,28 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return EEM_Payment
 	 */
-	protected function __construct( $timezone ) {
+	protected function __construct($timezone) {
 
-		$this->singular_item = __('Payment','event_espresso');
-		$this->plural_item = __('Payments','event_espresso');
+		$this->singular_item = __('Payment', 'event_espresso');
+		$this->plural_item = __('Payments', 'event_espresso');
 
 		$this->_tables = array(
-			'Payment'=>new EE_Primary_Table('esp_payment','PAY_ID')
+			'Payment'=>new EE_Primary_Table('esp_payment', 'PAY_ID')
 		);
 		$this->_fields = array(
 			'Payment'=>array(
-				'PAY_ID'=>new EE_Primary_Key_Int_Field('PAY_ID', __('Payment ID','event_espresso')),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Payment::status_id_failed, 'Status'),
-				'PAY_timestamp'=> new EE_Datetime_Field('PAY_timestamp', __('Timestamp of when payment was attempted','event_espresso'), false, time(), $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, time(), $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');
+}
 /**
  * Event Espresso
  *

Doc Comments +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	 * 		instantiate a new price object with blank/empty properties
 	 *
 	 * 		@access		public
-	 * 		@return		mixed		array on success, FALSE on fail
+	 * 		@return		EE_Base_Class|null		array on success, FALSE on fail
 	 */
 	public function get_new_price() {
 		return $this->create_default_object();
@@ -93,7 +93,7 @@ 
 	 *
 	 * @access        public
 	 * @param int $EVT_ID
-	 * @return array on success
+	 * @return EE_Base_Class[] on success
 	 */
 	public function get_all_event_prices( $EVT_ID = 0 ) {
 		return $this->get_all(array(
@@ -220,7 +220,7 @@ 
 	 * @access public
 	 * @param \EE_Price $price_a
 	 * @param \EE_Price $price_b
-	 * @return bool false on fail
+	 * @return integer 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() ) {
@@ -237,7 +237,7 @@ 
 	 * @access public
 	 * @param \EE_Price $price_a
 	 * @param \EE_Price $price_b
-	 * @return bool false on fail
+	 * @return integer 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() ) {
@@ -253,7 +253,7 @@ 
 	 *
 	 * 		@access		public
 	 * 		@param 		int 				$type - PRT_ID
-	 * 		@return 		boolean		false on fail
+	 * 		@return 		EE_Base_Class[]		false on fail
 	 */
 	public function get_all_prices_that_are_type( $type = 0 ) {
 		return $this->get_all(array(