eventespresso / event-espresso-core

core/db_classes/EE_Ticket.class.php

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 +152 added lines, -152 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,11 +470,11 @@ 
 	 * @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;
 	}
 
 
@@ -483,7 +483,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_subtotal() {
-		return EE_Taxes::get_subtotal_for_admin( $this );
+		return EE_Taxes::get_subtotal_for_admin($this);
 	}
 
 
@@ -493,7 +493,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);
 	}
 
 
@@ -503,8 +503,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'TKT_name', $name );
+	function set_name($name) {
+		$this->set('TKT_name', $name);
 	}
 
 
@@ -514,7 +514,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'TKT_description' );
+		return $this->get('TKT_description');
 	}
 
 
@@ -524,8 +524,8 @@ 
 	 * @param string $description
 	 * @return boolean
 	 */
-	function set_description( $description ) {
-		$this->set( 'TKT_description', $description );
+	function set_description($description) {
+		$this->set('TKT_description', $description);
 	}
 
 
@@ -536,8 +536,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);
 	}
 
 
@@ -547,8 +547,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');
 	}
 
 
@@ -559,8 +559,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);
 	}
 
 
@@ -570,8 +570,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');
 	}
 
 
@@ -583,8 +583,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');
 	}
 
 
@@ -594,8 +594,8 @@ 
 	 * @param int $min
 	 * @return boolean
 	 */
-	function set_min( $min ) {
-		$this->set( 'TKT_min', $min );
+	function set_min($min) {
+		$this->set('TKT_min', $min);
 	}
 
 
@@ -605,7 +605,7 @@ 
 	 * @return int
 	 */
 	function max() {
-		return $this->get( 'TKT_max' );
+		return $this->get('TKT_max');
 	}
 
 
@@ -615,8 +615,8 @@ 
 	 * @param int $max
 	 * @return boolean
 	 */
-	function set_max( $max ) {
-		$this->set( 'TKT_max', $max );
+	function set_max($max) {
+		$this->set('TKT_max', $max);
 	}
 
 
@@ -626,8 +626,8 @@ 
 	 * @param float $price
 	 * @return boolean
 	 */
-	function set_price( $price ) {
-		$this->set( 'TKT_price', $price );
+	function set_price($price) {
+		$this->set('TKT_price', $price);
 	}
 
 
@@ -637,7 +637,7 @@ 
 	 * @return int
 	 */
 	function sold() {
-		return $this->get( 'TKT_sold' );
+		return $this->get('TKT_sold');
 	}
 
 
@@ -647,9 +647,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);
 	}
 
 
@@ -659,8 +659,8 @@ 
 	 * @param int $sold
 	 * @return boolean
 	 */
-	function set_sold( $sold ) {
-		$this->set( 'TKT_sold', $sold );
+	function set_sold($sold) {
+		$this->set('TKT_sold', $sold);
 	}
 
 
@@ -670,11 +670,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);
 	}
 
 
@@ -684,7 +684,7 @@ 
 	 * @return int
 	 */
 	function qty() {
-		return $this->get( 'TKT_qty' );
+		return $this->get('TKT_qty');
 	}
 
 
@@ -694,8 +694,8 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function set_qty( $qty ) {
-		$this->set( 'TKT_qty', $qty );
+	function set_qty($qty) {
+		$this->set('TKT_qty', $qty);
 	}
 
 
@@ -705,7 +705,7 @@ 
 	 * @return int
 	 */
 	function uses() {
-		return $this->get( 'TKT_uses' );
+		return $this->get('TKT_uses');
 	}
 
 
@@ -715,8 +715,8 @@ 
 	 * @param int $uses
 	 * @return boolean
 	 */
-	function set_uses( $uses ) {
-		$this->set( 'TKT_uses', $uses );
+	function set_uses($uses) {
+		$this->set('TKT_uses', $uses);
 	}
 
 
@@ -726,7 +726,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'TKT_required' );
+		return $this->get('TKT_required');
 	}
 
 
@@ -736,8 +736,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);
 	}
 
 
@@ -747,7 +747,7 @@ 
 	 * @return boolean
 	 */
 	function taxable() {
-		return $this->get( 'TKT_taxable' );
+		return $this->get('TKT_taxable');
 	}
 
 
@@ -757,8 +757,8 @@ 
 	 * @param boolean $taxable
 	 * @return boolean
 	 */
-	function set_taxable( $taxable ) {
-		$this->set( 'TKT_taxable', $taxable );
+	function set_taxable($taxable) {
+		$this->set('TKT_taxable', $taxable);
 	}
 
 
@@ -768,7 +768,7 @@ 
 	 * @return boolean
 	 */
 	function is_default() {
-		return $this->get( 'TKT_is_default' );
+		return $this->get('TKT_is_default');
 	}
 
 
@@ -778,8 +778,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);
 	}
 
 
@@ -789,7 +789,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'TKT_order' );
+		return $this->get('TKT_order');
 	}
 
 
@@ -799,8 +799,8 @@ 
 	 * @param int $order
 	 * @return boolean
 	 */
-	function set_order( $order ) {
-		$this->set( 'TKT_order', $order );
+	function set_order($order) {
+		$this->set('TKT_order', $order);
 	}
 
 
@@ -810,7 +810,7 @@ 
 	 * @return int
 	 */
 	function row() {
-		return $this->get( 'TKT_row' );
+		return $this->get('TKT_row');
 	}
 
 
@@ -820,8 +820,8 @@ 
 	 * @param int $row
 	 * @return boolean
 	 */
-	function set_row( $row ) {
-		$this->set( 'TKT_row', $row );
+	function set_row($row) {
+		$this->set('TKT_row', $row);
 	}
 
 
@@ -831,7 +831,7 @@ 
 	 * @return boolean
 	 */
 	function deleted() {
-		return $this->get( 'TKT_deleted' );
+		return $this->get('TKT_deleted');
 	}
 
 
@@ -841,8 +841,8 @@ 
 	 * @param boolean $deleted
 	 * @return boolean
 	 */
-	function set_deleted( $deleted ) {
-		$this->set( 'TKT_deleted', $deleted );
+	function set_deleted($deleted) {
+		$this->set('TKT_deleted', $deleted);
 	}
 
 
@@ -852,7 +852,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -862,8 +862,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);
 	}
 
 
@@ -874,10 +874,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();
 	}
 
 
@@ -887,7 +887,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'TKT_name' );
+		return $this->get('TKT_name');
 	}
 
 
@@ -897,7 +897,7 @@ 
 	 * @return float
 	 */
 	function price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -907,8 +907,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);
 	}
 
 
@@ -919,8 +919,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;
 	}
@@ -932,7 +932,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_Venue.class.php

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

Doc Comments +8 added lines, -8 removed lines

