eventespresso / event-espresso-core

core/db_classes/EE_Term_Taxonomy.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 
 	/**
 	 * Gets taxonomy
-	 * @return string
+	 * @return boolean
 	 */
 	function taxonomy() {
 		return $this->get( 'taxonomy' );
@@ -62,7 +62,7 @@ 
 	/**
 	 * Sets taxonomy
 	 * @param string $taxonomy
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_taxonomy( $taxonomy ) {
 		$this->set( 'taxonomy', $taxonomy );
@@ -72,7 +72,7 @@ 
 
 	/**
 	 * Gets term_count
-	 * @return int
+	 * @return boolean
 	 */
 	function count() {
 		return $this->get( 'term_count' );
@@ -83,7 +83,7 @@ 
 	/**
 	 * Sets term_count
 	 * @param int $term_count
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_count( $term_count ) {
 		$this->set( 'term_count', $term_count );

Spacing +14 added lines, -14 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');
 }
 /**
  * Event Espresso
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	function taxonomy() {
-		return $this->get( 'taxonomy' );
+		return $this->get('taxonomy');
 	}
 
 
@@ -64,8 +64,8 @@ 
 	 * @param string $taxonomy
 	 * @return boolean
 	 */
-	function set_taxonomy( $taxonomy ) {
-		$this->set( 'taxonomy', $taxonomy );
+	function set_taxonomy($taxonomy) {
+		$this->set('taxonomy', $taxonomy);
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @return int
 	 */
 	function count() {
-		return $this->get( 'term_count' );
+		return $this->get('term_count');
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @param int $term_count
 	 * @return boolean
 	 */
-	function set_count( $term_count ) {
-		$this->set( 'term_count', $term_count );
+	function set_count($term_count) {
+		$this->set('term_count', $term_count);
 	}
 
 
@@ -96,7 +96,7 @@ 
 	 * @return EE_Term
 	 */
 	function term() {
-		return $this->get_first_related( 'Term' );
+		return $this->get_first_related('Term');
 	}
 
 

core/db_models/EEM_Attendee.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	*
 	* 		@access		public
 	* 		@param		$ATT_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		EE_Soft_Delete_Base_Class|null		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
 	public function get_attendee_by_ID( $ATT_ID = FALSE ) {

Indentation +26 added lines, -26 removed lines

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

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_Base.model.php' );
 
 /**

Spacing +50 added lines, -50 removed lines

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

core/db_models/EEM_Message_Template_Group.model.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for Wordpress
- *
- * @package		Event Espresso
- * @author		Seth Shoultes
- * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
- * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
- * @link		http://www.eventespresso.com
- * @version		4.1
- *
- * ------------------------------------------------------------------------
- *
- * EEM_Message_Template_Group
- *
- *
- *
- * @package		Event Espresso
- * @subpackage	includes/models/EEM_Message_Template_Group.model.php
- * @author		Darren Ethier
- *
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for Wordpress
+	 *
+	 * @package		Event Espresso
+	 * @author		Seth Shoultes
+	 * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
+	 * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
+	 * @link		http://www.eventespresso.com
+	 * @version		4.1
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EEM_Message_Template_Group
+	 *
+	 *
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/models/EEM_Message_Template_Group.model.php
+	 * @author		Darren Ethier
+	 *
+	 *
+	 */
 require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 

Spacing +56 added lines, -56 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * Event Espresso
@@ -24,7 +24,7 @@ 
  *
  *
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
 class EEM_Message_Template_Group extends EEM_Soft_Delete_Base {
 
 	// private instance of the EEM_Message_Template_Group object
@@ -32,7 +32,7 @@ 
 
 
 
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 		$this->singular_item = __('Message Template Group', 'event_espresso');
 		$this->plural_item = __('Message Template Groups', 'event_espresso');
 		$this->_tables = array(
@@ -41,11 +41,11 @@ 
 		$this->_fields = array(
 			'Message_Template_Group' => array(
 				'GRP_ID' => new EE_Primary_Key_Int_Field('GRP_ID', __('Message Template Group ID', 'event_espresso')),
-				'MTP_name' => new EE_Plain_Text_Field( 'MTP_name', __('The name of the temlpate group', 'event_espresso'), FALSE, '' ),
-				'MTP_description' => new EE_Simple_HTML_Field( 'MTP_description', __('A brief description about this template.', 'event_espresso' ), FALSE, '' ),
-				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id() ),
-				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email' ),
-				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'),false,'registration'),
+				'MTP_name' => new EE_Plain_Text_Field('MTP_name', __('The name of the temlpate group', 'event_espresso'), FALSE, ''),
+				'MTP_description' => new EE_Simple_HTML_Field('MTP_description', __('A brief description about this template.', 'event_espresso'), FALSE, ''),
+				'MTP_user_id'=> new EE_WP_User_Field('MTP_user_id', __('Template Creator ID', 'event_espresso'), FALSE, get_current_user_id()),
+				'MTP_messenger'=>new EE_Plain_Text_Field('MTP_messenger', __('Messenger Used for Template', 'event_espresso'), FALSE, 'email'),
+				'MTP_message_type'=>new EE_Plain_Text_Field('MTP_message_type', __('Message Type', 'event_espresso'), false, 'registration'),
 				'MTP_is_global'=>new EE_Boolean_Field('MTP_is_global', __('Flag indicating if Template Group is Global', 'event_espresso'), false, true),
 				'MTP_is_override'=>new EE_Boolean_Field('MTP_is_override', __('Flag indicating if Template Group overrides any other Templates for the messenger/messagetype combination', 'event_espresso'), false, false),
 				'MTP_deleted'=>new EE_Trashed_Flag_Field('MTP_deleted', __('Flag indicating whether this has been trashed', 'event_espresso'), false, false),
@@ -57,12 +57,12 @@ 
 			'Event' => new EE_HABTM_Relation('Event_Message_Template'),
 			'WP_User' => new EE_Belongs_To_Relation(),
 			);
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ){
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global( 'MTP_is_global');
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('MTP_is_global');
 		}
 		$this->_caps_slug = 'messages';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @return array   message template objects that are attached to a specific event.
 	 */
 	public function get_all_trashed_message_templates_by_event($EVT_ID, $orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE) {
-		$query_params = array( array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit );
-		return $count ? $this->count_deleted( $query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		$query_params = array(array('Event.EVT_ID' => $EVT_ID), 'order_by' => array($orderby => $order), 'limit' => $limit);
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access public
 	 * @return array all (including trashed or inactive) message template group objects for the given messenger
 	 */
-	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC' ) {
-		return $this->get_all_deleted_and_undeleted( array( array('MTP_messenger' => $messenger), 'order_by' => array($orderby => $order) ) );
+	public function get_all_message_templates_by_messenger($messenger, $orderby = 'GRP_ID', $order = 'ASC') {
+		return $this->get_all_deleted_and_undeleted(array(array('MTP_messenger' => $messenger), 'order_by' => array($orderby => $order)));
 	}
 
 
@@ -97,13 +97,13 @@ 
 	 * @param  array  $_where any existing where conditions to append these to.
 	 * @return array          original where conditions or original with additional filters.
 	 */
-	protected function _maybe_mtp_filters( $_where = array() ) {
+	protected function _maybe_mtp_filters($_where = array()) {
 		//account for messenger or message type filters
-		if ( isset($_REQUEST['ee_messenger_filter_by'] ) && $_REQUEST['ee_messenger_filter_by'] != 'none_selected' && $_REQUEST['ee_messenger_filter_by'] != 'all'  ) {
-			$_where['MTP_messenger'] =  $_REQUEST['ee_messenger_filter_by'] ;
+		if (isset($_REQUEST['ee_messenger_filter_by']) && $_REQUEST['ee_messenger_filter_by'] != 'none_selected' && $_REQUEST['ee_messenger_filter_by'] != 'all') {
+			$_where['MTP_messenger'] = $_REQUEST['ee_messenger_filter_by'];
 		}
 
-		if ( isset( $_REQUEST['ee_message_type_filter_by']) && $_REQUEST['ee_message_type_filter_by'] != 'none_selected' ) {
+		if (isset($_REQUEST['ee_message_type_filter_by']) && $_REQUEST['ee_message_type_filter_by'] != 'none_selected') {
 			$_where['MTP_message_type'] = $_REQUEST['ee_message_type_filter_by'];
 		}
 
@@ -117,18 +117,18 @@ 
 	 * @access public
 	 * @return array  all active (non_trashed, active) message template objects
 	 */
-	public function get_all_active_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $global = TRUE, $user_check = FALSE ) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+	public function get_all_active_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $global = TRUE, $user_check = FALSE) {
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
-		if  ( $user_check && ! $global && ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_messages', 'get_all_active_message_templates' )  ) {
+		if ($user_check && ! $global && ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_messages', 'get_all_active_message_templates')) {
 			$_where['MTP_user_id'] = get_current_user_id();
 		}
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all($query_params);
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -144,9 +144,9 @@ 
 
 		$_where = $this->_maybe_mtp_filters();
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		$r_templates = $count ? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted_and_undeleted( $query_params );
+		$r_templates = $count ? $this->count_deleted_and_undeleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted_and_undeleted($query_params);
 
 		return $r_templates;
 	}
@@ -160,9 +160,9 @@ 
 	 * @param  array  $query_params same as EEM_Base::get_all()
 	 * @return  EE_Message_Template_Group[]
 	 */
-	public function get_all_custom_templates_by_event( $EVT_ID, $query_params = array() ) {
-		$_where = array( 'Event.EVT_ID' => $EVT_ID );
-		return $this->get_all( array( $_where ) );
+	public function get_all_custom_templates_by_event($EVT_ID, $query_params = array()) {
+		$_where = array('Event.EVT_ID' => $EVT_ID);
+		return $this->get_all(array($_where));
 	}
 
 
@@ -176,13 +176,13 @@ 
 	 * @return EE_Message_Template_Group[] message template groups.
 	 */
 	public function get_all_trashed_grouped_message_templates($orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $global = TRUE) {
-		$_where = $global ? array('MTP_is_global' => TRUE ) : array('MTP_is_global' => FALSE );
+		$_where = $global ? array('MTP_is_global' => TRUE) : array('MTP_is_global' => FALSE);
 		$_where['MTP_is_active'] = TRUE;
 		$_where = $this->_maybe_mtp_filters($_where);
 
-		$query_params = array( $_where, 'order_by' => array($orderby => $order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE ) : $this->get_all_deleted( $query_params );
+		return $count ? $this->count_deleted($query_params, 'GRP_ID', TRUE) : $this->get_all_deleted($query_params);
 	}
 
 
@@ -199,7 +199,7 @@ 
 	 * @param  bool   $active  		ignore "active" or not. (default only return active)
 	 * @return mixed (int|EE_Message_Template_Group[])                depending on $count.
 	 */
-	public function get_event_message_templates_by_m_and_mt_and_evt( $messenger, $message_type, $evt_id, $orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $active = TRUE ) {
+	public function get_event_message_templates_by_m_and_mt_and_evt($messenger, $message_type, $evt_id, $orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $active = TRUE) {
 
 		$_where = array(
 			'MTP_messenger' => $messenger,
@@ -209,9 +209,9 @@ 
 			'MTP_is_active' => $active
 			);
 
-		$query_params = array( $_where, 'order_by' => array($orderby=>$order), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby=>$order), 'limit' => $limit);
 
-		return $count ? $this->count($query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -228,20 +228,20 @@ 
 	 * @param  bool   $active  		ignore "active" or not. (default only return active) - 'all' means return both inactive AND inactive.
 	 * @return ARRAY               message template objects that are global (i.e. non-event)
 	 */
-	public function get_global_message_template_by_m_and_mt($messenger, $message_type, $orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $active = TRUE ) {
+	public function get_global_message_template_by_m_and_mt($messenger, $message_type, $orderby = 'GRP_ID', $order = 'ASC', $limit = NULL, $count = FALSE, $active = TRUE) {
 		$_where = array(
 			'MTP_messenger' => $messenger,
 			'MTP_message_type' => $message_type,
 			'MTP_is_global' => TRUE,
 			);
 
-		if ( $active != 'all' ) {
+		if ($active != 'all') {
 			$_where['MTP_is_active'] = $active;
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $order ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $order), 'limit' => $limit);
 
-		return $count ? $this->count( $query_params, 'GRP_ID', TRUE ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'GRP_ID', TRUE) : $this->get_all($query_params);
 	}
 
 
@@ -254,14 +254,14 @@ 
 	 * @param  array  $query_params same as EEM_Base->get_all()
 	 * @return EE_Message_Template_Group[]
 	 */
-	public function get_custom_message_template_by_m_and_mt( $messenger, $message_type, $query_params = array() ) {
+	public function get_custom_message_template_by_m_and_mt($messenger, $message_type, $query_params = array()) {
 		$_where = array(
 			'MTP_is_global' => FALSE,
 			'MTP_messenger' => $messenger,
 			'MTP_message_type' => $message_type
 			);
 
-		return $this->get_all( array( $_where ) );
+		return $this->get_all(array($_where));
 	}
 
 
@@ -282,13 +282,13 @@ 
 		$assembled_fields = array();
 
 		//let's loop through all the fields and set them up in the right format
-		foreach ( $fields as $index => $value ) {
+		foreach ($fields as $index => $value) {
 			//first let's figure out if the value['content'] in the current index is an array.  If it is then this is special fields that are used in parsing special shortcodes (i.e. 'attendee_list').
-			if ( is_array($value['content']) ) {
+			if (is_array($value['content'])) {
 				$assembled_fields[$value['name']] = $value['content']['main'];
 				//loop through the content and get the other fields.
-				foreach ( $value['content'] as $name => $val ) {
-					if ( $name == 'main' ) continue;
+				foreach ($value['content'] as $name => $val) {
+					if ($name == 'main') continue;
 					$assembled_fields[$name] = $val;
 				}
 				continue;
@@ -299,21 +299,21 @@ 
 		}
 
 		//now we've got the assembled_fields.  We need to setup the string for the appropriate validator class and call that.
-		$m_ref = ucwords( str_replace('_',' ', $messenger ) );
-		$m_ref = str_replace( ' ', '_', $m_ref );
-		$mt_ref = ucwords( str_replace('_', ' ', $message_type ) );
-		$mt_ref = str_replace( ' ', '_', $mt_ref );
+		$m_ref = ucwords(str_replace('_', ' ', $messenger));
+		$m_ref = str_replace(' ', '_', $m_ref);
+		$mt_ref = ucwords(str_replace('_', ' ', $message_type));
+		$mt_ref = str_replace(' ', '_', $mt_ref);
 
-		$classname = 'EE_Messages_' . $m_ref . '_' . $mt_ref . '_Validator';
+		$classname = 'EE_Messages_'.$m_ref.'_'.$mt_ref.'_Validator';
 
-		if ( !class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso');
-			$msg[] = sprintf( __('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'), $classname );
-			throw new EE_Error( implode( '||', $msg ) );
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
+			$msg[] = sprintf(__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'), $classname);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$a = new ReflectionClass( $classname );
-		$_VLD = $a->newInstance( $assembled_fields, $context );
+		$a = new ReflectionClass($classname);
+		$_VLD = $a->newInstance($assembled_fields, $context);
 		$result = $_VLD->validate();
 		return $result;
 	}

Braces +5 added lines, -2 removed lines

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

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,37 +246,37 @@ 
 	 * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default.
 	 * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart
 	 */
-	function verify_button_urls( $payment_methods = NULL ) {
-		EE_Registry::instance()->load_helper( 'URL' );
-		$payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
-		foreach ( $payment_methods as $payment_method ) {
+	function verify_button_urls($payment_methods = NULL) {
+		EE_Registry::instance()->load_helper('URL');
+		$payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
 			try {
 				$current_button_url = $payment_method->button_url();
-				$buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
-					'current_ssl' => str_replace( "http://", "https://", $current_button_url ),
-					'current' => str_replace( "https://", "http://", $current_button_url ),
-					'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ),
-					'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ),
-				) );
-				foreach( $buttons_urls_to_try as $button_url_to_try ) {
-					if(
+				$buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
+					'current_ssl' => str_replace("http://", "https://", $current_button_url),
+					'current' => str_replace("https://", "http://", $current_button_url),
+					'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()),
+					'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()),
+				));
+				foreach ($buttons_urls_to_try as $button_url_to_try) {
+					if (
 							(//this is the current url and it exists, regardless of SSL issues
 								$button_url_to_try == $current_button_url &&
 								EEH_URL::remote_file_exists(
 										$button_url_to_try,
 										array(
 											'sslverify' => false,
-											'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+											'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
 											) )
 							)
 							||
 							(//this is NOT the current url and it exists with a working SSL cert
 								$button_url_to_try != $current_button_url &&
-								EEH_URL::remote_file_exists( $button_url_to_try )
+								EEH_URL::remote_file_exists($button_url_to_try)
 							) ) {
-						if( $current_button_url != $button_url_to_try ){
-							$payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) );
-							EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) );
+						if ($current_button_url != $button_url_to_try) {
+							$payment_method->save(array('PMD_button_url' => $button_url_to_try));
+							EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -284,8 +284,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -299,23 +299,23 @@ 
 	 * @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
 				//so deactivate it and move on
 				$payment_method->deactivate();
 				$payment_method->save();
-				EE_Error::add_attention( sprintf( __( "There is no payment method type '%s', so the payment method '%s' was deactivated", "event_espresso" ), $payment_method->type(), $payment_method->name() ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_attention(sprintf(__("There is no payment method type '%s', so the payment method '%s' was deactivated", "event_espresso"), $payment_method->type(), $payment_method->name()), __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 		return $usable_payment_methods;
@@ -331,16 +331,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_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_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_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_Primary_Key_Field_Base.php

Doc Comments +1 added lines

@@ -4,6 +4,7 @@
 	 * Overrides parent so it doesn't need to provide so many non-applicable fields
 	 * @param string $table_column
 	 * @param string $nicename
+	 * @param integer|null $default
 	 */
 	public function __construct($table_column, $nicename,$default) {
 		parent::__construct($table_column, $nicename, false, $default, null);

Spacing +3 added lines, -3 removed lines

@@ -1,18 +1,18 @@
 <?php
-abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name{
+abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name {
 	/**
 	 * Overrides parent so it doesn't need to provide so many non-applicable fields
 	 * @param string $table_column
 	 * @param string $nicename
 	 */
-	public function __construct($table_column, $nicename,$default) {
+	public function __construct($table_column, $nicename, $default) {
 		parent::__construct($table_column, $nicename, false, $default, null);
 	}
 	/**
 	 * @param $table_alias
 	 * @param $name
 	 */
-	function _construct_finalize($table_alias, $name, $model_name){
+	function _construct_finalize($table_alias, $name, $model_name) {
 		$this->_model_name_pointed_to = $model_name;
 		parent::_construct_finalize($table_alias, $name, $model_name);
 	}