eventespresso / event-espresso-core

core/db_models/EEM_Line_Item.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +59 added lines, -59 removed lines

@@ -105,41 +105,41 @@ 
 	 * @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_Line_Item
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Line Item','event_espresso');
-		$this->plural_item = __('Line Items','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Line Item', 'event_espresso');
+		$this->plural_item = __('Line Items', 'event_espresso');
 
 		$this->_tables = array(
-			'Line_Item'=>new EE_Primary_Table('esp_line_item','LIN_ID')
+			'Line_Item'=>new EE_Primary_Table('esp_line_item', 'LIN_ID')
 		);
-		$line_items_can_be_for = apply_filters( 'FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket','Price', 'Event' ) );
+		$line_items_can_be_for = apply_filters('FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket', 'Price', 'Event'));
 		$this->_fields = array(
 			'Line_Item' => array(
-				'LIN_ID' 				=> new EE_Primary_Key_Int_Field( 'LIN_ID', __( "ID", "event_espresso" ) ),
-				'LIN_code' 			=> new EE_Slug_Field( 'LIN_code', __( "Code for index into Cart", "event_espresso" ), TRUE ),
-				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field( 'TXN_ID', __( "Transaction ID", "event_espresso" ), TRUE, NULL, 'Transaction' ),
-				'LIN_name' 			=> new EE_Full_HTML_Field( 'LIN_name', __( "Line Item Name", "event_espresso" ), FALSE, '' ),
-				'LIN_desc' 			=> new EE_Full_HTML_Field( 'LIN_desc', __( "Line Item Description", "event_espresso" ), TRUE ),
-				'LIN_unit_price' 	=> new EE_Money_Field( 'LIN_unit_price', __( "Unit Price", "event_espresso" ), FALSE, 0 ),
-				'LIN_percent' 		=> new EE_Float_Field( 'LIN_percent', __( "Percent", "event_espresso" ), FALSE, 0 ),
-				'LIN_is_taxable' 	=> new EE_Boolean_Field( 'LIN_is_taxable', __( "Taxable", "event_espresso" ), FALSE, FALSE ),
-				'LIN_order' 			=> new EE_Integer_Field( 'LIN_order', __( "Order of Application towards total of parent", "event_espresso" ), FALSE, 1 ),
-				'LIN_total' 			=> new EE_Money_Field( 'LIN_total', __( "Total (unit price x quantity)", "event_espresso" ), FALSE, 0 ),
-				'LIN_quantity' 	=> new EE_Integer_Field( 'LIN_quantity', __( "Quantity", "event_espresso" ), TRUE, 1 ),
-				'LIN_parent' 		=> new EE_Integer_Field( 'LIN_parent', __( "Parent ID (this item goes towards that Line Item's total)", "event_espresso" ), TRUE, NULL ),
-				'LIN_type' 			=> new EE_Enum_Text_Field( 'LIN_type', __( "Type", "event_espresso" ), FALSE, 'line-item', array(
+				'LIN_ID' 				=> new EE_Primary_Key_Int_Field('LIN_ID', __("ID", "event_espresso")),
+				'LIN_code' 			=> new EE_Slug_Field('LIN_code', __("Code for index into Cart", "event_espresso"), TRUE),
+				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field('TXN_ID', __("Transaction ID", "event_espresso"), TRUE, NULL, 'Transaction'),
+				'LIN_name' 			=> new EE_Full_HTML_Field('LIN_name', __("Line Item Name", "event_espresso"), FALSE, ''),
+				'LIN_desc' 			=> new EE_Full_HTML_Field('LIN_desc', __("Line Item Description", "event_espresso"), TRUE),
+				'LIN_unit_price' 	=> new EE_Money_Field('LIN_unit_price', __("Unit Price", "event_espresso"), FALSE, 0),
+				'LIN_percent' 		=> new EE_Float_Field('LIN_percent', __("Percent", "event_espresso"), FALSE, 0),
+				'LIN_is_taxable' 	=> new EE_Boolean_Field('LIN_is_taxable', __("Taxable", "event_espresso"), FALSE, FALSE),
+				'LIN_order' 			=> new EE_Integer_Field('LIN_order', __("Order of Application towards total of parent", "event_espresso"), FALSE, 1),
+				'LIN_total' 			=> new EE_Money_Field('LIN_total', __("Total (unit price x quantity)", "event_espresso"), FALSE, 0),
+				'LIN_quantity' 	=> new EE_Integer_Field('LIN_quantity', __("Quantity", "event_espresso"), TRUE, 1),
+				'LIN_parent' 		=> new EE_Integer_Field('LIN_parent', __("Parent ID (this item goes towards that Line Item's total)", "event_espresso"), TRUE, NULL),
+				'LIN_type' 			=> new EE_Enum_Text_Field('LIN_type', __("Type", "event_espresso"), FALSE, 'line-item', array(
 						self::type_line_item		=>  __("Line Item", "event_espresso"),
 						self::type_sub_line_item	=>  __("Sub-Item", "event_espresso"),
 						self::type_sub_total		=>  __("Subtotal", "event_espresso"),
 						self::type_tax_sub_total 	=> __("Tax Subtotal", "event_espresso"),
 						self::type_tax					=>  __("Tax", "event_espresso"),
 						self::type_total				=>  __("Total", "event_espresso"),
-						self::type_cancellation	=> __( 'Cancellation', 'event_espresso' )
+						self::type_cancellation	=> __('Cancellation', 'event_espresso')
 					)
 				),
-				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field( 'OBJ_ID', __( 'ID of Item purchased.', 'event_espresso' ), TRUE, NULL, $line_items_can_be_for ),
-				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field( 'OBJ_type', __( "Model Name this Line Item is for", "event_espresso" ), TRUE, NULL, $line_items_can_be_for ),
-				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created','event_espresso'), false, EE_Datetime_Field::now, $timezone ),
+				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field('OBJ_ID', __('ID of Item purchased.', 'event_espresso'), TRUE, NULL, $line_items_can_be_for),
+				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Model Name this Line Item is for", "event_espresso"), TRUE, NULL, $line_items_can_be_for),
+				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
 			)
 		);
 		$this->_model_relations = array(
@@ -150,7 +150,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Transaction.Registration.Event';
 		$this->_caps_slug = 'transactions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_of_type_for_transaction( $line_item_type, $transaction ){
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_of_type_for_transaction($line_item_type, $transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => $line_item_type,
 			'TXN_ID' => $transaction
 		)));
@@ -177,14 +177,14 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_non_ticket_line_items_for_transaction( $transaction ) {
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_non_ticket_line_items_for_transaction($transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => self::type_line_item,
 			'TXN_ID' => $transaction,
 			'OR' => array(
-				'OBJ_type*notticket' => array( '!=', 'Ticket'),
-				'OBJ_type*null' => array( 'IS_NULL' ))
+				'OBJ_type*notticket' => array('!=', 'Ticket'),
+				'OBJ_type*null' => array('IS_NULL'))
 		)));
 	}
 
