eventespresso / event-espresso-core

core/db_models/EEM_Payment_Method.model.php

Doc Comments +2 added lines, -2 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
@@ -229,7 +229,7 @@ 
 	/**
 	 * Gets the ID of this object, or if its a string finds the object's id
 	 * associated with that slug
-	 * @param mixed $base_obj_or_id_or_slug
+	 * @param EE_Payment_Method $base_obj_or_id_or_slug
 	 * @return int
 	 */
 	function ensure_is_ID( $base_obj_or_id_or_slug ) {

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

Spacing +86 added lines, -86 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,24 +246,24 @@ 
 	 * 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( $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 ) );
+				$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 ($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));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -271,8 +271,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -286,16 +286,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
@@ -304,10 +304,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()
 					),
@@ -328,16 +328,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
 		);

core/db_models/EEM_Price.model.php

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		boolean		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(

Spacing +40 added lines, -40 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Price_Type.model.php

Doc Comments +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * return an array of Base types. Keys are INTs which are used in the database,
 	 * values are text-representations of the base type.
-	 * @return array
+	 * @return integer
 	 */
 	public function get_base_types(){
 		return $this->base_types;
@@ -121,7 +121,7 @@ 
 	 * 		instantiate a new price type object with blank/empty properties
 	 *
 	 * 		@access		public
-	 * 		@return		mixed		array on success, FALSE on fail
+	 * 		@return		EE_Price_Type		array on success, FALSE on fail
 	 */
 	public function get_new_price_type() {
 		return EE_Price_Type::new_instance();

Indentation +7 added lines, -7 removed lines

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

Spacing +26 added lines, -26 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Registration.model.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +19 added lines, -19 removed lines

@@ -219,11 +219,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;
@@ -250,14 +250,14 @@ 
 
 
 	/**
-	*		retrieve registration for a specific transaction attendee from db
-	*
-	* 		@access		public
-	* 		@param	int	$TXN_ID
-	* 		@param    int		$ATT_ID
-	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve registration for a specific transaction attendee from db
+	 *
+	 * 		@access		public
+	 * 		@param	int	$TXN_ID
+	 * 		@param    int		$ATT_ID
+	 * 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
 		return $this->get_one(array(
 			array(
@@ -270,12 +270,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 = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
@@ -304,11 +304,11 @@ 
 
 
 	/**
-	*		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
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
-	*/
+	 */
 	public function get_registrations_per_event_report( $period = '-1 month' ) {
 
 		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );

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 +66 added lines, -66 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,31 +92,31 @@ 
 	 *    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, time(), $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Final Price of registration after all ticket/price modifications','event_espresso'), false, 0),
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards 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, time(), $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Final Price of registration after all ticket/price modifications', 'event_espresso'), false, 0),
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards 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(
@@ -127,11 +127,11 @@ 
 			'Status'=>new EE_Belongs_To_Relation(),
 			'Answer'=>new EE_Has_Many_Relation(),
 			'Checkin'=>new EE_Has_Many_Relation(),
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -164,9 +164,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;
 	}
 
 
@@ -177,19 +177,19 @@ 
 	 * @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
 		/** @type WPDB $wpdb */
 		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;
 				}
 			}
 		}
@@ -204,15 +204,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);
 	}
 
 
@@ -224,11 +224,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)));
 	}
 
 
@@ -239,8 +239,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)));
@@ -258,13 +258,13 @@ 
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID
 			),
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
 		));
 	}
 
@@ -276,12 +276,12 @@ 
 	 *		@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 = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
@@ -293,8 +293,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;
 	}
@@ -309,23 +309,23 @@ 
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@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 = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		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')
 			)
 		);
 
@@ -339,11 +339,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
+		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)));
 	}
 
 
@@ -355,11 +355,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);
@@ -375,7 +375,7 @@ 
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		return $wpdb->query(
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
 	}
 
 

core/db_models/EEM_State.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	*
 	* 		@access		public
 	* 		@param		$STA_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		boolean		array on success, FALSE on fail
 	*/
 	public function delete_by_ID( $STA_ID = FALSE ) {
 

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 ) {

Spacing +41 added lines, -41 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(
@@ -55,9 +55,9 @@ 
 			'Venue'=>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();
 		//@todo: only show STA_active 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -84,8 +84,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;
 	}
@@ -100,14 +100,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;
@@ -119,8 +119,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;
@@ -132,11 +132,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;
@@ -148,11 +148,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;
@@ -167,15 +167,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;
@@ -188,15 +188,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 '';
 		}
 	}

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

core/db_models/EEM_System_Status.model.php

