eventespresso / event-espresso-core

core/db_models/EEM_Attendee.model.php

Indentation +26 added lines, -26 removed lines

@@ -105,13 +105,13 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		$ATT_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		$ATT_ID
+	 *		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
-	*/
+	 */
 	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
 		// retrieve a particular EE_Attendee
 		return $this->get_one_by_ID( $ATT_ID );
@@ -121,12 +121,12 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		array $where_cols_n_values
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		array $where_cols_n_values
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_attendee( $where_cols_n_values = array() ) {
 
 		if ( empty( $where_cols_n_values )) {
@@ -174,20 +174,20 @@ 
 
 
 	/**
-             * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
-             * EE_Attendee objects.
-             *
-             * @since    4.3.0
-             * @param  array $ids array of EE_Registration ids
-             * @return  EE_Attendee[]
-             */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
-                $ids = (array) $ids;
-                $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
-                    );
-                return $this->get_all( array( $_where ) );
-            }
+	 * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
+	 * EE_Attendee objects.
+	 *
+	 * @since    4.3.0
+	 * @param  array $ids array of EE_Registration ids
+	 * @return  EE_Attendee[]
+	 */
+			public function get_array_of_contacts_from_reg_ids( $ids ) {
+				$ids = (array) $ids;
+				$_where = array(
+					'Registration.REG_ID' => array( 'in', $ids )
+					);
+				return $this->get_all( array( $_where ) );
+			}
 
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -256,7 +256,7 @@
 	* 		@param	int	$TXN_ID
 	* 		@param    int		$ATT_ID
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		EE_Soft_Delete_Base_Class|null		array on success, FALSE on fail
 	*/
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
 		return $this->get_one(array(

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');
 
 /**
  *
@@ -19,16 +19,16 @@ 
 	 * QST_ID and QST_systems that relate to attendee attributes.
 	 * NOTE: this will be deprecated if we remove system questions
 	 */
-	const fname_question_id=1;
-	const lname_question_id=2;
-	const email_question_id=3;
-	const address_question_id=4;
-	const address2_question_id=5;
-	const city_question_id=6;
-	const state_question_id=7;
-	const country_question_id=8;
-	const zip_question_id=9;
-	const phone_question_id=10;
+	const fname_question_id = 1;
+	const lname_question_id = 2;
+	const email_question_id = 3;
+	const address_question_id = 4;
+	const address2_question_id = 5;
+	const city_question_id = 6;
+	const state_question_id = 7;
+	const country_question_id = 8;
+	const zip_question_id = 9;
+	const phone_question_id = 10;
 
 
 
@@ -39,9 +39,9 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Attendee','event_espresso');
-		$this->plural_item = __('Attendees','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Attendee', 'event_espresso');
+		$this->plural_item = __('Attendees', 'event_espresso');
 		$this->_tables = array(
 			'Attendee_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Attendee_Meta'=>new EE_Secondary_Table('esp_attendee_meta', 'ATTM_ID', 'ATT_ID')
@@ -55,37 +55,37 @@ 
 				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, time()),
 				'ATT_short_bio'=>new EE_Simple_HTML_Field('post_excerpt', __("Attendee Short Biography", "event_espresso"), true, __("No Biography Provided", "event_espresso")),
 				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, time()),
-				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false ),
+				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false),
 				'ATT_parent'=>new EE_DB_Only_Int_Field('post_parent', __("Parent Attendee (unused)", "event_espresso"), false, 0),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'),// EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'), // EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
 				'status' => new EE_WP_Post_Status_Field('post_status', __('Attendee Status', 'event_espresso'), false, 'publish')
 			),
 			'Attendee_Meta'=>array(
-				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID','event_espresso'), false),
+				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID', 'event_espresso'), false),
 				'ATT_ID_fk'=>new EE_DB_Only_Int_Field('ATT_ID', __("Foreign Key to Attendee in Post Table", "event_espresso"), false),
-				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name','event_espresso'), true, ''),
-				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name','event_espresso'), true, ''),
-				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1','event_espresso'), true, ''),
-				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2','event_espresso'), true, ''),
-				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City','event_espresso'), true, ''),
-				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State','event_espresso'), true,0,'State'),
-				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country','event_espresso'), true,'','Country'),
-				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code','event_espresso'), true, ''),
-				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address','event_espresso'), true, ''),
-				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone','event_espresso'), true, '')
+				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name', 'event_espresso'), true, ''),
+				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name', 'event_espresso'), true, ''),
+				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1', 'event_espresso'), true, ''),
+				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2', 'event_espresso'), true, ''),
+				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City', 'event_espresso'), true, ''),
+				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State', 'event_espresso'), true, 0, 'State'),
+				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country', 'event_espresso'), true, '', 'Country'),
+				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code', 'event_espresso'), true, ''),
+				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address', 'event_espresso'), true, ''),
+				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone', 'event_espresso'), true, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'State'=>new EE_Belongs_To_Relation(),
 			'Country'=>new EE_Belongs_To_Relation(),
-			'Event'=>new EE_HABTM_Relation('Registration', FALSE ),
+			'Event'=>new EE_HABTM_Relation('Registration', FALSE),
 			'WP_User' => new EE_Belongs_To_Relation(),
-			'Message' => new EE_Has_Many_Any_Relation( false ) //allow deletion of attendees even if they have messages in the queue for them.
+			'Message' => new EE_Has_Many_Any_Relation(false) //allow deletion of attendees even if they have messages in the queue for them.
 		);
 		require_once('strategies/EE_CPT_Where_Conditions.strategy.php');
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_attendees', 'ATTM_ID');
 		$this->_caps_slug = 'contacts';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -97,8 +97,8 @@ 
 	 * @param EE_Transaction/int $transaction_id_or_obj EE_Transaction or its ID
 	 * @return EE_Attendee[]
 	 */