@@ -194,7 +194,7 @@ 
 	 * because if there are spam bots afoot there will be LOTS of line items
 	 * @return int count of how many deleted
 	 */
-	public function delete_line_items_with_no_transaction(){
+	public function delete_line_items_with_no_transaction() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$time_to_leave_alone = apply_filters(
@@ -202,13 +202,13 @@ 
 		);
 		$query = $wpdb->prepare(
 				'DELETE li
-				FROM ' . $this->table() . ' li
-				LEFT JOIN ' . EEM_Transaction::instance()->table(). ' t ON li.TXN_ID = t.TXN_ID
+				FROM ' . $this->table().' li
+				LEFT JOIN ' . EEM_Transaction::instance()->table().' t ON li.TXN_ID = t.TXN_ID
 				WHERE t.TXN_ID IS NULL AND li.LIN_timestamp < %s',
 				// use GMT time because that's what TXN_timestamps are in
-				date(  'Y-m-d H:i:s', time() - $time_to_leave_alone )
+				date('Y-m-d H:i:s', time() - $time_to_leave_alone)
 				);
-		return $wpdb->query( $query );
+		return $wpdb->query($query);
 	}
 
 
@@ -221,10 +221,10 @@ 
 	 * @param \EE_Base_Class $object
 	 * @return EE_Line_Item[]
 	 */