Doc Comments +2 added lines, -4 removed lines

@@ -14,8 +14,6 @@ 
 	 * 		This function is a singleton method used to instantiate the EEM_Attendee object
 	 *
 	 * 		@access public
-	 * 		@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_System_Status
 	 */
 	public static function instance() {
 
@@ -147,7 +145,7 @@ 
 
 	/**
 	 *
-	 * @return array like EE_Config class
+	 * @return EE_Config like EE_Config class
 	 */
 	function get_ee_config(){
 		return EE_Config::instance();
@@ -197,7 +195,7 @@ 
 
 	/**
 	 * Checks if site responds ot HTTPS
-	 * @return boolean
+	 * @return string
 	 */
 	function get_https_enabled(){
 		$home = str_replace("http://", "https://", home_url());

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/fields/EE_Datetime_Field.php

Doc Comments +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 	 * This prepares the datetime for internal usage as a PHP DateTime object OR null (if nullable is
 	 * allowed)
 	 * @param string $datetime_string mysql timestamp in UTC
-	 * @return  mixed null | DateTime
+	 * @return  null|DateTime null | DateTime
 	 */
 	public function prepare_for_set_from_db( $datetime_string ) {
 		//if $datetime_value is empty, and ! $this->_nullable, just use time()

Spacing +101 added lines, -101 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');
 }
 /**
  * EE_Datetime_Field
@@ -111,16 +111,16 @@ 
 	 * @param string 	$pretty_date_format
 	 * @param string 	$pretty_time_format
 	 */
-	public function __construct( $table_column, $nice_name, $nullable, $default_value, $timezone_string = '', $date_format = '', $time_format = '', $pretty_date_format = '', $pretty_time_format = '' ){
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $timezone_string = '', $date_format = '', $time_format = '', $pretty_date_format = '', $pretty_time_format = '') {
 
-		$this->_date_format = ! empty( $date_format ) ? $date_format : get_option('date_format');
-		$this->_time_format = ! empty( $time_format ) ? $time_format : get_option('time_format');
-		$this->_pretty_date_format = ! empty( $pretty_date_format ) ? $pretty_date_format : get_option('date_format');
-		$this->_pretty_time_format = ! empty( $pretty_time_format ) ? $pretty_time_format : get_option('time_format');
+		$this->_date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$this->_time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$this->_pretty_date_format = ! empty($pretty_date_format) ? $pretty_date_format : get_option('date_format');
+		$this->_pretty_time_format = ! empty($pretty_time_format) ? $pretty_time_format : get_option('time_format');
 
-		parent::__construct( $table_column, $nice_name, $nullable, $default_value );
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$this->set_timezone( $timezone_string );
+		$this->set_timezone($timezone_string);
 
 	}
 
@@ -139,7 +139,7 @@ 
 	 * @return DateTimeZone
 	 */
 	public function get_UTC_DateTimeZone() {
-		return $this->_UTC_DateTimeZone instanceof DateTimeZone ? $this->_UTC_DateTimeZone : $this->_create_timezone_object_from_timezone_string( 'UTC' );
+		return $this->_UTC_DateTimeZone instanceof DateTimeZone ? $this->_UTC_DateTimeZone : $this->_create_timezone_object_from_timezone_string('UTC');
 	}
 
 
@@ -148,7 +148,7 @@ 
 	 * @return DateTimeZone
 	 */
 	public function get_blog_DateTimeZone() {
-		return $this->_blog_DateTimeZone instanceof DateTimeZone ? $this->_blog_DateTimeZone : $this->_create_timezone_object_from_timezone_string( '' );
+		return $this->_blog_DateTimeZone instanceof DateTimeZone ? $this->_blog_DateTimeZone : $this->_create_timezone_object_from_timezone_string('');
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @param  string|int $value_inputted_for_field_on_model_object could be a string formatted date time or int unix timestamp
 	 * @return DateTime
 	 */
-	public function prepare_for_set( $value_inputted_for_field_on_model_object ) {
-		return $this->_get_date_object( $value_inputted_for_field_on_model_object );
+	public function prepare_for_set($value_inputted_for_field_on_model_object) {
+		return $this->_get_date_object($value_inputted_for_field_on_model_object);
 	}
 
 
@@ -175,9 +175,9 @@ 
 	 * @param bool $pretty If we're returning the pretty formats or standard format string.
 	 * @return string    The final assembled format string.
 	 */
-	protected function _get_date_time_output( $pretty = FALSE ) {
+	protected function _get_date_time_output($pretty = FALSE) {
 
-		switch ( $this->_date_time_output ) {
+		switch ($this->_date_time_output) {
 			case 'time' :
 				return $pretty ? $this->_pretty_time_format : $this->_time_format;
 				break;
@@ -187,7 +187,7 @@ 
 				break;
 
 			default :
-				return $pretty ? $this->_pretty_date_format . ' ' . $this->_pretty_time_format : $this->_date_format . ' ' . $this->_time_format;
+				return $pretty ? $this->_pretty_date_format.' '.$this->_pretty_time_format : $this->_date_format.' '.$this->_time_format;
 		}
 	}
 
@@ -201,7 +201,7 @@ 
 	 * @param string $what acceptable values are 'time' or 'date'.  Any other value will be set but will always result in both 'date' and 'time' being returned.
 	 * @return void
 	 */
-	public function set_date_time_output( $what = NULL ) {
+	public function set_date_time_output($what = NULL) {
 		$this->_date_time_output = $what;
 	}
 
@@ -217,15 +217,15 @@ 
 	 * @param string $timezone_string A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php
 	 * @return void
 	 */
-	public function set_timezone( $timezone_string ) {
-		if( empty( $timezone_string ) && $this->_timezone_string != NULL ){
+	public function set_timezone($timezone_string) {
+		if (empty($timezone_string) && $this->_timezone_string != NULL) {
 			// leave the timezone AS-IS if we already have one and
 			// the function arg didn't provide one
 			return;
 		}
-		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string( $timezone_string );
-		$this->_timezone_string = ! empty( $timezone_string ) ? $timezone_string : 'UTC';
-		$this->_DateTimeZone = $this->_create_timezone_object_from_timezone_string( $this->_timezone_string );
+		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$this->_timezone_string = ! empty($timezone_string) ? $timezone_string : 'UTC';
+		$this->_DateTimeZone = $this->_create_timezone_object_from_timezone_string($this->_timezone_string);
 	}
 
 
@@ -237,8 +237,8 @@ 
 	 * @param string $timezone_string
 	 * @return \DateTimeZone
 	 */
-	protected function _create_timezone_object_from_timezone_string( $timezone_string = '' ) {
-		return new DateTimeZone( EEH_DTT_Helper::get_valid_timezone_string( $timezone_string ) );
+	protected function _create_timezone_object_from_timezone_string($timezone_string = '') {
+		return new DateTimeZone(EEH_DTT_Helper::get_valid_timezone_string($timezone_string));
 	}
 
 
@@ -263,8 +263,8 @@ 
 	 * @param bool   $pretty Whether to set pretty format or not.
 	 * @return void
 	 */
-	public function set_date_format( $format, $pretty = false ) {
-		if ( $pretty ) {
+	public function set_date_format($format, $pretty = false) {
+		if ($pretty) {
 			$this->_pretty_date_format = $format;
 		} else {
 			$this->_date_format = $format;
@@ -279,7 +279,7 @@ 
 	 * @param bool   $pretty Whether to get pretty format or not.
 	 * @return string
 	 */
-	public function get_date_format( $pretty = false ) {
+	public function get_date_format($pretty = false) {
 		return $pretty ? $this->_pretty_date_format : $this->_date_format;
 	}
 
@@ -294,8 +294,8 @@ 
 	 * @param bool   $pretty Whether to set pretty format or not.
 	 * @return void
 	 */
-	public function set_time_format( $format, $pretty = false ) {
-		if ( $pretty ) {
+	public function set_time_format($format, $pretty = false) {
+		if ($pretty) {
 			$this->_pretty_time_format = $format;
 		} else {
 			$this->_time_format = $format;
@@ -310,7 +310,7 @@ 
 	 * @param bool   $pretty Whether to get pretty format or not.
 	 * @return string
 	 */
-	public function get_time_format( $pretty = false ) {
+	public function get_time_format($pretty = false) {
 		return $pretty ? $this->_pretty_time_format : $this->_time_format;
 	}
 
@@ -325,7 +325,7 @@ 
 	 * @param string $format a new pretty date format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_date_format( $format ) {
+	public function set_pretty_date_format($format) {
 		$this->_pretty_date_format = $format;
 	}
 
@@ -342,7 +342,7 @@ 
 	 * @param string $format a new pretty time format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_time_format( $format ) {
+	public function set_pretty_time_format($format) {
 		$this->_pretty_time_format = $format;
 	}
 
@@ -354,9 +354,9 @@ 
 	 * @param DateTime    $current current DateTime object for the datetime field
 	 * @return DateTime
 	 */
-	public function prepare_for_set_with_new_time( $time_to_set_string, DateTime $current ){
+	public function prepare_for_set_with_new_time($time_to_set_string, DateTime $current) {
 		//if $time_to_set_string is datetime object, then let's use it to set the parse array.  Otherwise parse the string.
-		if ( $time_to_set_string instanceof DateTime ) {
+		if ($time_to_set_string instanceof DateTime) {
 			$parsed = array(
 				'hour' => $time_to_set_string->format('H'),
 				'minute' => $time_to_set_string->format('i'),
@@ -364,12 +364,12 @@ 
 				);
 		} else {
 			//parse incoming string
-			$parsed = date_parse_from_format( $this->_time_format, $time_to_set_string );
+			$parsed = date_parse_from_format($this->_time_format, $time_to_set_string);
 		}
 
 		//make sure $current is in the correct timezone.
-		$current->setTimeZone( $this->_DateTimeZone );
-		return $current->setTime( $parsed['hour'], $parsed['minute'], $parsed['second'] );
+		$current->setTimeZone($this->_DateTimeZone);
+		return $current->setTime($parsed['hour'], $parsed['minute'], $parsed['second']);
 	}
 
 
@@ -380,9 +380,9 @@ 
 	 * @param DateTime    $current current DateTime object for the datetime field
 	 * @return DateTime
 	 */
-	public function prepare_for_set_with_new_date( $date_to_set_string, DateTime $current ){
+	public function prepare_for_set_with_new_date($date_to_set_string, DateTime $current) {
 		//if $time_to_set_string is datetime object, then let's use it to set the parse array.  Otherwise parse the string.
-		if ( $date_to_set_string instanceof DateTime ) {
+		if ($date_to_set_string instanceof DateTime) {
 			$parsed = array(
 				'year' => $date_to_set_string->format('Y'),
 				'month' => $date_to_set_string->format('m'),
@@ -390,12 +390,12 @@ 
 				);
 		} else {
 			//parse incoming string
-			$parsed = date_parse_from_format( $this->_date_format, $date_to_set_string );
+			$parsed = date_parse_from_format($this->_date_format, $date_to_set_string);
 		}
 
 		//make sure $current is in the correct timezone
-		$current->setTimeZone( $this->_DateTimeZone );
-		return $current->setDate( $parsed['year'], $parsed['month'], $parsed['day'] );
+		$current->setTimeZone($this->_DateTimeZone);
+		return $current->setDate($parsed['year'], $parsed['month'], $parsed['day']);
 	}
 
 
@@ -407,8 +407,8 @@ 
 	 * @param  DateTime $DateTime
 	 * @return string formatted date time for given timezone
 	 */
-	public function prepare_for_get( $DateTime ) {
-		return $this->_prepare_for_display( $DateTime  );
+	public function prepare_for_get($DateTime) {
+		return $this->_prepare_for_display($DateTime);
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 * @param null     $schema
 	 * @return string
 	 */
-	public function prepare_for_pretty_echoing( $DateTime, $schema = null ) {
-		return $this->_prepare_for_display( $DateTime, $schema ? $schema : true );
+	public function prepare_for_pretty_echoing($DateTime, $schema = null) {
+		return $this->_prepare_for_display($DateTime, $schema ? $schema : true);
 	}
 
 
@@ -438,36 +438,36 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _prepare_for_display( $DateTime, $schema = false ) {
-		if ( ! $DateTime instanceof DateTime  ) {
-			if ( $this->_nullable ) {
+	protected function _prepare_for_display($DateTime, $schema = false) {
+		if ( ! $DateTime instanceof DateTime) {
+			if ($this->_nullable) {
 				return '';
 			} else {
-				if ( WP_DEBUG ) {
-					throw new EE_Error( sprintf( __('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.', 'event_espresso' ), $this->_nicename ) );
+				if (WP_DEBUG) {
+					throw new EE_Error(sprintf(__('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.', 'event_espresso'), $this->_nicename));
 				} else {
-					$DateTime = new DateTime( "now" );
-					EE_Error::add_error( sprintf( __('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.', 'event_espresso' ), $this->_nicename ) );
+					$DateTime = new DateTime("now");
+					EE_Error::add_error(sprintf(__('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.', 'event_espresso'), $this->_nicename));
 				}
 			}
 		}
-		$format_string = $this->_get_date_time_output( $schema );
+		$format_string = $this->_get_date_time_output($schema);
 		//make sure datetime_value is in the correct timezone (in case that's been updated).
-		$DateTime->setTimeZone( $this->_DateTimeZone );
-		if ( $schema ) {
-			if( $this->_display_timezone() ) {
+		$DateTime->setTimeZone($this->_DateTimeZone);
+		if ($schema) {
+			if ($this->_display_timezone()) {
 				//must be explicit because schema could equal true.
-				if( $schema === 'no_html' ){
-					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
-					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
+				if ($schema === 'no_html') {
+					$timezone_string = ' ('.$DateTime->format('T').')';
+				} else {
+					$timezone_string = ' <span class="ee_dtt_timezone_string">('.$DateTime->format('T').')</span>';
 				}
 			} else {
 				$timezone_string = '';
 			}
-			return $DateTime->format( $format_string ) . $timezone_string;
+			return $DateTime->format($format_string).$timezone_string;
 		} else {
-			return $DateTime->format( $format_string );
+			return $DateTime->format($format_string);
 		}
 	}
 
@@ -481,18 +481,18 @@ 
 	 * @return string mysql timestamp in UTC
 	 * @throws \EE_Error
 	 */
-	public function prepare_for_use_in_db( $datetime_value ) {
+	public function prepare_for_use_in_db($datetime_value) {
 		//we allow an empty value or DateTime object, but nothing else.
-		if ( ! empty( $datetime_value ) && ! $datetime_value instanceof DateTime ) {
-			throw new EE_Error( __('The incoming value being prepared for setting in the database must either be empty or a php DateTime object', 'event_espresso' ) );
+		if ( ! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
+			throw new EE_Error(__('The incoming value being prepared for setting in the database must either be empty or a php DateTime object', 'event_espresso'));
 		}
 
-		if ( $datetime_value instanceof DateTime ) {
-			return $datetime_value->setTimeZone( $this->get_UTC_DateTimeZone() )->format( EE_Datetime_Field::mysql_timestamp_format );
+		if ($datetime_value instanceof DateTime) {
+			return $datetime_value->setTimeZone($this->get_UTC_DateTimeZone())->format(EE_Datetime_Field::mysql_timestamp_format);
 		}
 
 		// if $datetime_value is empty, and ! $this->_nullable, use current_time() but set the GMT flag to true
-		return ! $this->_nullable && empty( $datetime_value ) ? current_time( 'mysql', true ) : null;
+		return ! $this->_nullable && empty($datetime_value) ? current_time('mysql', true) : null;
 	}
 
 
@@ -505,20 +505,20 @@ 
 	 * @param string $datetime_string mysql timestamp in UTC
 	 * @return  mixed null | DateTime
 	 */
-	public function prepare_for_set_from_db( $datetime_string ) {
+	public function prepare_for_set_from_db($datetime_string) {
 		//if $datetime_value is empty, and ! $this->_nullable, just use time()
-		if ( empty( $datetime_string) && $this->_nullable ) {
+		if (empty($datetime_string) && $this->_nullable) {
 			return null;
 		}
 		// datetime strings from the db should ALWAYS be in UTC+0, so use UTC_DateTimeZone when creating
-		$DateTime = empty( $datetime_string ) ? new DateTime( 'now', $this->get_UTC_DateTimeZone() ) : DateTime::createFromFormat( EE_Datetime_Field::mysql_timestamp_format, $datetime_string, $this->get_UTC_DateTimeZone() );
+		$DateTime = empty($datetime_string) ? new DateTime('now', $this->get_UTC_DateTimeZone()) : DateTime::createFromFormat(EE_Datetime_Field::mysql_timestamp_format, $datetime_string, $this->get_UTC_DateTimeZone());
 
-		if ( ! $DateTime instanceof DateTime ) {
+		if ( ! $DateTime instanceof DateTime) {
 			//if still no datetime object, then let's just use now
-			$DateTime = new DateTime( 'now', $this->get_UTC_DateTimeZone() );
+			$DateTime = new DateTime('now', $this->get_UTC_DateTimeZone());
 		}
 		// THEN apply the field's set DateTimeZone
-		$DateTime->setTimezone( $this->_DateTimeZone );
+		$DateTime->setTimezone($this->_DateTimeZone);
 		return $DateTime;
 	}
 
@@ -535,15 +535,15 @@ 
 	protected function _display_timezone() {
 
 		// first let's do a comparison of timezone strings.  If they match then we can get out without any further calculations
-		$blog_string = get_option( 'timezone_string' );
-		if ( $blog_string == $this->_timezone_string ) {
+		$blog_string = get_option('timezone_string');
+		if ($blog_string == $this->_timezone_string) {
 			return FALSE;
 		}
 		// now we need to calc the offset for the timezone string so we can compare with the blog offset.
-		$this_offset = $this->get_timezone_offset( $this->_DateTimeZone );
-		$blog_offset = $this->get_timezone_offset( $this->get_blog_DateTimeZone() );
+		$this_offset = $this->get_timezone_offset($this->_DateTimeZone);
+		$blog_offset = $this->get_timezone_offset($this->get_blog_DateTimeZone());
 		// now compare
-		if ( $blog_offset === $this_offset ) {
+		if ($blog_offset === $this_offset) {
 			return FALSE;
 		}
 		return TRUE;
@@ -561,26 +561,26 @@ 
 	 *
 	 * @return DateTime
 	 */
-	protected function _get_date_object( $date_string ) {
+	protected function _get_date_object($date_string) {
 		//first if this is an empty date_string and nullable is allowed, just return null.
-		if ( $this->_nullable && empty( $date_string ) ) {
+		if ($this->_nullable && empty($date_string)) {
 			return null;
 		}
 
 		// if incoming date
-		if ( $date_string instanceof DateTime ) {
-			$date_string->setTimeZone( $this->_DateTimeZone );
+		if ($date_string instanceof DateTime) {
+			$date_string->setTimeZone($this->_DateTimeZone);
 			return $date_string;
 		}
 
 		// if empty date_string and made it here.
 		// Return a datetime object for now in the given timezone.
-		if ( empty( $date_string ) ) {
-			return new DateTime( "now", $this->_DateTimeZone );
+		if (empty($date_string)) {
+			return new DateTime("now", $this->_DateTimeZone);
 		}
 
 		// if $date_string is matches something that looks like a Unix timestamp let's just use it.
-		if ( preg_match( EE_Datetime_Field::unix_timestamp_regex, $date_string ) ) {
+		if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $date_string)) {
 			try {
 				/**
 				 * This is operating under the assumption that the incoming Unix timestamp is
@@ -588,20 +588,20 @@ 
 				 * current_time('timestamp');
 				 *
 				 */
-				$DateTime =  new DateTime( "now", $this->_DateTimeZone );
-				return $DateTime->setTimestamp( $date_string );
-			 } catch ( Exception $e )  {
+				$DateTime = new DateTime("now", $this->_DateTimeZone);
+				return $DateTime->setTimestamp($date_string);
+			 } catch (Exception $e) {
 			 	// should be rare, but if things got fooled then let's just continue
 			 }
 		}
 		//not a unix timestamp.  So we will use the set format on this object and set timezone to
 		//create the DateTime object.
-		$format = $this->_date_format . ' ' . $this->_time_format;
+		$format = $this->_date_format.' '.$this->_time_format;
 		try {
-			return DateTime::createFromFormat( $format, $date_string, $this->_DateTimeZone );
-		} catch ( Exception $e ) {
+			return DateTime::createFromFormat($format, $date_string, $this->_DateTimeZone);
+		} catch (Exception $e) {
 			// if we made it here then likely then something went really wrong.  Instead of throwing an exception, let's just return a DateTime object for now, in the set timezone.
-			return new DateTime( "now", $this->_DateTimeZone );
+			return new DateTime("now", $this->_DateTimeZone);
 		}
 	}
 
@@ -614,9 +614,9 @@ 
 	 * @param null          $time
 	 * @return mixed
 	 */
-	public function get_timezone_offset( DateTimeZone $DateTimeZone, $time = null ) {
-		$time = preg_match( EE_Datetime_Field::unix_timestamp_regex, $time ) ? $time : time();
-		$transitions = $DateTimeZone->getTransitions( $time );
+	public function get_timezone_offset(DateTimeZone $DateTimeZone, $time = null) {
+		$time = preg_match(EE_Datetime_Field::unix_timestamp_regex, $time) ? $time : time();
+		$transitions = $DateTimeZone->getTransitions($time);
 		return $transitions[0]['offset'];
 	}
 
@@ -628,10 +628,10 @@ 
 	 * @param  string $timezone_string
 	 * @return string           abbreviation
 	 */
-	public function get_timezone_abbrev( $timezone_string ) {
-		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string( $timezone_string );
-		$dateTime = new DateTime( 'now', new DateTimeZone( $timezone_string ) );
-		return $dateTime->format( 'T' );
+	public function get_timezone_abbrev($timezone_string) {
+		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$dateTime = new DateTime('now', new DateTimeZone($timezone_string));
+		return $dateTime->format('T');
 	}
 
 

Braces +1 added lines, -1 removed lines

@@ -459,7 +459,7 @@
 				//must be explicit because schema could equal true.
 				if( $schema === 'no_html' ){
 					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
+				} else{
 					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
 				}
 			} else {

core/db_models/fields/EE_Field_With_Model_Name.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	/**
 	 * Returns the name of the model(s) pointed to
 	 * @deprecated since version 4.6.7
-	 * @return mixed string or array of strings
+	 * @return string string or array of strings
 	 */
 	function get_model_name_pointed_to(){
 		EE_Error::doing_it_wrong( 'get_model_name_pointed_to', __( 'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso' ), '4.6.7' );

Spacing +14 added lines, -14 removed lines

@@ -5,7 +5,7 @@ 
  * with the EE_Foreign_Key_Field to create a relation between any two models)
  * also required basically the exact same functionality, except NOT be a foreign key.
  */
-abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base{
+abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base {
 	/**
 	 * Usually the name of a single model. However, as in the case for custom post types,
 	 * it can actually be an array of models
@@ -20,7 +20,7 @@ 
 	 * @param mixed $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul dbe a string
 	 * @param string $model_name eg 'Event','Answer','Term', etc. Basically its the model class's name without the "EEM_"
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value,$model_name){
+	function __construct($table_column, $nicename, $nullable, $default_value, $model_name) {
 		$this->_model_name_pointed_to = $model_name;
 		parent::__construct($table_column, $nicename, $nullable, $default_value);
 	}
@@ -29,8 +29,8 @@ 
 	 * @deprecated since version 4.6.7
 	 * @return mixed string or array of strings
 	 */
-	function get_model_name_pointed_to(){
-		EE_Error::doing_it_wrong( 'get_model_name_pointed_to', __( 'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso' ), '4.6.7' );
+	function get_model_name_pointed_to() {
+		EE_Error::doing_it_wrong('get_model_name_pointed_to', __('This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso'), '4.6.7');
 		return $this->_model_name_pointed_to;
 	}
 	/**
@@ -39,31 +39,31 @@ 
 	 * @return array of model names pointed to by this field
 	 */
 	function get_model_names_pointed_to() {
-		if( is_array( $this->_model_name_pointed_to ) ) {
+		if (is_array($this->_model_name_pointed_to)) {
 			return $this->_model_name_pointed_to;
-		}else{
-			return array( $this->_model_name_pointed_to );
+		} else {
+			return array($this->_model_name_pointed_to);
 		}
 	}
 	/**
 	 * Returns the model's classname (eg EE_Event instead of just Event)
 	 * @return array
 	 */
-	function get_model_class_names_pointed_to(){
+	function get_model_class_names_pointed_to() {
 		$model_names = array();
-		if(is_array($this->_model_name_pointed_to)){
-			foreach($this->_model_name_pointed_to as $model_name){
+		if (is_array($this->_model_name_pointed_to)) {
+			foreach ($this->_model_name_pointed_to as $model_name) {
 				$model_names[] = "EE_".$model_name;
 			}
-		}else{
+		} else {
 			$model_names = array("EE_".$this->_model_name_pointed_to);
 		}
 		return $model_names;
 	}
 
-	function is_model_obj_of_type_pointed_to($model_obj_or_ID){
-		foreach($this->get_model_class_names_pointed_to() as $model_obj_classname){
-			if($model_obj_or_ID instanceof $model_obj_classname){
+	function is_model_obj_of_type_pointed_to($model_obj_or_ID) {
+		foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
+			if ($model_obj_or_ID instanceof $model_obj_classname) {
 				return true;
 			}
 		}

Braces +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	function get_model_names_pointed_to() {
 		if( is_array( $this->_model_name_pointed_to ) ) {
 			return $this->_model_name_pointed_to;
-		}else{
+		} else{
 			return array( $this->_model_name_pointed_to );
 		}
 	}
@@ -55,7 +55,7 @@ 
 			foreach($this->_model_name_pointed_to as $model_name){
 				$model_names[] = "EE_".$model_name;
 			}
-		}else{
+		} else{
 			$model_names = array("EE_".$this->_model_name_pointed_to);
 		}
 		return $model_names;

core/db_models/fields/EE_Model_Field_Base.php

Doc Comments +3 added lines, -3 removed lines

@@ -29,9 +29,9 @@ 
 	protected $_model_name;
 
 	/**
-	 * @param      $table_column
+	 * @param      string $table_column
 	 * @param      $nicename
-	 * @param      $nullable
+	 * @param      boolean $nullable
 	 * @param null $default_value
 	 */
 	function __construct($table_column, $nicename, $nullable, $default_value = null){
@@ -117,7 +117,7 @@ 
 	 * the field's type. Eg, we may want ot serialize it, strip tags, etc. By default,
 	 * we simply return it.
 	 * @param mixed $value_of_field_on_model_object
-	 * @return mixed
+	 * @return double
 	 */
 	function prepare_for_get($value_of_field_on_model_object){
 		return $value_of_field_on_model_object;

Braces +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	function get_name(){
 		if($this->_name){
 			return $this->_name;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
 		}
 	}

Spacing +23 added lines, -23 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');
 }
 /**
  *
@@ -18,7 +18,7 @@ 
  * @subpackage    /core/db_models/fields/EE_Model_Field_Base.php
  * @author 				Michael Nelson
  */
-abstract class EE_Model_Field_Base{
+abstract class EE_Model_Field_Base {
 	var $_table_alias;
 	var $_table_column;
 	var $_name;
@@ -34,7 +34,7 @@ 
 	 * @param      $nullable
 	 * @param null $default_value
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value = null){
+	function __construct($table_column, $nicename, $nullable, $default_value = null) {
 		$this->_table_column = $table_column;
 		$this->_nicename = $nicename;
 		$this->_nullable = $nullable;
@@ -48,22 +48,22 @@ 
 	 * @param $name
 	 * @param $model_name
 	 */
-	function _construct_finalize($table_alias, $name, $model_name){
+	function _construct_finalize($table_alias, $name, $model_name) {
 		$this->_table_alias = $table_alias;
 		$this->_name = $name;
 		$this->_model_name = $model_name;
 	}
-	function get_table_alias(){
+	function get_table_alias() {
 		return $this->_table_alias;
 	}
-	function get_table_column(){
+	function get_table_column() {
 		return $this->_table_column;
 	}
 	/**
 	 * Returns the name of the model this field is on. Eg 'Event' or 'Ticket_Datetime'
 	 * @return string
 	 */
-	function get_model_name(){
+	function get_model_name() {
 		return $this->_model_name;
 	}
 
@@ -71,17 +71,17 @@ 
 	 * @throws \EE_Error
 	 * @return string
 	 */
-	function get_name(){
-		if($this->_name){
+	function get_name() {
+		if ($this->_name) {
 			return $this->_name;
-		}else{
-			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"), get_class($this)));
 		}
 	}
-	function get_nicename(){
+	function get_nicename() {
 		return $this->_nicename;
 	}
-	function is_nullable(){
+	function is_nullable() {
 		return $this->_nullable;
 	}
 	/**
@@ -89,7 +89,7 @@ 
 	 * on insertion it can be null. However, on updates it must be present.
 	 * @return boolean
 	 */
-	function is_auto_increment(){
+	function is_auto_increment() {
 		return false;
 	}
 	/**
@@ -97,14 +97,14 @@ 
 	 * value domains at the top of EEM_Base
 	 * @return mixed
 	 */
-	function get_default_value(){
+	function get_default_value() {
 		return $this->_default_value;
 	}
 
 	/**
 	 * @return string
 	 */
-	function get_qualified_column(){
+	function get_qualified_column() {
 		return $this->get_table_alias().".".$this->get_table_column();
 	}
 	/**
@@ -115,7 +115,7 @@ 
 	 * @param mixed $value_of_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_get($value_of_field_on_model_object){
+	function prepare_for_get($value_of_field_on_model_object) {
 		return $value_of_field_on_model_object;
 	}
 	/**
@@ -125,7 +125,7 @@ 
 	 * @param mixed $value_of_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_use_in_db($value_of_field_on_model_object){
+	function prepare_for_use_in_db($value_of_field_on_model_object) {
 		return $value_of_field_on_model_object;
 	}
 
@@ -136,7 +136,7 @@ 
 	 * @param mixed $value_inputted_for_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_set($value_inputted_for_field_on_model_object){
+	function prepare_for_set($value_inputted_for_field_on_model_object) {
 		return $value_inputted_for_field_on_model_object;
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @param mixed $value_found_in_db_for_model_object
 	 * @return mixed
 	 */
-	function prepare_for_set_from_db($value_found_in_db_for_model_object){
+	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
 		return $this->prepare_for_set($value_found_in_db_for_model_object);
 	}
 
@@ -158,7 +158,7 @@ 
 	 * @param mixed $value_on_field_to_be_outputted
 	 * @return mixed
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
 		return $value_on_field_to_be_outputted;
 	}
 
@@ -173,7 +173,7 @@ 
 	 * By default, all fields aren't db-only.
 	 * @return boolean
 	 */
-	function is_db_only_field(){
+	function is_db_only_field() {
 		return false;
 	}
 }
\ No newline at end of file