eventespresso / event-espresso-core

core/db_classes/EE_Taxes.class.php

Indentation +6 added lines, -6 removed lines

@@ -2,12 +2,12 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Taxes class
- *
- * @package 			Event Espresso
- * @subpackage 	includes/classes/EE_Taxes.class.php
- * @author 				Brent Christensen
- */
+	 * Taxes class
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	includes/classes/EE_Taxes.class.php
+	 * @author 				Brent Christensen
+	 */
 class EE_Taxes extends EE_BASE {
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
-			return $tax;
+		if ( ! $ticket->get( 'TKT_taxable' ) ) {
+					return $tax;
+		}
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
 		$subtotal = self::get_subtotal_for_admin( $ticket );
 		//get taxes

Spacing +18 added lines, -18 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');
 }
 /**
  * Taxes class
@@ -32,20 +32,20 @@ 
 	 * @param  EE_Ticket $ticket incoming EE_Ticket
 	 * @return float             total taxes to apply to ticket.
 	 */
-	public static function get_total_taxes_for_admin( EE_Ticket $ticket ) {
+	public static function get_total_taxes_for_admin(EE_Ticket $ticket) {
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
+		if ( ! $ticket->get('TKT_taxable'))
 			return $tax;
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
-		$subtotal = self::get_subtotal_for_admin( $ticket );
+		$subtotal = self::get_subtotal_for_admin($ticket);
 		//get taxes
 		$taxes = self::get_taxes_for_admin();
 		//apply taxes to subtotal
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			//assuming taxes are not cumulative
-			$total_tax += $subtotal * $tax->get( 'PRC_amount' ) / 100;
+			$total_tax += $subtotal * $tax->get('PRC_amount') / 100;
 		}
 		return $total_tax;
 	}
@@ -56,9 +56,9 @@ 
 	 * @param EE_Ticket $ticket
 	 * @return float
 	 */