-	public function get_line_item_for_transaction_object( $TXN_ID, EE_Base_Class $object ){
-		return $this->get_all( array( array(
+	public function get_line_item_for_transaction_object($TXN_ID, EE_Base_Class $object) {
+		return $this->get_all(array(array(
 			'TXN_ID' 		=> $TXN_ID,
-			'OBJ_type' 	=> str_replace( 'EE_', '', get_class( $object )),
+			'OBJ_type' 	=> str_replace('EE_', '', get_class($object)),
 			'OBJ_ID' 		=> $object->ID()
 		)));
 	}
@@ -240,16 +240,16 @@ 
 	 * @param array $OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	public function get_object_line_items_for_transaction( $TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array() ){
+	public function get_object_line_items_for_transaction($TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array()) {
 		$query_params = array(
 			'OBJ_type' 	=> $OBJ_type,
 			// if incoming $OBJ_IDs is an array, then make sure it is formatted correctly for the query
-			'OBJ_ID' 		=> is_array( $OBJ_IDs ) && ! isset( $OBJ_IDs['IN'] ) ? array( 'IN', $OBJ_IDs ) : $OBJ_IDs
+			'OBJ_ID' 		=> is_array($OBJ_IDs) && ! isset($OBJ_IDs['IN']) ? array('IN', $OBJ_IDs) : $OBJ_IDs
 		);
-		if ( $TXN_ID ) {
+		if ($TXN_ID) {
 			$query_params['TXN_ID'] = $TXN_ID;
 		}
-		return $this->get_all( array( $query_params ));
+		return $this->get_all(array($query_params));
 	}
 
 
@@ -260,13 +260,13 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_ticket_line_items_for_transaction( EE_Transaction $transaction ) {
-		return $this->get_all( array(
+	public function get_all_ticket_line_items_for_transaction(EE_Transaction $transaction) {
+		return $this->get_all(array(
 		   array(
 			   'TXN_ID'   => $transaction->ID(),
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -278,14 +278,14 @@ 
 	 * @param int $TKT_ID
 	 * @return \EE_Line_Item
 	 */
-	public function get_ticket_line_item_for_transaction( $TXN_ID, $TKT_ID ) {
-		return $this->get_one( array(
+	public function get_ticket_line_item_for_transaction($TXN_ID, $TKT_ID) {
+		return $this->get_one(array(
 		   array(
-			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID( $TXN_ID ),
+			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID($TXN_ID),
 			   'OBJ_ID'   => $TKT_ID,
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -300,8 +300,8 @@ 
 	 * @param EE_Promotion $promotion
 	 * @return EE_Line_Item
 	 */
-	public function get_existing_promotion_line_item( EE_Line_Item $parent_line_item, EE_Promotion $promotion ) {
-		return $this->get_one( array(
+	public function get_existing_promotion_line_item(EE_Line_Item $parent_line_item, EE_Promotion $promotion) {
+		return $this->get_one(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -322,8 +322,8 @@ 
 	 * @param EE_Line_Item $parent_line_item
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_promotion_line_items( EE_Line_Item $parent_line_item ) {
-		return $this->get_all( array(
+	public function get_all_promotion_line_items(EE_Line_Item $parent_line_item) {
+		return $this->get_all(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -340,8 +340,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Line_ITem
 	 */
-	public function get_line_item_for_registration( EE_Registration $registration ) {
-		return $this->get_one( $this->line_item_for_registration_query_params( $registration ));
+	public function get_line_item_for_registration(EE_Registration $registration) {
+		return $this->get_one($this->line_item_for_registration_query_params($registration));
 	}
 
 	/**
@@ -350,14 +350,14 @@ 
 	 * @param array $original_query_params any extra query params you'd like to be merged with
 	 * @return array like EEM_Base::get_all()'s $query_params
 	 */
-	public function line_item_for_registration_query_params( EE_Registration $registration, $original_query_params = array() ) {
-		return array_replace_recursive( $original_query_params, array(
+	public function line_item_for_registration_query_params(EE_Registration $registration, $original_query_params = array()) {
+		return array_replace_recursive($original_query_params, array(
 			array(
 				'OBJ_ID' => $registration->ticket_ID(),
 				'OBJ_type' => 'Ticket',
 				'TXN_ID' => $registration->transaction_ID()
 			)
-		) );
+		));
 	}
 
 

core/db_models/EEM_Question_Group.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +23 added lines, -23 removed lines

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

core/db_models/EEM_Question_Option.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Option.class.php');
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Option.class.php');
 
 
 class EEM_Question_Option extends EEM_Soft_Delete_Base {
@@ -30,22 +30,22 @@ 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question Option','event_espresso');
-		$this->plural_item = __('Question Options','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question Option', 'event_espresso');
+		$this->plural_item = __('Question Options', 'event_espresso');
 
 		$this->_tables = array(
-			'Question_Option'=>new EE_Primary_Table('esp_question_option','QSO_ID')
+			'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
 		);
 		$this->_fields = array(
 			'Question_Option'=>array(
-					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID','event_espresso')),
-					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-					'QSO_value'=>new EE_Plain_Text_Field('QSO_value',  __("Question Option Value", "event_espresso"),false,''),
-					'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description','event_espresso'), false, ''),
-					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso' ), false, 0 ),
-					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option','event_espresso'), TRUE, NULL ),
-					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
+					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
+					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+					'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
+					'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
+					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
+					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option', 'event_espresso'), TRUE, NULL),
+					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
 				)
 		);
 		$this->_model_relations = array(
@@ -54,12 +54,12 @@ 
 
 		$this->_model_chain_to_wp_user = 'Question';
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Option');
 		$this->_caps_slug = 'questions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

core/db_models/EEM_Soft_Delete_Base.model.php

Braces +4 added lines, -2 removed lines

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

Doc Comments +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
 	 * Sum all the deleted items.
 	 * @param array $query_params like EEM_Base::get_all
 	 * @param string $field_to_sum
-	 * @return int
+	 * @return double
 	 */
 	public function sum_deleted($query_params = null, $field_to_sum = null){
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
@@ -195,7 +195,7 @@ 
 	 * @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
-	 * @return boolean success
+	 * @return integer success
 	 */
 	public function delete_permanently($query_params = array(), $allow_blocking = true){
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);

Indentation +7 added lines, -7 removed lines

@@ -111,14 +111,14 @@
 
 
 
-    /**
-     * Alters the query params so that only trashed/soft-deleted items are considered
-     * @param array $query_params like EEM_Base::get_all's $query_params
-     * @return array like EEM_Base::get_all's $query_params
-     */
+	/**
+	 * Alters the query params so that only trashed/soft-deleted items are considered
+	 * @param array $query_params like EEM_Base::get_all's $query_params
+	 * @return array like EEM_Base::get_all's $query_params
+	 */
 	public function alter_query_params_so_only_trashed_items_included($query_params){
-	    return $this->_alter_query_params_so_only_trashed_items_included($query_params);
-    }
+		return $this->_alter_query_params_so_only_trashed_items_included($query_params);
+	}
 
 	/**
 	 * Alters the query params so each item's deleted status is ignored.

Spacing +38 added lines, -38 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,13 +25,13 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		if( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions ){
+		if ( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -42,12 +42,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -67,7 +67,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -77,11 +77,11 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return $this->get_one(
 			$this->alter_query_params_to_restrict_by_ID(
 				$id,
-				array( 'default_where_conditions' => 'default' )
+				array('default_where_conditions' => 'default')
 			)
 		);
 	}
@@ -93,7 +93,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -103,9 +103,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -116,7 +116,7 @@ 
      * @param array $query_params like EEM_Base::get_all's $query_params
      * @return array like EEM_Base::get_all's $query_params
      */
-	public function alter_query_params_so_only_trashed_items_included($query_params){
+	public function alter_query_params_so_only_trashed_items_included($query_params) {
 	    return $this->_alter_query_params_so_only_trashed_items_included($query_params);
     }
 
@@ -125,7 +125,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included( $query_params = array() ){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params = array()) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -134,8 +134,8 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		if( ! isset( $query_params[ 'default_where_conditions' ] ) ) {
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
 			$query_params['default_where_conditions'] = 'minimum';
 		}
 		return $query_params;
@@ -148,9 +148,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -170,7 +170,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -180,7 +180,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -190,7 +190,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -208,7 +208,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete_permanently($query_params, $allow_blocking);
 	}
@@ -219,8 +219,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -229,14 +229,14 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
 		if (
 			$this->delete_or_restore(
 				$delete,
-				$this->alter_query_params_to_restrict_by_ID( $ID )
+				$this->alter_query_params_to_restrict_by_ID($ID)
 			)
 		) {
 			return TRUE;
@@ -256,7 +256,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -267,7 +267,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -276,10 +276,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -297,8 +297,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 }

core/db_models/EEM_Term_Taxonomy.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +36 added lines, -36 removed lines

@@ -21,7 +21,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Term_Taxonomy extends EEM_Base {
 
@@ -29,68 +29,68 @@ 
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term Taxonomy','event_espresso');
-		$this->plural_item = __('Term Taxonomy','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term Taxonomy', 'event_espresso');
+		$this->plural_item = __('Term Taxonomy', 'event_espresso');
 		$this->_tables = array(
 			'Term_Taxonomy'=> new EE_Primary_Table('term_taxonomy', 'term_taxonomy_id')
 		);
 		$this->_fields = array(
 			'Term_Taxonomy'=>array(
-				'term_taxonomy_id'=> new EE_Primary_Key_Int_Field('term_taxonomy_id', __('Term-Taxonomy ID','event_espresso')),
-				'term_id'=>new EE_Foreign_Key_Int_Field('term_id',  __("Term Id", "event_espresso"), false, 0, 'Term'), //EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
-				'taxonomy'=>new EE_Plain_Text_Field('taxonomy', __('Taxonomy Name','event_espresso'), false, 'category'),
-				'description'=>new EE_Post_Content_Field('description', __("Description of Term", "event_espresso"), false,''),
-				'parent'=>new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false,0),
+				'term_taxonomy_id'=> new EE_Primary_Key_Int_Field('term_taxonomy_id', __('Term-Taxonomy ID', 'event_espresso')),
+				'term_id'=>new EE_Foreign_Key_Int_Field('term_id', __("Term Id", "event_espresso"), false, 0, 'Term'), //EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
+				'taxonomy'=>new EE_Plain_Text_Field('taxonomy', __('Taxonomy Name', 'event_espresso'), false, 'category'),
+				'description'=>new EE_Post_Content_Field('description', __("Description of Term", "event_espresso"), false, ''),
+				'parent'=>new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false, 0),
 				'term_count'=> new EE_Integer_Field('count', __("Count of Objects attached", 'event_espresso'), false, 0)
 			));
 		$this->_model_relations = array(
 			'Term_Relationship'=>new EE_Has_Many_Relation(),
 			'Term'=>new EE_Belongs_To_Relation(),
 		);
-		$cpt_models = array_keys( EE_Registry::instance()->cpt_models() );
-		foreach( $cpt_models  as $model_name ) {
-			$this->_model_relations[ $model_name ] = new EE_HABTM_Relation( 'Term_Relationship' );
+		$cpt_models = array_keys(EE_Registry::instance()->cpt_models());
+		foreach ($cpt_models  as $model_name) {
+			$this->_model_relations[$model_name] = new EE_HABTM_Relation('Term_Relationship');
 		}
 		$this->_indexes = array(
-			'term_id_taxonomy'=>new EE_Unique_Index(array('term_id','taxonomy'))
+			'term_id_taxonomy'=>new EE_Unique_Index(array('term_id', 'taxonomy'))
 		);
 		$path_to_tax_model = '';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected( $path_to_tax_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected($path_to_tax_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
 
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type')
 				));
 
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type')
 				));
 
-		parent::__construct( $timezone );
-		add_filter( 'FHEE__Read__create_model_query_params', array( 'EEM_Term_Taxonomy', 'rest_api_query_params' ), 10, 3 );
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term_Taxonomy', 'rest_api_query_params'), 10, 3);
 	}
 	
 	/**
@@ -101,11 +101,11 @@ 
 	 * @param EEM_Base $model
 	 * @return array
 	 */
-	public static function rest_api_query_params( $model_query_params, $querystring_query_params, $model ) {
-		if( $model === EEM_Term_Taxonomy::instance() ) {
-			$taxonomies = get_taxonomies( array( 'show_in_rest' => true) );
-			if( ! empty( $taxonomies ) ) {
-				$model_query_params[0][ 'taxonomy' ] = array( 'IN', $taxonomies );
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model) {
+		if ($model === EEM_Term_Taxonomy::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if ( ! empty($taxonomies)) {
+				$model_query_params[0]['taxonomy'] = array('IN', $taxonomies);
 			}
 		}
 		return $model_query_params;

core/db_models/EEM_WP_User.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -22,24 +22,24 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('WP_User','event_espresso');
-		$this->plural_item = __('WP_Users','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('WP_User', 'event_espresso');
+		$this->plural_item = __('WP_Users', 'event_espresso');
 		global $wpdb;
 		$this->_tables = array(
-			'WP_User'=> new EE_Primary_Table( $wpdb->users, 'ID', true)
+			'WP_User'=> new EE_Primary_Table($wpdb->users, 'ID', true)
 		);
 		$this->_fields = array(
 			'WP_User'=>array(
-				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID','event_espresso')),
-				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login','event_espresso'), false, '' ),
-				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password','event_espresso'), false, '' ),
-				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name','event_espresso'), false, ''),
-				'user_email' => new EE_Email_Field('user_email', __( 'User Email', 'event_espresso' ), false),
-				'user_registered' => new EE_Datetime_Field( 'user_registered', __( 'Date User Registered', 'event_espresso' ), false, EE_Datetime_Field::now, $timezone ),
-				'user_activation_key' => new EE_Plain_Text_Field( 'user_activation_key', __( 'User Activation Key', 'event_espresso' ), false, '' ),
-				'user_status' => new EE_Integer_Field( 'user_status', __( 'User Status', 'event_espresso' ), false, 0 ),
-				'display_name' => new EE_Plain_Text_Field( 'display_name', __( 'Display Name', 'event_espresso' ), false, '' )
+				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
+				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login', 'event_espresso'), false, ''),
+				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password', 'event_espresso'), false, ''),
+				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name', 'event_espresso'), false, ''),
+				'user_email' => new EE_Email_Field('user_email', __('User Email', 'event_espresso'), false),
+				'user_registered' => new EE_Datetime_Field('user_registered', __('Date User Registered', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
+				'user_activation_key' => new EE_Plain_Text_Field('user_activation_key', __('User Activation Key', 'event_espresso'), false, ''),
+				'user_status' => new EE_Integer_Field('user_status', __('User Status', 'event_espresso'), false, 0),
+				'display_name' => new EE_Plain_Text_Field('display_name', __('Display Name', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Attendee' => new EE_Has_Many_Relation(),
@@ -56,14 +56,14 @@ 
 		);
 		$this->_wp_core_model = true;
 		$this->_caps_slug = 'users';
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ) {
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list';
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User();
 		}
 		//@todo: account for create_users controls whether they can create users at all
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**

core/db_models/strategies/EE_Soft_Delete_Where_Conditions.strategy.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  * @since		 	   4.6.0
  */
-class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions {
 	/**
 	 * Strategy for setting default soft delete where conditions. This strategy will find
 	 * the field of type 'EE_Trashed_Flag_Field', and add a condition that it be FALSE on all queries involving
@@ -22,12 +22,12 @@ 
 	 * Eg,
 	 *
 	 */
-	function __construct(){}
+	function __construct() {}
 	/**
 	 * Gets the where default where conditions for a custom post type model
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		$trashed_field_name = $this->deleted_field_name();
 		return array(
 			$trashed_field_name => false
@@ -39,12 +39,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function deleted_field_name(){
+	private function deleted_field_name() {
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 }
\ No newline at end of file

core/helpers/EEH_Class_Tools.helper.php

Braces +3 added lines, -1 removed lines

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

Spacing +34 added lines, -34 removed lines

@@ -35,35 +35,35 @@ 
 	 */
 	public static function get_called_class() {
 		$backtrace = debug_backtrace();
-		if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['class'] ) && ! isset( $backtrace[2]['file'] )) {
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
 			return $backtrace[2]['class'];
-		} else if ( isset( $backtrace[3] ) && is_array( $backtrace[3] ) && isset( $backtrace[3]['class'] ) && ! isset( $backtrace[3]['file'] )) {
+		} else if (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
 			return $backtrace[3]['class'];
-		} else if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['file'] ) && isset( $backtrace[2]['line'] )) {
-			if ( self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line'] ) {
+		} else if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
+			if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
 				self::$i++;
 			} else {
 				self::$i = 0;
-				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+				self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
 			}
 			// was  class method called via call_user_func ?
-			if ( $backtrace[2]['function'] == 'call_user_func' && isset( $backtrace[2]['args'] ) && is_array( $backtrace[2]['args'] )){
-				if ( isset( $backtrace[2]['args'][0] ) && isset( $backtrace[2]['args'][0][0] )) {
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
 					$called_class = $backtrace[2]['args'][0][0];
 					// is it an EE function ?
-					if ( strpos( $called_class, 'EE' ) === 0 ) {
-						$prefix_chars = strpos( $called_class, '_' ) + 1;
-						$prefix = substr( $called_class, 0, $prefix_chars );
-						$classname = substr( $called_class, $prefix_chars, strlen( $called_class ));
-						$classname = $prefix . str_replace( ' ', '_', ucwords( strtolower( str_replace( '_', ' ', $classname  ))));
+					if (strpos($called_class, 'EE') === 0) {
+						$prefix_chars = strpos($called_class, '_') + 1;
+						$prefix = substr($called_class, 0, $prefix_chars);
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
+						$classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
 						return $classname;
 					}
 				}
 			} else {
-				$lines = file( $backtrace[2]['file'] );
-				preg_match_all( '/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[$backtrace[2]['line']-1], $matches );
-				if ( isset( $matches[1] ) && isset( $matches[1][ self::$i ] )) {
-					return $matches[1][ self::$i ];
+				$lines = file($backtrace[2]['file']);
+				preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
+				if (isset($matches[1]) && isset($matches[1][self::$i])) {
+					return $matches[1][self::$i];
 				}
 			}
 		}
@@ -80,22 +80,22 @@ 
 	 * 	@param 	string 	$hook
 	 * 	@return 	array
 	 */
-	public static function get_class_names_for_all_callbacks_on_hook( $hook = NULL ) {
+	public static function get_class_names_for_all_callbacks_on_hook($hook = NULL) {
 		global $wp_filter;
 		$class_names = array();
 		// are any callbacks registered for this hook ?
-		if ( isset( $wp_filter[ $hook ] )) {
+		if (isset($wp_filter[$hook])) {
 			// loop thru all of the callbacks attached to the deprecated hookpoint
-			foreach( $wp_filter[ $hook ] as $priority ) {
-				foreach( $priority as $callback ) {
+			foreach ($wp_filter[$hook] as $priority) {
+				foreach ($priority as $callback) {
 					// is the callback a non-static class method ?
-					if ( isset( $callback['function'] ) && is_array( $callback['function'] )) {
-						if ( isset( $callback['function'][0] ) && is_object( $callback['function'][0] )) {
-							$class_names[] = get_class( $callback['function'][0] );
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
 						}
 					// test for static method
-					} else if ( strpos( $callback['function'], '::' ) !== FALSE ) {
-						$class = explode( '::', $callback['function'] );
+					} else if (strpos($callback['function'], '::') !== FALSE) {
+						$class = explode('::', $callback['function']);
 						$class_names[] = $class[0];
 					} else {
 						// just a function
@@ -116,24 +116,24 @@ 
 	 * 	@param		string 	$property
 	 * 	@return 		boolean
 	 */
-	public static function has_property( $class = NULL, $property = NULL ) {
+	public static function has_property($class = NULL, $property = NULL) {
 		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
-		if ( empty( $class ) || empty( $property )) {
+		if (empty($class) || empty($property)) {
 			return FALSE;
 		}
 		// if your hosting company doesn't cut the mustard
-		if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 			// just in case $class is an actual instantiated object
-			if ( is_object( $class )) {
-				return isset( $class->{$property} ) ? TRUE : FALSE;
+			if (is_object($class)) {
+				return isset($class->{$property} ) ? TRUE : FALSE;
 			} else {
 				// use reflection for < PHP 5.3 to get details using just the class name
-				$reflector = new ReflectionClass( $class );
-				return $reflector->hasProperty( $property );
+				$reflector = new ReflectionClass($class);
+				return $reflector->hasProperty($property);
 			}
 		} else {
 			// or try regular property exists method which works as expected in PHP 5.3+
-			return property_exists( $class, $property );
+			return property_exists($class, $property);
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 
 
 // if PHP version < 5.3
-if ( ! function_exists( 'get_called_class' )) {
+if ( ! function_exists('get_called_class')) {
 	/**
 	 * @return bool|string
 	 */

core/helpers/EEH_Event_View.helper.php

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -89,7 +91,7 @@ 
 			$payment_method_slug = EE_Registry::instance()->REQ->get( 'ee_payment_method', NULL );
 			if( $payment_method_slug ) {
 				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug( $payment_method_slug );
-			}else{
+			} else{
 				$payment_method = null;
 			}
 			/** @type EE_Payment_Processor $payment_processor */

Spacing +117 added lines, -117 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param    int $EVT_ID
 	 * @return    object
 	 */
-	public static function get_event( $EVT_ID = 0 ) {
-		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
+	public static function get_event($EVT_ID = 0) {
+		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint($EVT_ID);
 		// do we already have the Event  you are looking for?
-		if ( EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID ) {
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
 			return EEH_Event_View::$_event;
 		}
 		EEH_Event_View::$_event = NULL;
 		// international newspaper?
 		global $post;
 		// if this is being called from an EE_Event post, then we can just grab the attached EE_Event object
-		 if ( isset( $post->post_type ) && $post->post_type == 'espresso_events' || $EVT_ID ) {
+		 if (isset($post->post_type) && $post->post_type == 'espresso_events' || $EVT_ID) {
 //			d( $post );
 			// grab the event we're looking for
-			if ( isset( $post->EE_Event ) && ( $EVT_ID == 0 || ( $EVT_ID == $post->ID ))) {
+			if (isset($post->EE_Event) && ($EVT_ID == 0 || ($EVT_ID == $post->ID))) {
 				EEH_Event_View::$_event = $post->EE_Event;
 //				d( EEH_Event_View::$_event );
 			}
 			// now if we STILL do NOT have an EE_Event model object, BUT we have an Event ID...
-			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID ) {
+			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
 				// sigh... pull it from the db
-				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 //				d( EEH_Event_View::$_event );
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -118,13 +118,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -140,45 +140,45 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
 		global $post;
 
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 
 			// admin has chosen "full description" for the "Event Espresso - Events > Templates > Display Description" option
 			the_content();
 
-		} else if (( is_archive() && has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() ) ) {
+		} else if ((is_archive() && has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// AND an excerpt actually exists
 			the_excerpt();
 
-		} else if (( is_archive() && ! has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() )) {
+		} else if ((is_archive() && ! has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// but NO excerpt actually exists, so we need to create one
-			if ( ! empty( $num_words )) {
-				if ( empty( $more )) {
-					$more_link_text = __( '(more…)' );
-					$more = ' <a href="' . get_permalink() . '" class="more-link">' . $more_link_text . '</a>';
-					$more = apply_filters( 'the_content_more_link', $more, $more_link_text );
+			if ( ! empty($num_words)) {
+				if (empty($more)) {
+					$more_link_text = __('(more&hellip;)');
+					$more = ' <a href="'.get_permalink().'" class="more-link">'.$more_link_text.'</a>';
+					$more = apply_filters('the_content_more_link', $more, $more_link_text);
 				}
-				$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+				$content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-				$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				$content = wp_trim_words($content, $num_words, ' ').$more;
 			} else {
-				$content =  get_the_content();
+				$content = get_the_content();
 			}
 			global $allowedtags;
-			$content = wp_kses( $content, $allowedtags );
-			$content = strip_shortcodes( $content );
-			echo apply_filters( 'the_content', $content );
+			$content = wp_kses($content, $allowedtags);
+			$content = strip_shortcodes($content);
+			echo apply_filters('the_content', $content);
 
 		} else {
 			// admin has chosen "none" for the "Event Espresso - Events > Templates > Display Description" option
-			echo apply_filters( 'the_content', '' );
+			echo apply_filters('the_content', '');
 		}
 		return ob_get_clean();
 	}
@@ -192,13 +192,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	EE_Ticket[]
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -214,22 +214,22 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a>';
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a>';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -243,10 +243,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -260,10 +260,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -277,10 +277,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -294,10 +294,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -309,13 +309,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime( 'DTT_EVT_start', 'M' );?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime('DTT_EVT_start', 'M'); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -330,17 +330,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -355,17 +355,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -380,17 +380,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -405,17 +405,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -433,17 +433,17 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === null){
-			if($event instanceof EE_Event && $event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === null) {
+			if ($event instanceof EE_Event && $event->is_expired()) {
 				$include_expired = true;
-			}else{
+			} else {
 				$include_expired = false;
 			}
 		}
 
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -459,11 +459,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -477,10 +477,10 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -497,23 +497,23 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this event');
+				$link = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';

Doc Comments +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @access    public
 	 * @param    int $EVT_ID
-	 * @return    object
+	 * @return    null|boolean
 	 */
 	public static function get_event( $EVT_ID = 0 ) {
 		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
@@ -116,7 +116,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -136,7 +136,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -428,7 +428,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]