eventespresso / event-espresso-core

core/db_models/EEM_Price_Type.model.php

Indentation +7 added lines, -7 removed lines

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

Spacing +25 added lines, -25 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Registration.model.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 require_once ( EE_CLASSES . 'EE_Registration.class.php' );
 /**

Spacing +61 added lines, -61 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_Registration.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Registration.class.php');
 /**
  *
  * Registration Model
@@ -92,30 +92,30 @@ 
 	 *    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_Registration
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Registration','event_espresso');
-		$this->plural_item = __('Registrations','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
 		);
 		$this->_fields = array(
 			'Registration'=>array(
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Even tID','event_espresso'), false, 0, 'Event'),
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, current_time('timestamp'), $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Final Price of registration','event_espresso'), false, 0),
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Even tID', 'event_espresso'), false, 0, 'Event'),
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, current_time('timestamp'), $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Final Price of registration', 'event_espresso'), false, 0),
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -129,7 +129,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -143,9 +143,9 @@ 
 	 *		@param bool  $translated If true will return the values as singular localized strings
 	 *		@return array
 	 */
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
 	}
 
 
@@ -156,18 +156,18 @@ 
 	 * @param array $exclude
 	 * @return array
 	 */
-	private function _get_registration_status_array( $exclude = array() ) {
+	private function _get_registration_status_array($exclude = array()) {
 		//in the very rare circumstance that we are deleting a model's table's data
 		//and the table hasn't actually been created, this could have an error
 		global $wpdb;
-		EE_Registry::instance()->load_helper( 'Activation' );
-		if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
-			$results = $wpdb->get_results( $SQL );
+		EE_Registry::instance()->load_helper('Activation');
+		if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) {
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
+			$results = $wpdb->get_results($SQL);
 			self::$_reg_status = array();
-			foreach ( $results as $status ) {
-				if ( ! in_array( $status->STS_ID, $exclude )) {
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
 				}
 			}
 		}
@@ -182,15 +182,15 @@ 
 	 * @param  array  $where_params Array of query_params as described in the comments for EEM_Base::get_all()
 	 * @return wpdb results array
 	 */
-	public function get_reg_months_and_years( $where_params ) {
+	public function get_reg_months_and_years($where_params) {
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('reg_year', 'reg_month');
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
+		$query_params['order_by'] = array('REG_date' => 'DESC');
 		$columns_to_select = array(
 			'reg_year' => array('YEAR(REG_date)', '%s'),
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 
@@ -202,11 +202,11 @@ 
 	* 		@param		int		$ATT_ID
 	*		@return 	EE_Registration[]
 	*/
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
-		if ( ! $ATT_ID ) {
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
+		if ( ! $ATT_ID) {
 			return FALSE;
 		}
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
 	}
 
 
@@ -217,8 +217,8 @@ 
 	 * @param string $REG_url_link
 	 * @return EE_Registration
 	 */
-	public function get_registration_for_reg_url_link($REG_url_link){
-		if(!$REG_url_link){
+	public function get_registration_for_reg_url_link($REG_url_link) {
+		if ( ! $REG_url_link) {
 			return false;
 		}
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -236,12 +236,12 @@ 
 	* 		@param		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = FALSE, $ATT_ID = FALSE, $att_nmbr = FALSE ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = FALSE, $ATT_ID = FALSE, $att_nmbr = FALSE) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID),
-			'limit'=>array($att_nmbr-1,1)
+			'limit'=>array($att_nmbr - 1, 1)
 		));
 	}
 
@@ -253,11 +253,11 @@ 
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
 	*/
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_report($period = '-1 month') {
 		$sql_date = date("Y-m-d H:i:s", strtotime($period));
-		$where = array('REG_date'=>array('>=',$sql_date) );
+		$where = array('REG_date'=>array('>=', $sql_date));
 
-		if ( ! EE_Registry::instance()->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
@@ -269,8 +269,8 @@ 
 				),
 				OBJECT,
 				array(
-					'regDate'=>array('DATE(Registration.REG_date)','%s'),
-					'total'=>array('count(REG_ID)','%d')
+					'regDate'=>array('DATE(Registration.REG_date)', '%s'),
+					'total'=>array('count(REG_ID)', '%d')
 				));
 		return $results;
 	}
@@ -284,21 +284,21 @@ 
 	* 		@access		public
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
 	*/
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_report($period = '-1 month') {
 		$date_sql = date("Y-m-d H:i:s", strtotime($period));
-		$where = array( 'REG_date'=>array('>=',$date_sql ) );
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		$where = array('REG_date'=>array('>=', $date_sql));
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 		$results = $this->_get_all_wpdb_results(array(
 			$where,
 			'group_by'=>'Event.EVT_name',
 			'order_by'=>'Event.EVT_name',
-			'limit'=>array(0,24)),
+			'limit'=>array(0, 24)),
 			OBJECT,
 			array(
-				'event_name'=>array('Event_CPT.post_title','%s'),
-				'total'=>array('COUNT(REG_ID)','%s')
+				'event_name'=>array('Event_CPT.post_title', '%s'),
+				'total'=>array('COUNT(REG_ID)', '%s')
 			)
 		);
 
@@ -312,11 +312,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = FALSE){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = FALSE) {
+		if ( ! $TXN_ID) {
 			return false;
 		}
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -328,11 +328,11 @@ 
 	 *		@param boolean $for_incomplete_payments
 	 *		@return int
 	 */
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
 		// we only count approved registrations towards registration limits
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
-		if( $for_incomplete_payments ){
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
 		}
 
 		return $this->count($query_params);

Indentation +19 added lines, -19 removed lines

@@ -197,11 +197,11 @@ 
 
 
 	/**
-	*		retrieve ALL registrations for a particular Attendee from db
-	* 		@access		public
-	* 		@param		int		$ATT_ID
-	*		@return 	EE_Registration[]
-	*/
+	 *		retrieve ALL registrations for a particular Attendee from db
+	 * 		@access		public
+	 * 		@param		int		$ATT_ID
+	 *		@return 	EE_Registration[]
+	 */
 	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
 		if ( ! $ATT_ID ) {
 			return FALSE;
@@ -228,14 +228,14 @@ 
 
 
 	/**
-	*		retrieve registration for a specific transaction attendee from db
-	*
-	* 		@access		public
-	* 		@param		$TXN_ID
-	* 		@param		$ATT_ID
-	* 		@param		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve registration for a specific transaction attendee from db
+	 *
+	 * 		@access		public
+	 * 		@param		$TXN_ID
+	 * 		@param		$ATT_ID
+	 * 		@param		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_registration_for_transaction_attendee( $TXN_ID = FALSE, $ATT_ID = FALSE, $att_nmbr = FALSE ) {
 		return $this->get_one(array(
 			array(
@@ -247,12 +247,12 @@ 
 
 
 	/**
-	*		get the number of registrations per day  for the Registration Admin page Reports Tab.
+	 *		get the number of registrations per day  for the Registration Admin page Reports Tab.
 	 *		(doesn't utilize models because it's a fairly specialized query)
-	* 		@access		public
+	 * 		@access		public
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
-	*/
+	 */
 	public function get_registrations_per_day_report( $period = '-1 month' ) {
 		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 		$where = array('REG_date'=>array('>=',$sql_date) );
@@ -280,10 +280,10 @@ 
 
 
 	/**
-	*		get the number of registrations per event  for the Registration Admin page Reports Tab
-	* 		@access		public
+	 *		get the number of registrations per event  for the Registration Admin page Reports Tab
+	 * 		@access		public
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
-	*/
+	 */
 	public function get_registrations_per_event_report( $period = '-1 month' ) {
 		$date_sql = date("Y-m-d H:i:s", strtotime($period));
 		$where = array( 'REG_date'=>array('>=',$date_sql ) );

core/db_models/EEM_Soft_Delete_Base.model.php

Braces +4 added lines, -2 removed lines

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

Spacing +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');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,14 +25,14 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		require_once( EE_MODELS . 'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
-		if( ! $this->_default_where_conditions_strategy){
+		require_once(EE_MODELS.'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
+		if ( ! $this->_default_where_conditions_strategy) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -43,12 +43,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -59,7 +59,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all($query_params = array()){
+	public function get_all($query_params = array()) {
 		return parent::get_all($query_params);
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one($query_params = array()){
+	public function get_one($query_params = array()) {
 		return parent::get_one($query_params);
 	}
 	/**
@@ -77,7 +77,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -87,7 +87,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -108,7 +108,7 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return parent::get_one_by_ID($id);
 	}
 	/**
@@ -119,7 +119,7 @@ 
 	 * @param boolean $distinct
 	 * @return int count
 	 */
-	public function count($query_params = array(), $field_to_count = null, $distinct = false){
+	public function count($query_params = array(), $field_to_count = null, $distinct = false) {
 		//just calls parent, but changes PHP docs for this function
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -131,7 +131,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -141,9 +141,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -161,7 +161,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
 		$query_params['default_where_conditions'] = 'other_models_only';
 		return $query_params;
 	}
@@ -173,9 +173,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -184,9 +184,9 @@ 
 	 * @param string $field_to_sum name of field
 	 * @return int count
 	 */
-	public function sum($query_params =null,$field_to_sum= null){
+	public function sum($query_params = null, $field_to_sum = null) {
 		//just calls parent, but changes PHP doc
-		return parent::sum($query_params,$field_to_sum);
+		return parent::sum($query_params, $field_to_sum);
 	}
 
 
@@ -196,7 +196,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -207,7 +207,7 @@ 
 	 * @param string $field_to_sum
 	 * @reutrn int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -217,7 +217,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -227,7 +227,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -245,7 +245,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete($query_params, $allow_blocking);
 	}
@@ -260,7 +260,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently_by_ID($ID=FALSE, $allow_blocking = true){
+	public function delete_permanently_by_ID($ID = FALSE, $allow_blocking = true) {
 		$query_params = array();
 		$query_params[0] = array($this->get_primary_key_field()->get_name() => $ID);
 		$query_params['limit'] = 1;
@@ -274,8 +274,8 @@ 
 	 * @param mixed $ID value of the primary_key or primary_text_key
 	 * @return boolean success
 	 */
-	public function delete_by_ID($ID){
-		return $this->delete_or_restore_by_ID(true,$ID);
+	public function delete_by_ID($ID) {
+		return $this->delete_or_restore_by_ID(true, $ID);
 	}
 	/**
 	 * Restores a particular item by its ID (primary key). Ignores the fact whether the item
@@ -283,8 +283,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -293,15 +293,15 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
-		$primaryKeyName=$this->primary_key_name();
+		$primaryKeyName = $this->primary_key_name();
 		// retrieve a particular transaction
 		$query_params = array();
-		$query_params[0] = array( $primaryKeyName => $ID );
-		if ( $this->delete_or_restore ($delete, $query_params )) {
+		$query_params[0] = array($primaryKeyName => $ID);
+		if ($this->delete_or_restore($delete, $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -319,7 +319,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -330,7 +330,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -339,10 +339,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -360,9 +360,9 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 
 	/**
@@ -377,8 +377,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int how many items were updated
 	 */
-	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
-		return parent::update($fields_n_values,$query_params, $keep_model_objs_in_sync );
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
+		return parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 
 

core/db_models/EEM_State.model.php

Indentation +16 added lines, -16 removed lines

@@ -64,11 +64,11 @@ 
 
 
 	/**
-	*	reset_cached_states
-	*
-	* 	@access		private
-	*	@return 		void
-	*/
+	 *	reset_cached_states
+	 *
+	 * 	@access		private
+	 *	@return 		void
+	 */
 	public function reset_cached_states() {
 		EEM_State::$_active_states = array();
 		EEM_State::$_all_states = array();
@@ -78,11 +78,11 @@ 
 
 
 	/**
-	*		_get_states
-	*
-	* 		@access		private
-	*		@return 		array
-	*/
+	 *		_get_states
+	 *
+	 * 		@access		private
+	 *		@return 		array
+	 */
 	public function get_all_states() {
 		if ( ! self::$_all_states ) {
 			self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 )));
@@ -161,12 +161,12 @@ 
 
 
 	/**
-	*		delete  a single state from db via their ID
-	*
-	* 		@access		public
-	* 		@param		$STA_ID
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		delete  a single state from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		$STA_ID
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function delete_by_ID( $STA_ID = FALSE ) {
 
 		if ( ! $STA_ID ) {

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -196,7 +198,7 @@ 
 		$names = $this->get_col( array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name' );
 		if( is_array( $names ) && ! empty( $names ) ){
 			return reset( $names );
-		}else{
+		} else{
 			return '';
 		}
 	}

Spacing +40 added lines, -40 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_State.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_State.class.php');
 
 class EEM_State extends EEM_Base {
 
@@ -33,9 +33,9 @@ 
   	// array of all active states
 	private static $_active_states = FALSE;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('State/Province','event_espresso');
-		$this->plural_item = __('States/Provinces','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('State/Province', 'event_espresso');
+		$this->plural_item = __('States/Provinces', 'event_espresso');
 
 		$this->_tables = array(
 			'State'=> new EE_Primary_Table('esp_state', 'STA_ID')
@@ -43,10 +43,10 @@ 
 
 		$this->_fields = array(
 			'State'=>array(
-				'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID','event_espresso')),
-				'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code','event_espresso'), false, NULL, 'Country'),
-				'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation','event_espresso'), false, ''),
-				'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name','event_espresso'), false, ''),
+				'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID', 'event_espresso')),
+				'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code', 'event_espresso'), false, NULL, 'Country'),
+				'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation', 'event_espresso'), false, ''),
+				'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name', 'event_espresso'), false, ''),
 				'STA_active'=> new EE_Boolean_Field('STA_active', __('State Active Flag', 'event_espresso'), false, false)
 				));
 		$this->_model_relations = array(
@@ -54,7 +54,7 @@ 
 			'Country' => new EE_Belongs_To_Relation(),
 			'Venue'=>new EE_Has_Many_Relation(),
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -81,8 +81,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_states() {
-		if ( ! self::$_all_states ) {
-			self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 )));
+		if ( ! self::$_all_states) {
+			self::$_all_states = $this->get_all(array('order_by'=>array('STA_name'=>'ASC'), 'limit'=> array(0, 99999)));
 		}
 		return self::$_all_states;
 	}
@@ -97,14 +97,14 @@ 
 	 * @param bool  $flush_cache
 	 * @return        array
 	 */
-	public function get_all_active_states( $countries = array(), $flush_cache = FALSE ) {
-		if ( ! self::$_active_states || $flush_cache ) {
-			$countries = is_array( $countries ) && ! empty( $countries ) ? $countries : EEM_Country::instance()->get_all_active_countries();
-			self::$_active_states =  $this->get_all( array(
-				array( 'STA_active' => TRUE, 'CNT_ISO' => array( 'IN', array_keys( $countries ))),
-				'order_by' => array( 'STA_name'=>'ASC' ),
-				'limit' => array( 0, 99999 ),
-				'force_join' => array( 'Country' )
+	public function get_all_active_states($countries = array(), $flush_cache = FALSE) {
+		if ( ! self::$_active_states || $flush_cache) {
+			$countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries();
+			self::$_active_states = $this->get_all(array(
+				array('STA_active' => TRUE, 'CNT_ISO' => array('IN', array_keys($countries))),
+				'order_by' => array('STA_name'=>'ASC'),
+				'limit' => array(0, 99999),
+				'force_join' => array('Country')
 			));
 		}
 		return self::$_active_states;
@@ -116,8 +116,8 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_states_of_active_countries(){
-		if ( $states = $this->get_all( array( array( 'Country.CNT_active' => TRUE, 'STA_active' => TRUE ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+	public function get_all_states_of_active_countries() {
+		if ($states = $this->get_all(array(array('Country.CNT_active' => TRUE, 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -129,11 +129,11 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_active_states_for_these_countries( $countries ){
-		if ( ! $countries ) {
+	public function get_all_active_states_for_these_countries($countries) {
+		if ( ! $countries) {
 			return FALSE;
 		}
-		if ( $states = $this->get_all( array(  array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries )), 'STA_active' => TRUE ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+		if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries)), 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -145,11 +145,11 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_states_for_these_countries( $countries ){
-		if ( ! $countries ) {
+	public function get_all_states_for_these_countries($countries) {
+		if ( ! $countries) {
 			return FALSE;
 		}
-		if ( $states = $this->get_all( array( array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries ))),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+		if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries))), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -164,15 +164,15 @@ 
 	* 		@param		$STA_ID
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function delete_by_ID( $STA_ID = FALSE ) {
+	public function delete_by_ID($STA_ID = FALSE) {
 
-		if ( ! $STA_ID ) {
+		if ( ! $STA_ID) {
 			return FALSE;
 		}
 
 		// retrieve a particular transaction
-		$where_cols_n_values = array( array( 'STA_ID' => $STA_ID ));
-		if ( $answer = $this->delete ( $where_cols_n_values )) {
+		$where_cols_n_values = array(array('STA_ID' => $STA_ID));
+		if ($answer = $this->delete($where_cols_n_values)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -185,15 +185,15 @@ 
 	 * @param string $state_ID
 	 * @return string
 	 */
-	public function get_state_name_by_ID( $state_ID ){
-		if( isset( self::$_all_states[ $state_ID ] ) &&
-				self::$_all_states[ $state_ID ] instanceof EE_State ){
-			return self::$_all_states[ $state_ID ]->name();
+	public function get_state_name_by_ID($state_ID) {
+		if (isset(self::$_all_states[$state_ID]) &&
+				self::$_all_states[$state_ID] instanceof EE_State) {
+			return self::$_all_states[$state_ID]->name();
 		}
-		$names = $this->get_col( array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name' );
-		if( is_array( $names ) && ! empty( $names ) ){
-			return reset( $names );
-		}else{
+		$names = $this->get_col(array(array('STA_ID' => $state_ID), 'limit' => 1), 'STA_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		} else {
 			return '';
 		}
 	}

core/db_models/EEM_Status.model.php

Indentation +23 added lines, -23 removed lines

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

Braces +6 added lines, -3 removed lines

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

Spacing +20 added lines, -20 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,7 +60,7 @@ 
 			'Payment'=>new EE_Has_Many_Relation()
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -73,7 +73,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(
@@ -203,30 +203,30 @@ 
 	  			)
 	    );
 
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
 
-		if ( !is_array($statuses) )
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
+		if ( ! is_array($statuses))
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
 
 	    $translation = array();
 
-	    foreach ( $statuses as $id => $code ) {
-	    	if ( isset( $translation_array[$id] ) ) {
+	    foreach ($statuses as $id => $code) {
+	    	if (isset($translation_array[$id])) {
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
 	    	} else {
 	    		$translation[$id] = $code;
 	    	}
 
 	    	//schema
-	    	switch ( $schema ) {
+	    	switch ($schema) {
 	    		case 'lower' :
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
 	    			break;
 	    		case 'sentence' :
-	    			$translation[$id] = ucwords( $translation[$id] );
+	    			$translation[$id] = ucwords($translation[$id]);
 	    			break;
 	    		case 'upper' :
-	    			$translation[$id] = strtoupper( $translation[$id] );
+	    			$translation[$id] = strtoupper($translation[$id]);
 	    			break;
 	    	}
 	    }

core/db_models/EEM_System_Status.model.php

Spacing +54 added lines, -54 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * Model for retrieving Information about the Event Espresso status.
  */
-class EEM_System_Status{
+class EEM_System_Status {
 
 	// private instance of the EEM_System_Status object
 	protected static $_instance = NULL;
@@ -26,7 +26,7 @@ 
 		}
 		return self::$_instance;
 	}
-	private function __construct(){
+	private function __construct() {
 
 	}
 	/**
@@ -34,7 +34,7 @@ 
 	 * @return array where each key is a function name on this class, and each value is SOMETHING--
 	 * it might be a value, an array, or an object
 	 */
-	function get_system_stati(){
+	function get_system_stati() {
 		return array(
 			'ee_version'=>$this->get_ee_version(),
 			'ee_activation_history'=>$this->get_ee_activation_history(),
@@ -55,14 +55,14 @@ 
 	 *
 	 * @return string
 	 */
-	function get_ee_version(){
+	function get_ee_version() {
 		return espresso_version();
 	}
 	/**
 	 *
 	 * @return string
 	 */
-	function php_version(){
+	function php_version() {
 		return phpversion();
 	}
 	/**
@@ -79,16 +79,16 @@ 
 		'DomainPath' => 'Domain Path',
 		'Network' => 'Network',
 	 */
-	function get_active_plugins(){
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() )
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
-		$active_plugins = array_map( 'strtolower', $active_plugins );
+	function get_active_plugins() {
+		$active_plugins = (array) get_option('active_plugins', array());
+		if (is_multisite())
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
+		$active_plugins = array_map('strtolower', $active_plugins);
 		$plugin_info = array();
-		foreach ( $active_plugins as $plugin ) {
-				$plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+		foreach ($active_plugins as $plugin) {
+				$plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-				$plugin_info[ $plugin ] = $plugin_data;
+				$plugin_info[$plugin] = $plugin_data;
 		}
 		return $plugin_info;
 	}
@@ -97,17 +97,17 @@ 
 	 *
 	 * @return array with keys 'home_url' and 'site_url'
 	 */
-	function get_wp_settings(){
-		$wp_memory_int = $this->let_to_num( WP_MEMORY_LIMIT );
-		if ( $wp_memory_int < 67108864 ) {
-			$wp_memory_to_display = '<mark class="error">' . sprintf( __('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"' ) . '</mark>';
+	function get_wp_settings() {
+		$wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
+		if ($wp_memory_int < 67108864) {
+			$wp_memory_to_display = '<mark class="error">'.sprintf(__('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"').'</mark>';
 		} else {
-			$wp_memory_to_display = '<mark class="yes">' . size_format( $wp_memory_int ) . '</mark>';
+			$wp_memory_to_display = '<mark class="yes">'.size_format($wp_memory_int).'</mark>';
 		}
 		return array(
-			'name'=>get_bloginfo('name','display'),
+			'name'=>get_bloginfo('name', 'display'),
 			'is_multisite'=>is_multisite(),
-			'version'=>  get_bloginfo( 'version', 'display' ),
+			'version'=>  get_bloginfo('version', 'display'),
 			'home_url'=>home_url(),
 			'site_url'=>site_url(),
 			'WP_DEBUG'=>WP_DEBUG,
@@ -116,8 +116,8 @@ 
 			'gmt_offset'=>get_option('gmt_offset'),
 			'timezone_string'=>get_option('timezone_string'),
 			'admin_email'=>  get_bloginfo('admin_email', 'display'),
-			'language'=>get_bloginfo('language','display'),
-			'wp_max_upload_size' => size_format( wp_max_upload_size() ),
+			'language'=>get_bloginfo('language', 'display'),
+			'wp_max_upload_size' => size_format(wp_max_upload_size()),
 			'wp_memory' => $wp_memory_to_display
 			);
 	}
@@ -126,7 +126,7 @@ 
 	 * Gets an array of information about the history of ee versions installed
 	 * @return array
 	 */
-	function get_ee_activation_history(){
+	function get_ee_activation_history() {
 		return get_option('espresso_db_update');
 	}
 
@@ -135,11 +135,11 @@ 
 	 * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that version was installed
 	 * @return EE_Data_Migration_Script_Base[]
 	 */
-	function get_ee_migration_history(){
+	function get_ee_migration_history() {
 		$options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
 		$presentable_migration_scripts = array();
-		foreach($options as $option_array){
-			$presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix,"",$option_array['option_name'])] = maybe_unserialize($option_array['option_value']);
+		foreach ($options as $option_array) {
+			$presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name'])] = maybe_unserialize($option_array['option_value']);
 		}
 		return $presentable_migration_scripts;
 //		return get_option(EE_Data_Migration_Manager::data_migrations_option_name);//EE_Data_Migration_Manager::instance()->get_data_migrations_ran();
@@ -149,7 +149,7 @@ 
 	 *
 	 * @return array like EE_Config class
 	 */
-	function get_ee_config(){
+	function get_ee_config() {
 		return EE_Config::instance();
 	}
 
@@ -157,24 +157,24 @@ 
 	 * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
 	 * @return array like the output of phpinfo(), but in an array
 	 */
-	function get_php_info(){
+	function get_php_info() {
 		ob_start();
 		phpinfo(-1);
 
 		$pi = preg_replace(
 		array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-		'#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
+		'#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
 		"#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
 		 '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
 		 .'<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
 		 '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
 		 '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
 		 "# +#", '#<tr>#', '#</tr>#'),
-		array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
+		array('$1', '', '', '', '</$1>'."\n", '<', ' ', ' ', ' ', '', ' ',
 		 '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
 		 "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
 		 '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-		 '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+		 '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n".
 		 '<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
 		ob_get_clean());
 
@@ -182,14 +182,14 @@ 
 		unset($sections[0]);
 
 		$pi = array();
-		foreach($sections as $section){
+		foreach ($sections as $section) {
 		  $n = substr($section, 0, strpos($section, '</h2>'));
 		  preg_match_all(
 		  '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
 			$section, $askapache, PREG_SET_ORDER);
-		  foreach($askapache as $m)
+		  foreach ($askapache as $m)
 			  $m2 = isset($m[2]) ? $m[2] : null;
-			  $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2);
+			  $pi[$n][$m[1]] = ( ! isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
 		}
 
 		return $pi;
@@ -199,13 +199,13 @@ 
 	 * Checks if site responds ot HTTPS
 	 * @return boolean
 	 */
-	function get_https_enabled(){
+	function get_https_enabled() {
 		$home = str_replace("http://", "https://", home_url());
 		$response = wp_remote_get($home);
-		if($response instanceof WP_Error){
+		if ($response instanceof WP_Error) {
 			$error_string = '';
-			foreach($response->errors as $short_name => $description_array){
-				$error_string .= "<b>$short_name</b>: ".implode(", ",$description_array);
+			foreach ($response->errors as $short_name => $description_array) {
+				$error_string .= "<b>$short_name</b>: ".implode(", ", $description_array);
 			}
 			return $error_string;
 		}
@@ -215,25 +215,25 @@ 
 	 * Whether or not logging is enabled
 	 * @return string descripting logging's status
 	 */
-	function get_logging_enabled(){
-		$opened = @fopen( EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a' );
-		return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf( __('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"','</mark>' ) ;
+	function get_logging_enabled() {
+		$opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR.'/logs/espresso_log.txt', 'a');
+		return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
 	}
 	/**
 	 *  Whether curl ro fsock works
 	 * @return string describing posting's status
 	 */
-	function get_remote_posting(){
-		$fsock_works = function_exists( 'fsockopen' );
-		$curl_works = function_exists( 'curl_init' );
-		if ( $fsock_works && $curl_works ) {
+	function get_remote_posting() {
+		$fsock_works = function_exists('fsockopen');
+		$curl_works = function_exists('curl_init');
+		if ($fsock_works && $curl_works) {
 			$status = __('Your server has fsockopen and cURL enabled.', 'event_espresso');
-		} elseif ( $fsock_works ) {
+		} elseif ($fsock_works) {
 			$status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
-		} elseif( $curl_works ) {
+		} elseif ($curl_works) {
 			$status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-		}else{
-			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>';
+		} else {
+			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso').'</mark>';
 		}
 		return $status;
 
@@ -242,7 +242,7 @@ 
 	 * Gets all the php.ini settings
 	 * @return array
 	 */
-	function get_php_ini_all(){
+	function get_php_ini_all() {
 		return ini_get_all();
 	}
 	/**
@@ -251,10 +251,10 @@ 
 	 * @param type $size
 	 * @return int
 	 */
-	function let_to_num( $size ) {
-		$l 		= substr( $size, -1 );
-		$ret 	= substr( $size, 0, -1 );
-		switch( strtoupper( $l ) ) {
+	function let_to_num($size) {
+		$l = substr($size, -1);
+		$ret = substr($size, 0, -1);
+		switch (strtoupper($l)) {
 			case 'P':
 				$ret *= 1024;
 			case 'T':

Braces +7 added lines, -5 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	function get_active_plugins(){
 		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() )
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		if ( is_multisite() ) {
+					$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		}
 		$active_plugins = array_map( 'strtolower', $active_plugins );
 		$plugin_info = array();
 		foreach ( $active_plugins as $plugin ) {
@@ -187,8 +188,9 @@ 
 		  preg_match_all(
 		  '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
 			$section, $askapache, PREG_SET_ORDER);
-		  foreach($askapache as $m)
-			  $m2 = isset($m[2]) ? $m[2] : null;
+		  foreach($askapache as $m) {
+		  			  $m2 = isset($m[2]) ? $m[2] : null;
+		  }
 			  $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2);
 		}
 
@@ -232,7 +234,7 @@ 
 			$status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
 		} elseif( $curl_works ) {
 			$status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-		}else{
+		} else{
 			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>';
 		}
 		return $status;

core/db_models/EEM_Term_Relationship.model.php

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -89,7 +91,7 @@ 
 		global $wpdb;
 		if( $term_taxonomy_id ){
 			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
-		}else{
+		} else{
 			$second_operand = 'tr.term_taxonomy_id';
 		}
 		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count

Spacing +20 added lines, -20 removed lines

@@ -21,24 +21,24 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Term_Relationship extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term Relationship','event_espresso');
-		$this->plural_item = __('Term Relationships','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term Relationship', 'event_espresso');
+		$this->plural_item = __('Term Relationships', 'event_espresso');
 		$this->_tables = array(
 			'Term_Relationship'=> new EE_Primary_Table('term_relationships')
 		);
 		$this->_fields = array(
 			'Term_Relationship'=>array(
-				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID','event_espresso'), false,0,array('Event','Venue','Attendee')),
-				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
-				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
+				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID', 'event_espresso'), false, 0, array('Event', 'Venue', 'Attendee')),
+				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID', 'event_espresso'), false, 0, 'Term_Taxonomy'),
+				'term_order'=>new EE_Integer_Field('term_order', __('Term Order', 'event_espresso'), false, 0)
 			));
 		$this->_model_relations = array(
 			'Event'=>new EE_Belongs_To_Relation(),
@@ -47,10 +47,10 @@ 
 			'Term_Taxonomy'=>new EE_Belongs_To_Relation()
 		);
 		$this->_indexes = array(
-			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id','term_taxonomy_id'))
+			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id'))
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -59,17 +59,17 @@ 
 	 * @global type $wpdb
 	 * @return int the number of rows affected
 	 */
-	public function update_term_taxonomy_counts($term_taxonomy_id = NULL){
+	public function update_term_taxonomy_counts($term_taxonomy_id = NULL) {
 		//because this uses a subquery and sometimes assigning to column to be another column's
 		//value, we just write the SQL directly.
 		global $wpdb;
-		if( $term_taxonomy_id ){
-			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
-		}else{
+		if ($term_taxonomy_id) {
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
+		} else {
 			$second_operand = 'tr.term_taxonomy_id';
 		}
-		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
-from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)" ) );
+		$rows_affected = $this->_do_wpdb_query('query', array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
+from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)"));
 		return $rows_affected;
 	}
 
@@ -81,8 +81,8 @@ 
 	 */
 	public function insert($field_n_values) {
 		$return = parent::insert($field_n_values);
-		if( isset( $field_n_values[ 'term_taxonomy_id' ] ) ) {
-			$this->update_term_taxonomy_counts($field_n_values[ 'term_taxonomy_id' ] );
+		if (isset($field_n_values['term_taxonomy_id'])) {
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
 		}
 		return $return;
 	}
@@ -98,8 +98,8 @@ 
 	 * @return int
 	 */
 	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
-		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync );
-		if( $count ){
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -113,7 +113,7 @@ 
 	 */
 	public function delete($query_params, $allow_blocking = true) {
 		$count = parent::delete($query_params, $allow_blocking);
-		if( $count ){
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;

core/db_models/EEM_Ticket.model.php

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -131,8 +133,9 @@ 
 					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold','%d'),//note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
 					'initially_available'=>array('Ticket.TKT_qty','%d')));
 
-		if ( empty( $remaining_per_ticket ) )
-			return FALSE;
+		if ( empty( $remaining_per_ticket ) ) {
+					return FALSE;
+		}
 
 
 		foreach($remaining_per_ticket as $remaining){

Spacing +36 added lines, -36 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Ticket.class.php');
 
 class EEM_Ticket extends EEM_Soft_Delete_Base {
 
@@ -36,35 +36,35 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return void
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Ticket','event_espresso');
-		$this->plural_item = __('Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket', 'event_espresso');
+		$this->plural_item = __('Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Ticket'=> new EE_Primary_Table('esp_ticket', 'TKT_ID')
 		);
 		$this->_fields = array(
 			'Ticket'=>array(
-				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso')),
-				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso'), false, 0, 'Ticket_Template'),
+				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso')),
+				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso'), false, 0, 'Ticket_Template'),
 				'TKT_name'=>new EE_Plain_Text_Field('TKT_name', __('Ticket Name', 'event_espresso'), false, ''),
-				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, '' ),
-				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket','event_espresso'), false, current_time('timestamp'), $timezone ),
-				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket','event_espresso'), false, current_time('timestamp'), $timezone ),
-				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0 ),
-				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, INF ),
+				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, ''),
+				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket', 'event_espresso'), false, current_time('timestamp'), $timezone),
+				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket', 'event_espresso'), false, current_time('timestamp'), $timezone),
+				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0),
+				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, INF),
 				'TKT_price'=> new EE_Money_Field('TKT_price', 'Final calculated price for ticket', false, 0),
 				'TKT_sold' => new EE_Integer_Field('TKT_sold', __('Number of this ticket sold', 'event_espresso'), false, 0),
-				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available','event_espresso'), false, INF),
-				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, INF ),
-				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false ),
-				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false,false),
-				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false ),
+				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available', 'event_espresso'), false, INF),
+				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, INF),
+				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false),
+				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false, false),
+				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false),
 				'TKT_order' => new EE_Integer_Field('TKT_order', __('The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)', 'event_espresso'), false, 0),
-				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0 ),
+				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0),
 				'TKT_deleted' => new EE_Trashed_Flag_Field('TKT_deleted', __('Flag indicating if this has been archived or not', 'event_espresso'), false, false),
-				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE ),
-				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0 )
+				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE),
+				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0)
 			));
 		$this->_model_relations = array(
 			'Datetime'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -75,7 +75,7 @@ 
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -85,10 +85,10 @@ 
 	 * @return EE_Ticket[]
 	 */
 	public function get_all_default_tickets() {
-		$tickets = $this->get_all( array( array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')) );
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')));
 
 		//we need to set the start date and end date to today's date and the start of the default dtt
-		return $this->_set_default_dates( $tickets );
+		return $this->_set_default_dates($tickets);
 	}
 
 
@@ -98,10 +98,10 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return EE_Ticket[]
 	 */
-	private function _set_default_dates( $tickets ) {
-		foreach ( $tickets as $ticket ) {
-			$ticket->set('TKT_start_date', current_time('timestamp') );
-			$ticket->set('TKT_end_date', current_time('timestamp') + (60 * 60 * 24 * 30 ) );
+	private function _set_default_dates($tickets) {
+		foreach ($tickets as $ticket) {
+			$ticket->set('TKT_start_date', current_time('timestamp'));
+			$ticket->set('TKT_end_date', current_time('timestamp') + (60 * 60 * 24 * 30));
 			$ticket->set_end_time("12am");
 		}
 
@@ -115,25 +115,25 @@ 
 	 * @param array $query_params
 	 * @return int|boolean of tickets available. If sold out, return less than 1. If infinite, returns INF,  IF there are NO tickets attached to datetime then FALSE is returned.
 	 */
-	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()){
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
 		$sum = 0;
 		$query_params[0]['Datetime.DTT_ID'] = $DTT_ID;
 		$remaining_per_ticket = $this->_get_all_wpdb_results(
 				$query_params,
 				ARRAY_A,
 				array(
-					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold','%d'),//note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
-					'initially_available'=>array('Ticket.TKT_qty','%d')));
+					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold', '%d'), //note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
+					'initially_available'=>array('Ticket.TKT_qty', '%d')));
 
-		if ( empty( $remaining_per_ticket ) )
+		if (empty($remaining_per_ticket))
 			return FALSE;
 
 
-		foreach($remaining_per_ticket as $remaining){
-			if(intval($remaining['initially_available'])==EE_INF_IN_DB){//infinite in DB
+		foreach ($remaining_per_ticket as $remaining) {
+			if (intval($remaining['initially_available']) == EE_INF_IN_DB) {//infinite in DB
 				return INF;
 			}
-			$sum+=intval($remaining['tickets_remaining']);
+			$sum += intval($remaining['tickets_remaining']);
 		}
 
 		return $sum;
@@ -144,8 +144,8 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return void
 	 */
-	public function update_tickets_sold($tickets){
-		foreach($tickets as $ticket){
+	public function update_tickets_sold($tickets) {
+		foreach ($tickets as $ticket) {
 			/* @var  $ticket EE_Ticket */
 			$ticket->update_tickets_sold();
 		}

core/db_models/EEM_WP_User.model.php

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');
+}
 /**
  * WP User Model. Not intended to replace WP_User, but this just allows
  * for EE model queries to more easily integrate with the WP User table

Spacing +13 added lines, -13 removed lines

@@ -22,23 +22,23 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('WP_User','event_espresso');
-		$this->plural_item = __('WP_Users','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('WP_User', 'event_espresso');
+		$this->plural_item = __('WP_Users', 'event_espresso');
 		$this->_tables = array(
 			'WP_User'=> new EE_Primary_Table('users', 'ID')
 		);
 		$this->_fields = array(
 			'WP_User'=>array(
-				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID','event_espresso')),
-				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login','event_espresso'), false, '' ),
-				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password','event_espresso'), false, '' ),
-				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name','event_espresso'), false, ''),
-				'user_email' => new EE_Email_Field('user_email', __( 'User Email', 'event_espresso' ), false),
-				'user_registered' => new EE_Datetime_Field( 'user_registered', __( 'Date User Registered', 'event_espresso' ), false, current_time('timestamp'), $timezone ),
-				'user_activation_key' => new EE_Plain_Text_Field( 'user_activation_key', __( 'User Activation Key', 'event_espresso' ), false, '' ),
-				'user_status' => new EE_Integer_Field( 'user_status', __( 'User Status', 'event_espresso' ), false, 0 ),
-				'display_name' => new EE_Plain_Text_Field( 'display_name', __( 'Display Name', 'event_espresso' ), false, '' )
+				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
+				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login', 'event_espresso'), false, ''),
+				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password', 'event_espresso'), false, ''),
+				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name', 'event_espresso'), false, ''),
+				'user_email' => new EE_Email_Field('user_email', __('User Email', 'event_espresso'), false),
+				'user_registered' => new EE_Datetime_Field('user_registered', __('Date User Registered', 'event_espresso'), false, current_time('timestamp'), $timezone),
+				'user_activation_key' => new EE_Plain_Text_Field('user_activation_key', __('User Activation Key', 'event_espresso'), false, ''),
+				'user_status' => new EE_Integer_Field('user_status', __('User Status', 'event_espresso'), false, 0),
+				'display_name' => new EE_Plain_Text_Field('display_name', __('Display Name', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Attendee' => new EE_Has_Many_Relation(),
@@ -53,7 +53,7 @@ 
 			'Venue' => new EE_Has_Many_Relation(),
 		);
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 }
 // End of file EEM_WP_User.model.php