eventespresso / event-espresso-core

core/db_models/EEM_Message_Template_Group.model.php

Braces +5 added lines, -2 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +8 added lines, -8 removed lines

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

Spacing +60 added lines, -60 removed lines

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

core/db_models/EEM_Payment.model.php

Indentation +8 added lines, -8 removed lines

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

Spacing +52 added lines, -52 removed lines

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

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

Indentation +13 added lines, -13 removed lines

@@ -2,19 +2,19 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- *
- * Payment Method Model
- *
- * For storing all payment methods (things that interact between EE and gateways).
- * As of 4.3, payment methods are NOT singletons so there can be multiple instances of payment methods
- * of the same type, with different details. Eg, multiple paypal standard gateways so different
- * events can have their proceeds going to different paypal accounts
- *
- * @package 			Event Espresso
- * @subpackage 	includes/models/EEM_Checkin.model.php
- * @author             Mike Nelson
- *
- */
+	 *
+	 * Payment Method Model
+	 *
+	 * For storing all payment methods (things that interact between EE and gateways).
+	 * As of 4.3, payment methods are NOT singletons so there can be multiple instances of payment methods
+	 * of the same type, with different details. Eg, multiple paypal standard gateways so different
+	 * events can have their proceeds going to different paypal accounts
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	includes/models/EEM_Checkin.model.php
+	 * @author             Mike Nelson
+	 *
+	 */
 class EEM_Payment_Method extends EEM_Base {
 
 	const scope_cart = 'CART';

Braces +3 added lines, -6 removed lines

@@ -217,8 +217,7 @@ 
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
 			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
-		}
-		catch ( EE_Error $e ) {
+		} catch ( EE_Error $e ) {
 			//handle it outside the catch
 		}
 		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
@@ -283,8 +282,7 @@ 
 						break;
 					}
 				}
-			}
-			catch ( EE_Error $e ) {
+			} catch ( EE_Error $e ) {
 				$payment_method->set_active( FALSE );
 			}
 		}
@@ -307,8 +305,7 @@ 
 			try {
 				$payment_method->type_obj();
 				$usable_payment_methods[ $key ] = $payment_method;
-			}
-			catch ( EE_Error $e ) {
+			} catch ( EE_Error $e ) {
 				//if it threw an exception, its because the payment type object
 				//isn't defined (probably because somehow the DB got borked,
 				//or an addon which defined it got deactivated

Doc Comments +3 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
 	/**
 	 * Overrides parent ot also check by the slug
 	 * @see EEM_Base::ensure_is_obj()
-	 * @param string|int|EE_Payment_Method $base_class_obj_or_id
+	 * @param EE_Payment_Method $base_class_obj_or_id
 	 * @param boolean                      $ensure_is_in_db
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
@@ -363,8 +363,8 @@ 
 	 * Note: if an offline payment method was selected on the related transaction then this will have no payment methods returned.
 	 * It will ONLY return a payment method for a PAYMENT recorded against the registration.
 	 *
-	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
-	 * @return EE_Payment|null
+	 * @param EE_Registration $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
+	 * @return EE_Base_Class|null
 	 */
 	public function get_last_used_for_registration( $registration_or_reg_id ) {
 		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );

Spacing +91 added lines, -91 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -37,33 +37,33 @@ 
 	 * @access   protected
 	 * @return EEM_Payment_Method
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __( 'Payment Method', 'event_espresso' );
-		$this->plural_item = __( 'Payment Methods', 'event_espresso' );
-		$this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) );
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Payment Method', 'event_espresso');
+		$this->plural_item = __('Payment Methods', 'event_espresso');
+		$this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID'));
 		$this->_fields = array(
 			'Payment_Method' => array(
-				'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ),
-				'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ),
-				'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ),
-				'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ),
-				'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ),
-				'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ),
-				'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ),
-				'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ),
-				'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ),
-				'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ),
-				'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ),
-				'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API'
+				'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')),
+				'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'),
+				'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE),
+				'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''),
+				'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE),
+				'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE),
+				'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE),
+				'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0),
+				'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE),
+				'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE),
+				'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''),
+				'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API'
 		) );
 		$this->_model_relations = array(
  //			'Event'=>new EE_HABTM_Relation('Event_Payment_Method'),
 			'Payment' => new EE_Has_Many_Relation(),
-			'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ),
+			'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'),
 			'Transaction' => new EE_Has_Many_Relation(),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 * @param string $slug
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_by_slug( $slug ) {
-		return $this->get_one( array( array( 'PMD_slug' => $slug ) ) );
+	public function get_one_by_slug($slug) {
+		return $this->get_one(array(array('PMD_slug' => $slug)));
 	}
 
 
@@ -88,8 +88,8 @@ 
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__scopes',
 			array(
-				self::scope_cart 		=> __( "Front-end Registration Page", 'event_espresso' ),
-				self::scope_admin 	=> __( "Admin Registration Page (no online processing)", 'event_espresso' )
+				self::scope_cart 		=> __("Front-end Registration Page", 'event_espresso'),
+				self::scope_admin 	=> __("Admin Registration Page (no online processing)", 'event_espresso')
 			)
 		);
 	}