@@ -49,11 +49,11 @@ 
 
 
 	/**
-	 * @param      $table_column
+	 * @param      string $table_column
 	 * @param      $nice_name
-	 * @param      $nullable
+	 * @param      boolean $nullable
 	 * @param null $default_value
-	 * @param null $timezone
+	 * @param string|null $timezone
 	 * @param null $date_format
 	 * @param null $time_format
 	 * @param null $pretty_date_format
@@ -86,7 +86,7 @@ 
 
 
 	/**
-	 * @return DateTimeZone|null
+	 * @return DateTimeZone
 	 */
 	public static function get_UTC_DateTimeZone() {
 		return EE_Datetime_Field::$_UTC_DateTimeZone instanceof DateTimeZone ? EE_Datetime_Field::$_UTC_DateTimeZone : new DateTimeZone( 'UTC' );
@@ -96,7 +96,7 @@ 
 
 	/**
 	 * this prepares any incoming date data and make sure its converted to a utc unix timestamp
-	 * @param  string|int $value_inputted_for_field_on_model_object could be a string formatted date time or int unix timestamp
+	 * @param  string $value_inputted_for_field_on_model_object could be a string formatted date time or int unix timestamp
 	 * @return int                                           unix timestamp (utc)
 	 */
 	public function prepare_for_set($value_inputted_for_field_on_model_object) {
@@ -308,7 +308,7 @@ 
 	 * @param mixed $datetime_value
 	 * @param string  $schema if set to "no_html", even if the timezone is shown, there will be no tags next to it.
 	 * @internal param mixed $value_on_field_to_be_outputted
-	 * @return mixed
+	 * @return string
 	 */
 	public function prepare_for_pretty_echoing( $datetime_value, $schema = null ) {
 		if( $this->_display_timezone() ) {
@@ -429,7 +429,7 @@ 
 
 	/**
 	 * @param $datetime
-	 * @return bool|int|string
+	 * @return integer
 	 * @throws EE_Error
 	 */
 	private function _convert_from_numeric_value_to_utc_unix_timestamp( $datetime ) {
@@ -453,7 +453,7 @@ 
 
 
 	/**
-	 * @param $datetime
+	 * @param string $datetime
 	 * @return string
 	 * @throws EE_Error
 	 */

Indentation +1 added lines, -1 removed lines

@@ -550,7 +550,7 @@
 				}
 			}
 		}
-        		return FALSE;
+				return FALSE;
 	}
 
 

Spacing +107 added lines, -107 removed lines

@@ -59,19 +59,19 @@ 
 	 * @param null $pretty_date_format
 	 * @param null $pretty_time_format
 	 */
-	public function __construct( $table_column, $nice_name, $nullable, $default_value, $timezone = NULL, $date_format = NULL, $time_format = NULL, $pretty_date_format = NULL, $pretty_time_format = NULL ){
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $timezone = NULL, $date_format = NULL, $time_format = NULL, $pretty_date_format = NULL, $pretty_time_format = NULL) {
 
 		parent::__construct($table_column, $nice_name, $nullable, $default_value);
 		$this->_date_format = empty($date_format) ? get_option('date_format') : $date_format;
-		$this->_date_format = EE_Base_Class::fix_date_format_for_use_with_strtotime( $this->_date_format );
+		$this->_date_format = EE_Base_Class::fix_date_format_for_use_with_strtotime($this->_date_format);
 		$this->_time_format = empty($time_format) ? get_option('time_format') : $time_format;
 
-		$this->set_timezone( $timezone );
+		$this->set_timezone($timezone);
 
 
 		$this->_pretty_date_format = empty($pretty_date_format) ? get_option('date_format') : $pretty_date_format;
-		$this->_pretty_date_format = EE_Base_Class::fix_date_format_for_use_with_strtotime( $this->_pretty_date_format );
-		$this->_pretty_time_format = empty( $pretty_time_format ) ? get_option('time_format') : $pretty_time_format;
+		$this->_pretty_date_format = EE_Base_Class::fix_date_format_for_use_with_strtotime($this->_pretty_date_format);
+		$this->_pretty_time_format = empty($pretty_time_format) ? get_option('time_format') : $pretty_time_format;
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return DateTimeZone|null
 	 */
 	public static function get_UTC_DateTimeZone() {
-		return EE_Datetime_Field::$_UTC_DateTimeZone instanceof DateTimeZone ? EE_Datetime_Field::$_UTC_DateTimeZone : new DateTimeZone( 'UTC' );
+		return EE_Datetime_Field::$_UTC_DateTimeZone instanceof DateTimeZone ? EE_Datetime_Field::$_UTC_DateTimeZone : new DateTimeZone('UTC');
 	}
 
 
@@ -100,7 +100,7 @@ 
 	 * @return int                                           unix timestamp (utc)
 	 */
 	public function prepare_for_set($value_inputted_for_field_on_model_object) {
-		return $this->_convert_to_utc_unix_timestamp( $value_inputted_for_field_on_model_object);
+		return $this->_convert_to_utc_unix_timestamp($value_inputted_for_field_on_model_object);
 	}
 
 
@@ -116,9 +116,9 @@ 
 	 * @param bool $pretty If we're returning the pretty formats or standard format string.
 	 * @return string    The final assembled format string.
 	 */
-	private function _get_date_time_output( $pretty = FALSE ) {
+	private function _get_date_time_output($pretty = FALSE) {
 
-		switch ( $this->_date_time_output ) {
+		switch ($this->_date_time_output) {
 			case 'time' :
 				return $pretty ? $this->_pretty_time_format : $this->_time_format;
 				break;
@@ -128,7 +128,7 @@ 
 				break;
 
 			default :
-				return $pretty ? $this->_pretty_date_format . ' ' . $this->_pretty_time_format : $this->_date_format . ' ' . $this->_time_format;
+				return $pretty ? $this->_pretty_date_format.' '.$this->_pretty_time_format : $this->_date_format.' '.$this->_time_format;
 		}
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $what acceptable values are 'time' or 'date'.  Any other value will be set but will always result in both 'date' and 'time' being returned.
 	 * @return void
 	 */
-	public function set_date_time_output( $what = NULL ) {
+	public function set_date_time_output($what = NULL) {
 		$this->_date_time_output = $what;
 	}
 
@@ -158,23 +158,23 @@ 
 	 * @param string $timezone A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php
 	 * @return void
 	 */
-	public function set_timezone( $timezone ) {
-		if( $timezone === NULL && $this->_timezone != NULL){
+	public function set_timezone($timezone) {
+		if ($timezone === NULL && $this->_timezone != NULL) {
 			//leave the timezone AS-IS if we already have one and
 			//the function arg didn't provide one
 			return;
 		}
-		$this->_timezone = empty( $timezone ) ? get_option('timezone_string') : $timezone;
+		$this->_timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $this->_timezone ) ) {
+		if (empty($this->_timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
 			$this->_blog_offset = $offset;
-			$this->_timezone = self::timezone_convert_to_string_from_offset( $offset );
+			$this->_timezone = self::timezone_convert_to_string_from_offset($offset);
 		}
 
-		self::validate_timezone( $this->_timezone ); //just running validation on the timezone.
+		self::validate_timezone($this->_timezone); //just running validation on the timezone.
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @param string $format a new date format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_date_format( $format ) {
+	public function set_date_format($format) {
 		$this->_date_format = $format;
 	}
 
@@ -212,7 +212,7 @@ 
 	 * @param string $format a new time format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_time_format( $format ) {
+	public function set_time_format($format) {
 		$this->_time_format = $format;
 	}
 
@@ -227,7 +227,7 @@ 
 	 * @param string $format a new pretty date format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_date_format( $format ) {
+	public function set_pretty_date_format($format) {
 		$this->_pretty_date_format = $format;
 	}
 
@@ -244,7 +244,7 @@ 
 	 * @param string $format a new pretty time format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_time_format( $format ) {
+	public function set_pretty_time_format($format) {
 		$this->_pretty_time_format = $format;
 	}
 
@@ -257,12 +257,12 @@ 
 	 * @throws EE_Error
 	 * @return int updated timestamp
 	 */
-	public function prepare_for_set_with_new_time($time_to_set_string, $current_datetime_value ){
-		$this->_set_date_obj( date( $this->_date_format . ' ' . $this->_time_format, $current_datetime_value), 'UTC' );
-		if ( ! $this->_date instanceof DateTime  && ! $this->_nullable ) {
-			throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
+	public function prepare_for_set_with_new_time($time_to_set_string, $current_datetime_value) {
+		$this->_set_date_obj(date($this->_date_format.' '.$this->_time_format, $current_datetime_value), 'UTC');
+		if ( ! $this->_date instanceof DateTime && ! $this->_nullable) {
+			throw new EE_Error(__('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso'));
 		}
-		return $this->_prepare_for_set_new( $time_to_set_string, TRUE );
+		return $this->_prepare_for_set_new($time_to_set_string, TRUE);
 	}
 
 
@@ -274,12 +274,12 @@ 
 	 * @throws EE_Error
 	 * @return int updated timestamp
 	 */
-	public function prepare_for_set_with_new_date($date_to_set_string, $current_datetime_value ){
-		$this->_set_date_obj( date( $this->_date_format  . ' ' . $this->_time_format, $current_datetime_value ), 'UTC' );
-		if ( ! $this->_date instanceof DateTime && ! $this->_nullable ) {
-			throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
+	public function prepare_for_set_with_new_date($date_to_set_string, $current_datetime_value) {
+		$this->_set_date_obj(date($this->_date_format.' '.$this->_time_format, $current_datetime_value), 'UTC');
+		if ( ! $this->_date instanceof DateTime && ! $this->_nullable) {
+			throw new EE_Error(__('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso'));
 		}
-		return $this->_prepare_for_set_new( $date_to_set_string );
+		return $this->_prepare_for_set_new($date_to_set_string);
 	}
 
 
@@ -292,11 +292,11 @@ 
 	 * @param  int    $datetime_value This will always be a unix timestamp in UTC because that's what the internal data type of the date time property is.
 	 * @return string                formatted date time for given timezone
 	 */
-	public function prepare_for_get( $datetime_value ) {
+	public function prepare_for_get($datetime_value) {
 
 		$format_string = $this->_get_date_time_output();
 		//send this to our formatter to return localized time for the timezone
-		return $this->_convert_to_timezone_from_utc_unix_timestamp( $datetime_value, $format_string );
+		return $this->_convert_to_timezone_from_utc_unix_timestamp($datetime_value, $format_string);
 	}
 
 
@@ -310,19 +310,19 @@ 
 	 * @internal param mixed $value_on_field_to_be_outputted
 	 * @return mixed
 	 */
-	public function prepare_for_pretty_echoing( $datetime_value, $schema = null ) {
-		if( $this->_display_timezone() ) {
-			if( $schema == 'no_html' ){
-				$timezone_string = '(' . self::get_timezone_abbrev( $this->_timezone ) . ')';
-			}else{
-				$timezone_string = '<span class="ee_dtt_timezone_string">(' . self::get_timezone_abbrev($this->_timezone) . ')</span>';
+	public function prepare_for_pretty_echoing($datetime_value, $schema = null) {
+		if ($this->_display_timezone()) {
+			if ($schema == 'no_html') {
+				$timezone_string = '('.self::get_timezone_abbrev($this->_timezone).')';
+			} else {
+				$timezone_string = '<span class="ee_dtt_timezone_string">('.self::get_timezone_abbrev($this->_timezone).')</span>';
 			}
 		} else {
 			$timezone_string = '';
 		}
 
-		$format_string = $this->_get_date_time_output( TRUE );
-		return $this->_convert_to_timezone_from_utc_unix_timestamp( $datetime_value, $format_string ) . $timezone_string;
+		$format_string = $this->_get_date_time_output(TRUE);
+		return $this->_convert_to_timezone_from_utc_unix_timestamp($datetime_value, $format_string).$timezone_string;
 	}
 
 
@@ -333,8 +333,8 @@ 
 	 * @param  int $datetime_value unix timestamp in UTC
 	 * @return string                mysql timestamp in UTC
 	 */
-	public function prepare_for_use_in_db( $datetime_value ) {
-		return $this->_nullable && empty( $datetime_value) ? NULL : date( "Y-m-d H:i:s", $datetime_value );
+	public function prepare_for_use_in_db($datetime_value) {
+		return $this->_nullable && empty($datetime_value) ? NULL : date("Y-m-d H:i:s", $datetime_value);
 	}
 
 
@@ -346,8 +346,8 @@ 
 	 * @param  string $datetime_value mysql timestamp in UTC
 	 * @return int                 UnixTime in UTC
 	 */
-	public function prepare_for_set_from_db( $datetime_value ) {
-		return $this->_nullable && empty( $datetime_value ) ? NULL : strtotime( $datetime_value );
+	public function prepare_for_set_from_db($datetime_value) {
+		return $this->_nullable && empty($datetime_value) ? NULL : strtotime($datetime_value);
 	}
 
 
@@ -359,17 +359,17 @@ 
 	 * @throws EE_Error
 	 * @return string           final converted date-time-zone.
 	 */
-	private function _convert_to_timezone_from_utc_unix_timestamp( $datetime_value, $format ) {
-		if ( $this->_nullable && empty( $datetime_value )) {
+	private function _convert_to_timezone_from_utc_unix_timestamp($datetime_value, $format) {
+		if ($this->_nullable && empty($datetime_value)) {
 			return NULL;
 		}
-		$datetime = date( 'Y-m-d H:i:s', (int)$datetime_value );
-		$this->_set_date_obj( $datetime, 'UTC' );
-		if ( ! $this->_date instanceof DateTime ) {
-			throw new EE_Error( sprintf( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used on %s', 'event_espresso' ) , $this->get_model_name() ) );
+		$datetime = date('Y-m-d H:i:s', (int) $datetime_value);
+		$this->_set_date_obj($datetime, 'UTC');
+		if ( ! $this->_date instanceof DateTime) {
+			throw new EE_Error(sprintf(__('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used on %s', 'event_espresso'), $this->get_model_name()));
 		}
-		$this->_date->setTimezone( new DateTimeZone( $this->_timezone ) );
-		return $this->_date->format( $format );
+		$this->_date->setTimezone(new DateTimeZone($this->_timezone));
+		return $this->_date->format($format);
 
 	}
 
@@ -388,22 +388,22 @@ 
 	 * @param  boolean $is_time            If this is a time adjustment set this boolean flag to true, otherwise it is a date adjustment
 	 * @return int                         UTC UnixTimestamp
 	 */
-	private function _prepare_for_set_new( $datetime_adjustment, $is_time = FALSE ) {
-		if ( $this->_nullable && empty( $datetime_adjustment ) ) {
+	private function _prepare_for_set_new($datetime_adjustment, $is_time = FALSE) {
+		if ($this->_nullable && empty($datetime_adjustment)) {
 			return NULL;
 		}
 		//first let's parse the incoming string
-		$parsed = date_parse( $datetime_adjustment );
+		$parsed = date_parse($datetime_adjustment);
 		//set the timezone to the incoming timezone for the current date_object
-		$this->_date->setTimezone( new DateTimeZone( $this->_timezone ) );
+		$this->_date->setTimezone(new DateTimeZone($this->_timezone));
 		//let's adjust the time or date depending on our $is_time boolean
-		if ( $is_time ) {
-			$this->_date->setTime( $parsed['hour'], $parsed['minute'] );
+		if ($is_time) {
+			$this->_date->setTime($parsed['hour'], $parsed['minute']);
 		} else {
-			$this->_date->setDate( $parsed['year'], $parsed['month'], $parsed['day'] );
+			$this->_date->setDate($parsed['year'], $parsed['month'], $parsed['day']);
 		}
 		//return to UTC time
-		$this->_date->setTimezone( EE_Datetime_Field::get_UTC_DateTimeZone() );
+		$this->_date->setTimezone(EE_Datetime_Field::get_UTC_DateTimeZone());
 		//return unix timestamp
 		return $this->_date->format('U');
 	}
@@ -418,10 +418,10 @@ 
 	 * @param  string|int $datetime This can be either an integer timestamp (in which case this method will convert from int to string first to make sure we get the right timezone setup )
 	 * @return string 		unix timestamp for utc
 	 */
-	private function _convert_to_utc_unix_timestamp( $datetime ) {
-		if ( $this->_nullable && empty( $datetime ) )
+	private function _convert_to_utc_unix_timestamp($datetime) {
+		if ($this->_nullable && empty($datetime))
 			return NULL;
-		$timestamp = is_numeric( $datetime ) ? $this->_convert_from_numeric_value_to_utc_unix_timestamp( $datetime ) : $this->_convert_from_string_value_to_utc_unix_timestamp( $datetime );
+		$timestamp = is_numeric($datetime) ? $this->_convert_from_numeric_value_to_utc_unix_timestamp($datetime) : $this->_convert_from_string_value_to_utc_unix_timestamp($datetime);
 		return $timestamp;
 	}
 
@@ -432,15 +432,15 @@ 
 	 * @return bool|int|string
 	 * @throws EE_Error
 	 */
-	private function _convert_from_numeric_value_to_utc_unix_timestamp( $datetime ) {
-		$datetime = date( 'Y-m-d H:i:s', (int) $datetime);
+	private function _convert_from_numeric_value_to_utc_unix_timestamp($datetime) {
+		$datetime = date('Y-m-d H:i:s', (int) $datetime);
 
-		date_default_timezone_set( $this->_timezone );
+		date_default_timezone_set($this->_timezone);
 		$timestamp = strtotime($datetime);
 
 		//if we don't have a datetime at this point then something has gone wrong
-		if ( $timestamp === NULL || $timestamp === FALSE) {
-			throw new EE_Error( sprintf( __('Something went wrong with setting the date/time.  Likely, either there is an invalid timezone string or invalid timestamp being used. Datetime passed in: %s producted timestamp: %s', 'event_espresso' ), $datetime, $timestamp )  );
+		if ($timestamp === NULL || $timestamp === FALSE) {
+			throw new EE_Error(sprintf(__('Something went wrong with setting the date/time.  Likely, either there is an invalid timezone string or invalid timestamp being used. Datetime passed in: %s producted timestamp: %s', 'event_espresso'), $datetime, $timestamp));
 		}
 
 		//return to default for PHP
@@ -457,15 +457,15 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function _convert_from_string_value_to_utc_unix_timestamp( $datetime ) {
+	private function _convert_from_string_value_to_utc_unix_timestamp($datetime) {
 		//create a new datetime object using the given string and timezone
-		$this->_set_date_obj( $datetime, $this->_timezone );
+		$this->_set_date_obj($datetime, $this->_timezone);
 
-		if ( ! $this->_date instanceof DateTime && ! $this->_nullable ) {
-			throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
+		if ( ! $this->_date instanceof DateTime && ! $this->_nullable) {
+			throw new EE_Error(__('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso'));
 		}
 
-		$this->_date->setTimezone( EE_Datetime_Field::get_UTC_DateTimeZone() );
+		$this->_date->setTimezone(EE_Datetime_Field::get_UTC_DateTimeZone());
 		return $this->_date->format('U');
 
 	}
@@ -481,13 +481,13 @@ 
 	 * @throws EE_Error
 	 * @return boolean    Return True if Valid, False if Invalid
 	 */
-	public static function validate_timezone( $timezone_string ) {
+	public static function validate_timezone($timezone_string) {
 		// easiest way to test a timezone string is just see if it throws an error when you try to create a DateTimeZone object with it
 		try {
-			new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
-			throw new EE_Error( sprintf(
-				__( 'The timezone given (%s), is invalid, please check with %sthis list%s for what valid timezones can be used', 'event_espresso' ),
+			new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
+			throw new EE_Error(sprintf(
+				__('The timezone given (%s), is invalid, please check with %sthis list%s for what valid timezones can be used', 'event_espresso'),
 				$timezone_string,
 				'<a href="http://www.php.net/manual/en/timezones.php">',
 				'</a>'
@@ -506,13 +506,13 @@ 
 	 * @param  string $offset GMT offset
 	 * @return string         timezone_string (valid for DateTimeZone)
 	 */
-	public static function timezone_convert_to_string_from_offset( $offset ) {
+	public static function timezone_convert_to_string_from_offset($offset) {
 		$offset *= 3600; // convert hour offset to seconds
 		//make sure $offset is int (cause if incoming was int then converted to float);
 		$offset = (int) $offset;
 
 		//account for WP offsets that aren't valid UTC
-		switch ( $offset ) {
+		switch ($offset) {
 			case -1800 :
 				$offset = -3600;
 				break;
@@ -543,9 +543,9 @@ 
 		}
 
 		$abbreviations = timezone_abbreviations_list();
-		foreach ( $abbreviations as $abbreviation ) {
-			foreach ( $abbreviation as $city ) {
-				if ( $city['offset'] === $offset && $city['dst'] === FALSE ) {
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] === $offset && $city['dst'] === FALSE) {
 					return $city['timezone_id'];
 				}
 			}
@@ -561,18 +561,18 @@ 
 	 * @param  string $tz valid timezone string
 	 * @return int     if conversion can happen then we return the offset, if not then we return FALSE (or EE_Error)
 	 */
-	public static function timezone_convert_to_offset_from_string( $tz ) {
+	public static function timezone_convert_to_offset_from_string($tz) {
 		$abbreviations = timezone_abbreviations_list();
 		$offset = NULL;
-		foreach ( $abbreviations as $abbreviation ) {
-			foreach ( $abbreviation as $city ) {
-				if ( $city['timezone_id'] == $tz ) {
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['timezone_id'] == $tz) {
 					$offset = $city['offset'];
 				}
 			}
 		}
 		//$offset will be in seconds so let's convert to hours and make sure its an int
-		return ! empty( $offset) ? (int)( $offset / 3600 ) : 0;
+		return ! empty($offset) ? (int) ($offset / 3600) : 0;
 	}
 
 
@@ -588,15 +588,15 @@ 
 
 		//first let's do a comparison of timezone strings.  If they match then we can get out without any further calculations
 		$blog_string = get_option('timezone_string');
-		if ( $blog_string == $this->_timezone )
+		if ($blog_string == $this->_timezone)
 			return FALSE;
 
 		//now we need to calc the offset for the timezone string so we can compare with the blog offset.
-		$this_offset = self::timezone_convert_to_offset_from_string( $this->_timezone );
-		$blog_offset = !empty( $this->_blog_offset ) ? $this->_blog_offset : self::timezone_convert_to_offset_from_string( $blog_string );
+		$this_offset = self::timezone_convert_to_offset_from_string($this->_timezone);
+		$blog_offset = ! empty($this->_blog_offset) ? $this->_blog_offset : self::timezone_convert_to_offset_from_string($blog_string);
 
 		//now compare
-		if ( $blog_offset === $this_offset )
+		if ($blog_offset === $this_offset)
 			return FALSE;
 
 		return TRUE;
@@ -612,32 +612,32 @@ 
 	 * @throws Exception
 	 * @return void
 	 */
-	private function _set_date_obj( $date_string, $timezone ) {
-		if ( $this->_nullable && empty( $date_string ) ) {
+	private function _set_date_obj($date_string, $timezone) {
+		if ($this->_nullable && empty($date_string)) {
 			$this->_date = NULL;
 			return;
 		}
 		try {
 			//start off assuming it's a wonky excel format
-			if ( version_compare( PHP_VERSION, '5.3.0' ) >= 0 ) {
+			if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
 				// maybe it's the Microsoft excel format '16/08/2013 8:58' ?
-				$this->_date = DateTime::createFromFormat( 'd/m/Y H:i', $date_string, new DateTimeZone( $timezone ));
+				$this->_date = DateTime::createFromFormat('d/m/Y H:i', $date_string, new DateTimeZone($timezone));
 			} else {
 				//change 'd/m/Y H:i'  to 'd-m-Y H:i'  because of how strtotime() interprets date formats. see: http://www.php.net/manual/en/datetime.formats.date.php
-				$this->_date = new DateTime( date( 'd-m-Y H:i', strtotime( $date_string )), new DateTimeZone( $timezone ));
+				$this->_date = new DateTime(date('d-m-Y H:i', strtotime($date_string)), new DateTimeZone($timezone));
 			}
-		} catch( Exception $e ) {}
+		} catch (Exception $e) {}
 
-		if( ! $this->_date ){
+		if ( ! $this->_date) {
 			try {
-				$this->_date = new DateTime( $date_string, new DateTimeZone( $timezone ));
-			} catch( Exception $e ) {
+				$this->_date = new DateTime($date_string, new DateTimeZone($timezone));
+			} catch (Exception $e) {
 				// because DateTime chokes on some formats, check if strtotime fails, and throw error regarding bad format
-				if ( strtotime( $date_string ) == 0 ) {
-					throw new Exception( sprintf( __('The following date time \'%s\' can not be parsed by PHP due to its formatting.%sYou may need to choose a more standard date time format. Please check your WordPress Settings.', 'event_espresso' ), $date_string, '<br />' ));
+				if (strtotime($date_string) == 0) {
+					throw new Exception(sprintf(__('The following date time \'%s\' can not be parsed by PHP due to its formatting.%sYou may need to choose a more standard date time format. Please check your WordPress Settings.', 'event_espresso'), $date_string, '<br />'));
 				} else {
 					//ok give up, but don't throw an error
-					$this->_date = new DateTime( NULL, new DateTimeZone( $timezone ));
+					$this->_date = new DateTime(NULL, new DateTimeZone($timezone));
 				}
 			}
 		}
@@ -651,9 +651,9 @@ 
 	 * @param  string $timezone Valid timezone String
 	 * @return string           abbreviation
 	 */
-	public static function get_timezone_abbrev( $timezone ) {
+	public static function get_timezone_abbrev($timezone) {
 		$dateTime = new DateTime();
-		$dateTime->setTimeZone( new DateTimeZone($timezone) );
+		$dateTime->setTimeZone(new DateTimeZone($timezone));
 		return $dateTime->format('T');
 	}
 

Braces +10 added lines, -7 removed lines

@@ -314,7 +314,7 @@ 
 		if( $this->_display_timezone() ) {
 			if( $schema == 'no_html' ){
 				$timezone_string = '(' . self::get_timezone_abbrev( $this->_timezone ) . ')';
-			}else{
+			} else{
 				$timezone_string = '<span class="ee_dtt_timezone_string">(' . self::get_timezone_abbrev($this->_timezone) . ')</span>';
 			}
 		} else {
@@ -419,8 +419,9 @@ 
 	 * @return string 		unix timestamp for utc
 	 */
 	private function _convert_to_utc_unix_timestamp( $datetime ) {
-		if ( $this->_nullable && empty( $datetime ) )
-			return NULL;
+		if ( $this->_nullable && empty( $datetime ) ) {
+					return NULL;
+		}
 		$timestamp = is_numeric( $datetime ) ? $this->_convert_from_numeric_value_to_utc_unix_timestamp( $datetime ) : $this->_convert_from_string_value_to_utc_unix_timestamp( $datetime );
 		return $timestamp;
 	}
@@ -588,16 +589,18 @@ 
 
 		//first let's do a comparison of timezone strings.  If they match then we can get out without any further calculations
 		$blog_string = get_option('timezone_string');
-		if ( $blog_string == $this->_timezone )
-			return FALSE;
+		if ( $blog_string == $this->_timezone ) {
+					return FALSE;
+		}
 
 		//now we need to calc the offset for the timezone string so we can compare with the blog offset.
 		$this_offset = self::timezone_convert_to_offset_from_string( $this->_timezone );
 		$blog_offset = !empty( $this->_blog_offset ) ? $this->_blog_offset : self::timezone_convert_to_offset_from_string( $blog_string );
 
 		//now compare
-		if ( $blog_offset === $this_offset )
-			return FALSE;
+		if ( $blog_offset === $this_offset ) {
+					return FALSE;
+		}
 
 		return TRUE;
 

core/helpers/EEH_Event_View.helper.php

Doc Comments +6 added lines, -6 removed lines

@@ -116,7 +116,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -136,7 +136,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -318,7 +318,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_primary_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -343,7 +343,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    boolean|string
 	 */
 	public static function get_last_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -368,7 +368,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -418,7 +418,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]

Spacing +114 added lines, -114 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param    int $EVT_ID
 	 * @return    object
 	 */
-	public static function get_event( $EVT_ID = 0 ) {
-		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
+	public static function get_event($EVT_ID = 0) {
+		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint($EVT_ID);
 		// do we already have the Event  you are looking for?
-		if ( EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID ) {
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
 			return EEH_Event_View::$_event;
 		}
 		EEH_Event_View::$_event = NULL;
 		// international newspaper?
 		global $post;
 		// if this is being called from an EE_Event post, then we can just grab the attached EE_Event object
-		 if ( isset( $post->post_type ) && $post->post_type == 'espresso_events' || $EVT_ID ) {
+		 if (isset($post->post_type) && $post->post_type == 'espresso_events' || $EVT_ID) {
 //			d( $post );
 			// grab the event we're looking for
-			if ( isset( $post->EE_Event ) && ( $EVT_ID == 0 || ( $EVT_ID == $post->ID ))) {
+			if (isset($post->EE_Event) && ($EVT_ID == 0 || ($EVT_ID == $post->ID))) {
 				EEH_Event_View::$_event = $post->EE_Event;
 //				d( EEH_Event_View::$_event );
 			}
 			// now if we STILL do NOT have an EE_Event model object, BUT we have an Event ID...
-			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID ) {
+			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
 				// sigh... pull it from the db
-				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 //				d( EEH_Event_View::$_event );
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -118,13 +118,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -140,39 +140,39 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
 
 		global $post;
 		$content = '';
 
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 			//echo '<h2 style="color:#E76700;">the_content<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
 			the_content();
-		} else if (( is_archive() && has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() ) || apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', FALSE )) {
+		} else if ((is_archive() && has_excerpt($post->ID) && espresso_display_excerpt_in_event_list()) || apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', FALSE)) {
 			//echo '<h2 style="color:#E76700;">the_excerpt<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
 			the_excerpt();
-		} else if (( is_archive() && ! has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() )) {
+		} else if ((is_archive() && ! has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 			//echo '<h2 style="color:#E76700;">get_the_content<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span><b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
-			if ( ! empty( $num_words )) {
-				if ( empty( $more )) {
-					$more = ' <a href="' . get_permalink() . '" class="more-link">' . __( '(more&hellip;)' ) . '</a>';
-					$more = apply_filters( 'the_content_more_link', $more );
+			if ( ! empty($num_words)) {
+				if (empty($more)) {
+					$more = ' <a href="'.get_permalink().'" class="more-link">'.__('(more&hellip;)').'</a>';
+					$more = apply_filters('the_content_more_link', $more);
 				}
-				$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+				$content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-				$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				$content = wp_trim_words($content, $num_words, ' ').$more;
 			} else {
-				$content =  get_the_content();
+				$content = get_the_content();
 			}
 			global $allowedtags;
-			$content = wp_kses( $content, $allowedtags );
-			$content = strip_shortcodes( $content );
-			echo apply_filters( 'the_content', $content );
+			$content = wp_kses($content, $allowedtags);
+			$content = strip_shortcodes($content);
+			echo apply_filters('the_content', $content);
 
 		} else {
 			//echo '<h2 style="color:#E76700;">nothing<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
-			echo apply_filters( 'the_content', $content );
+			echo apply_filters('the_content', $content);
 		}
 		return ob_get_clean();
 	}
@@ -186,13 +186,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -208,22 +208,22 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a>';
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a>';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -237,9 +237,9 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		return $datetime instanceof EE_Datetime ? $datetime->start_date_and_time( $dt_frmt, $tm_frmt ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		return $datetime instanceof EE_Datetime ? $datetime->start_date_and_time($dt_frmt, $tm_frmt) : '';
 	}
 
 
@@ -253,9 +253,9 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		return $datetime instanceof EE_Datetime ? $datetime->end_date_and_time( $dt_frmt, $tm_frmt ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		return $datetime instanceof EE_Datetime ? $datetime->end_date_and_time($dt_frmt, $tm_frmt) : '';
 	}
 
 
@@ -269,9 +269,9 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		return $datetime instanceof EE_Datetime ?  $datetime->start_date_and_time( $dt_frmt, $tm_frmt ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		return $datetime instanceof EE_Datetime ? $datetime->start_date_and_time($dt_frmt, $tm_frmt) : '';
 	}
 
 
@@ -285,9 +285,9 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		return $datetime instanceof EE_Datetime ?  $datetime->end_date_and_time( $dt_frmt, $tm_frmt ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		return $datetime instanceof EE_Datetime ? $datetime->end_date_and_time($dt_frmt, $tm_frmt) : '';
 	}
 
 
@@ -299,13 +299,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo date_i18n( 'M', strtotime( $datetime->start_date()));?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo date_i18n('M', strtotime($datetime->start_date())); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -320,17 +320,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -345,17 +345,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -370,17 +370,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -395,17 +395,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -423,18 +423,18 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = NULL, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === NULL){
-			if($event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = NULL, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === NULL) {
+			if ($event->is_expired()) {
 				$include_expired = TRUE;
-			}else{
+			} else {
 				$include_expired = FALSE;
 			}
-		}else{
+		} else {
 			$include_expired = TRUE;
 		}
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -450,11 +450,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -468,11 +468,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			EE_Registry::instance()->load_helper('Formatter');
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -489,23 +489,23 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this event');
+				$link = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';

Braces +5 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -428,10 +430,10 @@ 
 		if($include_expired === NULL){
 			if($event->is_expired()){
 				$include_expired = TRUE;
-			}else{
+			} else{
 				$include_expired = FALSE;
 			}
-		}else{
+		} else{
 			$include_expired = TRUE;
 		}
 		if ( $event instanceof EE_Event ) {

core/libraries/form_sections/scrap/EE_Registration_Question_Group_Reg_Form.form.php

Doc Comments +1 added lines

@@ -91,6 +91,7 @@
 	 * @param EE_Registration $registration
 	 * @param EE_Question     $question
 	 * @param mixed EE_Answer|NULL      $answer
+	 * @param EE_Answer $answer
 	 * @return EE_Form_Input_Base
 	 */
 	public function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_Registration_Question_Group_Reg_Form
- *
- * For auto-generating form sections for an EE_Transaction
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_Registration_Question_Group_Reg_Form
+  *
+  * For auto-generating form sections for an EE_Transaction
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 
 class EE_Registration_Question_Group_Reg_Form extends EE_Form_Section_Proper {
 

Spacing +29 added lines, -29 removed lines

@@ -20,15 +20,15 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Registration_Question_Group_Reg_Form
 	 */
-	public function __construct( EE_Registration $registration, EE_Question_Group $question_group ){
+	public function __construct(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
 			'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
 			'subsections' 			=> array(),
 			'name' 					=> $question_group->identifier(),
-			'html_id' 					=> 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id' 					=> 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class' 			=> 'ee-reg-form-qstn-grp-dv',
-			'html_label_id' 		=> 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl'
+			'html_label_id' 		=> 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl'
 		);
 
 		$questions = $question_group->get_many_related(
@@ -37,20 +37,20 @@ 
 				array(
 					// where params
 					'QST_deleted' => 0,
-					'QST_admin_only' => is_admin() ? 1 :0
+					'QST_admin_only' => is_admin() ? 1 : 0
 				),
 				'order_by'=>array(
 					'Question_Group_Question.QGQ_order' =>'ASC'
 				)
 			)
 		);
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
-				$form_args['subsections'][] = $this->_reg_form_question( $registration, $question );
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
+				$form_args['subsections'][] = $this->_reg_form_question($registration, $question);
 			}
 		}
 //		d( $form_args );
-		parent::__construct( $form_args );
+		parent::__construct($form_args);
 	}
 
 	/**
@@ -59,29 +59,29 @@ 
 	 * @param EE_Question     $question
 	 * @return 	EE_Form_Input_Base
 	 */
-	public function _reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function _reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 			// if this question was for an attendee detail, then check for that answer
-			$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value( $registration, $question->ID() );
-			$answer = $registration->reg_url_link() || ! $answer_value ? EEM_Answer::instance()->get_one( array( array( 'QST_ID'=>$question->ID(), 'REG_ID'=>$registration->ID() ))) : NULL;
+			$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->ID());
+			$answer = $registration->reg_url_link() || ! $answer_value ? EEM_Answer::instance()->get_one(array(array('QST_ID'=>$question->ID(), 'REG_ID'=>$registration->ID()))) : NULL;
 			// if NOT returning to edit an existing registration OR if this question is for an attendee property OR we still don't have an EE_Answer object
-			if( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) {
+			if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) {
 				// create an EE_Answer object for storing everything in
-				$answer = EE_Answer::new_instance ( array(
+				$answer = EE_Answer::new_instance(array(
 					'QST_ID'=> $question->ID(),
 					'REG_ID'=> $registration->ID()
 				));
 			}
 			// verify instance
-			if( $answer instanceof EE_Answer ){
-				if ( ! empty( $answer_value )) {
-					$answer->set( 'ANS_value', $answer_value );
+			if ($answer instanceof EE_Answer) {
+				if ( ! empty($answer_value)) {
+					$answer->set('ANS_value', $answer_value);
 				}
-				$answer->cache( 'Question', $question );
-				$answer_cache_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link();
-				$registration->cache( 'Answer', $answer, $answer_cache_id );
+				$answer->cache('Question', $question);
+				$answer_cache_id = $question->system_ID() != NULL ? $question->system_ID().'-'.$registration->reg_url_link() : $question->ID().'-'.$registration->reg_url_link();
+				$registration->cache('Answer', $answer, $answer_cache_id);
 			}
-			return $this->_generate_question_input( $registration, $question, $answer );
+			return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @param mixed EE_Answer|NULL      $answer
 	 * @return EE_Form_Input_Base
 	 */
-	public function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	public function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 //		d( $registration );
 //		d( $question );
 //		d( $answer );
@@ -115,22 +115,22 @@ 
 		//		raw_value;
 		$input_constructor_args = array(
 			'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
-			'name' 					=> $registration->reg_url_link() . '-' . $question->ID(),
-			'html_name' 			=> 'ee_reg_qstn[' . $registration->reg_url_link() . '][' . $question->ID() . ']',
-			'html_id' 					=> 'ee-reg-qstn-' . $registration->reg_url_link() . '-' . $question->ID(),
+			'name' 					=> $registration->reg_url_link().'-'.$question->ID(),
+			'html_name' 			=> 'ee_reg_qstn['.$registration->reg_url_link().']['.$question->ID().']',
+			'html_id' 					=> 'ee-reg-qstn-'.$registration->reg_url_link().'-'.$question->ID(),
 			'html_class' 			=> 'ee-reg-qstn',
 			'required' 				=> $question->required(),
-			'html_label_id'		=> 'ee-reg-qstn-' . $registration->reg_url_link() . '-' . $question->ID() . '-lbl',
+			'html_label_id'		=> 'ee-reg-qstn-'.$registration->reg_url_link().'-'.$question->ID().'-lbl',
 			'html_label_class'	=> 'ee-reg-qstn-lbl',
 			'html_label_text'		=> $question->display_text()
 		);
 
-		if ( $answer instanceof EE_Answer ) {
-			$input_constructor_args['html_name'] .= '[' . $answer->ID() . ']';
+		if ($answer instanceof EE_Answer) {
+			$input_constructor_args['html_name'] .= '['.$answer->ID().']';
 			$input_constructor_args['default'] .= $answer->value();
 		}
 
-		switch ( $question->type() ) {
+		switch ($question->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
 				$input_class = 'EE_Text_Input';
@@ -157,7 +157,7 @@ 
 				break;
 		}
 //		d( $input_constructor_args );
-		return new $input_class( $input_constructor_args );
+		return new $input_class($input_constructor_args);
 
 	}
 

modules/single_page_checkout/inc/EE_SPCO_Reg_Step_Attendee_Information.class.php

Doc Comments +3 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function initialize_reg_step() {
 	}
@@ -342,7 +342,7 @@ 
 	 * _auto_copy_attendee_info
 	 *
 	 * @access public
-	 * @return 	EE_Form_Section_Proper
+	 * @return 	EE_Form_Section_HTML
 	 */
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
@@ -456,6 +456,7 @@ 
 	 * @param EE_Registration $registration
 	 * @param EE_Question     $question
 	 * @param mixed EE_Answer|NULL      $answer
+	 * @param EE_Answer $answer
 	 * @return EE_Form_Input_Base
 	 */
 	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Attendee_Information
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Attendee_Information
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step {
 
 	/**

Braces +2 added lines, -2 removed lines

@@ -507,7 +507,7 @@ 
 			case EEM_Question::QST_type_text :
 				if( $identifier == 'email' ){
 					return new EE_Email_Input( $input_constructor_args );
-				}else{
+				} else{
 					return new EE_Text_Input( $input_constructor_args );
 				}
 				break;
@@ -792,7 +792,7 @@ 
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
+			} else {
 				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 				// remove malformed data
 				unset( $valid_data[ $reg_url_link ] );

Spacing +245 added lines, -246 removed lines

@@ -32,13 +32,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Attendee_Information
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'attendee_information';
 		$this->_name = __('Attendee Information', 'event_espresso');
-		$this->_template = SPCO_TEMPLATES_PATH . $this->slug() . DS . 'attendee_info_main.template.php';
+		$this->_template = SPCO_TEMPLATES_PATH.$this->slug().DS.'attendee_info_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please answer the following registration questions before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please answer the following registration questions before proceeding.', 'event_espresso'));
 	}
 
 
@@ -47,7 +47,7 @@ 
 		EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['required_multi_field'] = __(' is a required question. Please enter a value for at least one of the options.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['answer_required_questions'] = __('Please answer all required questions correctly before proceeding.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf( __('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>' );
+		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(__('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>');
 		EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = __('An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['enter_valid_email'] = __('You must enter a valid email address.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = __('You must enter a valid email address and answer all other required questions before you can proceed.', 'event_espresso');
@@ -85,30 +85,30 @@ 
 			'ticket_count' 	=> array()
 		);
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		if ( $registrations ) {
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
 					// can this registration be processed during this visit ?
-					if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
-						$subsections[ $registration->reg_url_link() ] = $this->registrations_reg_form( $registration );
-						if ( ! $this->checkout->admin_request ) {
-							$template_args['registrations'][ $registration->reg_url_link() ] = $registration;
-							$template_args['ticket_count'][ $registration->ticket()->ID() ] = isset( $template_args['ticket_count'][ $registration->ticket()->ID() ] ) ? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1 : 1;
+					if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
+						$subsections[$registration->reg_url_link()] = $this->registrations_reg_form($registration);
+						if ( ! $this->checkout->admin_request) {
+							$template_args['registrations'][$registration->reg_url_link()] = $registration;
+							$template_args['ticket_count'][$registration->ticket()->ID()] = isset($template_args['ticket_count'][$registration->ticket()->ID()]) ? $template_args['ticket_count'][$registration->ticket()->ID()] + 1 : 1;
 						}
-						if ( $registration->is_primary_registrant() ) {
+						if ($registration->is_primary_registrant()) {
 							$primary_registrant = $registration->reg_url_link();
 						}
 					}
 				}
 			}
 			// print_copy_info ?
-			if ( $primary_registrant && count( $registrations ) > 1 && ! $this->checkout->admin_request ) {
+			if ($primary_registrant && count($registrations) > 1 && ! $this->checkout->admin_request) {
 				// TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info
 				$copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info ? $this->copy_attendee_info_form() : $this->auto_copy_attendee_info();
 				// generate hidden input
-				if ( isset( $subsections[ $primary_registrant ] ) && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper ) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options );
+				if (isset($subsections[$primary_registrant]) && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper) {
+					$subsections[$primary_registrant]->add_subsections($copy_options);
 				}
 			}
 
@@ -120,8 +120,7 @@ 
 				'html_id' 					=> $this->reg_form_name(),
 				'subsections' 			=> $subsections,
 				'layout_strategy'		=> $this->checkout->admin_request ?
-					new EE_Div_Per_Section_Layout() :
-					new EE_Template_Layout(
+					new EE_Div_Per_Section_Layout() : new EE_Template_Layout(
 						array(
 							'layout_template_file' 	=> $this->_template, // layout_template
 							'template_args' 				=> $template_args
@@ -138,61 +137,61 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Form_Section_Proper
 	 */
-	public function registrations_reg_form( EE_Registration $registration ) {
-		EE_Registry::instance()->load_helper( 'Template' );
+	public function registrations_reg_form(EE_Registration $registration) {
+		EE_Registry::instance()->load_helper('Template');
 		static $attendee_nmbr = 1;
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 				=> 'ee-registration-' . $registration->reg_url_link(),
+			'html_id' 				=> 'ee-registration-'.$registration->reg_url_link(),
 			'html_class' 		=> 'ee-reg-form-attendee-dv',
 			'html_style' 		=> $this->checkout->admin_request ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;' : '',
 			'subsections' 		=> array(),
 			'layout_strategy' => new EE_Fieldset_Section_Layout(
 				array(
 					'legend_class' 	=> 'spco-attendee-lgnd smaller-text lt-grey-text',
-					'legend_text' 	=> sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr )
+					'legend_text' 	=> sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr)
 				)
 			)
 		);
 		// verify that registration has valid event
-		if ( $registration->event() instanceof EE_Event ) {
+		if ($registration->event() instanceof EE_Event) {
 			$query_params = array(
 				array(
 					'Event.EVT_ID' => $registration->event()->ID(),
 					'Event_Question_Group.EQG_primary' => $registration->count() == 1 ? TRUE : FALSE
 				),
-				'order_by'=>array( 'QSG_order'=>'ASC' )
+				'order_by'=>array('QSG_order'=>'ASC')
 			);
-			$question_groups = $registration->event()->question_groups( $query_params );
-			if ( $question_groups ) {
-				foreach ( $question_groups as $question_group ) {
-					if ( $question_group instanceof EE_Question_Group ) {
-						$form_args['subsections'][ $question_group->identifier() ] = $this->question_group_reg_form( $registration, $question_group );
+			$question_groups = $registration->event()->question_groups($query_params);
+			if ($question_groups) {
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$form_args['subsections'][$question_group->identifier()] = $this->question_group_reg_form($registration, $question_group);
 						// add hidden input
-						$form_args['subsections']['additional_attendee_reg_info'] = $this->additional_attendee_reg_info_input( $registration );
+						$form_args['subsections']['additional_attendee_reg_info'] = $this->additional_attendee_reg_info_input($registration);
 					}
 				}
 				// if we have question groups for additional attendees, then display the copy options
 				$this->_print_copy_info = $attendee_nmbr > 1 ? TRUE : $this->_print_copy_info;
 			} else {
-				$form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link() ] = new EE_Form_Section_HTML(
+				$form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link()] = new EE_Form_Section_HTML(
 					EEH_Template::locate_template(
-						SPCO_TEMPLATES_PATH . 'attendee_information' . DS . 'attendee_info_not_required.template.php',
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__registrations_reg_form__attendee_info_not_required_template_args', array()),
+						SPCO_TEMPLATES_PATH.'attendee_information'.DS.'attendee_info_not_required.template.php',
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__registrations_reg_form__attendee_info_not_required_template_args', array()),
 						TRUE,
 						TRUE
 					)
 				);
 				// add hidden input
-				$form_args['subsections']['additional_attendee_reg_info'] = $this->additional_attendee_reg_info_input( $registration, FALSE );
+				$form_args['subsections']['additional_attendee_reg_info'] = $this->additional_attendee_reg_info_input($registration, FALSE);
 			}
 		}
-		if ( $registration->is_primary_registrant() ) {
+		if ($registration->is_primary_registrant()) {
 			// generate hidden input
-			$form_args['subsections']['primary_registrant'] = $this->additional_primary_registrant_inputs( $registration );
+			$form_args['subsections']['primary_registrant'] = $this->additional_primary_registrant_inputs($registration);
 		}
 		$attendee_nmbr++;
-		return new EE_Form_Section_Proper( $form_args );
+		return new EE_Form_Section_Proper($form_args);
 	}
 
 
@@ -205,11 +204,11 @@ 
 	 * @param bool  $additional_attendee_reg_info
 	 * @return    EE_Form_Input_Base
 	 */
-	public function additional_attendee_reg_info_input( EE_Registration $registration, $additional_attendee_reg_info = TRUE ){
+	public function additional_attendee_reg_info_input(EE_Registration $registration, $additional_attendee_reg_info = TRUE) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
-				'html_id' 				=> 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'html_id' 				=> 'additional-attendee-reg-info-'.$registration->reg_url_link(),
 				'default'				=> $additional_attendee_reg_info
 			)
 		);
@@ -222,22 +221,22 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return EE_Form_Section_Proper
 	 */
-	public function question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){
+	public function question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 					=> 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id' 					=> 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class' 			=> $this->checkout->admin_request ? 'form-table ee-reg-form-qstn-grp-dv' : 'ee-reg-form-qstn-grp-dv',
-			'html_label_id' 		=> 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl',
+			'html_label_id' 		=> 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl',
 			'subsections' 			=> array(
-				'reg_form_qstn_grp_hdr' => $this->question_group_header( $question_group )
+				'reg_form_qstn_grp_hdr' => $this->question_group_header($question_group)
 			),
 			'layout_strategy' 	=> $this->checkout->admin_request ? new EE_Admin_Two_Column_Layout() : new EE_Div_Per_Section_Layout()
 		);
 		// where params
-		$query_params = array( 'QST_deleted' => 0 );
+		$query_params = array('QST_deleted' => 0);
 		// don't load admin only questions on the frontend
-		if ( ! $this->checkout->admin_request ) {
-			$query_params['QST_admin_only'] = array( '!=', TRUE );
+		if ( ! $this->checkout->admin_request) {
+			$query_params['QST_admin_only'] = array('!=', TRUE);
 		}
 		$questions = $question_group->get_many_related(
 			'Question',
@@ -249,21 +248,21 @@ 
 			)
 		);
 		// filter for additional content before questions
-		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this));
 		// loop thru questions
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
 				$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-				$form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question );
+				$form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question);
 			}
 		}
-		$form_args['subsections'] = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this );
+		$form_args['subsections'] = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this);
 
 		// filter for additional content after questions
-		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this));
 //		d( $form_args );
-		$question_group_reg_form = new EE_Form_Section_Proper( $form_args );
-		return apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this );
+		$question_group_reg_form = new EE_Form_Section_Proper($form_args);
+		return apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this);
 	}
 
 
@@ -273,12 +272,12 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Form_Section_HTML
 	 */
-	public function question_group_header( EE_Question_Group $question_group ){
+	public function question_group_header(EE_Question_Group $question_group) {
 		$html = '';
 		// group_name
-		if ( $question_group->show_group_name() && $question_group->name() != '' ) {
+		if ($question_group->show_group_name() && $question_group->name() != '') {
 			EE_Registry::instance()->load_helper('HTML');
-			if ( $this->checkout->admin_request ) {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -292,7 +291,7 @@ 
 			}
 		}
 		// group_desc
-		if ( $question_group->show_group_desc() && $question_group->desc() != '' ) {
+		if ($question_group->show_group_desc() && $question_group->desc() != '') {
 			$html .= EEH_HTML::p(
 				$question_group->desc(),
 				'',
@@ -300,7 +299,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -309,14 +308,14 @@ 
 	 * @access public
 	 * @return 	EE_Form_Section_Proper
 	 */
-	public function copy_attendee_info_form(){
+	public function copy_attendee_info_form() {
 		// array of params to pass to parent constructor
 		return new EE_Form_Section_Proper(
 			array(
 				'subsections' 			=> $this->copy_attendee_info_inputs(),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 			=> SPCO_TEMPLATES_PATH . 'attendee_information' . DS . 'copy_attendee_info.template.php', // layout_template
+						'layout_template_file' 			=> SPCO_TEMPLATES_PATH.'attendee_information'.DS.'copy_attendee_info.template.php', // layout_template
 						'begin_template_file' 			=> NULL,
 						'input_template_file' 				=> NULL,
 						'subsection_template_file' 	=> NULL,
@@ -338,8 +337,8 @@ 
 	public function auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
 			EEH_Template::locate_template(
-				SPCO_TEMPLATES_PATH . 'attendee_information' . DS . 'auto_copy_attendee_info.template.php',
-				apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
+				SPCO_TEMPLATES_PATH.'attendee_information'.DS.'auto_copy_attendee_info.template.php',
+				apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
 				TRUE,
 				TRUE
 			)
@@ -358,25 +357,25 @@ 
 		$copy_attendee_info_inputs = array();
 		$prev_ticket = NULL;
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			// for all  attendees other than the primary attendee
-			if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) {
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
 				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-				if ( $registration->ticket()->ID() !== $prev_ticket ) {
+				if ($registration->ticket()->ID() !== $prev_ticket) {
 					$item_name = $registration->ticket()->name();
-					$item_name .= $registration->ticket()->description() != '' ? ' - ' . $registration->ticket()->description() : '';
-					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML(
-						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					$item_name .= $registration->ticket()->description() != '' ? ' - '.$registration->ticket()->description() : '';
+					$copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
 					);
 					$prev_ticket = $registration->ticket()->ID();
 				}
 
-				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new
+				$copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new
 				EE_Checkbox_Multi_Input(
-					array( $registration->ID() => sprintf( __('Attendee #%s', 'event_espresso'), $registration->count() )),
+					array($registration->ID() => sprintf(__('Attendee #%s', 'event_espresso'), $registration->count())),
 					array(
-						'html_id' 								=> 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_id' 								=> 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
 						'html_class' 						=> 'spco-copy-attendee-chk ee-do-not-validate',
 						'display_html_label_text' 	=> FALSE
 					)
@@ -395,7 +394,7 @@ 
 	 * @param EE_Registration $registration
 	 * @return    EE_Form_Input_Base
 	 */
-	public function additional_primary_registrant_inputs( EE_Registration $registration ){
+	public function additional_primary_registrant_inputs(EE_Registration $registration) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
@@ -413,31 +412,31 @@ 
 	 * @param EE_Question     $question
 	 * @return 	EE_Form_Input_Base
 	 */
-	public function reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 		// if this question was for an attendee detail, then check for that answer
-		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value( $registration, $question->ID() );
+		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->ID());
 		$answer = $answer_value === null
-				? EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() )	) )
+				? EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())))
 				: null;
 		// if NOT returning to edit an existing registration OR if this question is for an attendee property OR we still don't have an EE_Answer object
-		if( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) {
+		if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) {
 			// create an EE_Answer object for storing everything in
-			$answer = EE_Answer::new_instance ( array(
+			$answer = EE_Answer::new_instance(array(
 				'QST_ID'=> $question->ID(),
 				'REG_ID'=> $registration->ID()
 			));
 		}
 		// verify instance
-		if( $answer instanceof EE_Answer ){
-			if ( ! empty( $answer_value )) {
-				$answer->set( 'ANS_value', $answer_value );
+		if ($answer instanceof EE_Answer) {
+			if ( ! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
 			}
-			$answer->cache( 'Question', $question );
-			$answer_cache_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer->cache('Question', $question);
+			$answer_cache_id = $question->system_ID() != NULL ? $question->system_ID().'-'.$registration->reg_url_link() : $question->ID().'-'.$registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
 		}
-		return $this->_generate_question_input( $registration, $question, $answer );
+		return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -449,7 +448,7 @@ 
 	 * @param mixed EE_Answer|NULL      $answer
 	 * @return EE_Form_Input_Base
 	 */
-	public function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	public function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		//		d( $registration );
 		//		d( $question );
 		//		d( $answer );
@@ -472,88 +471,88 @@ 
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
 
 		$input_constructor_args = array(
-			'html_name' 			=> 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-			'html_id' 					=> 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-			'html_class' 			=> 'ee-reg-qstn ee-reg-qstn-' . $identifier,
+			'html_name' 			=> 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id' 					=> 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class' 			=> 'ee-reg-qstn ee-reg-qstn-'.$identifier,
 			'required' 				=> $question->required() ? TRUE : FALSE,
-			'html_label_id'		=> 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_label_id'		=> 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 			'html_label_text'		=> $question->display_text(),
 			'required_validation_error_message' => $question->required_text()
 		);
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
-			if ( $answer->ID() ) {
-				$input_constructor_args['html_name'] 		.= '[' . $answer->ID() . ']';
-				$input_constructor_args['html_id'] 				.= '-' . $answer->ID();
-				$input_constructor_args['html_label_id'] 	.= '-' . $answer->ID();
+		if ($answer instanceof EE_Answer) {
+			if ($answer->ID()) {
+				$input_constructor_args['html_name'] 		.= '['.$answer->ID().']';
+				$input_constructor_args['html_id'] 				.= '-'.$answer->ID();
+				$input_constructor_args['html_label_id'] .= '-'.$answer->ID();
 			}
 			$input_constructor_args['default'] = $answer->value();
 		}
 		//add "-lbl" to the end of the label id
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
+		$input_constructor_args['html_label_id'] .= '-lbl';
 
-		switch ( $question->type() ) {
+		switch ($question->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				if( $identifier == 'email' ){
-					return new EE_Email_Input( $input_constructor_args );
-				}else{
-					return new EE_Text_Input( $input_constructor_args );
+				if ($identifier == 'email') {
+					return new EE_Email_Input($input_constructor_args);
+				} else {
+					return new EE_Text_Input($input_constructor_args);
 				}
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				return new EE_Text_Area_Input( $input_constructor_args );
+				return new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				return new EE_Radio_Button_Input( $question->options(), $input_constructor_args );
+				return new EE_Radio_Button_Input($question->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				return new EE_Select_Input( $question->options(), $input_constructor_args );
+				return new EE_Select_Input($question->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
-				$state_options = array( '' => array( '' => ''));
+				$state_options = array('' => array('' => ''));
 				$states = $this->checkout->action == 'process_reg_step' ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_active_states();
-				if ( ! empty( $states )) {
-					foreach( $states as $state ){
-						if ( $state instanceof EE_State ) {
-							$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+				if ( ! empty($states)) {
+					foreach ($states as $state) {
+						if ($state instanceof EE_State) {
+							$state_options[$state->country()->name()][$state->ID()] = $state->name();
 						}
 					}
 				}
-				$state_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this );
-				return new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$state_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this);
+				return new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
-				$country_options = array( '' => '' );
+				$country_options = array('' => '');
 				// get possibly cached list of countries
 				$countries = $this->checkout->action == 'process_reg_step' ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-				if ( ! empty( $countries )) {
-					foreach( $countries as $country ){
-						if ( $country instanceof EE_Country ) {
-							$country_options[ $country->ID() ] = $country->name();
+				if ( ! empty($countries)) {
+					foreach ($countries as $country) {
+						if ($country instanceof EE_Country) {
+							$country_options[$country->ID()] = $country->name();
 						}
 					}
 				}
-				$country_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this );
-				return new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$country_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this);
+				return new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				return new EE_Checkbox_Multi_Input( $question->options(), $input_constructor_args );
+				return new EE_Checkbox_Multi_Input($question->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				return new EE_Datepicker_Input( $input_constructor_args );
+				return new EE_Datepicker_Input($input_constructor_args);
 				break;
 			// fallback
 			default :
-				return new EE_Text_Input( $input_constructor_args );
+				return new EE_Text_Input($input_constructor_args);
 		}
 	}
 
@@ -576,65 +575,65 @@ 
 	 */
 	public function process_reg_step() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab validated data from form
 		$valid_data = $this->checkout->current_step->valid_data();
 		//EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ );
 		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-		if ( empty( $valid_data ))  {
-			EE_Error::add_error( __('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($valid_data)) {
+			EE_Error::add_error(__('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		//EEH_Debug_Tools::printr( $this->checkout->transaction, '$this->checkout->transaction', __FILE__, __LINE__ );
-		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) {
-			EE_Error::add_error( __( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			EE_Error::add_error(__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// get cached registrations
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify we got the goods
-		if ( empty( $registrations )) {
-			EE_Error::add_error( __( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations)) {
+			EE_Error::add_error(__('Your form data could not be applied to any valid registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// extract attendee info from form data and save to model objects
-		$registrations_processed = $this->_process_registrations( $registrations, $valid_data );
+		$registrations_processed = $this->_process_registrations($registrations, $valid_data);
 		// if first pass thru SPCO, then let's check processed registrations against the total number of tickets in the cart
-		if ( $registrations_processed === FALSE ) {
+		if ($registrations_processed === FALSE) {
 			// but return immediately if the previous step exited early due to errors
 			return FALSE;
-		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) {
+		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
 			// generate a correctly translated string for all possible singular/plural combinations
-			if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) {
+			if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
 				$error_msg = sprintf(
-					__( 'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
-			} else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) {
+			} else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 			} else {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 
 			}
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// mark this reg step as completed
 		$this->checkout->current_step->set_completed();
-		$this->_set_success_message( __('The Attendee Information Step has been successfully completed.', 'event_espresso' ));
+		$this->_set_success_message(__('The Attendee Information Step has been successfully completed.', 'event_espresso'));
 		//do action in case a plugin wants to do something with the data submitted in step 1.
 		//passes EE_Single_Page_Checkout, and it's posted data
-		do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data );
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
 		return TRUE;
 
 	}
@@ -648,9 +647,9 @@ 
 	 * @param array             $valid_data
 	 * @return boolean | int
 	 */
-	private function _process_registrations( $registrations = array(), $valid_data = array() ) {
+	private function _process_registrations($registrations = array(), $valid_data = array()) {
 		// load resources and set some defaults
-		EE_Registry::instance()->load_model( 'Attendee' );
+		EE_Registry::instance()->load_model('Attendee');
 		// holder for primary registrant attendee object
 		$this->checkout->primary_attendee_obj = NULL;
 		// array for tracking reg form data for the primary registrant
@@ -667,19 +666,19 @@ 
 		// attendee counter
 		$att_nmbr = 0;
 		// grab the saved registrations from the transaction
-		foreach ( $registrations  as $registration ) {
+		foreach ($registrations  as $registration) {
 			// verify EE_Registration object
-			if ( ! $registration instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $registration instanceof EE_Registration) {
+				EE_Error::add_error(__('An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( $reg_url_link ) {
+			if ($reg_url_link) {
 				// should this registration be processed during this visit ?
-				if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
+				if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
 					// if NOT revisiting, then let's save the registration now, so that we have a REG_ID to use when generating other objects
-					if ( ! $this->checkout->revisit ) {
+					if ( ! $this->checkout->revisit) {
 						$registration->save();
 					}
 
@@ -690,41 +689,41 @@ 
 					 * @var bool   if TRUE is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this ) ) {
+					if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this)) {
 						return FALSE;
 					}
 
 					// Houston, we have a registration!
 					$att_nmbr++;
-					$this->_attendee_data[ $reg_url_link ] = array();
+					$this->_attendee_data[$reg_url_link] = array();
 					// unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] );
-					if ( isset( $valid_data[ $reg_url_link ] )) {
+					if (isset($valid_data[$reg_url_link])) {
 						// do we need to copy basic info from primary attendee ?
-						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0 ? TRUE : FALSE;
+						$copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info']) && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0 ? TRUE : FALSE;
 						// filter form input data for this registration
-						$valid_data[ $reg_url_link ] = apply_filters( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[ $reg_url_link ] );
+						$valid_data[$reg_url_link] = apply_filters('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[$reg_url_link]);
 						//EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ );
-						if ( isset( $valid_data['primary_attendee'] )) {
-							$primary_registrant['line_item_id'] =  ! empty( $valid_data['primary_attendee'] ) ? $valid_data['primary_attendee'] : FALSE;
-							unset( $valid_data['primary_attendee'] );
+						if (isset($valid_data['primary_attendee'])) {
+							$primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee']) ? $valid_data['primary_attendee'] : FALSE;
+							unset($valid_data['primary_attendee']);
 						}
 						// now loop through our array of valid post data && process attendee reg forms
-						foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) {
-							if ( ! in_array( $form_section, $non_input_form_sections )) {
-								foreach ( $form_inputs as $form_input => $input_value ) {
+						foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) {
+							if ( ! in_array($form_section, $non_input_form_sections)) {
+								foreach ($form_inputs as $form_input => $input_value) {
 									// check for critical inputs
-									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email( $form_input, $input_value )) {
+									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email($form_input, $input_value)) {
 										return FALSE;
 									}
 									// store a bit of data about the primary attendee
-									if ( $att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty( $input_value )) {
-										$primary_registrant[ $form_input ] = $input_value;
-									} else if ( $copy_primary && isset( $primary_registrant[ $form_input ] ) && $input_value == NULL ) {
-										$input_value = $primary_registrant[ $form_input ];
+									if ($att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty($input_value)) {
+										$primary_registrant[$form_input] = $input_value;
+									} else if ($copy_primary && isset($primary_registrant[$form_input]) && $input_value == NULL) {
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
-									if ( ! $this->_save_registration_form_input( $registration, $form_input, $input_value ))  {
-										EE_Error::add_error( sprintf( __( 'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso' ), $form_input, $input_value ), __FILE__, __FUNCTION__, __LINE__ );
+									if ( ! $this->_save_registration_form_input($registration, $form_input, $input_value)) {
+										EE_Error::add_error(sprintf(__('Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso'), $form_input, $input_value), __FILE__, __FUNCTION__, __LINE__);
 										return FALSE;
 									}
 								}
@@ -733,51 +732,51 @@ 
 					}
 					//EEH_Debug_Tools::printr( $this->_attendee_data, '$this->_attendee_data', __FILE__, __LINE__ );
 					// this registration does not require additional attendee information ?
-					if ( $copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+					if ($copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 						// just copy the primary registrant
 						$attendee = $this->checkout->primary_attendee_obj;
 					} else {
 						// have we met before?
-						$attendee = $this->_find_existing_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+						$attendee = $this->_find_existing_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
-							$attendee = $this->_update_existing_attendee_data( $attendee, $this->_attendee_data[ $reg_url_link ] );
+						if ($attendee instanceof EE_Attendee) {
+							$attendee = $this->_update_existing_attendee_data($attendee, $this->_attendee_data[$reg_url_link]);
 						} else {
 							// ensure critical details are set for additional attendees
-							$this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant( $this->_attendee_data[ $reg_url_link ] ) : $this->_attendee_data[ $reg_url_link ];
-							$attendee = $this->_create_new_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+							$this->_attendee_data[$reg_url_link] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant($this->_attendee_data[$reg_url_link]) : $this->_attendee_data[$reg_url_link];
+							$attendee = $this->_create_new_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						}
 						// who's #1 ?
-						if ( $att_nmbr == 1 ) {
+						if ($att_nmbr == 1) {
 							$this->checkout->primary_attendee_obj = $attendee;
 						}
 					}
 					//EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ );
 					// add relation to registration, set attendee ID, and cache attendee
-					$this->_associate_attendee_with_registration( $registration, $attendee );
-					if ( ! $registration->attendee() instanceof EE_Attendee ) {
-						EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ );
+					$this->_associate_attendee_with_registration($registration, $attendee);
+					if ( ! $registration->attendee() instanceof EE_Attendee) {
+						EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					}
 					/** @type EE_Registration_Processor $registration_processor */
-					$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+					$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 					// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-					$registration_processor->toggle_incomplete_registration_status_to_default( $registration, FALSE );
+					$registration_processor->toggle_incomplete_registration_status_to_default($registration, FALSE);
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-					$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+					$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 					// if we've gotten this far, then let's save what we have
 					$registration->save();
 					// add relation between TXN and registration
-					$this->_associate_registration_with_transaction( $registration );
+					$this->_associate_registration_with_transaction($registration);
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
-				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			} else {
+				EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// remove malformed data
-				unset( $valid_data[ $reg_url_link ] );
+				unset($valid_data[$reg_url_link]);
 				return FALSE;
 			}
 
@@ -795,22 +794,22 @@ 
 	 * @param string           	$input_value
 	 * @return boolean
 	 */
-	private function _save_registration_form_input( EE_Registration $registration, $form_input = '', $input_value = '' ) {
+	private function _save_registration_form_input(EE_Registration $registration, $form_input = '', $input_value = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '()</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
 		//EEH_Debug_Tools::printr( $form_input, '$form_input', __FILE__, __LINE__ );
 		// allow for plugins to hook in and do their own processing of the form input.
 		// For plugins to bypass normal processing here, they just need to return a boolean value.
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this)) {
 			return TRUE;
 		}
 
 		// grab related answer objects
 		$answers = $registration->answers();
 		// $answer_cache_id is the key used to find the EE_Answer we want
-		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input . '-' . $registration->reg_url_link();
-		$answer_is_obj = isset( $answers[ $answer_cache_id ] ) && $answers[ $answer_cache_id ] instanceof EE_Answer ? TRUE : FALSE;
+		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($answers[$answer_cache_id]) && $answers[$answer_cache_id] instanceof EE_Answer ? TRUE : FALSE;
 		//rename form_inputs if they are EE_Attendee properties
-		switch( (string)$form_input ) {
+		switch ((string) $form_input) {
 
 			case 'state' :
 			case 'STA_ID' :
@@ -825,31 +824,31 @@ 
 				break;
 
 			default :
-				$ATT_input = 'ATT_' . $form_input;
+				$ATT_input = 'ATT_'.$form_input;
 				//EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ );
-				$attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? TRUE : FALSE;
-				$form_input = $attendee_property ? 'ATT_' . $form_input : $form_input;
+				$attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? TRUE : FALSE;
+				$form_input = $attendee_property ? 'ATT_'.$form_input : $form_input;
 		}
 		//EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ );
 		// if this form input has a corresponding attendee property
-		if ( $attendee_property ) {
-			$this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value;
-			if (  $answer_is_obj ) {
+		if ($attendee_property) {
+			$this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value;
+			if ($answer_is_obj) {
 				// and delete the corresponding answer since we won't be storing this data in that object
-				$registration->_remove_relation_to( $answers[ $answer_cache_id ], 'Answer' );
+				$registration->_remove_relation_to($answers[$answer_cache_id], 'Answer');
 			}
 			return TRUE;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$answers[ $answer_cache_id ]->set_value( $input_value );
-			return $answers[ $answer_cache_id ]->save();
+			$answers[$answer_cache_id]->set_value($input_value);
+			return $answers[$answer_cache_id]->save();
 		} else {
-			foreach ( $answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($answers as $answer) {
+				if ($answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id) {
+					$answer->set_value($input_value);
 					return $answer->save() !== FALSE ? TRUE : FALSE;
 				}
 			}
@@ -866,29 +865,29 @@ 
 	 * @param string $input_value
 	 * @return boolean
 	 */
-	private function _verify_critical_attendee_details_are_set_and_validate_email( $form_input = '', $input_value = '' ) {
-		if ( empty( $input_value )) {
-			switch( $form_input ) {
+	private function _verify_critical_attendee_details_are_set_and_validate_email($form_input = '', $input_value = '') {
+		if (empty($input_value)) {
+			switch ($form_input) {
 				case 'fname' :
-					EE_Error::add_error( __( 'First Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('First Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'lname' :
-					EE_Error::add_error( __( 'Last Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Last Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'email' :
-					EE_Error::add_error( __( 'Email Address is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Email Address is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 			}
-		} else if ( $form_input === 'email' ) {
+		} else if ($form_input === 'email') {
 			// clean the email address
-			$valid_email = sanitize_email( $input_value );
+			$valid_email = sanitize_email($input_value);
 			// check if it matches
-			if ( $input_value != $valid_email ) {
+			if ($input_value != $valid_email) {
 				// whoops!!!
-				EE_Error::add_error( __( 'Please enter a valid email address.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Please enter a valid email address.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 		}
@@ -916,14 +915,14 @@ 
 	 * @param array           $attendee_data
 	 * @return boolean
 	 */
-	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : '';
-		$ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : '';
-		$ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] ) ? $attendee_data['ATT_email'] : '';
+		$ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : '';
+		$ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : '';
+		$ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email']) ? $attendee_data['ATT_email'] : '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $ATT_fname,
 				'ATT_lname' => $ATT_lname,
 				'ATT_email' => $ATT_email
@@ -931,7 +930,7 @@ 
 		} else {
 			$existing_attendee = NULL;
 		}
-		return apply_filters( 'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data );
+		return apply_filters('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data);
 	}
 
 
@@ -943,13 +942,13 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) {
+	private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) {
 		// first remove fname, lname, and email from attendee data
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
-			if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) {
-				$existing_attendee->set( $property_name, $property_value );
+		foreach ($attendee_data as $property_name => $property_value) {
+			if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) {
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -966,11 +965,11 @@ 
 	 * @param EE_Attendee     $attendee
 	 * @return void
 	 */
-	private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) {
+	private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) {
 		// add relation to attendee
-		$registration->_add_relation_to( $attendee, 'Attendee' );
-		$registration->set_attendee_id( $attendee->ID() );
-		$registration->update_cache_after_object_save( 'Attendee', $attendee );
+		$registration->_add_relation_to($attendee, 'Attendee');
+		$registration->set_attendee_id($attendee->ID());
+		$registration->update_cache_after_object_save('Attendee', $attendee);
 	}
 
 
@@ -981,10 +980,10 @@ 
 	 * @param EE_Registration $registration
 	 * @return void
 	 */
-	private function _associate_registration_with_transaction( EE_Registration $registration ) {
+	private function _associate_registration_with_transaction(EE_Registration $registration) {
 		// add relation to attendee
-		$this->checkout->transaction->_add_relation_to( $registration, 'Registration' );
-		$this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration );
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
 	}
 
 
@@ -996,17 +995,17 @@ 
 	 * @param array $attendee_data
 	 * @return array
 	 */
-	private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) {
+	private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) {
 		// bare minimum critical details include first name, last name, email address
-		$critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// add address info to critical details?
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE )) {
-			$address_details = array( 'ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone' );
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE)) {
+			$address_details = array('ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone');
+			$critical_attendee_details = array_merge($critical_attendee_details, $address_details);
 		}
-		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
-			if ( ! isset( $attendee_data[ $critical_attendee_detail ] ) || empty( $attendee_data[ $critical_attendee_detail ] )) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get( $critical_attendee_detail );
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if ( ! isset($attendee_data[$critical_attendee_detail]) || empty($attendee_data[$critical_attendee_detail])) {
+				$attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get($critical_attendee_detail);
 			}
 		}
 		return $attendee_data;
@@ -1021,11 +1020,11 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}
@@ -1041,7 +1040,7 @@ 
 	 */
 	public function update_reg_step() {
 		// save everything
-		if ( $this->process_reg_step() ) {
+		if ($this->process_reg_step()) {
 			$this->checkout->redirect = TRUE;
 			$this->checkout->redirect_url = add_query_arg(
 				array(
@@ -1050,7 +1049,7 @@ 
 				),
 				$this->checkout->thank_you_page_url
 			);
-			$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 			return TRUE;
 		}
 		return FALSE;

modules/single_page_checkout/inc/EE_SPCO_Reg_Step_Finalize_Registration.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function initialize_reg_step() {
 
@@ -169,7 +169,7 @@ 
 
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function update_reg_step() {
 		EE_Error::doing_it_wrong( __CLASS__ . '::' . __FILE__, __( 'Can not call update_reg_step() on the Finalize Registration reg step.', 'event_espresso'), '4.6.0' );

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Finalize_Registration
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Finalize_Registration
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Finalize_Registration extends EE_SPCO_Reg_Step {
 
 	/**

Spacing +24 added lines, -24 removed lines

@@ -20,7 +20,7 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return 	\EE_SPCO_Reg_Step_Finalize_Registration
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'finalize_registration';
 		$this->_name = __('Finalize Registration', 'event_espresso');
 		$this->_submit_button_text = $this->_name;
@@ -47,9 +47,9 @@ 
 	public function initialize_reg_step() {
 
 		// there's actually no reg form to process if this is the final step
-		if ( $this->is_current_step() ) {
+		if ($this->is_current_step()) {
 			$this->checkout->step = $_REQUEST['step'] = $this->slug();
-			$this->checkout->action = $_REQUEST[ 'action' ] = 'process_reg_step';
+			$this->checkout->action = $_REQUEST['action'] = 'process_reg_step';
 			$this->checkout->generate_reg_form = false;
 		}
 
@@ -72,7 +72,7 @@ 
 	 */
 	public function process_reg_step() {
 		// ensure all data gets refreshed from the db
-		$this->checkout->refresh_all_entities( true );
+		$this->checkout->refresh_all_entities(true);
 		// ensures that all details and statuses for transaction, registration, and payments are updated
 		$txn_update_params = $this->_finalize_transaction();
 		// DEBUG LOG
@@ -87,16 +87,16 @@ 
 		//	)
 		//);
 		// set a hook point
-		do_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', $this->checkout, $txn_update_params );
+		do_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', $this->checkout, $txn_update_params);
 		// check if transaction has a primary registrant and that it has a related Attendee object
-		if ( $this->checkout->transaction_has_primary_registrant() ) {
+		if ($this->checkout->transaction_has_primary_registrant()) {
 			// setup URL for redirect
 			$this->checkout->redirect_url = add_query_arg(
-				array( 'e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link() ),
+				array('e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()),
 				$this->checkout->thank_you_page_url
 			);
 		} else {
-			EE_Error::add_error( __( 'A valid Primary Registration for this Transaction could not be found.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->checkout->redirect = false;
 			$this->checkout->continue_reg = false;
 			return false;
@@ -104,7 +104,7 @@ 
 		// you don't have to go home but you can't stay here !
 		$this->checkout->redirect = true;
 		$this->checkout->continue_reg = true;
-		$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 		// mark this reg step as completed
 		$this->checkout->current_step->set_completed();
 		$this->checkout->set_exit_spco();
@@ -120,21 +120,21 @@ 
 	 */
 	protected function _finalize_transaction() {
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		//set revisit flag in txn processor
-		$transaction_processor->set_revisit( $this->checkout->revisit );
+		$transaction_processor->set_revisit($this->checkout->revisit);
 		// at this point we'll consider a TXN to not have been abandoned
-		$transaction_processor->toggle_abandoned_transaction_status( $this->checkout->transaction );
-		if ( $this->checkout->cart instanceof EE_Cart ) {
+		$transaction_processor->toggle_abandoned_transaction_status($this->checkout->transaction);
+		if ($this->checkout->cart instanceof EE_Cart) {
 			// save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $this->checkout->transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($this->checkout->transaction->ID());
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $this->checkout->transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($this->checkout->transaction, false);
 		// If the selected method of payment used an off-site gateway...
-		if ( $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ($this->checkout->payment_method instanceof EE_Payment_Method) {
 			// if SPCO revisit and TXN status has changed due to a payment
 			//if (
 			//	filter_var( $this->checkout->revisit, FILTER_VALIDATE_BOOLEAN ) &&
@@ -144,17 +144,17 @@ 
 			//	add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
 			//}
 
-			if ( $this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site() ) {
-				$gateway= $this->checkout->payment_method->type_obj()->get_gateway();
-				if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+			if ($this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site()) {
+				$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
+				if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 					// do NOT trigger notifications because it was already done during the IPN
-					remove_all_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications' );
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 );
+					remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
 				}
 			}
 		}
 		// this will result in the base session properties getting saved to the TXN_Session_data field
-		$this->checkout->transaction->set_txn_session_data( EE_Registry::instance()->SSN->get_session_data( null, true ));
+		$this->checkout->transaction->set_txn_session_data(EE_Registry::instance()->SSN->get_session_data(null, true));
 		// update the TXN if payment conditions have changed
 		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
 			$this->checkout->transaction,
@@ -169,7 +169,7 @@ 
 	 * @return boolean
 	 */
 	public function update_reg_step() {
-		EE_Error::doing_it_wrong( __CLASS__ . '::' . __FILE__, __( 'Can not call update_reg_step() on the Finalize Registration reg step.', 'event_espresso'), '4.6.0' );
+		EE_Error::doing_it_wrong(__CLASS__.'::'.__FILE__, __('Can not call update_reg_step() on the Finalize Registration reg step.', 'event_espresso'), '4.6.0');
 	 }
 
 

admin_pages/maintenance/templates/ee_data_reset_and_delete.template.php

Spacing +13 added lines, -13 removed lines

@@ -4,14 +4,14 @@ 
 */
 ?>
 <h1>
-	<?php _e( 'Reset/Delete Data for Event Espresso', 'event_espresso' );?>
+	<?php _e('Reset/Delete Data for Event Espresso', 'event_espresso'); ?>
 </h1>
 <br />
 
 <!-- reset DB url is here. Just need to make it look pretty and unhide it-->
 <div class="padding">
-	<h3 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso');?></h3>
-	<p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso');?></p>
+	<h3 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Capabilities', 'event_espresso'); ?></h3>
+	<p><?php _e('Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.', 'event_espresso'); ?></p>
 	<div class="float-right"><?php echo $reset_capabilities_button; ?></div>
 	<div class="clear"></div>
 </div>
@@ -19,24 +19,24 @@ 
 <br />
 
 <div class="padding">
-	<h3 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso');?></h3>
-	<p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso');?></p>
-	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url;?>"><?php _e('Reset Event Espresso Tables', 'event_espresso');?></a></div>
+	<h3 class="espresso-header"><span class="dashicons dashicons-update ee-icon-size-22"></span><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></h3>
+	<p><?php _e('Use this to reset Event Espresso Data and return your site to how it was just after first activating Event Espresso.', 'event_espresso'); ?></p>
+	<div class="float-right"><a class="button button-primary" href="<?php echo $reset_db_url; ?>"><?php _e('Reset Event Espresso Tables', 'event_espresso'); ?></a></div>
 	<div class="clear"></div>
 </div>
 <br />
 <br />
 
 <div class="padding">
-	<h3 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso');?></h3>
-	<p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso');?></p>
-	<p class="important-notice"><?php printf( __('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>' ); ?><br/></p>
+	<h3 class="espresso-header"><span class="dashicons dashicons-post-trash ee-icon-size-22"></span><?php _e('Permanently Delete ALL Event Espresso Tables and Data', 'event_espresso'); ?></h3>
+	<p><?php _e('If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.', 'event_espresso'); ?></p>
+	<p class="important-notice"><?php printf(__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'), '<strong>', '</strong>'); ?><br/></p>
 	<ol>
-		<li><?php  _e('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database', 'event_espresso');?></li>
-		<li><?php printf( __('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
-        <li><?php printf( __('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>' ); ?></li>
+		<li><?php  _e('First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database', 'event_espresso'); ?></li>
+		<li><?php printf(__('Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
+        <li><?php printf(__('Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s', 'event_espresso'), '<strong>', '</strong>'); ?></li>
 	</ol>
-	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso');?></a></div>
+	<div class="float-right"><a href="<?php echo $delete_db_url; ?>" id="delete-all-data-btn" class="button-primary"><?php _e('Permanently Delete All Event Espresso Data', 'event_espresso'); ?></a></div>
 	<div class="clear"></div>
 </div>
 <br/>

admin_pages/maintenance/templates/ee_migration_page.template.php

Spacing +57 added lines, -57 removed lines

@@ -12,70 +12,70 @@ 
  * @var $update_migration_script_page_link string
  */
 
-if ( $show_backup_db_text ) { ?>
-<h1><span class="dashicons dashicons-migrate"></span><?php _e("Database Migration Manager", "event_espresso");?></h1>
+if ($show_backup_db_text) { ?>
+<h1><span class="dashicons dashicons-migrate"></span><?php _e("Database Migration Manager", "event_espresso"); ?></h1>
 <?php } ?>
 <div class="padding">
 	<div id="migration-prep">
 
- 		<?php if ( $script_names ) { ?>
+ 		<?php if ($script_names) { ?>
  			<h3 class="espresso-header">
  				<span class="dashicons dashicons-flag ee-icon-size-22"></span>
- 				<?php echo apply_filters('FHEE__ee_migration_page__header',  sprintf(__("Event Espresso has detected event data from version %s that can be migrated (updated) to work with version %s.", "event_espresso"),$current_db_state,$next_db_state),$current_db_state,$next_db_state);?>
+ 				<?php echo apply_filters('FHEE__ee_migration_page__header', sprintf(__("Event Espresso has detected event data from version %s that can be migrated (updated) to work with version %s.", "event_espresso"), $current_db_state, $next_db_state), $current_db_state, $next_db_state); ?>
  			</h3>
  			<p>
- 			<?php echo apply_filters('FHEE__ee_migration_page__p_after_header',sprintf(__("Since you have already been using Event Espresso and have previous event and registration data in your database, you have the option to migrate, or copy over, this existing data into a format that is compatible with %s.", "event_espresso"),$next_db_state),$next_db_state);?>
+ 			<?php echo apply_filters('FHEE__ee_migration_page__p_after_header', sprintf(__("Since you have already been using Event Espresso and have previous event and registration data in your database, you have the option to migrate, or copy over, this existing data into a format that is compatible with %s.", "event_espresso"), $next_db_state), $next_db_state); ?>
  			</p>
- 		<?php } elseif ( $show_most_recent_migration ) { ?>
+ 		<?php } elseif ($show_most_recent_migration) { ?>
  			 <h3 class="espresso-header">
  			 	<span class="dashicons dashicons-awards ee-icon-size-22"></span>
- 				 <?php echo apply_filters('FHEE__ee_migration_page__done_migration_header',sprintf(__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s', "event_espresso"),$ultimate_db_state));?>
+ 				 <?php echo apply_filters('FHEE__ee_migration_page__done_migration_header', sprintf(__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s', "event_espresso"), $ultimate_db_state)); ?>
  			 </h3>
  			 <p>
- 			 	<?php echo apply_filters('FHEE__ee_migration_page__p_after_done_migration_header',sprintf(__("Time to find out about all the great new features %s has to offer.", "event_espresso"),$ultimate_db_state));?> &nbsp;
- 			 	<b><a id="get-started-after-migrate" class="button-primary" href="<?php echo add_query_arg( array( 'page' => 'espresso_about' ), admin_url( 'admin.php' )); ?>">
- 			 		<?php _e("Let's Get Started", "event_espresso");?>&nbsp;<span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
+ 			 	<?php echo apply_filters('FHEE__ee_migration_page__p_after_done_migration_header', sprintf(__("Time to find out about all the great new features %s has to offer.", "event_espresso"), $ultimate_db_state)); ?> &nbsp;
+ 			 	<b><a id="get-started-after-migrate" class="button-primary" href="<?php echo add_query_arg(array('page' => 'espresso_about'), admin_url('admin.php')); ?>">
+ 			 		<?php _e("Let's Get Started", "event_espresso"); ?>&nbsp;<span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
  			 	</a></b>
  			 </p>
  		<?php } ?>
 
 
-		<?php if ($show_backup_db_text){ ?>
+		<?php if ($show_backup_db_text) { ?>
 		<div id="migration-options-dv">
 			<h2>
 				<span class="dashicons dashicons-admin-tools"></span>
-				<?php _e("Migration Options", "event_espresso");?>
-				<span class="tiny-text lt-grey-text"> &nbsp; <?php _e(' to migrate or not to migrate?', "event_espresso");?></span>
+				<?php _e("Migration Options", "event_espresso"); ?>
+				<span class="tiny-text lt-grey-text"> &nbsp; <?php _e(' to migrate or not to migrate?', "event_espresso"); ?></span>
 			</h2>
 			<div class="ee-table-wrap">
 				<table>
 					<tbody>
 						<tr>
-							<td><h3><?php _e('1', 'event_espresso');?></h3></td>
+							<td><h3><?php _e('1', 'event_espresso'); ?></h3></td>
 							<td>
 								<?php
-								echo apply_filters('FHEE__ee_migration_page__option_1_main',sprintf(
+								echo apply_filters('FHEE__ee_migration_page__option_1_main', sprintf(
 									__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.', "event_espresso"),
 									'<strong>',
 									'</strong>',
-									'<a id="migration-risks" class="" title="' . esc_attr__('click for more details', "event_espresso") . '">',
+									'<a id="migration-risks" class="" title="'.esc_attr__('click for more details', "event_espresso").'">',
 									'</a>',
 									$current_db_state,
 									$next_db_state
-								),$current_db_state,$next_db_state);
+								), $current_db_state, $next_db_state);
 								?>
-								<a id="display-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="migration-details" ><?php _e('click for more details', "event_espresso");?>&nbsp;+</a>
-								<a  id="hide-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="migration-details" style="display:none;" ><?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?></a>
+								<a id="display-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="migration-details" ><?php _e('click for more details', "event_espresso"); ?>&nbsp;+</a>
+								<a  id="hide-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="migration-details" style="display:none;" ><?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?></a>
 							</td>
 							<td>
-								<a id="db-backed-up" class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text',sprintf(__("Migrate My %s Data to %s", "event_espresso"),$current_db_state,$next_db_state),$current_db_state,$next_db_state);?></a>
+								<a id="db-backed-up" class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text', sprintf(__("Migrate My %s Data to %s", "event_espresso"), $current_db_state, $next_db_state), $current_db_state, $next_db_state); ?></a>
 							</td>
 						</tr>
 						<tr>
 							<td colspan="3" style="padding: 0">
 								<div id="migration-details-dv" style="display: none; padding: 1em;">
 
-									<span class="reminder-spn"><?php printf(__("%s Important: %s Before migrating, please back up your database and files.", "event_espresso"),"<b>","</b>");?></span>
+									<span class="reminder-spn"><?php printf(__("%s Important: %s Before migrating, please back up your database and files.", "event_espresso"), "<b>", "</b>"); ?></span>
 									<p>
 									<?php
 										printf(
@@ -91,27 +91,27 @@ 
 										);
 									?>
 									</p>
-									<?php do_action('AHEE__ee_migration_page__option_1_extra_details');?>
+									<?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
 								</div>
 							</td>
 						</tr>
 						<tr>
-							<td><h3><?php _e('2', 'event_espresso');?></h3></td>
+							<td><h3><?php _e('2', 'event_espresso'); ?></h3></td>
 							<td>
-								<?php echo apply_filters( 'FHEE__ee_migration_page__option_2_main',sprintf(__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.', "event_espresso"),$current_db_state,$next_db_state,$ultimate_db_state),$current_db_state,$next_db_state,$ultimate_db_state);?><br />
-								<span class="reminder-spn"><?php _e( 'Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.', 'event_espresso' );?></span>
-								<a id="display-no-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="no-migration-details"><?php _e('click for more details', "event_espresso");?>&nbsp;+</a>
-								<a  id="hide-no-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="no-migration-details" style="display:none;" ><?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?></a>
+								<?php echo apply_filters('FHEE__ee_migration_page__option_2_main', sprintf(__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.', "event_espresso"), $current_db_state, $next_db_state, $ultimate_db_state), $current_db_state, $next_db_state, $ultimate_db_state); ?><br />
+								<span class="reminder-spn"><?php _e('Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.', 'event_espresso'); ?></span>
+								<a id="display-no-migration-details" class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="no-migration-details"><?php _e('click for more details', "event_espresso"); ?>&nbsp;+</a>
+								<a  id="hide-no-migration-details" class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"  rel="no-migration-details" style="display:none;" ><?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?></a>
 							</td>
 							<td>
-								<a id="do-not-migrate" class="do-not-migrate button-primary" href="<?php echo $reset_db_page_link;?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text',sprintf(__("Just Start %s and Delete Existing Data", "event_espresso"),$ultimate_db_state),$ultimate_db_state);?></a>
+								<a id="do-not-migrate" class="do-not-migrate button-primary" href="<?php echo $reset_db_page_link; ?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text', sprintf(__("Just Start %s and Delete Existing Data", "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?></a>
 							</td>
 						</tr>
 						<tr>
 							<td colspan="3" style="padding: 0">
 								<div id="no-migration-details-dv" style="display: none; padding: 1em;">
 									<p>
-									<?php echo apply_filters('FHEE__ee_migration_page__option_2_details',sprintf(__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", "event_espresso"),$ultimate_db_state),$ultimate_db_state);?>
+									<?php echo apply_filters('FHEE__ee_migration_page__option_2_details', sprintf(__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
 									</p>
 								</div>
 							</td>
@@ -119,20 +119,20 @@ 
 					</tbody>
 				</table>
 			</div>
-			<?php do_action('AHEE__ee_migration_page__after_migration_options_table');?>
+			<?php do_action('AHEE__ee_migration_page__after_migration_options_table'); ?>
 		</div>
 	<?php } ?>
 
 	<?php
-		if ( $show_most_recent_migration ) {
-			if( $most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base ) {
-				if( $most_recent_migration->can_continue() ) {
+		if ($show_most_recent_migration) {
+			if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) {
+				if ($most_recent_migration->can_continue()) {
 					//tell the user they shoudl continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
 					<h3 class="espresso-header">
 						<span class="dashicons dashicons-star-half ee-icon-size-22"></span>
-						<?php printf(__("It appears that your previous Data Migration Task (%s) is incomplete, and should be resumed", "event_espresso"),$most_recent_migration->pretty_name());?>
+						<?php printf(__("It appears that your previous Data Migration Task (%s) is incomplete, and should be resumed", "event_espresso"), $most_recent_migration->pretty_name()); ?>
 					</h3>
-			<?php } elseif ( $most_recent_migration->is_broken() ) {
+			<?php } elseif ($most_recent_migration->is_broken()) {
 					//tell the user the migration failed and they should notify EE?>
 					<h3 class="espresso-header">
 						<span class="dashicons dashicons-no ee-icon-size-22"></span>
@@ -141,19 +141,19 @@ 
 			<?php }
 
 				//display errors or not of the most recent migration ran
-				if ( $most_recent_migration->get_errors() ){ ?>
+				if ($most_recent_migration->get_errors()) { ?>
 					<div class="ee-attention">
-						<strong><?php printf(__("Warnings occurred during your last migration (%s):",'event_espresso'),$most_recent_migration->pretty_name()) ?></strong>
-						<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Warnings", 'event_espresso');?></a>
+						<strong><?php printf(__("Warnings occurred during your last migration (%s):", 'event_espresso'), $most_recent_migration->pretty_name()) ?></strong>
+						<a id="show-hide-migration-warnings" class="display-the-hidden"><?php _e("Show Warnings", 'event_espresso'); ?></a>
 						<ul class="migration-warnings" style="display:none">
-						<?php foreach($most_recent_migration->get_errors() as $error){ ?>
+						<?php foreach ($most_recent_migration->get_errors() as $error) { ?>
 							<li><?php echo $error ?></li>
 						<?php }?>
 						</ul>
 					</div>
 				<?php } else {
 					//there were no errors during the last migration, just say so?>
-					<h2><?php printf(__("The last data migration task (%s) ran successfully without errors.", "event_espresso"),$most_recent_migration->pretty_name())?></h2>
+					<h2><?php printf(__("The last data migration task (%s) ran successfully without errors.", "event_espresso"), $most_recent_migration->pretty_name())?></h2>
 				<?php }
 				} else {
 			}
@@ -164,12 +164,12 @@ 
 	</div>
 	<!--end of #migration-prep-->
 
-	<?php if ($show_migration_progress){?>
+	<?php if ($show_migration_progress) {?>
 	<div id='migration-monitor' <?php echo $show_backup_db_text ? "style='display:none'" : ''?>>
-		<?php if( $show_backup_db_text){?>
+		<?php if ($show_backup_db_text) {?>
 		<p>
 			<a class="toggle-migration-monitor small-text" style="cursor: pointer;">
-				<span class="dashicons dashicons-arrow-left-alt2" style="top:0px;"></span><?php _e("return to previous screen", "event_espresso");?>
+				<span class="dashicons dashicons-arrow-left-alt2" style="top:0px;"></span><?php _e("return to previous screen", "event_espresso"); ?>
 			</a>
 			<br/>
 
@@ -178,33 +178,33 @@ 
 		<div id='progress-area'>
 			<h3 class="espresso-header">
 				<?php
-				echo  sprintf( _n(
+				echo  sprintf(_n(
 					"In order to import all of your existing Event Espresso data, the following upgrade task needs to be performed:",
 					"In order to import all of your existing Event Espresso data, the following %s upgrade tasks need to be performed:",
 					count($script_names),
 					"event_espresso"
-				), count( $script_names ) );?>
+				), count($script_names)); ?>
 			</h3>
 			<ul style="list-style: inside;">
-				<?php foreach($script_names as $script_name){?>
+				<?php foreach ($script_names as $script_name) {?>
 				<li style="margin: 0 0 1em 1em; line-height: 1.1em;"><?php echo $script_name?></li>
 				<?php }?>
 			</ul>
 			<br/>
 			<?php if (count($script_names) > 1) {?>
-			<p><?php _e("Please note: after each task is completed you will need to continue the data migration, or report an error to Event Espresso.", "event_espresso");?></p>
+			<p><?php _e("Please note: after each task is completed you will need to continue the data migration, or report an error to Event Espresso.", "event_espresso"); ?></p>
 			<?php }?>
 
 			<div class="ee-attention">
 				<p>
 					<span class="reminder-spn">
-						<strong><?php _e("Please Note:", "event_espresso");?></strong>
+						<strong><?php _e("Please Note:", "event_espresso"); ?></strong>
 					</span>
 					<br/>
-					<?php _e("Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", "event_espresso");?>
+					<?php _e("Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", "event_espresso"); ?>
 				</p>
 				<p>
-					<?php printf(__("%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.", "event_espresso"),'<strong>', '</strong>' );?>
+					<?php printf(__("%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.", "event_espresso"), '<strong>', '</strong>'); ?>
 				</p>
 				<p>
 					<?php _e("Click the button below to begin the migration process.", "event_espresso") ?>
@@ -219,7 +219,7 @@ 
 			<!-- #progress-responsive -->
 
 			<button id='start-migration' class='button-primary'>
-				<?php echo $show_continue_current_migration_script ? __("Continue Migration", "event_espresso") : __("Begin Migration", "event_espresso");?>
+				<?php echo $show_continue_current_migration_script ? __("Continue Migration", "event_espresso") : __("Begin Migration", "event_espresso"); ?>
 			</button>
 			<br class="clear"/>
 
@@ -235,9 +235,9 @@ 
 	</div>
 
 <?php }
-	   if ( $show_maintenance_switch ) {
+	   if ($show_maintenance_switch) {
  ?>
-	<h2><span class="dashicons dashicons-admin-tools"></span><?php  _e('Set Event Espresso Maintenance Mode', 'event_espresso');?></h2>
+	<h2><span class="dashicons dashicons-admin-tools"></span><?php  _e('Set Event Espresso Maintenance Mode', 'event_espresso'); ?></h2>
    	<form method='post' action='<?php echo $update_migration_script_page_link?>'>
 		<div class="ee-table-wrap">
 			<table>
@@ -246,9 +246,9 @@ 
 						<input type="radio" id="maintenance_mode_level_off" name="maintenance_mode_level" value="0" <?php echo EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_0_not_in_maintenance ? 'checked="checked"' : ''?>>
 					</td>
 					<th align="left">
-						<label for="maintenance_mode_level_off"><?php  _e('Maintenance Mode OFF', 'event_espresso');?></label>
+						<label for="maintenance_mode_level_off"><?php  _e('Maintenance Mode OFF', 'event_espresso'); ?></label>
 				   		<p class='description' style="font-weight: normal;">
-					   		<?php _e("This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", "event_espresso");?>
+					   		<?php _e("This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", "event_espresso"); ?>
 				   		</p>
 					</th>
 				</tr>
@@ -261,14 +261,14 @@ 
 							<?php  _e('Maintenance Mode ON', 'event_espresso')?>
 						</label>
 				   		<p class='description' style="font-weight: normal;">
-					   		<?php _e("This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.", "event_espresso");?>
+					   		<?php _e("This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.", "event_espresso"); ?>
 				   		</p>
 					</th>
 				</tr>
 			</table>
 		</div>
 		<p>
-   			<input type='submit' class="button-primary" value='<?php _e("Update Maintenance Mode", "event_espresso");?>'>
+   			<input type='submit' class="button-primary" value='<?php _e("Update Maintenance Mode", "event_espresso"); ?>'>
    		</p>
    	</form>
 	   	<?php