-	public static function get_subtotal_for_admin( EE_Ticket $ticket ) {
+	public static function get_subtotal_for_admin(EE_Ticket $ticket) {
 		$TKT_ID = $ticket->ID();
-		return isset( self::$_subtotal[ $TKT_ID ] ) ? self::$_subtotal[ $TKT_ID ] : self::_get_subtotal_for_admin( $ticket );
+		return isset(self::$_subtotal[$TKT_ID]) ? self::$_subtotal[$TKT_ID] : self::_get_subtotal_for_admin($ticket);
 	}
 
 
@@ -68,26 +68,26 @@ 
 	 * @param  EE_Ticket $ticket
 	 * @return float     subtotal calculated from all EE_Price[] on Ticket.
 	 */
-	private static function _get_subtotal_for_admin( EE_Ticket $ticket ) {
+	private static function _get_subtotal_for_admin(EE_Ticket $ticket) {
 		$subtotal = 0;
 		//get all prices
-		$prices = $ticket->get_many_related( 'Price', array( 'default_where_conditions' => 'none', 'order_by' => array( 'PRC_order' => 'ASC' ) ) );
+		$prices = $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC')));
 		//let's loop through them (base price is always the first item)
-		foreach ( $prices as $price ) {
-			if ( $price instanceof EE_Price ) {
-				switch ( $price->type_obj()->base_type() ) {
+		foreach ($prices as $price) {
+			if ($price instanceof EE_Price) {
+				switch ($price->type_obj()->base_type()) {
 					case 1: // base price
 					case 3: // surcharges
-						$subtotal += $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal += $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 					case 2: // discounts
-						$subtotal -= $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal -= $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 				}
 			}
 		}
 		$TKT_ID = $ticket->ID();
-		self::$_subtotal = array( $TKT_ID => $subtotal );
+		self::$_subtotal = array($TKT_ID => $subtotal);
 		return $subtotal;
 	}
 
@@ -98,7 +98,7 @@ 
 	 * @return EE_Price[] EE_Price objects that have PRT_ID == 4
 	 */
 	public static function get_taxes_for_admin() {
-		self::$_default_taxes = ! empty( self::$_default_taxes ) ? self::$_default_taxes : EE_Registry::instance()->load_model( 'Price' )->get_all( array( array( 'Price_Type.PBT_ID' => 4 ) ) );
+		self::$_default_taxes = ! empty(self::$_default_taxes) ? self::$_default_taxes : EE_Registry::instance()->load_model('Price')->get_all(array(array('Price_Type.PBT_ID' => 4)));
 		return self::$_default_taxes;
 	}
 

core/db_classes/EE_Term_Relationship.class.php

Spacing +7 added lines, -7 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
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	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);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	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);
 	}
 
 

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link 				{@link http://www.eventespresso.com}
- * @ since 			4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link 				{@link http://www.eventespresso.com}
+	 * @ since 			4.0
+	 *
+	 */
 
 
 

core/db_classes/EE_Ticket.class.php

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package 		Event Espresso
- * @ author 		Event Espresso
- * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link 				{@link http://www.eventespresso.com}
- * @ since 			4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package 		Event Espresso
+	 * @ author 		Event Espresso
+	 * @ copyright 	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license 		{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link 				{@link http://www.eventespresso.com}
+	 * @ since 			4.0
+	 *
+	 */
 
 
 

Doc Comments +32 added lines, -32 removed lines

@@ -194,7 +194,7 @@ 
 
 	/**
 	 * Gets min
-	 * @return int
+	 * @return boolean
 	 */
 	function min() {
 		return $this->get( 'TKT_min' );
@@ -236,7 +236,7 @@ 
 	 * This returns the chronologically last datetime that this ticket is associated with
 	 * @param string 	$dt_frmt
 	 * @param string 	$conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
-	 * @return array
+	 * @return string
 	 */
 	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
 		return $this->first_datetime()->start_date( $dt_frmt ) . $conjunction . $this->last_datetime()->end_date( $dt_frmt );
@@ -374,7 +374,7 @@ 
 	/**
 	 * Gets all the ticket applicabilities (ie, relations between datetimes and tickets)
 	 * @param array $query_params see EEM_Base::get_all()
-	 * @return EE_Datetime_Ticket
+	 * @return EE_Base_Class[]
 	 */
 	public function datetime_tickets( $query_params = array() ) {
 		return $this->get_many_related( 'Datetime_Ticket', $query_params );
@@ -396,7 +396,7 @@ 
 
 	/**
 	 * Gets ID
-	 * @return string
+	 * @return boolean
 	 */
 	function ID() {
 		return $this->get( 'TKT_ID' );
@@ -410,7 +410,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('TKT_wp_user');
@@ -508,7 +508,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'TKT_name', $name );
@@ -518,7 +518,7 @@ 
 
 	/**
 	 * Gets description
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get( 'TKT_description' );
@@ -529,7 +529,7 @@ 
 	/**
 	 * Sets description
 	 * @param string $description
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_description( $description ) {
 		$this->set( 'TKT_description', $description );
@@ -599,7 +599,7 @@ 
 	/**
 	 * Sets min
 	 * @param int $min
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_min( $min ) {
 		$this->set( 'TKT_min', $min );
@@ -609,7 +609,7 @@ 
 
 	/**
 	 * Gets max
-	 * @return int
+	 * @return boolean
 	 */
 	function max() {
 		return $this->get( 'TKT_max' );
@@ -620,7 +620,7 @@ 
 	/**
 	 * Sets max
 	 * @param int $max
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_max( $max ) {
 		$this->set( 'TKT_max', $max );
@@ -631,7 +631,7 @@ 
 	/**
 	 * Sets price
 	 * @param float $price
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_price( $price ) {
 		$this->set( 'TKT_price', $price );
@@ -641,7 +641,7 @@ 
 
 	/**
 	 * Gets sold
-	 * @return int
+	 * @return boolean
 	 */
 	function sold() {
 		return $this->get( 'TKT_sold' );
@@ -652,7 +652,7 @@ 
 	/**
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function increase_sold( $qty = 1 ) {
 		$sold = $this->get_raw( 'TKT_sold' ) + $qty;
@@ -664,7 +664,7 @@ 
 	/**
 	 * Sets sold
 	 * @param int $sold
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_sold( $sold ) {
 		$this->set( 'TKT_sold', $sold );
@@ -675,7 +675,7 @@ 
 	/**
 	 * decrements (subtracts) sold by amount passed by $qty
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function decrease_sold( $qty = 1 ) {
 		$sold = $this->get_raw( 'TKT_sold' ) - $qty;
@@ -688,7 +688,7 @@ 
 
 	/**
 	 * Gets qty
-	 * @return int
+	 * @return boolean
 	 */
 	function qty() {
 		return $this->get( 'TKT_qty' );
@@ -699,7 +699,7 @@ 
 	/**
 	 * Sets qty
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_qty( $qty ) {
 		$this->set( 'TKT_qty', $qty );
@@ -709,7 +709,7 @@ 
 
 	/**
 	 * Gets uses
-	 * @return int
+	 * @return boolean
 	 */
 	function uses() {
 		return $this->get( 'TKT_uses' );
@@ -720,7 +720,7 @@ 
 	/**
 	 * Sets uses
 	 * @param int $uses
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_uses( $uses ) {
 		$this->set( 'TKT_uses', $uses );
@@ -741,7 +741,7 @@ 
 	/**
 	 * sets the TKT_required property
 	 * @param boolean $required
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function set_required( $required ) {
 		$this->set( 'TKT_required', $required );
@@ -762,7 +762,7 @@ 
 	/**
 	 * Sets taxable
 	 * @param boolean $taxable
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_taxable( $taxable ) {
 		$this->set( 'TKT_taxable', $taxable );
@@ -783,7 +783,7 @@ 
 	/**
 	 * Sets is_default
 	 * @param boolean $is_default
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_is_default( $is_default ) {
 		$this->set( 'TKT_is_default', $is_default );
@@ -793,7 +793,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get( 'TKT_order' );
@@ -804,7 +804,7 @@ 
 	/**
 	 * Sets order
 	 * @param int $order
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_order( $order ) {
 		$this->set( 'TKT_order', $order );
@@ -814,7 +814,7 @@ 
 
 	/**
 	 * Gets row
-	 * @return int
+	 * @return boolean
 	 */
 	function row() {
 		return $this->get( 'TKT_row' );
@@ -825,7 +825,7 @@ 
 	/**
 	 * Sets row
 	 * @param int $row
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_row( $row ) {
 		$this->set( 'TKT_row', $row );
@@ -846,7 +846,7 @@ 
 	/**
 	 * Sets deleted
 	 * @param boolean $deleted
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_deleted( $deleted ) {
 		$this->set( 'TKT_deleted', $deleted );
@@ -856,7 +856,7 @@ 
 
 	/**
 	 * Gets parent
-	 * @return int
+	 * @return boolean
 	 */
 	function parent_ID() {
 		return $this->get( 'TKT_parent' );
@@ -867,7 +867,7 @@ 
 	/**
 	 * Sets parent
 	 * @param int $parent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_parent_ID( $parent ) {
 		$this->set( 'TKT_parent', $parent );
@@ -891,7 +891,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get( 'TKT_name' );
@@ -901,7 +901,7 @@ 
 
 	/**
 	 * Gets price
-	 * @return float
+	 * @return boolean
 	 */
 	function price() {
 		return $this->get( 'TKT_price' );

Spacing +153 added lines, -153 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
@@ -63,9 +63,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -76,8 +76,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -86,7 +86,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -96,18 +96,18 @@ 
 	 * @param  int $DTT_ID the primary key for a particular datetime
 	 * @return boolean
 	 */
-	public function available( $DTT_ID = 0 ) {
+	public function available($DTT_ID = 0) {
 		// are we checking availability for a particular datetime ?
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			// get that datetime object
-			$datetime = $this->get_first_related( 'Datetime', array( array( 'DTT_ID' => $DTT_ID ) ) );
+			$datetime = $this->get_first_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
 			// if  ticket sales for this datetime have exceeded the reg limit...
-			if ( $datetime instanceof EE_Datetime && $datetime->sold_out() ) {
+			if ($datetime instanceof EE_Datetime && $datetime->sold_out()) {
 				return FALSE;
 			}
 		}
 		// datetime is still open for registration, but is this ticket sold out ?
-		return $this->get_raw( 'TKT_qty' ) < 1 || $this->get_raw( 'TKT_qty' ) > $this->get_raw( 'TKT_sold' ) ? TRUE : FALSE;
+		return $this->get_raw('TKT_qty') < 1 || $this->get_raw('TKT_qty') > $this->get_raw('TKT_sold') ? TRUE : FALSE;
 	}
 
 
@@ -117,21 +117,21 @@ 
 	 * @param bool $display true = we'll return a localized string, otherwise we just return the value of the relevant status const
 	 * @return mixed(int|string) status int if the display string isn't requested
 	 */
-	public function ticket_status( $display = FALSE ) {
-		if ( ! $this->is_remaining() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::sold_out, FALSE, 'sentence' ) : EE_Ticket::sold_out;
+	public function ticket_status($display = FALSE) {
+		if ( ! $this->is_remaining()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, FALSE, 'sentence') : EE_Ticket::sold_out;
 		}
-		if ( $this->get( 'TKT_deleted' ) ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::archived, FALSE, 'sentence' ) : EE_Ticket::archived;
+		if ($this->get('TKT_deleted')) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::archived, FALSE, 'sentence') : EE_Ticket::archived;
 		}
-		if ( $this->is_expired() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::expired, FALSE, 'sentence' ) : EE_Ticket::expired;
+		if ($this->is_expired()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::expired, FALSE, 'sentence') : EE_Ticket::expired;
 		}
-		if ( $this->is_pending() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::pending, FALSE, 'sentence' ) : EE_Ticket::pending;
+		if ($this->is_pending()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::pending, FALSE, 'sentence') : EE_Ticket::pending;
 		}
-		if ( $this->is_on_sale() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence' ) : EE_Ticket::onsale;
+		if ($this->is_on_sale()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : EE_Ticket::onsale;
 		}
 		return '';
 	}
@@ -145,12 +145,12 @@ 
 	 * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
 	 * @return boolean         true = tickets remaining, false not.
 	 */
-	public function is_remaining( $DTT_ID = 0 ) {
-		$num_remaining = $this->remaining( $DTT_ID );
-		if ( $num_remaining === 0 ) {
+	public function is_remaining($DTT_ID = 0) {
+		$num_remaining = $this->remaining($DTT_ID);
+		if ($num_remaining === 0) {
 			return FALSE;
 		}
-		if ( $num_remaining > 0 && $num_remaining < $this->min() ) {
+		if ($num_remaining > 0 && $num_remaining < $this->min()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -164,25 +164,25 @@ 
 	 *                     all related datetimes
 	 * @return int
 	 */
-	public function remaining( $DTT_ID = 0 ) {
+	public function remaining($DTT_ID = 0) {
 		// are we checking availability for a particular datetime ?
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			// get array with the one requested datetime
-			$datetimes = $this->get_many_related( 'Datetime', array( array( 'DTT_ID' => $DTT_ID ) ) );
+			$datetimes = $this->get_many_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
 		} else {
 			// we need to check availability of ALL datetimes
-			$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+			$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 		}
 		//		d( $datetimes );
 		// if datetime reg limit is not unlimited
-		if ( ! empty( $datetimes ) ) {
+		if ( ! empty($datetimes)) {
 			// although TKT_qty and $datetime->spaces_remaining() could both be INF
 			//we only need to check for INF explicitly if we want to optimize.
 			//because INF - x = INF; and min(x,INF) = x(
-			$tickets_remaining = $this->get( 'TKT_qty' ) - $this->get( 'TKT_sold' );
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$tickets_remaining = min( $tickets_remaining, $datetime->spaces_remaining() );
+			$tickets_remaining = $this->get('TKT_qty') - $this->get('TKT_sold');
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$tickets_remaining = min($tickets_remaining, $datetime->spaces_remaining());
 				}
 			}
 			return $tickets_remaining;
@@ -197,7 +197,7 @@ 
 	 * @return int
 	 */
 	function min() {
-		return $this->get( 'TKT_min' );
+		return $this->get('TKT_min');
 	}
 
 
@@ -207,7 +207,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'TKT_end_date' ) < time() );
+		return ($this->get_raw('TKT_end_date') < time());
 	}
 
 
@@ -217,7 +217,7 @@ 
 	 * @return boolean
 	 */
 	public function is_pending() {
-		return ( $this->get_raw( 'TKT_start_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') > time());
 	}
 
 
@@ -227,7 +227,7 @@ 
 	 * @return boolean
 	 */
 	public function is_on_sale() {
-		return ( $this->get_raw( 'TKT_start_date' ) < time() && $this->get_raw( 'TKT_end_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') < time() && $this->get_raw('TKT_end_date') > time());
 	}
 
 
@@ -238,8 +238,8 @@ 
 	 * @param string 	$conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return array
 	 */
-	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
-		return $this->first_datetime()->start_date( $dt_frmt ) . $conjunction . $this->last_datetime()->end_date( $dt_frmt );
+	public function date_range($dt_frmt = '', $conjunction = ' - ') {
+		return $this->first_datetime()->start_date($dt_frmt).$conjunction.$this->last_datetime()->end_date($dt_frmt);
 	}
 
 
@@ -249,8 +249,8 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1 ) );
-		return reset( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1));
+		return reset($datetimes);
 	}
 
 
@@ -261,11 +261,11 @@ 
 	 * @param array $query_params see EEM_Base::get_all()
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes( $query_params = array() ) {
-		if ( ! isset( $query_params[ 'order_by' ] ) ) {
-			$query_params[ 'order_by' ][ 'DTT_order' ] = 'ASC';
+	public function datetimes($query_params = array()) {
+		if ( ! isset($query_params['order_by'])) {
+			$query_params['order_by']['DTT_order'] = 'ASC';
 		}
-		return $this->get_many_related( 'Datetime', $query_params );
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -275,8 +275,8 @@ 
 	 * @return EE_Datetime
 	 */
 	public function last_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1, 'order_by' => array( 'DTT_EVT_start' => 'DESC' ) ) );
-		return end( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1, 'order_by' => array('DTT_EVT_start' => 'DESC')));
+		return end($datetimes);
 	}
 
 
@@ -290,22 +290,22 @@ 
 	 * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
 	 * @return mixed (array|int)          how many tickets have sold
 	 */
-	public function tickets_sold( $what = 'ticket', $dtt_id = NULL ) {
+	public function tickets_sold($what = 'ticket', $dtt_id = NULL) {
 		$total = 0;
 		$tickets_sold = $this->_all_tickets_sold();
-		switch ( $what ) {
+		switch ($what) {
 			case 'ticket' :
-				return $tickets_sold[ 'ticket' ];
+				return $tickets_sold['ticket'];
 				break;
 			case 'datetime' :
-				if ( empty( $tickets_sold[ 'datetime' ] ) ) {
+				if (empty($tickets_sold['datetime'])) {
 					return $total;
 				}
-				if ( ! empty( $dtt_id ) && ! isset( $tickets_sold[ 'datetime' ][ $dtt_id ] ) ) {
-					EE_Error::add_error( __( "You've requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+				if ( ! empty($dtt_id) && ! isset($tickets_sold['datetime'][$dtt_id])) {
+					EE_Error::add_error(__("You've requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 					return $total;
 				}
-				return empty( $dtt_id ) ? $tickets_sold[ 'datetime' ] : $tickets_sold[ 'datetime' ][ $dtt_id ];
+				return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][$dtt_id];
 				break;
 			default:
 				return $total;
@@ -319,15 +319,15 @@ 
 	 * @return EE_Ticket[]
 	 */
 	protected function _all_tickets_sold() {
-		$datetimes = $this->get_many_related( 'Datetime' );
+		$datetimes = $this->get_many_related('Datetime');
 		$tickets_sold = array();
-		if ( ! empty( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				$tickets_sold[ 'datetime' ][ $datetime->ID() ] = $datetime->get( 'DTT_sold' );
+		if ( ! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				$tickets_sold['datetime'][$datetime->ID()] = $datetime->get('DTT_sold');
 			}
 		}
 		//Tickets sold
-		$tickets_sold[ 'ticket' ] = $this->get_raw( 'TKT_sold' );
+		$tickets_sold['ticket'] = $this->get_raw('TKT_sold');
 		return $tickets_sold;
 	}
 
@@ -340,9 +340,9 @@ 
 	 * @param  bool $return_array whether to return as an array indexed by price id or just the object.
 	 * @return EE_Price
 	 */
-	public function base_price( $return_array = FALSE ) {
-		$_where = array( 'Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price );
-		return $return_array ? $this->get_many_related( 'Price', array( $_where ) ) : $this->get_first_related( 'Price', array( $_where ) );
+	public function base_price($return_array = FALSE) {
+		$_where = array('Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price);
+		return $return_array ? $this->get_many_related('Price', array($_where)) : $this->get_first_related('Price', array($_where));
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @return EE_Price[]
 	 */
 	public function price_modifiers() {
-		$query_params = array( 0 => array( 'Price_Type.PBT_ID' => array( 'NOT IN', array( EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax ) ) ) );
-		return $this->prices( $query_params );
+		$query_params = array(0 => array('Price_Type.PBT_ID' => array('NOT IN', array(EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax))));
+		return $this->prices($query_params);
 	}
 
 
@@ -365,8 +365,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Price[]
 	 */
-	public function prices( $query_params = array() ) {
-		return $this->get_many_related( 'Price', $query_params );
+	public function prices($query_params = array()) {
+		return $this->get_many_related('Price', $query_params);
 	}
 
 
@@ -376,8 +376,8 @@ 
 	 * @param array $query_params see EEM_Base::get_all()
 	 * @return EE_Datetime_Ticket
 	 */
-	public function datetime_tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime_Ticket', $query_params );
+	public function datetime_tickets($query_params = array()) {
+		return $this->get_many_related('Datetime_Ticket', $query_params);
 	}
 
 
@@ -388,8 +388,8 @@ 
 	 * @param boolean $show_deleted
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = TRUE, $show_deleted = FALSE ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_ticket_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted );
+	public function datetimes_ordered($show_expired = TRUE, $show_deleted = FALSE) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_ticket_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted);
 	}
 
 
@@ -399,7 +399,7 @@ 
 	 * @return string
 	 */
 	function ID() {
-		return $this->get( 'TKT_ID' );
+		return $this->get('TKT_ID');
 	}
 
 
@@ -423,7 +423,7 @@ 
 	 * @return EE_Ticket_Template
 	 */
 	public function template() {
-		return $this->get_first_related( 'Ticket_Template' );
+		return $this->get_first_related('Ticket_Template');
 	}
 
 
@@ -433,7 +433,7 @@ 
 	 * @return EE_Price[]
 	 */
 	public function get_ticket_taxes_for_admin() {
-		return EE_Taxes::get_taxes_for_admin( $this );
+		return EE_Taxes::get_taxes_for_admin($this);
 	}
 
 
@@ -442,7 +442,7 @@ 
 	 * @return bool
 	 */
 	public function ticket_price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -451,7 +451,7 @@ 
 	 * @return mixed
 	 */
 	public function pretty_price() {
-		return $this->get_pretty( 'TKT_price' );
+		return $this->get_pretty('TKT_price');
 	}
 
 
@@ -470,17 +470,17 @@ 
 	 * @param bool $no_cache
 	 * @return float
 	 */
-	public function get_ticket_total_with_taxes( $no_cache = FALSE ) {
-		if ( ! isset( $this->_ticket_total_with_taxes ) || $no_cache ) {
+	public function get_ticket_total_with_taxes($no_cache = FALSE) {
+		if ( ! isset($this->_ticket_total_with_taxes) || $no_cache) {
 			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
 		}
-		return (float)$this->_ticket_total_with_taxes;
+		return (float) $this->_ticket_total_with_taxes;
 	}
 
 
 
 	public function ensure_TKT_Price_correct() {
-		$this->set( 'TKT_price', EE_Taxes::get_subtotal_for_admin( $this ) );
+		$this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
 		$this->save();
 	}
 
@@ -490,7 +490,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_subtotal() {
-		return EE_Taxes::get_subtotal_for_admin( $this );
+		return EE_Taxes::get_subtotal_for_admin($this);
 	}
 
 
@@ -500,7 +500,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_taxes_total_for_admin() {
-		return EE_Taxes::get_total_taxes_for_admin( $this );
+		return EE_Taxes::get_total_taxes_for_admin($this);
 	}
 
 
@@ -510,8 +510,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'TKT_name', $name );
+	function set_name($name) {
+		$this->set('TKT_name', $name);
 	}
 
 
@@ -521,7 +521,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'TKT_description' );
+		return $this->get('TKT_description');
 	}
 
 
@@ -531,8 +531,8 @@ 
 	 * @param string $description
 	 * @return boolean
 	 */
-	function set_description( $description ) {
-		$this->set( 'TKT_description', $description );
+	function set_description($description) {
+		$this->set('TKT_description', $description);
 	}
 
 
@@ -543,8 +543,8 @@ 
 	 * @param string $tm_frmt
 	 * @return string
 	 */
-	function start_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_start_date', $dt_frmt, $tm_frmt );
+	function start_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_start_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -554,8 +554,8 @@ 
 	 * @param string $start_date
 	 * @return void
 	 */
-	function set_start_date( $start_date ) {
-		$this->_set_date_time( 'B', $start_date, 'TKT_start_date' );
+	function set_start_date($start_date) {
+		$this->_set_date_time('B', $start_date, 'TKT_start_date');
 	}
 
 
@@ -566,8 +566,8 @@ 
 	 * @param string $tm_frmt
 	 * @return string
 	 */
-	function end_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_end_date', $dt_frmt, $tm_frmt );
+	function end_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_end_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -577,8 +577,8 @@ 
 	 * @param string $end_date
 	 * @return void
 	 */
-	function set_end_date( $end_date ) {
-		$this->_set_date_time( 'B', $end_date, 'TKT_end_date' );
+	function set_end_date($end_date) {
+		$this->_set_date_time('B', $end_date, 'TKT_end_date');
 	}
 
 
@@ -590,8 +590,8 @@ 
 	 *
 	 * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
 	 */
-	function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'TKT_end_date' );
+	function set_end_time($time) {
+		$this->_set_time_for($time, 'TKT_end_date');
 	}
 
 
@@ -601,8 +601,8 @@ 
 	 * @param int $min
 	 * @return boolean
 	 */
-	function set_min( $min ) {
-		$this->set( 'TKT_min', $min );
+	function set_min($min) {
+		$this->set('TKT_min', $min);
 	}
 
 
@@ -612,7 +612,7 @@ 
 	 * @return int
 	 */
 	function max() {
-		return $this->get( 'TKT_max' );
+		return $this->get('TKT_max');
 	}
 
 
@@ -622,8 +622,8 @@ 
 	 * @param int $max
 	 * @return boolean
 	 */
-	function set_max( $max ) {
-		$this->set( 'TKT_max', $max );
+	function set_max($max) {
+		$this->set('TKT_max', $max);
 	}
 
 
@@ -633,8 +633,8 @@ 
 	 * @param float $price
 	 * @return boolean
 	 */
-	function set_price( $price ) {
-		$this->set( 'TKT_price', $price );
+	function set_price($price) {
+		$this->set('TKT_price', $price);
 	}
 
 
@@ -644,7 +644,7 @@ 
 	 * @return int
 	 */
 	function sold() {
-		return $this->get( 'TKT_sold' );
+		return $this->get('TKT_sold');
 	}
 
 
@@ -654,9 +654,9 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function increase_sold( $qty = 1 ) {
-		$sold = $this->get_raw( 'TKT_sold' ) + $qty;
-		return $this->set_sold( $sold );
+	function increase_sold($qty = 1) {
+		$sold = $this->get_raw('TKT_sold') + $qty;
+		return $this->set_sold($sold);
 	}
 
 
@@ -666,8 +666,8 @@ 
 	 * @param int $sold
 	 * @return boolean
 	 */
-	function set_sold( $sold ) {
-		$this->set( 'TKT_sold', $sold );
+	function set_sold($sold) {
+		$this->set('TKT_sold', $sold);
 	}
 
 
@@ -677,11 +677,11 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function decrease_sold( $qty = 1 ) {
-		$sold = $this->get_raw( 'TKT_sold' ) - $qty;
+	function decrease_sold($qty = 1) {
+		$sold = $this->get_raw('TKT_sold') - $qty;
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		return $this->set_sold( $sold );
+		$sold = max(0, $sold);
+		return $this->set_sold($sold);
 	}
 
 
@@ -691,7 +691,7 @@ 
 	 * @return int
 	 */
 	function qty() {
-		return $this->get( 'TKT_qty' );
+		return $this->get('TKT_qty');
 	}
 
 
@@ -701,8 +701,8 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function set_qty( $qty ) {
-		$this->set( 'TKT_qty', $qty );
+	function set_qty($qty) {
+		$this->set('TKT_qty', $qty);
 	}
 
 
@@ -712,7 +712,7 @@ 
 	 * @return int
 	 */
 	function uses() {
-		return $this->get( 'TKT_uses' );
+		return $this->get('TKT_uses');
 	}
 
 
@@ -722,8 +722,8 @@ 
 	 * @param int $uses
 	 * @return boolean
 	 */
-	function set_uses( $uses ) {
-		$this->set( 'TKT_uses', $uses );
+	function set_uses($uses) {
+		$this->set('TKT_uses', $uses);
 	}
 
 
@@ -733,7 +733,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'TKT_required' );
+		return $this->get('TKT_required');
 	}
 
 
@@ -743,8 +743,8 @@ 
 	 * @param boolean $required
 	 * @return boolean
 	 */
-	public function set_required( $required ) {
-		$this->set( 'TKT_required', $required );
+	public function set_required($required) {
+		$this->set('TKT_required', $required);
 	}
 
 
@@ -754,7 +754,7 @@ 
 	 * @return boolean
 	 */
 	function taxable() {
-		return $this->get( 'TKT_taxable' );
+		return $this->get('TKT_taxable');
 	}
 
 
@@ -764,8 +764,8 @@ 
 	 * @param boolean $taxable
 	 * @return boolean
 	 */
-	function set_taxable( $taxable ) {
-		$this->set( 'TKT_taxable', $taxable );
+	function set_taxable($taxable) {
+		$this->set('TKT_taxable', $taxable);
 	}
 
 
@@ -775,7 +775,7 @@ 
 	 * @return boolean
 	 */
 	function is_default() {
-		return $this->get( 'TKT_is_default' );
+		return $this->get('TKT_is_default');
 	}
 
 
@@ -785,8 +785,8 @@ 
 	 * @param boolean $is_default
 	 * @return boolean
 	 */
-	function set_is_default( $is_default ) {
-		$this->set( 'TKT_is_default', $is_default );
+	function set_is_default($is_default) {
+		$this->set('TKT_is_default', $is_default);
 	}
 
 
@@ -796,7 +796,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'TKT_order' );
+		return $this->get('TKT_order');
 	}
 
 
@@ -806,8 +806,8 @@ 
 	 * @param int $order
 	 * @return boolean
 	 */
-	function set_order( $order ) {
-		$this->set( 'TKT_order', $order );
+	function set_order($order) {
+		$this->set('TKT_order', $order);
 	}
 
 
@@ -817,7 +817,7 @@ 
 	 * @return int
 	 */
 	function row() {
-		return $this->get( 'TKT_row' );
+		return $this->get('TKT_row');
 	}
 
 
@@ -827,8 +827,8 @@ 
 	 * @param int $row
 	 * @return boolean
 	 */
-	function set_row( $row ) {
-		$this->set( 'TKT_row', $row );
+	function set_row($row) {
+		$this->set('TKT_row', $row);
 	}
 
 
@@ -838,7 +838,7 @@ 
 	 * @return boolean
 	 */
 	function deleted() {
-		return $this->get( 'TKT_deleted' );
+		return $this->get('TKT_deleted');
 	}
 
 
@@ -848,8 +848,8 @@ 
 	 * @param boolean $deleted
 	 * @return boolean
 	 */
-	function set_deleted( $deleted ) {
-		$this->set( 'TKT_deleted', $deleted );
+	function set_deleted($deleted) {
+		$this->set('TKT_deleted', $deleted);
 	}
 
 
@@ -859,7 +859,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -869,8 +869,8 @@ 
 	 * @param int $parent
 	 * @return boolean
 	 */
-	function set_parent_ID( $parent ) {
-		$this->set( 'TKT_parent', $parent );
+	function set_parent_ID($parent) {
+		$this->set('TKT_parent', $parent);
 	}
 
 
@@ -881,10 +881,10 @@ 
 	 */
 	function name_and_info() {
 		$times = array();
-		foreach ( $this->datetimes() as $datetime ) {
+		foreach ($this->datetimes() as $datetime) {
 			$times[] = $datetime->start_date_and_time();
 		}
-		return $this->name() . " @ " . implode( ", ", $times ) . " for " . $this->price();
+		return $this->name()." @ ".implode(", ", $times)." for ".$this->price();
 	}
 
 
@@ -894,7 +894,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'TKT_name' );
+		return $this->get('TKT_name');
 	}
 
 
@@ -904,7 +904,7 @@ 
 	 * @return float
 	 */
 	function price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -914,8 +914,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -926,8 +926,8 @@ 
 	 * @return int
 	 */
 	public function update_tickets_sold() {
-		$count_regs_for_this_ticket = $this->count_registrations( array( array( 'STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0 ) ) );
-		$this->set_sold( $count_regs_for_this_ticket );
+		$count_regs_for_this_ticket = $this->count_registrations(array(array('STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0)));
+		$this->set_sold($count_regs_for_this_ticket);
 		$this->save();
 		return $count_regs_for_this_ticket;
 	}
@@ -939,7 +939,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function count_registrations( $query_params = array() ) {
+	public function count_registrations($query_params = array()) {
 		return $this->count_related('Registration', $query_params);
 	}
 } //end EE_Ticket class

core/db_classes/EE_Ticket_Template.class.php

Spacing +7 added lines, -7 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
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package        Event Espresso
- * @ author        Event Espresso
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                {@link http://www.eventespresso.com}
- * @ since            4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package        Event Espresso
+	 * @ author        Event Espresso
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                {@link http://www.eventespresso.com}
+	 * @ since            4.0
+	 *
+	 */
 
 
 

core/db_classes/EE_Transaction.class.php

Braces +2 added lines, -2 removed lines

@@ -742,11 +742,11 @@
 		$pm = $this->get_first_related('Payment_Method');
 		if( $pm instanceof EE_Payment_Method ){
 			return $pm;
-		}else{
+		} else{
 			$last_payment = $this->last_payment();
 			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
 				return $last_payment->payment_method();
-			}else{
+			} else{
 				return NULL;
 			}
 		}

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package        Event Espresso
- * @ author        Event Espresso
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                {@link http://www.eventespresso.com}
- * @ since            4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package        Event Espresso
+	 * @ author        Event Espresso
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                {@link http://www.eventespresso.com}
+	 * @ since            4.0
+	 *
+	 */
 
 
 

Doc Comments +6 added lines, -6 removed lines

@@ -209,7 +209,7 @@ 
 	/**
 	 *        get Transaction Total
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function total() {
 		return $this->get( 'TXN_total' );
@@ -220,7 +220,7 @@ 
 	/**
 	 *        get Total Amount Paid to Date
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function paid() {
 		return $this->get( 'TXN_paid' );
@@ -322,7 +322,7 @@ 
 	/**
 	 * Gets all the attendees for this transaction (handy for use with EE_Attendee's get_registrations_for_event function
 	 * for getting attendees and how many registrations they each have for an event)
-	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
+	 * @return EE_Base_Class[] EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
 		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
@@ -567,7 +567,7 @@ 
 	/**
 	 * Gets all the extra meta info on this payment
 	 * @param array $query_params like EEM_Base::get_all
-	 * @return EE_Extra_Meta
+	 * @return EE_Base_Class[]
 	 */
 	public function extra_meta( $query_params = array() ) {
 		return $this->get_many_related( 'Extra_Meta', $query_params );
@@ -714,7 +714,7 @@ 
 
 	/**
 	 * Gets PMD_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function payment_method_ID() {
 		return $this->get('PMD_ID');
@@ -725,7 +725,7 @@ 
 	/**
 	 * Sets PMD_ID
 	 * @param int $PMD_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_payment_method_ID($PMD_ID) {
 		$this->set('PMD_ID', $PMD_ID);

Spacing +112 added lines, -112 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
@@ -26,7 +26,7 @@ 
  * @subpackage 	includes/classes/EE_Transaction.class.php
  * @author 				Brent Christensen
  */
-class EE_Transaction extends EE_Base_Class implements EEI_Transaction{
+class EE_Transaction extends EE_Base_Class implements EEI_Transaction {
 
 
 	/**
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Transaction
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -48,8 +48,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Transaction
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	 * @return 	void
 	 */
 	public function lock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		$locked_transactions[ $this->ID() ] = true;
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		$locked_transactions[$this->ID()] = true;
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return 	void
 	 */
 	public function unlock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		unset( $locked_transactions[ $this->ID() ] );
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		unset($locked_transactions[$this->ID()]);
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 	/**
@@ -99,8 +99,8 @@ 
 	 * @return boolean
 	 */
 	public function is_locked() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		return isset( $locked_transactions[ $this->ID() ] ) ? true : false;
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		return isset($locked_transactions[$this->ID()]) ? true : false;
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 * @access        public
 	 * @param        float $total total value of transaction
 	 */
-	public function set_total( $total = 0.00 ) {
-		$this->set( 'TXN_total', $total );
+	public function set_total($total = 0.00) {
+		$this->set('TXN_total', $total);
 	}
 
 
@@ -123,8 +123,8 @@ 
 	 * @access        public
 	 * @param        float $total_paid total amount paid to date (sum of all payments)
 	 */
-	public function set_paid( $total_paid = 0.00 ) {
-		$this->set( 'TXN_paid', $total_paid );
+	public function set_paid($total_paid = 0.00) {
+		$this->set('TXN_paid', $total_paid);
 	}
 
 
@@ -135,8 +135,8 @@ 
 	 * @access        public
 	 * @param        string $status whether the transaction is open, declined, accepted, or any number of custom values that can be set
 	 */
-	public function set_status( $status = '' ) {
-		$this->set( 'STS_ID', $status );
+	public function set_status($status = '') {
+		$this->set('STS_ID', $status);
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @access        public
 	 * @param        string $hash_salt required for some payment gateways
 	 */
-	public function set_hash_salt( $hash_salt = '' ) {
-		$this->set( 'TXN_hash_salt', $hash_salt );
+	public function set_hash_salt($hash_salt = '') {
+		$this->set('TXN_hash_salt', $hash_salt);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * Sets TXN_reg_steps array
 	 * @param array $txn_reg_steps
 	 */
-	function set_reg_steps( $txn_reg_steps ) {
-		$this->set( 'TXN_reg_steps', $txn_reg_steps );
+	function set_reg_steps($txn_reg_steps) {
+		$this->set('TXN_reg_steps', $txn_reg_steps);
 	}
 
 
@@ -168,8 +168,8 @@ 
 	 * @return array
 	 */
 	function reg_steps() {
-		$TXN_reg_steps = $this->get( 'TXN_reg_steps' );
-		return is_array( $TXN_reg_steps ) ? $TXN_reg_steps : array();
+		$TXN_reg_steps = $this->get('TXN_reg_steps');
+		return is_array($TXN_reg_steps) ? $TXN_reg_steps : array();
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @return string of transaction's total cost, with currency symbol and decimal
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -189,7 +189,7 @@ 
 	 * @return string
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -201,7 +201,7 @@ 
 	 * @return float amount remaining
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -212,7 +212,7 @@ 
 	 * @return float
 	 */
 	public function total() {
-		return $this->get( 'TXN_total' );
+		return $this->get('TXN_total');
 	}
 
 
@@ -223,7 +223,7 @@ 
 	 * @return float
 	 */
 	public function paid() {
-		return $this->get( 'TXN_paid' );
+		return $this->get('TXN_paid');
 	}
 
 
@@ -233,8 +233,8 @@ 
 	 * @access        public
 	 */
 	public function get_cart_session() {
-		$session_data = $this->get( 'TXN_session_data' );
-		return isset( $session_data[ 'cart' ] ) && $session_data[ 'cart' ] instanceof EE_Cart ? $session_data[ 'cart' ] : NULL;
+		$session_data = $this->get('TXN_session_data');
+		return isset($session_data['cart']) && $session_data['cart'] instanceof EE_Cart ? $session_data['cart'] : NULL;
 	}
 
 
@@ -244,9 +244,9 @@ 
 	 * @access        public
 	 */
 	public function session_data() {
-		$session_data = $this->get( 'TXN_session_data' );
-		if ( empty( $session_data ) ) {
-			$session_data = array( 'id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array() );
+		$session_data = $this->get('TXN_session_data');
+		if (empty($session_data)) {
+			$session_data = array('id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array());
 		}
 		return $session_data;
 	}
@@ -259,11 +259,11 @@ 
 	 * @access        public
 	 * @param        EE_Session|array $session_data
 	 */
-	public function set_txn_session_data( $session_data ) {
-		if ( $session_data instanceof EE_Session ) {
-			$this->set( 'TXN_session_data', $session_data->get_session_data( NULL, TRUE ));
+	public function set_txn_session_data($session_data) {
+		if ($session_data instanceof EE_Session) {
+			$this->set('TXN_session_data', $session_data->get_session_data(NULL, TRUE));
 		} else {
-			$this->set( 'TXN_session_data', $session_data );
+			$this->set('TXN_session_data', $session_data);
 		}
 	}
 
@@ -274,7 +274,7 @@ 
 	 * @access        public
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -293,13 +293,13 @@ 
 	 * @param 	boolean 	$gmt - whether to return a unix timestamp with UTC offset applied (default) or no UTC offset applied
 	 * @return 	string | int
 	 */
-	public function datetime( $format = FALSE, $gmt = FALSE ) {
-		if ( $format ) {
-			return $this->get_pretty( 'TXN_timestamp' );
-		} else if ( $gmt ) {
-			return $this->get_raw( 'TXN_timestamp' );
+	public function datetime($format = FALSE, $gmt = FALSE) {
+		if ($format) {
+			return $this->get_pretty('TXN_timestamp');
+		} else if ($gmt) {
+			return $this->get_raw('TXN_timestamp');
 		} else {
-			return $this->get( 'TXN_timestamp' );
+			return $this->get('TXN_timestamp');
 		}
 	}
 
@@ -311,10 +311,10 @@ 
 	 * @param        boolean $get_cached   TRUE to retrieve cached registrations or FALSE to pull from the db
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array(), $get_cached = FALSE ) {
-		$query_params = ( empty( $query_params ) || ! is_array( $query_params ) ) ? array( 'order_by' => array( 'Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC' ) ) : $query_params;
+	public function registrations($query_params = array(), $get_cached = FALSE) {
+		$query_params = (empty($query_params) || ! is_array($query_params)) ? array('order_by' => array('Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC')) : $query_params;
 		$query_params = $get_cached ? array() : $query_params;
-		return $this->get_many_related( 'Registration', $query_params );
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -325,7 +325,7 @@ 
 	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
-		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
+		return $this->get_many_related('Attendee', array(array('Registration.Transaction.TXN_ID' => $this->ID())));
 	}
 
 
@@ -335,8 +335,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Payment[]
 	 */
-	public function payments( $query_params = array() ) {
-		return $this->get_many_related( 'Payment', $query_params );
+	public function payments($query_params = array()) {
+		return $this->get_many_related('Payment', $query_params);
 	}
 
 
@@ -346,8 +346,8 @@ 
 	 * @return EE_Payment[]
 	 */
 	public function approved_payments() {
-		EE_Registry::instance()->load_model( 'Payment' );
-		return $this->get_many_related( 'Payment', array( array( 'STS_ID' => EEM_Payment::status_id_approved ), 'order_by' => array( 'PAY_timestamp' => 'DESC' ) ) );
+		EE_Registry::instance()->load_model('Payment');
+		return $this->get_many_related('Payment', array(array('STS_ID' => EEM_Payment::status_id_approved), 'order_by' => array('PAY_timestamp' => 'DESC')));
 	}
 
 
@@ -357,8 +357,8 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -368,10 +368,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Transaction::complete_status_code:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -388,7 +388,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-plus ee-icon-size-16 orange-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -398,7 +398,7 @@ 
 	 * @access        public
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -408,7 +408,7 @@ 
 	 * @return boolean
 	 */
 	public function is_free() {
-		return (float)$this->get( 'TXN_total' ) == 0 ? TRUE : FALSE;
+		return (float) $this->get('TXN_total') == 0 ? TRUE : FALSE;
 	}
 
 
@@ -476,12 +476,12 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function invoice_url( $type = 'html' ) {
+	public function invoice_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->invoice_url( $type );
+		return $REG->invoice_url($type);
 	}
 
 
@@ -491,7 +491,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function primary_registration() {
-		return $this->get_first_related( 'Registration', array( array( 'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT ) ) );
+		return $this->get_first_related('Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -501,12 +501,12 @@ 
 	 * @param string $type 'pdf' or 'html' (default is 'html')
 	 * @return string
 	 */
-	public function receipt_url( $type = 'html' ) {
+	public function receipt_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->receipt_url( $type );
+		return $REG->receipt_url($type);
 	}
 
 
@@ -531,15 +531,15 @@ 
 	 * @deprecated
 	 * @return boolean
 	 */
-	public function update_based_on_payments(){
+	public function update_based_on_payments() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this);
 	}
 
 
@@ -548,7 +548,7 @@ 
 	 * @return string
 	 */
 	public function gateway_response_on_transaction() {
-		$payment = $this->get_first_related( 'Payment' );
+		$payment = $this->get_first_related('Payment');
 		return $payment instanceof EE_Payment ? $payment->gateway_response() : '';
 	}
 
@@ -559,7 +559,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -569,8 +569,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Extra_Meta
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -580,8 +580,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_registration( EE_Registration $registration ) {
-		return $this->_add_relation_to( $registration, 'Registration' );
+	public function add_registration(EE_Registration $registration) {
+		return $this->_add_relation_to($registration, 'Registration');
 	}
 
 
@@ -592,8 +592,8 @@ 
 	 * @param int $registration_or_id
 	 * @return EE_Base_Class that was removed from being related
 	 */
-	public function remove_registration_with_id( $registration_or_id ) {
-		return $this->_remove_relation_to( $registration_or_id, 'Registration' );
+	public function remove_registration_with_id($registration_or_id) {
+		return $this->_remove_relation_to($registration_or_id, 'Registration');
 	}
 
 
@@ -603,7 +603,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function items_purchased() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_line_item ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_line_item)));
 	}
 
 
@@ -613,8 +613,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_line_item( EE_Line_Item $line_item ) {
-		return $this->_add_relation_to( $line_item, 'Line_Item' );
+	public function add_line_item(EE_Line_Item $line_item) {
+		return $this->_add_relation_to($line_item, 'Line_Item');
 	}
 
 
@@ -624,8 +624,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Line_Item[]
 	 */
-	public function line_items( $query_params = array() ) {
-		return $this->get_many_related( 'Line_Item', $query_params );
+	public function line_items($query_params = array()) {
+		return $this->get_many_related('Line_Item', $query_params);
 	}
 
 
@@ -635,7 +635,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function tax_items() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_tax ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_tax)));
 	}
 
 
@@ -646,9 +646,9 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
 			$item = EEH_Line_Item::create_default_total_line_item();
 		}
 		return $item;
@@ -663,7 +663,7 @@ 
 	 */
 	public function tax_total() {
 		$tax_line_item = $this->tax_total_line_item();
-		if ( $tax_line_item ) {
+		if ($tax_line_item) {
 			return $tax_line_item->total();
 		} else {
 			return 0;
@@ -677,9 +677,9 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function tax_total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax_sub_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax_sub_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
 			$item = EEH_Line_Item::create_default_total_line_item();
 		}
 		return $item;
@@ -691,20 +691,20 @@ 
 	 *  Gets the array of billing info for the gateway and for this transaction's primary registration's attendee.
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info(){
+	public function billing_info() {
 		$payment_method = $this->payment_method();
-		if ( !$payment_method){
+		if ( ! $payment_method) {
 			EE_Error::add_error(__("Could not find billing info for transaction because no gateway has been used for it yet", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $this->primary_registration();
-		if ( ! $primary_reg ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $primary_reg) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$attendee = $primary_reg->attendee();
-		if ( ! $attendee ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $attendee) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return $attendee->billing_info_for_payment_method($payment_method);
@@ -739,15 +739,15 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		$pm = $this->get_first_related('Payment_Method');
-		if( $pm instanceof EE_Payment_Method ){
+		if ($pm instanceof EE_Payment_Method) {
 			return $pm;
-		}else{
+		} else {
 			$last_payment = $this->last_payment();
-			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
+			if ($last_payment instanceof EE_Payment && $last_payment->payment_method()) {
 				return $last_payment->payment_method();
-			}else{
+			} else {
 				return NULL;
 			}
 		}
@@ -758,15 +758,15 @@ 
 	 * @return EE_Payment
 	 */
 	public function last_payment() {
-		return $this->get_first_related( 'Payment', array( 'order_by' => array( 'PAY_ID' => 'desc' ) ) );
+		return $this->get_first_related('Payment', array('order_by' => array('PAY_ID' => 'desc')));
 	}
 
 	/**
 	 * Gets all the line items which are unrelated to tickets on this transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function non_ticket_line_items(){
-		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction( $this->ID() );
+	public function non_ticket_line_items() {
+		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction($this->ID());
 	}
 
 

core/db_classes/EE_Venue.class.php

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package        Event Espresso
- * @ author        Event Espresso
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link                {@link http://www.eventespresso.com}
- * @ since            4.0
- *
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package        Event Espresso
+	 * @ author        Event Espresso
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link                {@link http://www.eventespresso.com}
+	 * @ since            4.0
+	 *
+	 */
 
 
 

Doc Comments +19 added lines, -19 removed lines

@@ -53,7 +53,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get( 'VNU_name' );
@@ -62,7 +62,7 @@ 
 
 	/**
 	 * Gets phone
-	 * @return string
+	 * @return boolean
 	 */
 	function phone() {
 		return $this->get( 'VNU_phone' );
@@ -72,7 +72,7 @@ 
 
 	/**
 	 * venue_url
-	 * @return string
+	 * @return boolean
 	 */
 	function venue_url() {
 		return $this->get( 'VNU_url' );
@@ -81,7 +81,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get( 'VNU_desc' );
@@ -91,7 +91,7 @@ 
 
 	/**
 	 * Gets short description (AKA: the excerpt)
-	 * @return string
+	 * @return boolean
 	 */
 	function excerpt() {
 		return $this->get( 'VNU_short_desc' );
@@ -101,7 +101,7 @@ 
 
 	/**
 	 * Gets identifier
-	 * @return string
+	 * @return boolean
 	 */
 	function identifier() {
 		return $this->get( 'VNU_identifier' );
@@ -111,7 +111,7 @@ 
 
 	/**
 	 * Gets address
-	 * @return string
+	 * @return boolean
 	 */
 	function address() {
 		return $this->get( 'VNU_address' );
@@ -121,7 +121,7 @@ 
 
 	/**
 	 * Gets address2
-	 * @return string
+	 * @return boolean
 	 */
 	function address2() {
 		return $this->get( 'VNU_address2' );
@@ -132,7 +132,7 @@ 
 
 	/**
 	 * Gets city
-	 * @return string
+	 * @return boolean
 	 */
 	function city() {
 		return $this->get( 'VNU_city' );
@@ -140,7 +140,7 @@ 
 
 	/**
 	 * Gets state
-	 * @return int
+	 * @return boolean
 	 */
 	function state_ID() {
 		return $this->get( 'STA_ID' );
@@ -194,7 +194,7 @@ 
 
 	/**
 	 * country_ID
-	 * @return string
+	 * @return boolean
 	 */
 	function country_ID() {
 		return $this->get( 'CNT_ISO' );
@@ -239,7 +239,7 @@ 
 
 	/**
 	 * Gets zip
-	 * @return string
+	 * @return boolean
 	 */
 	function zip() {
 		return $this->get( 'VNU_zip' );
@@ -259,7 +259,7 @@ 
 
 	/**
 	 * Gets created
-	 * @return string
+	 * @return boolean
 	 */
 	function created() {
 		return $this->get( 'VNU_created' );
@@ -269,7 +269,7 @@ 
 
 	/**
 	 * Gets modified
-	 * @return string
+	 * @return boolean
 	 */
 	function modified() {
 		return $this->get( 'VNU_modified' );
@@ -279,7 +279,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get( 'VNU_order' );
@@ -289,7 +289,7 @@ 
 
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get( 'VNU_wp_user' );
@@ -298,7 +298,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function virtual_phone() {
 		return $this->get( 'VNU_virtual_phone' );
@@ -307,7 +307,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function virtual_url() {
 		return $this->get( 'VNU_virtual_url' );
@@ -325,7 +325,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function google_map_link() {
 		return $this->get( 'VNU_google_map_link' );

Spacing +82 added lines, -82 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
@@ -33,9 +33,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Venue
 	 */
-	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);
 	}
 
 
@@ -45,8 +45,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Venue
 	 */
-	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);
 	}
 
 
@@ -56,7 +56,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'VNU_name' );
+		return $this->get('VNU_name');
 	}
 
 
@@ -65,7 +65,7 @@ 
 	 * @return string
 	 */
 	function phone() {
-		return $this->get( 'VNU_phone' );
+		return $this->get('VNU_phone');
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @return string
 	 */
 	function venue_url() {
-		return $this->get( 'VNU_url' );
+		return $this->get('VNU_url');
 	}
 
 
@@ -84,7 +84,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'VNU_desc' );
+		return $this->get('VNU_desc');
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	function excerpt() {
-		return $this->get( 'VNU_short_desc' );
+		return $this->get('VNU_short_desc');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return string
 	 */
 	function identifier() {
-		return $this->get( 'VNU_identifier' );
+		return $this->get('VNU_identifier');
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 * @return string
 	 */
 	function address() {
-		return $this->get( 'VNU_address' );
+		return $this->get('VNU_address');
 	}
 
 
@@ -124,7 +124,7 @@ 
 	 * @return string
 	 */
 	function address2() {
-		return $this->get( 'VNU_address2' );
+		return $this->get('VNU_address2');
 	}
 
 
@@ -135,7 +135,7 @@ 
 	 * @return string
 	 */
 	function city() {
-		return $this->get( 'VNU_city' );
+		return $this->get('VNU_city');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * @return int
 	 */
 	function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -152,7 +152,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -161,7 +161,7 @@ 
 	 * @return string
 	 */
 	public function state_name() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -171,7 +171,7 @@ 
 	 * @return EE_State
 	 */
 	function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 
@@ -183,7 +183,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -197,7 +197,7 @@ 
 	 * @return string
 	 */
 	function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -206,7 +206,7 @@ 
 	 * @return string
 	 */
 	public function country_name() {
-		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -216,7 +216,7 @@ 
 	 * @return EE_Country
 	 */
 	function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -228,7 +228,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -242,7 +242,7 @@ 
 	 * @return string
 	 */
 	function zip() {
-		return $this->get( 'VNU_zip' );
+		return $this->get('VNU_zip');
 	}
 
 
@@ -252,7 +252,7 @@ 
 	 * @return int
 	 */
 	function capacity() {
-		return $this->get_pretty( 'VNU_capacity', 'symbol' );
+		return $this->get_pretty('VNU_capacity', 'symbol');
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @return string
 	 */
 	function created() {
-		return $this->get( 'VNU_created' );
+		return $this->get('VNU_created');
 	}
 
 
@@ -272,7 +272,7 @@ 
 	 * @return string
 	 */
 	function modified() {
-		return $this->get( 'VNU_modified' );
+		return $this->get('VNU_modified');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'VNU_order' );
+		return $this->get('VNU_order');
 	}
 
 
@@ -292,7 +292,7 @@ 
 	 * @return int
 	 */
 	function wp_user() {
-		return $this->get( 'VNU_wp_user' );
+		return $this->get('VNU_wp_user');
 	}
 
 
@@ -301,7 +301,7 @@ 
 	 * @return string
 	 */
 	function virtual_phone() {
-		return $this->get( 'VNU_virtual_phone' );
+		return $this->get('VNU_virtual_phone');
 	}
 
 
@@ -310,7 +310,7 @@ 
 	 * @return string
 	 */
 	function virtual_url() {
-		return $this->get( 'VNU_virtual_url' );
+		return $this->get('VNU_virtual_url');
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return bool
 	 */
 	function enable_for_gmap() {
-		return $this->get( 'VNU_enable_for_gmap' );
+		return $this->get('VNU_enable_for_gmap');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	function google_map_link() {
-		return $this->get( 'VNU_google_map_link' );
+		return $this->get('VNU_google_map_link');
 	}
 
 
@@ -340,16 +340,16 @@ 
 	 * @param bool  $upcoming
 	 * @return EE_Event[]
 	 */
-	function events( $query_params = array(), $upcoming = FALSE ) {
-		if ( $upcoming ) {
+	function events($query_params = array(), $upcoming = FALSE) {
+		if ($upcoming) {
 			$query_params = array(
 				array(
 					'status' => 'publish',
-					'Datetime.DTT_EVT_start' => array( '>', current_time( 'mysql' ))
+					'Datetime.DTT_EVT_start' => array('>', current_time('mysql'))
 				)
 			);
 		}
-		return $this->get_many_related( 'Event', $query_params );
+		return $this->get_many_related('Event', $query_params);
 	}
 
 
@@ -367,8 +367,8 @@ 
 	/**
 	 * Sets address
 	 */
-	function set_address( $address = '' ) {
-		$this->set( 'VNU_address', $address );
+	function set_address($address = '') {
+		$this->set('VNU_address', $address);
 	}
 
 
@@ -376,8 +376,8 @@ 
 	/**
 	 * @param string $address2
 	 */
-	function set_address2( $address2 = '' ) {
-		$this->set( 'VNU_address2', $address2 );
+	function set_address2($address2 = '') {
+		$this->set('VNU_address2', $address2);
 	}
 
 
@@ -385,8 +385,8 @@ 
 	/**
 	 * @param string $city
 	 */
-	function set_city( $city = '' ) {
-		$this->set( 'VNU_city', $city );
+	function set_city($city = '') {
+		$this->set('VNU_city', $city);
 	}
 
 
@@ -394,8 +394,8 @@ 
 	/**
 	 * @param int $state
 	 */
-	function set_state_ID( $state = 0 ) {
-		$this->set( 'STA_ID', $state );
+	function set_state_ID($state = 0) {
+		$this->set('STA_ID', $state);
 	}
 
 
@@ -406,8 +406,8 @@ 
 	 * @param EE_State /int $state_id_or_obj
 	 * @return EE_State
 	 */
-	function set_state_obj( $state_id_or_obj ) {
-		return $this->_add_relation_to( $state_id_or_obj, 'State' );
+	function set_state_obj($state_id_or_obj) {
+		return $this->_add_relation_to($state_id_or_obj, 'State');
 	}
 
 
@@ -415,8 +415,8 @@ 
 	/**
 	 * @param int $country_ID
 	 */
-	function set_country_ID( $country_ID = 0 ) {
-		$this->set( 'CNT_ISO', $country_ID );
+	function set_country_ID($country_ID = 0) {
+		$this->set('CNT_ISO', $country_ID);
 	}
 
 
@@ -425,7 +425,7 @@ 
 	 * @param EE_Country /string $country_id_or_obj
 	 * @return EE_Country
 	 */
-	function set_country_obj( $country_id_or_obj ) {
+	function set_country_obj($country_id_or_obj) {
 		return $this->_add_relation_to($country_id_or_obj, 'Country');
 	}
 
@@ -434,8 +434,8 @@ 
 	/**
 	 * @param string $zip
 	 */
-	function set_zip( $zip = '' ) {
-		$this->set( 'VNU_zip', $zip );
+	function set_zip($zip = '') {
+		$this->set('VNU_zip', $zip);
 	}
 
 
@@ -443,8 +443,8 @@ 
 	/**
 	 * @param int $capacity
 	 */
-	function set_capacity( $capacity = 0 ) {
-		$this->set( 'VNU_capacity', $capacity );
+	function set_capacity($capacity = 0) {
+		$this->set('VNU_capacity', $capacity);
 	}
 
 
@@ -452,8 +452,8 @@ 
 	/**
 	 * @param string $created
 	 */
-	function set_created( $created = '' ) {
-		$this->set( 'VNU_created', $created );
+	function set_created($created = '') {
+		$this->set('VNU_created', $created);
 	}
 
 
@@ -461,8 +461,8 @@ 
 	/**
 	 * @param string $desc
 	 */
-	function set_description( $desc = '' ) {
-		$this->set( 'VNU_desc', $desc );
+	function set_description($desc = '') {
+		$this->set('VNU_desc', $desc);
 	}
 
 
@@ -470,8 +470,8 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	function set_identifier( $identifier = '' ) {
-		$this->set( 'VNU_identifier', $identifier );
+	function set_identifier($identifier = '') {
+		$this->set('VNU_identifier', $identifier);
 	}
 
 
@@ -479,8 +479,8 @@ 
 	/**
 	 * @param string $modified
 	 */
-	function set_modified( $modified = '' ) {
-		$this->set( 'VNU_modified', $modified );
+	function set_modified($modified = '') {
+		$this->set('VNU_modified', $modified);
 	}
 
 
@@ -488,8 +488,8 @@ 
 	/**
 	 * @param string $name
 	 */
-	function set_name( $name = '' ) {
-		$this->set( 'VNU_name', $name );
+	function set_name($name = '') {
+		$this->set('VNU_name', $name);
 	}
 
 
@@ -497,8 +497,8 @@ 
 	/**
 	 * @param int $order
 	 */
-	function set_order( $order = 0 ) {
-		$this->set( 'VNU_order', $order );
+	function set_order($order = 0) {
+		$this->set('VNU_order', $order);
 	}
 
 
@@ -506,8 +506,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_phone( $phone = '' ) {
-		$this->set( 'VNU_phone', $phone );
+	function set_phone($phone = '') {
+		$this->set('VNU_phone', $phone);
 	}
 
 
@@ -515,8 +515,8 @@ 
 	/**
 	 * @param int $wp_user
 	 */
-	function set_wp_user( $wp_user = 1 ) {
-		$this->set( 'VNU_wp_user', $wp_user );
+	function set_wp_user($wp_user = 1) {
+		$this->set('VNU_wp_user', $wp_user);
 	}
 
 
@@ -524,8 +524,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_venue_url( $url = '' ) {
-		$this->set( 'VNU_url', $url );
+	function set_venue_url($url = '') {
+		$this->set('VNU_url', $url);
 	}
 
 
@@ -533,8 +533,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_virtual_phone( $phone = '' ) {
-		$this->set( 'VNU_virtual_phone', $phone );
+	function set_virtual_phone($phone = '') {
+		$this->set('VNU_virtual_phone', $phone);
 	}
 
 
@@ -542,8 +542,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_virtual_url( $url = '' ) {
-		$this->set( 'VNU_virtual_url', $url );
+	function set_virtual_url($url = '') {
+		$this->set('VNU_virtual_url', $url);
 	}
 
 
@@ -551,8 +551,8 @@ 
 	/**
 	 * @param string $enable
 	 */
-	function set_enable_for_gmap( $enable = '' ) {
-		$this->set( 'VNU_enable_for_gmap', $enable );
+	function set_enable_for_gmap($enable = '') {
+		$this->set('VNU_enable_for_gmap', $enable);
 	}
 
 
@@ -560,8 +560,8 @@ 
 	/**
 	 * @param string $google_map_link
 	 */
-	function set_google_map_link( $google_map_link = '' ) {
-		$this->set( 'VNU_google_map_link', $google_map_link );
+	function set_google_map_link($google_map_link = '') {
+		$this->set('VNU_google_map_link', $google_map_link);
 	}
 
 

core/db_classes/EE_WP_User.class.php

Indentation +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@
 	exit( 'No direct script access allowed' );
 }
 /**
- * EE_WP_User class
- *
- * @package 			Event Espresso
- * @subpackage 	includes/classes/EE_WP_User.class.php
- * @author 				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * EE_WP_User class
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	includes/classes/EE_WP_User.class.php
+	 * @author 				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_WP_User extends EE_Base_Class {
 
 	/**

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_WP_User class
@@ -22,9 +22,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User|mixed
 	 */
-	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);
 	}
 
 
@@ -33,8 +33,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User
 	 */
-	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);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @return WP_User
 	 */
 	public function wp_user_obj() {
-		if( ! $this->_wp_user_obj ) {
-			$this->_wp_user_obj = get_user_by('ID', $this->ID() );
+		if ( ! $this->_wp_user_obj) {
+			$this->_wp_user_obj = get_user_by('ID', $this->ID());
 		}
 		return $this->_wp_user_obj;
 	}

core/db_models/EEM_Answer.model.php

Spacing +29 added lines, -29 removed lines

@@ -50,18 +50,18 @@ 
 	/**
 	 * 	constructor
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Answer','event_espresso');
-		$this->plural_item = __('Answers','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Answer', 'event_espresso');
+		$this->plural_item = __('Answers', 'event_espresso');
 		$this->_tables = array(
 			'Answer'=> new EE_Primary_Table('esp_answer', 'ANS_ID')
 		);
 		$this->_fields = array(
 			'Answer'=>array(
-				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID','event_espresso')),
-				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID','event_espresso'), false, 0, 'Registration'),
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value','event_espresso'), false, '')
+				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID', 'event_espresso')),
+				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Belongs_To_Relation(),
@@ -69,7 +69,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
 		$this->_caps_slug = 'registrations';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -82,19 +82,19 @@ 
 	 * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
 	 * @return string
 	 */
-	public function get_answer_value_to_question( EE_Registration $registration, $question_id = NULL,$pretty_answer = FALSE ){
-		$value = $this->get_attendee_property_answer_value( $registration, $question_id, $pretty_answer );
-		if (  $value === NULL ){
-			$answer_obj = $this->get_registration_question_answer_object( $registration, $question_id, $pretty_answer );
-			if( $answer_obj instanceof EE_Answer ){
-				if($pretty_answer){
+	public function get_answer_value_to_question(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
+		$value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
+		if ($value === NULL) {
+			$answer_obj = $this->get_registration_question_answer_object($registration, $question_id, $pretty_answer);
+			if ($answer_obj instanceof EE_Answer) {
+				if ($pretty_answer) {
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else {
 					$value = $answer_obj->value();
 				}
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
 	}
 
 
@@ -105,9 +105,9 @@ 
 	 * @param int $question_id
 	 * @return EE_Answer
 	 */
-	public function get_registration_question_answer_object( EE_Registration $registration, $question_id = NULL){
-		$answer_obj = $this->get_one( array( array( 'QST_ID'=>$question_id, 'REG_ID'=>$registration->ID() )));
-		return apply_filters( 'FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id );
+	public function get_registration_question_answer_object(EE_Registration $registration, $question_id = NULL) {
+		$answer_obj = $this->get_one(array(array('QST_ID'=>$question_id, 'REG_ID'=>$registration->ID())));
+		return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
 	}
 
 
@@ -119,27 +119,27 @@ 
 	 * @param boolean $pretty_answer
 	 * @return string
 	 */
-	public function get_attendee_property_answer_value( EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE ){
+	public function get_attendee_property_answer_value(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
 		$field_name = NULL;
 		$value = NULL;
 		//only bother checking if the registration has an attendee
-		if( $registration->attendee() instanceof EE_Attendee && isset($this->_question_id_to_att_field_map[$question_id])){
+		if ($registration->attendee() instanceof EE_Attendee && isset($this->_question_id_to_att_field_map[$question_id])) {
 			$field_name = $this->_question_id_to_att_field_map[$question_id];
-			if($pretty_answer){
-				if($field_name == 'STA_ID'){
+			if ($pretty_answer) {
+				if ($field_name == 'STA_ID') {
 					$state = $registration->attendee()->state_obj();
-					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'),$registration->attendee()->state_ID());
-				}else if($field_name == 'CNT_ISO'){
+					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
+				} else if ($field_name == 'CNT_ISO') {
 					$country = $registration->attendee()->country_obj();
-					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
-				}else{
+					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
+				} else {
 					$value = $registration->attendee()->get_pretty($field_name);
 				}
-			}else{
+			} else {
 				$value = $registration->attendee()->get($field_name);
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id);
 	}
 
 

Braces +7 added lines, -5 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 @@ 
 			if( $answer_obj instanceof EE_Answer ){
 				if($pretty_answer){
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else{
 					$value = $answer_obj->value();
 				}
 			}
@@ -129,13 +131,13 @@ 
 				if($field_name == 'STA_ID'){
 					$state = $registration->attendee()->state_obj();
 					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'),$registration->attendee()->state_ID());
-				}else if($field_name == 'CNT_ISO'){
+				} else if($field_name == 'CNT_ISO'){
 					$country = $registration->attendee()->country_obj();
 					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
-				}else{
+				} else{
 					$value = $registration->attendee()->get_pretty($field_name);
 				}
-			}else{
+			} else{
 				$value = $registration->attendee()->get($field_name);
 			}
 		}

core/db_models/EEM_Attendee.model.php

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 ) );
+			}
 
 
 }

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, time()),
 				'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, time()),
-				'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));
             }
 
 

Doc Comments +1 added lines, -1 removed lines

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

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
  *