@@ -101,9 +101,9 @@ 
 	 * @param string $scope like one of EEM_Payment_Method::instance()->scopes()
 	 * @return boolean
 	 */
-	public function is_valid_scope( $scope ) {
+	public function is_valid_scope($scope) {
 		$scopes = $this->scopes();
-		if ( isset( $scopes[ $scope ] ) ) {
+		if (isset($scopes[$scope])) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -119,11 +119,11 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_active( $scope = NULL, $query_params = array() ) {
-		if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) {
-			$query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) );
+	public function get_all_active($scope = NULL, $query_params = array()) {
+		if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) {
+			$query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC'));
 		}
-		return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+		return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function count_active( $scope = NULL, $query_params = array() ){
-		return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function count_active($scope = NULL, $query_params = array()) {
+		return $this->count($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -144,21 +144,21 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){
-		if ( $scope ) {
-			if ( $this->is_valid_scope( $scope ) ) {
-				return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params );
+	protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		if ($scope) {
+			if ($this->is_valid_scope($scope)) {
+				return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params);
 			} else {
-				throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) );
+				throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope));
 			}
 		} else {
 			$acceptable_scopes = array();
 			$count = 0;
-			foreach ( $this->scopes() as $scope_name => $desc ) {
+			foreach ($this->scopes() as $scope_name => $desc) {
 				$count++;
-				$acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' );
+				$acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%');
 			}
-			return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params );
+			return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params);
 		}
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) {
-		return $this->_get_query_params_for_all_active( $scope, $query_params );
+	public function get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		return $this->_get_query_params_for_all_active($scope, $query_params);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @param array  $query_params
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_active( $scope = NULL, $query_params = array() ) {
-		return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function get_one_active($scope = NULL, $query_params = array()) {
+		return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 
@@ -192,8 +192,8 @@ 
 	 * @param string $type
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_of_type( $type ) {
-		return $this->get_one( array( array( 'PMD_type' => $type ) ) );
+	public function get_one_of_type($type) {
+		return $this->get_one(array(array('PMD_type' => $type)));
 	}
 
 
@@ -206,22 +206,22 @@ 
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) {
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		//first: check if it's a slug
-		if( is_string( $base_class_obj_or_id ) ) {
-			$obj = $this->get_one_by_slug( $base_class_obj_or_id );
-			if( $obj ) {
+		if (is_string($base_class_obj_or_id)) {
+			$obj = $this->get_one_by_slug($base_class_obj_or_id);
+			if ($obj) {
 				return $obj;
 			}
 		}
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
-			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
+			return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db);
 		}
-		catch ( EE_Error $e ) {
+		catch (EE_Error $e) {
 			//handle it outside the catch
 		}
-		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
+		throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id));
 	}
 
 
@@ -232,12 +232,12 @@ 
 	 * @param mixed $base_obj_or_id_or_slug
 	 * @return int
 	 */
-	function ensure_is_ID( $base_obj_or_id_or_slug ) {
-		if ( is_string( $base_obj_or_id_or_slug ) ) {
+	function ensure_is_ID($base_obj_or_id_or_slug) {
+		if (is_string($base_obj_or_id_or_slug)) {
 			//assume it's a slug
-			$base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug );
+			$base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug);
 		}
-		return parent::ensure_is_ID( $base_obj_or_id_or_slug );
+		return parent::ensure_is_ID($base_obj_or_id_or_slug);
 	}
 
 
@@ -246,37 +246,37 @@ 
 	 * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default.
 	 * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart
 	 */
-	function verify_button_urls( $payment_methods = NULL ) {
-		EE_Registry::instance()->load_helper( 'URL' );
-		$payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
-		foreach ( $payment_methods as $payment_method ) {
+	function verify_button_urls($payment_methods = NULL) {
+		EE_Registry::instance()->load_helper('URL');
+		$payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
 			try {
 				$current_button_url = $payment_method->button_url();
-				$buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
-					'current_ssl' => str_replace( "http://", "https://", $current_button_url ),
-					'current' => str_replace( "https://", "http://", $current_button_url ),
-					'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ),
-					'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ),
-				) );
-				foreach( $buttons_urls_to_try as $button_url_to_try ) {
-					if(
+				$buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
+					'current_ssl' => str_replace("http://", "https://", $current_button_url),
+					'current' => str_replace("https://", "http://", $current_button_url),
+					'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()),
+					'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()),
+				));
+				foreach ($buttons_urls_to_try as $button_url_to_try) {
+					if (
 							(//this is the current url and it exists, regardless of SSL issues
 								$button_url_to_try == $current_button_url &&
 								EEH_URL::remote_file_exists(
 										$button_url_to_try,
 										array(
 											'sslverify' => false,
-											'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+											'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
 											) )
 							)
 							||
 							(//this is NOT the current url and it exists with a working SSL cert
 								$button_url_to_try != $current_button_url &&
-								EEH_URL::remote_file_exists( $button_url_to_try )
+								EEH_URL::remote_file_exists($button_url_to_try)
 							) ) {
-						if( $current_button_url != $button_url_to_try ){
-							$payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) );
-							EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) );
+						if ($current_button_url != $button_url_to_try) {
+							$payment_method->save(array('PMD_button_url' => $button_url_to_try));
+							EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -284,8 +284,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -299,16 +299,16 @@ 
 	 * @param array $rows
 	 * @return EE_Payment_Method[]
 	 */
-	protected function _create_objects( $rows = array() ) {
-		$payment_methods = parent::_create_objects( $rows );
+	protected function _create_objects($rows = array()) {
+		$payment_methods = parent::_create_objects($rows);
 		/* @var $payment_methods EE_Payment_Method[] */
 		$usable_payment_methods = array();
-		foreach ( $payment_methods as $key => $payment_method ) {
+		foreach ($payment_methods as $key => $payment_method) {
 			try {
 				$payment_method->type_obj();
-				$usable_payment_methods[ $key ] = $payment_method;
+				$usable_payment_methods[$key] = $payment_method;
 			}
-			catch ( EE_Error $e ) {
+			catch (EE_Error $e) {
 				//if it threw an exception, its because the payment type object
 				//isn't defined (probably because somehow the DB got borked,
 				//or an addon which defined it got deactivated
@@ -317,10 +317,10 @@ 
 				$payment_method->save();
 				EE_Error::add_attention(
 					sprintf(
-						__( 'An error occurred while attempting to use the "%1$s" payment method, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated?%2$sIt can be reactivated on the %3$sPlugins admin page%4$s||%2$sThe actual error was:%2$s%5$s', 'event_espresso' ),
+						__('An error occurred while attempting to use the "%1$s" payment method, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated?%2$sIt can be reactivated on the %3$sPlugins admin page%4$s||%2$sThe actual error was:%2$s%5$s', 'event_espresso'),
 						$payment_method->name(),
 						'<br />',
-						'<a href="' . admin_url('plugins.php') . '">',
+						'<a href="'.admin_url('plugins.php').'">',
 						'</a>',
 						$e->getMessage()
 					),
@@ -341,16 +341,16 @@ 
 	 * @param string 	$scope @see EEM_Payment_Method::get_all_for_events
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_for_transaction( $transaction, $scope ) {
+	public function get_all_for_transaction($transaction, $scope) {
 		//@todo take relations between events and payment methods into account, once that relation exists
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			//@todo take the relation between transaction and currencies into account
 		}
-		$currencies_for_events = array( EE_Config::instance()->currency->code );
+		$currencies_for_events = array(EE_Config::instance()->currency->code);
 		//give addons a chance to override what payment methods are chosen based on the transaction
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-			$this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ),
+			$this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))),
 			$transaction,
 			$scope
 		);
@@ -366,16 +366,16 @@ 
 	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
 	 * @return EE_Payment|null
 	 */
-	public function get_last_used_for_registration( $registration_or_reg_id ) {
-		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );
+	public function get_last_used_for_registration($registration_or_reg_id) {
+		$registration_id = EEM_Registration::instance()->ensure_is_ID($registration_or_reg_id);
 
 		$query_params = array(
 			0 => array(
 				'Payment.Registration.REG_ID' => $registration_id,
 			),
-			'order_by' => array( 'Payment.PAY_ID' => 'DESC' )
+			'order_by' => array('Payment.PAY_ID' => 'DESC')
 		);
-		return $this->get_one( $query_params );
+		return $this->get_one($query_params);
 	}
 
 }

core/db_models/EEM_Price.model.php

Spacing +40 added lines, -40 removed lines

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

Braces +3 added lines, -1 removed lines

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

Doc Comments +5 added lines, -5 removed lines

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

core/db_models/EEM_Question_Group.model.php

Spacing +23 added lines, -23 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Question_Group_Question.model.php

Spacing +15 added lines, -15 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Registration_Payment.model.php

Spacing +9 added lines, -9 removed lines

@@ -15,21 +15,21 @@ 
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 
-		$this->singular_item = __( 'Registration Payment', 'event_espresso' );
-		$this->plural_item 	= __( 'Registration Payments', 'event_espresso' );
+		$this->singular_item = __('Registration Payment', 'event_espresso');
+		$this->plural_item = __('Registration Payments', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration_Payment' => new EE_Primary_Table( 'esp_registration_payment', 'RPY_ID' )
+			'Registration_Payment' => new EE_Primary_Table('esp_registration_payment', 'RPY_ID')
 		);
 
 		$this->_fields = array(
 			'Registration_Payment'=>array(
-				'RPY_ID' 				=> new EE_Primary_Key_Int_Field( 'RPY_ID', __( 'Registration Payment ID', 'event_espresso' )),
-				'REG_ID' 				=> new EE_Foreign_Key_Int_Field( 'REG_ID', __( 'Registration ID', 'event_espresso' ), false, 0, 'Registration' ),
-				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field( 'PAY_ID', __( 'Payment ID', 'event_espresso' ), true, null, 'Payment' ),
-				'RPY_amount' 	=> new EE_Money_Field( 'RPY_amount', __( 'Amount attributed to the registration', 'event_espresso' ), false, 0 ),
+				'RPY_ID' 				=> new EE_Primary_Key_Int_Field('RPY_ID', __('Registration Payment ID', 'event_espresso')),
+				'REG_ID' 				=> new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field('PAY_ID', __('Payment ID', 'event_espresso'), true, null, 'Payment'),
+				'RPY_amount' 	=> new EE_Money_Field('RPY_amount', __('Amount attributed to the registration', 'event_espresso'), false, 0),
 			)
 		);
 
@@ -38,7 +38,7 @@ 
 			'Payment' 		=> new EE_Belongs_To_Relation(),
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Status.model.php

Spacing +21 added lines, -21 removed lines

@@ -13,7 +13,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Class EEM_Status
@@ -32,27 +32,27 @@ 
 	/**
 	 * @return EEM_Status
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Status','event_espresso');
-		$this->plural_item = __('Stati','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Status', 'event_espresso');
+		$this->plural_item = __('Stati', 'event_espresso');
 		$this->_tables = array(
 			'Status'=> new EE_Primary_Table('esp_status', 'STS_ID')
 		);
 		$this->_fields = array(
 			'Status'=>array(
-				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID','event_espresso')),
-				'STS_code'=>new EE_Plain_Text_Field('STS_code',__('Status Code','event_espresso'),false, ''),
+				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID', 'event_espresso')),
+				'STS_code'=>new EE_Plain_Text_Field('STS_code', __('Status Code', 'event_espresso'), false, ''),
 				'STS_type'=>new EE_Enum_Text_Field('STS_type', __("Type", "event_espresso"), false, 'event',
 						array(
-							'event'=> __("Event", "event_espresso"),//deprecated
+							'event'=> __("Event", "event_espresso"), //deprecated
 							'registration'=>  __("Registration", "event_espresso"),
 							'transaction'=>  __("Transaction", "event_espresso"),
 							'payment'=>  __("Payment", "event_espresso"),
 							'email'=>  __("Email", "event_espresso")
 						)),
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -60,9 +60,9 @@ 
 			'Payment'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @throws EE_Error
 	 * @return array             an array of translated strings for the incoming status id.
 	 */
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -205,30 +205,30 @@ 
 	  			)
 	    );
 
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( ! is_array($statuses))
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
 
 	    $translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
+	    foreach ($statuses as $id => $code) {
+	    	if (isset($translation_array[$id])) {
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
 	    	} else {
 	    		$translation[$id] = $code;
 	    	}
 
 	    	//schema
-	    	switch ( $schema ) {
+	    	switch ($schema) {
 	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
 	    			break;
 	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
+	    			$translation[$id] = ucwords($translation[$id]);
 	    			break;
 	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
+	    			$translation[$id] = strtoupper($translation[$id]);
 	    			break;
 	    	}
 	    }

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -207,8 +209,9 @@ 
 
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( !is_array($statuses) ) {
+					throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		}
 
 	    $translation = array();
 

Indentation +35 added lines, -35 removed lines

@@ -79,7 +79,7 @@ 
 	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
 		$translation_array = array(
-	     	EEM_Registration::status_id_pending_payment => array(
+		 	EEM_Registration::status_id_pending_payment => array(
 				__('pending payment', 'event_espresso'), //singular
 				__('pending payments', 'event_espresso') //plural
 				),
@@ -213,53 +213,53 @@ 
 				__('queued for sending', 'event_espresso'),
 				__('queued for sending', 'event_espresso'),
 			),
-	        EEM_Message::status_failed => array(
-		        __('failed', 'event_espresso'),
-		        __('failed', 'event_espresso'),
-	        ),
-	        EEM_Message::status_resend => array(
-		        __('queued for resending', 'event_espresso'),
-		        __('queued for resending', 'event_espresso'),
-	        ),
-	        EEM_Message::status_incomplete => array(
-		        __('queued for generating', 'event_espresso'),
-		        __('queued for generating', 'event_espresso'),
-	        ),
+			EEM_Message::status_failed => array(
+				__('failed', 'event_espresso'),
+				__('failed', 'event_espresso'),
+			),
+			EEM_Message::status_resend => array(
+				__('queued for resending', 'event_espresso'),
+				__('queued for resending', 'event_espresso'),
+			),
+			EEM_Message::status_incomplete => array(
+				__('queued for generating', 'event_espresso'),
+				__('queued for generating', 'event_espresso'),
+			),
 			EEM_Message::status_retry => array(
 				__('failed sending, can be retried', 'event_espresso'),
 				__('failed sending, can be retried', 'event_espresso')
 			)
-	    );
+		);
 
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
 
 		if ( !is_array($statuses) )
 			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
 
-	    $translation = array();
+		$translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
-	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
-	    	} else {
-	    		$translation[$id] = $code;
-	    	}
+		foreach ( $statuses as $id => $code ) {
+			if ( isset( $translation_array[$id] ) ) {
+				$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
+			} else {
+				$translation[$id] = $code;
+			}
 
-	    	//schema
-	    	switch ( $schema ) {
-	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
-	    			break;
-	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
-	    			break;
-	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
-	    			break;
-	    	}
-	    }
+			//schema
+			switch ( $schema ) {
+				case 'lower' :
+					$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+					break;
+				case 'sentence' :
+					$translation[$id] = ucwords( $translation[$id] );
+					break;
+				case 'upper' :
+					$translation[$id] = strtoupper( $translation[$id] );
+					break;
+			}
+		}
 
-	    return $translation;
+		return $translation;
 	}
 
 

core/db_models/EEM_Term.model.php

Spacing +48 added lines, -48 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -20,58 +20,58 @@ 
 	/**
 	 *__construct
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term','event_espresso');
-		$this->plural_item = __('Terms','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
 		$this->_tables = array(
 			'Term'=> new EE_Primary_Table('terms', 'term_id')
 		);
 		$this->_fields = array(
 			'Term'=>array(
-				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID','event_espresso')),
-				'name'=>new EE_Plain_Text_Field('name',__('Term Name','event_espresso'),false, ''),
-				'slug'=>new EE_Slug_Field('slug', __('Term Slug','event_espresso'), false),
+				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'=>new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'=>new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
 				'term_group'=>new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0)
 			));
 		$this->_model_relations = array(
 			'Term_Taxonomy'=>new EE_Has_Many_Relation(),
 		);
 		$path_to_tax_model = 'Term_Taxonomy';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected( $path_to_tax_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected($path_to_tax_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
 
-		$path_to_tax_model = $path_to_tax_model . '.';
+		$path_to_tax_model = $path_to_tax_model.'.';
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type')
 				));
 
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type')
 				));
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -82,20 +82,20 @@ 
 	 *
 	 * @access public
 	 */
-	public function get_all_ee_categories( $show_uncategorized = FALSE ) {
+	public function get_all_ee_categories($show_uncategorized = FALSE) {
 
 		$where_params = array(
 			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-			'NOT' => array( 'name' => __( 'Uncategorized', 'event_espresso' ))
+			'NOT' => array('name' => __('Uncategorized', 'event_espresso'))
 		);
 
-		if ( $show_uncategorized ) {
-			unset( $where_params['NOT'] );
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
 		}
 
-	 	return EEM_Term::instance()->get_all( array(
+	 	return EEM_Term::instance()->get_all(array(
 			$where_params,
-			'order_by' => array( 'name' => 'ASC' )
+			'order_by' => array('name' => 'ASC')
 		));
 	}
 
@@ -108,8 +108,8 @@ 
 	 * @param string $post_type
 	 * @return array
 	 */
-	public function get_all_CPT_post_tags( $post_type = '' ) {
-		switch( $post_type ) {
+	public function get_all_CPT_post_tags($post_type = '') {
+		switch ($post_type) {
 			case 'espresso_events' :
 				return $this->get_all_event_post_tags();
 				break;
@@ -119,7 +119,7 @@ 
 			default :
 				$event_tags = $this->get_all_event_post_tags();
 				$venue_tags = $this->get_all_venue_post_tags();
-				return array_merge( $event_tags, $venue_tags );
+				return array_merge($event_tags, $venue_tags);
 		}
 		return array();
 	}
@@ -132,19 +132,19 @@ 
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
 	public function get_all_event_post_tags() {
-	 	$post_tags = EEM_Term::instance()->get_all( array(
+	 	$post_tags = EEM_Term::instance()->get_all(array(
 			array(
 				'Term_Taxonomy.taxonomy' => 'post_tag',
 				'Term_Taxonomy.Event.post_type' => 'espresso_events',
 			),
-			'order_by' => array( 'name' => 'ASC' ),
-			'force_join' => array( 'Term_Taxonomy.Event' )
+			'order_by' => array('name' => 'ASC'),
+			'force_join' => array('Term_Taxonomy.Event')
 		));
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_events';
+			$post_tags[$key]->post_type[] = 'espresso_events';
 		}
 		return $post_tags;
 //		return array( 'espresso_events' => $post_tags );
@@ -158,19 +158,19 @@ 
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
 	public function get_all_venue_post_tags() {
-		$post_tags = EEM_Term::instance()->get_all( array(
+		$post_tags = EEM_Term::instance()->get_all(array(
 			array(
 				'Term_Taxonomy.taxonomy' => 'post_tag',
 				'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
 			),
-			'order_by' => array( 'name' => 'ASC' ),
-			'force_join' => array( 'Term_Taxonomy' )
+			'order_by' => array('name' => 'ASC'),
+			'force_join' => array('Term_Taxonomy')
 		));
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+			$post_tags[$key]->post_type[] = 'espresso_venues';
 		}
 		return $post_tags;
 //		return array( 'espresso_venues' => $post_tags );

Braces +3 added lines, -1 removed lines

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