-	public function get_attendees_for_transaction( $transaction_id_or_obj ){
-		return $this->get_all( array( array(
+	public function get_attendees_for_transaction($transaction_id_or_obj) {
+		return $this->get_all(array(array(
 			  'Registration.Transaction.TXN_ID' => $transaction_id_or_obj instanceof EE_Transaction ? $transaction_id_or_obj->ID() : $transaction_id_or_obj
 		  )));
 	}
@@ -113,9 +113,9 @@ 
 	*		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
-	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
+	public function get_attendee_by_ID($ATT_ID = FALSE) {
 		// retrieve a particular EE_Attendee
-		return $this->get_one_by_ID( $ATT_ID );
+		return $this->get_one_by_ID($ATT_ID);
 	}
 
 
@@ -128,14 +128,14 @@ 
 	* 		@param		array $where_cols_n_values
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_attendee( $where_cols_n_values = array() ) {
+	public function get_attendee($where_cols_n_values = array()) {
 
-		if ( empty( $where_cols_n_values )) {
+		if (empty($where_cols_n_values)) {
 			return FALSE;
 		}
-		$attendee = $this->get_all( array($where_cols_n_values ));
-		if ( ! empty( $attendee )) {
-			return array_shift( $attendee );
+		$attendee = $this->get_all(array($where_cols_n_values));
+		if ( ! empty($attendee)) {
+			return array_shift($attendee);
 		} else {
 			return FALSE;
 		}
@@ -151,20 +151,20 @@ 
 	 * @param array $where_cols_n_values
 	 * @return bool|mixed
 	 */
-	public function find_existing_attendee( $where_cols_n_values = NULL ) {
+	public function find_existing_attendee($where_cols_n_values = NULL) {
 		// search by combo of first and last names plus the email address
-		$attendee_data_keys = array( 'ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email );
+		$attendee_data_keys = array('ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email);
 		// no search params means attendee object already exists.
-		$where_cols_n_values = is_array( $where_cols_n_values ) && ! empty( $where_cols_n_values ) ? $where_cols_n_values : $attendee_data_keys;
+		$where_cols_n_values = is_array($where_cols_n_values) && ! empty($where_cols_n_values) ? $where_cols_n_values : $attendee_data_keys;
 		$valid_data = TRUE;
 		// check for required values
-		$valid_data = isset( $where_cols_n_values['ATT_fname'] ) && ! empty( $where_cols_n_values['ATT_fname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_lname'] ) && ! empty( $where_cols_n_values['ATT_lname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_email'] ) && ! empty( $where_cols_n_values['ATT_email'] ) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_fname']) && ! empty($where_cols_n_values['ATT_fname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_lname']) && ! empty($where_cols_n_values['ATT_lname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_email']) && ! empty($where_cols_n_values['ATT_email']) ? $valid_data : FALSE;
 
-		if ( $valid_data ) {
-			$attendee = $this->get_attendee( $where_cols_n_values );
-			if ( $attendee instanceof EE_Attendee ) {
+		if ($valid_data) {
+			$attendee = $this->get_attendee($where_cols_n_values);
+			if ($attendee instanceof EE_Attendee) {
 				return $attendee;
 			}
 		}
@@ -182,12 +182,12 @@ 
              * @param  array $ids array of EE_Registration ids
              * @return  EE_Attendee[]
              */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
+            public function get_array_of_contacts_from_reg_ids($ids) {
                 $ids = (array) $ids;
                 $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
+                    'Registration.REG_ID' => array('in', $ids)
                     );
-                return $this->get_all( array( $_where ) );
+                return $this->get_all(array($_where));
             }
 
 

core/db_models/EEM_CPT_Base.model.php

Indentation +15 added lines, -15 removed lines

@@ -1,21 +1,21 @@
 <?php
 define('EE_Event_Category_Taxonomy','espresso_event_category');
 /**
- *
- * EEM_CPT_Base
- *
- * For shared functionality between models internally implemented
- * as Custom Post Types. Subclass of EEM_Soft_Delete_Base, meaning that when you 'delete' one of these model objects
- * we actually default ot just trashing it. (It works differently than EEM_Soft_Delete under the hood,because there's a post status field
- * instead of a soft-delete flag, but the functionality is the same)
- * Note: if you add a new subclass of EEM_CPT_Base, you should add it as a relation
- * on EEM_Term_Taxonomy and EEM_Term_Relationship
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Mike Nelson
- *
- */
+	 *
+	 * EEM_CPT_Base
+	 *
+	 * For shared functionality between models internally implemented
+	 * as Custom Post Types. Subclass of EEM_Soft_Delete_Base, meaning that when you 'delete' one of these model objects
+	 * we actually default ot just trashing it. (It works differently than EEM_Soft_Delete under the hood,because there's a post status field
+	 * instead of a soft-delete flag, but the functionality is the same)
+	 * Note: if you add a new subclass of EEM_CPT_Base, you should add it as a relation
+	 * on EEM_Term_Taxonomy and EEM_Term_Relationship
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Mike Nelson
+	 *
+	 */
 abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
 
 	/**

Spacing +83 added lines, -83 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define('EE_Event_Category_Taxonomy','espresso_event_category');
+define('EE_Event_Category_Taxonomy', 'espresso_event_category');
 /**
  *
  * EEM_CPT_Base
@@ -16,7 +16,7 @@ 
  * @author 				Mike Nelson
  *
  */
-abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
+abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base {
 
 	/**
 	 * @var string post_status_trashed - the wp post status for trashed cpts
@@ -44,42 +44,42 @@ 
 	 * @param string $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 
 		//adds a relationship to Term_Taxonomy for all these models. For this to work
 		//Term_Relationship must have a relation to each model subclassing EE_CPT_Base explicitly
 		//eg, in EEM_Term_Relationship, inside the _model_relations array, there must be an entry
 		//with key equalling the subclassing model's model name (eg 'Event' or 'Venue'), and the value
 		//must also be new EE_HABTM_Relation('Term_Relationship');
-		$this->_model_relations['Term_Taxonomy'] =new EE_HABTM_Relation('Term_Relationship');
+		$this->_model_relations['Term_Taxonomy'] = new EE_HABTM_Relation('Term_Relationship');
 		$primary_table_name = NULL;
 		//add  the common _status field to all CPT primary tables.
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
 				$primary_table_name = $alias;
 			}
 		}
 		//set default wp post statuses if child has not already set.
-		if ( ! isset( $this->_fields[$primary_table_name]['status'] )) {
+		if ( ! isset($this->_fields[$primary_table_name]['status'])) {
 			$this->_fields[$primary_table_name]['status'] = new EE_WP_Post_Status_Field('post_status', __("Event Status", "event_espresso"), false, 'draft');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['to_ping'])){
-			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __( 'To Ping', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['to_ping'])) {
+			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __('To Ping', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['pinged'])){
-			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __( 'Pinged', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['pinged'])) {
+			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __('Pinged', 'event_espresso'), FALSE, '');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['comment_status'])){
-			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso' ), FALSE, 'open');
+		if ( ! isset($this->_fields[$primary_table_name]['comment_status'])) {
+			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['ping_status'])){
+		if ( ! isset($this->_fields[$primary_table_name]['ping_status'])) {
 			$this->_fields[$primary_table_name]['ping_status'] = new EE_Plain_Text_Field('ping_status', __('Ping Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['post_content_filtered'])){
-			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __( 'Post Content Filtered', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['post_content_filtered'])) {
+			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __('Post Content Filtered', 'event_espresso'), FALSE, '');
 		}
 		parent::__construct($timezone);
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function public_event_stati() {
 		// @see wp-includes/post.php
-		return get_post_stati( array( 'public' => TRUE ));
+		return get_post_stati(array('public' => TRUE));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		throw new EE_Error(sprintf(__("EEM_CPT_Base should nto call deleted_field_name! It should instead use post_status_field_name", "event_espresso")));
 	}
 
@@ -114,12 +114,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function post_status_field_name(){
+	public function post_status_field_name() {
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -130,9 +130,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=self::post_status_trashed;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = self::post_status_trashed;
 		return $query_params;
 	}
 
@@ -143,9 +143,9 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=array('IN',array_keys($this->get_status_array()));
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = array('IN', array_keys($this->get_status_array()));
 		return $query_params;
 	}
 
@@ -157,11 +157,11 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean success
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$post_status_field_name=$this->post_status_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$post_status_field_name = $this->post_status_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		$new_status = $delete ? self::post_status_trashed : 'draft';
-		if ( $this->update (array($post_status_field_name=>$new_status), $query_params )) {
+		if ($this->update(array($post_status_field_name=>$new_status), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -178,7 +178,7 @@ 
 	 */
 	public function meta_table() {
 		$meta_table = $this->_get_other_tables();
-		$meta_table = reset( $meta_table );
+		$meta_table = reset($meta_table);
 		return $meta_table instanceof EE_Secondary_Table ? $meta_table->get_table_name() : NULL;
 	}
 
@@ -190,16 +190,16 @@ 
 	 * @param  bool $all triggers whether we include DB_Only fields or JUST non DB_Only fields.  Defaults to false (no db only fields)
 	 * @return array
 	 */
-	public function get_meta_table_fields( $all = FALSE ) {
+	public function get_meta_table_fields($all = FALSE) {
 		$all_fields = $fields_to_return = array();
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table)
+				$all_fields = array_merge($this->_get_fields_for_table($alias), $all_fields);
 		}
 
-		if ( !$all ) {
-			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
+		if ( ! $all) {
+			foreach ($all_fields as $name => $obj) {
+				if ($obj instanceof EE_DB_Only_Field_Base)
 					continue;
 				$fields_to_return[] = $name;
 			}
@@ -222,13 +222,13 @@ 
 	 * @param int $parent_term_taxonomy_id
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description ='',$parent_term_taxonomy_id = null){
+	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description = '', $parent_term_taxonomy_id = null) {
 		//create term
-		require_once( EE_MODELS . 'EEM_Term.model.php');
+		require_once(EE_MODELS.'EEM_Term.model.php');
 		//first, check for a term by the same name or slug
 		$category_slug = sanitize_title($category_name);
-		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name,'slug'=>$category_slug))));
-		if( ! $term ){
+		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name, 'slug'=>$category_slug))));
+		if ( ! $term) {
 			$term = EE_Term::new_instance(array(
 				'name'=>$category_name,
 				'slug'=>$category_slug
@@ -236,10 +236,10 @@ 
 			$term->save();
 		}
 		//make sure there's a term-taxonomy entry too
-		require_once( EE_MODELS . 'EEM_Term_Taxonomy.model.php');
-		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(),'taxonomy'=>EE_Event_Category_Taxonomy)));
+		require_once(EE_MODELS.'EEM_Term_Taxonomy.model.php');
+		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(), 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( ! $term_taxonomy ){
+		if ( ! $term_taxonomy) {
 			$term_taxonomy = EE_Term_Taxonomy::new_instance(array(
 				'term_id'=>$term->ID(),
 				'taxonomy'=>EE_Event_Category_Taxonomy,
@@ -248,7 +248,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else {
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -263,11 +263,11 @@ 
 	 * @param string $category_name name of the event category (term)
 	 * @return bool
 	 */
-	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name){
+	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name) {
 		//find the term_taxonomy by that name
-		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name,'taxonomy'=>EE_Event_Category_Taxonomy)));
+		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name, 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( $term_taxonomy ){
+		if ($term_taxonomy) {
 			$term_taxonomy->set_count($term_taxonomy->count() - 1);
 			$term_taxonomy->save();
 		}
@@ -287,8 +287,8 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	public function get_feature_image( $id, $size = 'thumbnail', $attr = '' ) {
-		return get_the_post_thumbnail( $id, $size, $attr );
+	public function get_feature_image($id, $size = 'thumbnail', $attr = '') {
+		return get_the_post_thumbnail($id, $size, $attr);
 	}
 
 
@@ -301,10 +301,10 @@ 
 	 * @global array $wp_post_statuses set in wp core for storing all the post stati
 	 * @return array
 	 */
-	public function get_post_statuses(){
+	public function get_post_statuses() {
 		global $wp_post_statuses;
 		$statuses = array();
-		foreach($wp_post_statuses as $post_status => $args_object){
+		foreach ($wp_post_statuses as $post_status => $args_object) {
 			$statuses[$post_status] = $args_object->label;
 		}
 		return $statuses;
@@ -319,9 +319,9 @@ 
 	public function get_status_array() {
 		$statuses = $this->get_post_statuses();
 		//first the global filter
-		$statuses = apply_filters( 'FHEE_EEM_CPT_Base__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_CPT_Base__get_status_array', $statuses);
 		//now the class specific filter
-		$statuses = apply_filters( 'FHEE_EEM_' . get_class($this) . '__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_'.get_class($this).'__get_status_array', $statuses);
 		return $statuses;
 	}
 
@@ -333,7 +333,7 @@ 
 	 */
 	public function get_custom_post_statuses() {
 		$new_stati = array();
-		foreach ( $this->_custom_stati as $status => $props ) {
+		foreach ($this->_custom_stati as $status => $props) {
 			$new_stati[$status] = $props['label'];
 		}
 		return $new_stati;
@@ -349,24 +349,24 @@ 
 	 * @param WP_Post|array $post
 	 * @return EE_CPT_Base
 	 */
-	public function instantiate_class_from_post_object_orig($post){
-		$post = (array)$post;
+	public function instantiate_class_from_post_object_orig($post) {
+		$post = (array) $post;
 		$has_all_necessary_fields_for_table = true;
 		//check if the post has fields on the meta table already
-		foreach($this->_get_other_tables() as $table_obj){
+		foreach ($this->_get_other_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$has_all_necessary_fields_for_table = false;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( ! $has_all_necessary_fields_for_table){
+		if ( ! $has_all_necessary_fields_for_table) {
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else {
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}
@@ -377,30 +377,30 @@ 
 	 * @param null $post
 	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class
 	 */
-	public function instantiate_class_from_post_object( $post = NULL ){
-		if ( empty( $post )) {
+	public function instantiate_class_from_post_object($post = NULL) {
+		if (empty($post)) {
 			global $post;
 		}
-		$post = (array)$post;
+		$post = (array) $post;
 		$tables_needing_to_be_queried = array();
 		//check if the post has fields on the meta table already
-		foreach($this->get_tables() as $table_obj){
+		foreach ($this->get_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$tables_needing_to_be_queried[$table_obj->get_table_alias()] = $table_obj;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( $tables_needing_to_be_queried){
-			if(count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table){
+		if ($tables_needing_to_be_queried) {
+			if (count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table) {
 				//so we're only missing data from a secondary table. Well that's not too hard to query for
 				$table_to_query = reset($tables_needing_to_be_queried);
-				$missing_data = $this->_do_wpdb_query( 'get_row', array( 'SELECT * FROM ' . $table_to_query->get_table_name() . ' WHERE ' . $table_to_query->get_fk_on_table() . ' = ' . $post['ID'], ARRAY_A ));
-				if ( ! empty( $missing_data )) {
-					$post = array_merge( $post, $missing_data );
+				$missing_data = $this->_do_wpdb_query('get_row', array('SELECT * FROM '.$table_to_query->get_table_name().' WHERE '.$table_to_query->get_fk_on_table().' = '.$post['ID'], ARRAY_A));
+				if ( ! empty($missing_data)) {
+					$post = array_merge($post, $missing_data);
 				}
 			} else {
 				return $this->get_one_by_ID($post['ID']);
@@ -417,15 +417,15 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function post_type(){
+	public function post_type() {
 		$post_type_field = NULL;
-		foreach($this->field_settings(true) as $field_obj){
-			if($field_obj instanceof EE_WP_Post_Type_Field){
-				$post_type_field = $field_obj;break;
+		foreach ($this->field_settings(true) as $field_obj) {
+			if ($field_obj instanceof EE_WP_Post_Type_Field) {
+				$post_type_field = $field_obj; break;
 			}
 		}
-		if($post_type_field == NULL){
-			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"),get_class($this)));
+		if ($post_type_field == NULL) {
+			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"), get_class($this)));
 		}
 		return $post_type_field->get_default_value();
 	}

Braces +9 added lines, -7 removed lines

@@ -118,7 +118,7 @@ 
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
 		if($field){
 			return $field->get_name();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
 		}
 	}
@@ -193,14 +193,16 @@ 
 	public function get_meta_table_fields( $all = FALSE ) {
 		$all_fields = $fields_to_return = array();
 		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+			if ( $table_obj instanceof EE_Secondary_Table ) {
+							$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+			}
 		}
 
 		if ( !$all ) {
 			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
-					continue;
+				if ( $obj instanceof EE_DB_Only_Field_Base ) {
+									continue;
+				}
 				$fields_to_return[] = $name;
 			}
 		} else {
@@ -248,7 +250,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else{
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -366,7 +368,7 @@ 
 		if( ! $has_all_necessary_fields_for_table){
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else{
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}

core/db_models/EEM_Checkin.model.php

Spacing +8 added lines, -8 removed lines

@@ -23,8 +23,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Checkin.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Checkin.class.php');
 
 class EEM_Checkin extends EEM_Base {
 
@@ -40,12 +40,12 @@ 
 	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Check-In','event_espresso');
-		$this->plural_item = __('Check-Ins','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Check-In', 'event_espresso');
+		$this->plural_item = __('Check-Ins', 'event_espresso');
 
 		$this->_tables = array(
-			'Checkin'=>new EE_Primary_Table('esp_checkin','CHK_ID')
+			'Checkin'=>new EE_Primary_Table('esp_checkin', 'CHK_ID')
 		);
 		$this->_fields = array(
 			'Checkin'=> array(
@@ -53,7 +53,7 @@ 
 				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', 'Registration Id', false, 0, 'Registration'),
 				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', 'Datetime Id', false, 0, 'Datetime'),
 				'CHK_in'=>new EE_Boolean_Field('CHK_in', 'Whether a person has checked in or checked out', false, true),
-				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified','event_espresso'), false, time(), $timezone )
+				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified', 'event_espresso'), false, time(), $timezone)
 			)
 		);
 		$this->_model_relations = array(
@@ -61,7 +61,7 @@ 
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Country.model.php

Indentation +11 added lines, -11 removed lines

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

Spacing +34 added lines, -34 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/db_models/EEM_Currency.model.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,32 +25,32 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEM_Currency extends EEM_Base{
+class EEM_Currency extends EEM_Base {
 		// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Currency','event_espresso');
-		$this->plural_item = __('Currencies','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Currency', 'event_espresso');
+		$this->plural_item = __('Currencies', 'event_espresso');
 		$this->_tables = array(
 			'Currency'=> new EE_Primary_Table('esp_currency', 'CUR_code')
 		);
 		$this->_fields = array(
 			'Currency'=>array(
-				'CUR_code'=> new EE_Primary_Key_String_Field('CUR_code', __('Currency COde','event_espresso')),
-				'CUR_single' => new EE_Plain_Text_Field('CUR_single', __('Currency Name Singular','event_espresso'), false),
-				'CUR_plural' => new EE_Plain_Text_Field('CUR_plural', __('Currency Name Plural','event_espresso'), false),
-				'CUR_sign' => new EE_Plain_Text_Field('CUR_sign', __('Currency Sign','event_espresso'), false),
-				'CUR_dec_plc' => new EE_Integer_Field('CUR_dec_plc', __('Currency Decimal Places','event_espresso'), false, 2),
-				'CUR_active'=>new EE_Boolean_Field('CUR_active', __("Active?", 'event_espresso'), false,true),
+				'CUR_code'=> new EE_Primary_Key_String_Field('CUR_code', __('Currency COde', 'event_espresso')),
+				'CUR_single' => new EE_Plain_Text_Field('CUR_single', __('Currency Name Singular', 'event_espresso'), false),
+				'CUR_plural' => new EE_Plain_Text_Field('CUR_plural', __('Currency Name Plural', 'event_espresso'), false),
+				'CUR_sign' => new EE_Plain_Text_Field('CUR_sign', __('Currency Sign', 'event_espresso'), false),
+				'CUR_dec_plc' => new EE_Integer_Field('CUR_dec_plc', __('Currency Decimal Places', 'event_espresso'), false, 2),
+				'CUR_active'=>new EE_Boolean_Field('CUR_active', __("Active?", 'event_espresso'), false, true),
 			));
 		$this->_model_relations = array(
 			'Payment_Method'=>new EE_HABTM_Relation('Currency_Payment_Method'),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -59,10 +59,10 @@ 
 	 * @param array $query_params see EEM_Base::get_all
 	 * @return EE_Currency[]
 	 */
-	public function get_all_active($query_params = array()){
+	public function get_all_active($query_params = array()) {
 		$query_params[0]['CUR_active'] = true;
-		if( ! isset($query_params['order_by'])){
-			$query_params['order_by'] = array('CUR_code'=>'ASC','CUR_single'=>'ASC');
+		if ( ! isset($query_params['order_by'])) {
+			$query_params['order_by'] = array('CUR_code'=>'ASC', 'CUR_single'=>'ASC');
 		}
 		return $this->get_all($query_params);
 	}
@@ -71,17 +71,17 @@ 
 	 * @param EE_PMT_Base $payment_method_type
 	 * @return EE_Currency[]
 	 */
-	public function get_all_currencies_usable_by($payment_method_type){
-		if($payment_method_type instanceof EE_PMT_Base &&
-				$payment_method_type->get_gateway()){
+	public function get_all_currencies_usable_by($payment_method_type) {
+		if ($payment_method_type instanceof EE_PMT_Base &&
+				$payment_method_type->get_gateway()) {
 			$currencies_supported = $payment_method_type->get_gateway()->currencies_supported();
-		}else{
+		} else {
 			$currencies_supported = EE_Gateway::all_currencies_supported;
 		}
-		if($currencies_supported == EE_Gateway::all_currencies_supported || empty( $currencies_supported ) ) {
+		if ($currencies_supported == EE_Gateway::all_currencies_supported || empty($currencies_supported)) {
 			$currencies = $this->get_all_active();
-		}else{
-			$currencies = $this->get_all_active(array(array('CUR_code'=>array('IN',$currencies_supported))));
+		} else {
+			$currencies = $this->get_all_active(array(array('CUR_code'=>array('IN', $currencies_supported))));
 		}
 		return $currencies;
 	}

Braces +4 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -84,7 +85,7 @@ 
 	public function is_valid() {
 		if(count($this->_validation_errors)){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -113,7 +114,7 @@ 
 		if($message_or_object instanceof EE_Validation_Error){
 			$validation_error= $message_or_object;
 			$validation_error->set_form_section($this);
-		}else{
+		} else{
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
 		}
 		$this->_validation_errors[] = $validation_error;

core/db_models/EEM_Currency_Payment_Method.model.php

Spacing +11 added lines, -11 removed lines

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

Braces +2 added lines, -1 removed lines

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

core/db_models/EEM_Datetime_Ticket.model.php

Spacing +13 added lines, -13 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Event.model.php

Indentation +53 added lines, -53 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
 /**
- *
- * EEM_Event Model
- *
- * extends EEM_CPT_Base which extends EEM_Base
- *
- * @package			Event Espresso
- * @subpackage		includes/models/
- * @author				Michael Nelson, Brent Christensen
- *
- */
+	 *
+	 * EEM_Event Model
+	 *
+	 * extends EEM_CPT_Base which extends EEM_Base
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/models/
+	 * @author				Michael Nelson, Brent Christensen
+	 *
+	 */
 class EEM_Event  extends EEM_CPT_Base{
 
 	/**
@@ -172,11 +172,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 ),
@@ -190,12 +190,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__ );
@@ -211,13 +211,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__ );
@@ -234,13 +234,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 )) {
@@ -268,12 +268,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 )) {
@@ -299,12 +299,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 )) {
@@ -389,12 +389,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 +157 added lines, -157 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,15 +89,15 @@ 
 			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)
 				)
 			)
 		);
@@ -105,41 +105,41 @@ 
 		EEM_Event::$_default_reg_status = EEM_Registration::status_id_pending_payment;
 
 		$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)
 
 			));
 
@@ -156,8 +156,8 @@ 
 
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_events', 'EVTM_ID');
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	/**
 	 * @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;
 	}
 
@@ -178,9 +178,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')
 		));
 	}
 
@@ -196,13 +196,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)
 		));
 	}
 
@@ -218,13 +218,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)
 		));
 	}
 
@@ -241,10 +241,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;
 		}
 
@@ -254,7 +254,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')
 		));
@@ -274,16 +274,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()
 			),
@@ -305,16 +305,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'
@@ -333,45 +333,45 @@ 
 	 * @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;
-
-					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()]['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;
+
+					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();
 							}
 						}
 					}
@@ -395,9 +395,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 ) {
 
@@ -464,36 +464,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);
 	}
 
 
@@ -508,30 +508,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);
 	}
 
 
@@ -543,56 +543,56 @@ 
 	 * @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.
-		$and_condtion = array_merge( $and_condition, $where_params );
+		$and_condtion = array_merge($and_condition, $where_params);
 
 		$where_params['AND'] = $and_condition;
 		$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);
 	}
 
 
@@ -603,40 +603,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);
 	}
 
 
@@ -644,13 +644,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);
 			}
@@ -660,7 +660,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);
 	}
 
 

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();

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