eventespresso / event-espresso-core

core/db_classes/EE_Registration_Payment.class.php

Spacing +12 added lines, -12 removed lines

@@ -19,9 +19,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '', $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = '', $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -31,8 +31,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	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);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @return 	int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return    int
 	 */
 	public function payment_ID() {
-		return $this->get( 'PAY_ID' );
+		return $this->get('PAY_ID');
 	}
 
 
@@ -65,7 +65,7 @@ 
 	 * @return 	float
 	 */
 	public function amount() {
-		return $this->get( 'RPY_amount' );
+		return $this->get('RPY_amount');
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 * @access    public
 	 * @param float $amount
 	 */
-	public function set_amount( $amount = 0.000 ) {
-		$this->set( 'RPY_amount', $amount );
+	public function set_amount($amount = 0.000) {
+		$this->set('RPY_amount', $amount);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @return \EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 * @return \EE_Payment
 	 */
 	public function payment() {
-		return $this->get_first_related( 'Payment' );
+		return $this->get_first_related('Payment');
 	}
 
 

core/db_classes/EE_Ticket.class.php

Spacing +181 added lines, -181 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
@@ -66,9 +66,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Ticket
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Ticket
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -99,13 +99,13 @@ 
 	 * @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;
 			}
 		}
@@ -120,21 +120,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 '';
 	}
@@ -148,12 +148,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;
@@ -167,25 +167,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 EE_INF
 			// we only need to check for EE_INF explicitly if we want to optimize.
 			// because EE_INF - x = EE_INF; and min(x,EE_INF) = x;
 			$tickets_remaining = $this->qty() - $this->sold();
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$tickets_remaining = min( $tickets_remaining, $datetime->spaces_remaining() );
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$tickets_remaining = min($tickets_remaining, $datetime->spaces_remaining());
 				}
 			}
 			return $tickets_remaining;
@@ -200,7 +200,7 @@ 
 	 * @return int
 	 */
 	function min() {
-		return $this->get( 'TKT_min' );
+		return $this->get('TKT_min');
 	}
 
 
@@ -210,7 +210,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'TKT_end_date' ) < time() );
+		return ($this->get_raw('TKT_end_date') < time());
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function is_pending() {
-		return ( $this->get_raw( 'TKT_start_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') > time());
 	}
 
 
@@ -230,7 +230,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());
 	}
 
 
@@ -241,11 +241,11 @@ 
 	 * @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 = ' - ' ) {
-		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date( $dt_frmt ) : '';
-		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date( $dt_frmt ) : '';
+	public function date_range($dt_frmt = '', $conjunction = ' - ') {
+		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date($dt_frmt) : '';
+		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date($dt_frmt) : '';
 
-		return $first_date && $last_date ? $first_date . $conjunction  . $last_date : '';
+		return $first_date && $last_date ? $first_date.$conjunction.$last_date : '';
 	}
 
 
@@ -255,8 +255,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);
 	}
 
 
@@ -267,11 +267,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);
 	}
 
 
@@ -281,8 +281,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);
 	}
 
 
@@ -296,22 +296,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;
@@ -325,15 +325,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->sold();
+		$tickets_sold['ticket'] = $this->sold();
 		return $tickets_sold;
 	}
 
@@ -346,9 +346,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));
 	}
 
 
@@ -360,8 +360,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);
 	}
 
 
@@ -371,8 +371,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);
 	}
 
 
@@ -382,8 +382,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);
 	}
 
 
@@ -394,8 +394,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);
 	}
 
 
@@ -405,7 +405,7 @@ 
 	 * @return string
 	 */
 	function ID() {
-		return $this->get( 'TKT_ID' );
+		return $this->get('TKT_ID');
 	}
 
 
@@ -429,7 +429,7 @@ 
 	 * @return EE_Ticket_Template
 	 */
 	public function template() {
-		return $this->get_first_related( 'Ticket_Template' );
+		return $this->get_first_related('Ticket_Template');
 	}
 
 
@@ -448,7 +448,7 @@ 
 	 * @return bool
 	 */
 	public function ticket_price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -457,7 +457,7 @@ 
 	 * @return mixed
 	 */
 	public function pretty_price() {
-		return $this->get_pretty( 'TKT_price' );
+		return $this->get_pretty('TKT_price');
 	}
 
 
@@ -476,17 +476,17 @@ 
 	 * @param bool $no_cache
 	 * @return float
 	 */
-	public function get_ticket_total_with_taxes( $no_cache = FALSE ) {
-		if ( ! isset( $this->_ticket_total_with_taxes ) || $no_cache ) {
+	public function get_ticket_total_with_taxes($no_cache = FALSE) {
+		if ( ! isset($this->_ticket_total_with_taxes) || $no_cache) {
 			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
 		}
-		return (float)$this->_ticket_total_with_taxes;
+		return (float) $this->_ticket_total_with_taxes;
 	}
 
 
 
 	public function ensure_TKT_Price_correct() {
-		$this->set( 'TKT_price', EE_Taxes::get_subtotal_for_admin( $this ) );
+		$this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
 		$this->save();
 	}
 
@@ -496,7 +496,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_subtotal() {
-		return EE_Taxes::get_subtotal_for_admin( $this );
+		return EE_Taxes::get_subtotal_for_admin($this);
 	}
 
 
@@ -506,7 +506,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);
 	}
 
 
@@ -516,8 +516,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'TKT_name', $name );
+	function set_name($name) {
+		$this->set('TKT_name', $name);
 	}
 
 
@@ -527,7 +527,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'TKT_description' );
+		return $this->get('TKT_description');
 	}
 
 
@@ -537,8 +537,8 @@ 
 	 * @param string $description
 	 * @return boolean
 	 */
-	function set_description( $description ) {
-		$this->set( 'TKT_description', $description );
+	function set_description($description) {
+		$this->set('TKT_description', $description);
 	}
 
 
@@ -549,8 +549,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);
 	}
 
 
@@ -560,8 +560,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');
 	}
 
 
@@ -572,8 +572,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);
 	}
 
 
@@ -583,8 +583,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');
 	}
 
 
@@ -596,8 +596,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');
 	}
 
 
@@ -607,8 +607,8 @@ 
 	 * @param int $min
 	 * @return boolean
 	 */
-	function set_min( $min ) {
-		$this->set( 'TKT_min', $min );
+	function set_min($min) {
+		$this->set('TKT_min', $min);
 	}
 
 
@@ -618,7 +618,7 @@ 
 	 * @return int
 	 */
 	function max() {
-		return $this->get( 'TKT_max' );
+		return $this->get('TKT_max');
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 * @param int $max
 	 * @return boolean
 	 */
-	function set_max( $max ) {
-		$this->set( 'TKT_max', $max );
+	function set_max($max) {
+		$this->set('TKT_max', $max);
 	}
 
 
@@ -639,8 +639,8 @@ 
 	 * @param float $price
 	 * @return boolean
 	 */
-	function set_price( $price ) {
-		$this->set( 'TKT_price', $price );
+	function set_price($price) {
+		$this->set('TKT_price', $price);
 	}
 
 
@@ -650,7 +650,7 @@ 
 	 * @return int
 	 */
 	function sold() {
-		return $this->get_raw( 'TKT_sold' );
+		return $this->get_raw('TKT_sold');
 	}
 
 
@@ -660,10 +660,10 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function increase_sold( $qty = 1 ) {
+	function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
-		$this->_increase_sold_for_datetimes( $qty );
-		return $this->set_sold( $sold );
+		$this->_increase_sold_for_datetimes($qty);
+		return $this->set_sold($sold);
 	}
 
 
@@ -673,12 +673,12 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	protected function _increase_sold_for_datetimes( $qty = 1 ) {
+	protected function _increase_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->increase_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->increase_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -692,10 +692,10 @@ 
 	 * @param int $sold
 	 * @return boolean
 	 */
-	function set_sold( $sold ) {
+	function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'TKT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('TKT_sold', $sold);
 	}
 
 
@@ -705,10 +705,10 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function decrease_sold( $qty = 1 ) {
+	function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->_decrease_sold_for_datetimes( $qty );
-		return $this->set_sold( $sold );
+		$this->_decrease_sold_for_datetimes($qty);
+		return $this->set_sold($sold);
 	}
 
 
@@ -719,12 +719,12 @@ 
 	* @param int $qty
 	* @return boolean
 	*/
-	protected function _decrease_sold_for_datetimes( $qty = 1 ) {
+	protected function _decrease_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->decrease_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->decrease_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -745,14 +745,14 @@ 
 	 *
 	 * @return int
 	 */
-	function qty( $context = '' ) {
-		switch ( $context ) {
+	function qty($context = '') {
+		switch ($context) {
 			case 'reg_limit' :
 				return $this->real_quantity_on_ticket();
 			case 'saleable' :
-				return $this->real_quantity_on_ticket( 'saleable' );
+				return $this->real_quantity_on_ticket('saleable');
 			default:
-				return $this->get_raw( 'TKT_qty' );
+				return $this->get_raw('TKT_qty');
 		}
 	}
 
@@ -769,38 +769,38 @@ 
 	 *
 	 * @return int
 	 */
-	function real_quantity_on_ticket( $context = 'reg_limit' ) {
+	function real_quantity_on_ticket($context = 'reg_limit') {
 		// start with the original db value for ticket quantity
-		$raw = $this->get_raw( 'TKT_qty' );
+		$raw = $this->get_raw('TKT_qty');
 		// return immediately if it's zero
-		if ( $raw === 0 ) {
+		if ($raw === 0) {
 			return $raw;
 		}
 		// ensure qty doesn't exceed raw value for THIS ticket
-		$qty = min( EE_INF, $raw );
+		$qty = min(EE_INF, $raw);
 		// NOW that we know the  maximum number of tickets available for the ticket
 		// we need to calculate the maximum number of tickets available for the datetime
 		// without really factoring this ticket into the calculations
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				// initialize with no restrictions for each datetime
 				// but adjust datetime qty based on datetime reg limit
-				$datetime_qty = min( EE_INF, $datetime->reg_limit() );
+				$datetime_qty = min(EE_INF, $datetime->reg_limit());
 				// if we want the actual saleable amount, then we need to consider OTHER ticket sales
 				// for this datetime, that do NOT include sales for this ticket (so we add THIS ticket's sales back in)
-				if ( $context == 'saleable' ) {
-					$datetime_qty = max( $datetime_qty - $datetime->sold() + $this->sold(), 0 );
+				if ($context == 'saleable') {
+					$datetime_qty = max($datetime_qty - $datetime->sold() + $this->sold(), 0);
 					$datetime_qty = ! $datetime->sold_out() ? $datetime_qty : 0;
 				}
-				$qty = min( $datetime_qty, $qty );
+				$qty = min($datetime_qty, $qty);
 			}
 
 		}
 		// we need to factor in the details for this specific ticket
-		if ( $qty > 0 && $context == 'saleable' ) {
+		if ($qty > 0 && $context == 'saleable') {
 			// and subtract the sales for THIS ticket
-			$qty = max( $qty - $this->sold(), 0 );
+			$qty = max($qty - $this->sold(), 0);
 			//echo '&nbsp; $qty: ' . $qty . "<br />";
 		}
 		//echo '$qty: ' . $qty . "<br />";
@@ -816,14 +816,14 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	function set_qty( $qty ) {
+	function set_qty($qty) {
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
-				$qty = min( $qty, $datetime->reg_limit() );
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$qty = min($qty, $datetime->reg_limit());
 			}
 		}
-		$this->set( 'TKT_qty', $qty );
+		$this->set('TKT_qty', $qty);
 	}
 
 
@@ -833,7 +833,7 @@ 
 	 * @return int
 	 */
 	function uses() {
-		return $this->get( 'TKT_uses' );
+		return $this->get('TKT_uses');
 	}
 
 
@@ -843,8 +843,8 @@ 
 	 * @param int $uses
 	 * @return boolean
 	 */
-	function set_uses( $uses ) {
-		$this->set( 'TKT_uses', $uses );
+	function set_uses($uses) {
+		$this->set('TKT_uses', $uses);
 	}
 
 
@@ -854,7 +854,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'TKT_required' );
+		return $this->get('TKT_required');
 	}
 
 
@@ -864,8 +864,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);
 	}
 
 
@@ -875,7 +875,7 @@ 
 	 * @return boolean
 	 */
 	function taxable() {
-		return $this->get( 'TKT_taxable' );
+		return $this->get('TKT_taxable');
 	}
 
 
@@ -885,8 +885,8 @@ 
 	 * @param boolean $taxable
 	 * @return boolean
 	 */
-	function set_taxable( $taxable ) {
-		$this->set( 'TKT_taxable', $taxable );
+	function set_taxable($taxable) {
+		$this->set('TKT_taxable', $taxable);
 	}
 
 
@@ -896,7 +896,7 @@ 
 	 * @return boolean
 	 */
 	function is_default() {
-		return $this->get( 'TKT_is_default' );
+		return $this->get('TKT_is_default');
 	}
 
 
@@ -906,8 +906,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);
 	}
 
 
@@ -917,7 +917,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'TKT_order' );
+		return $this->get('TKT_order');
 	}
 
 
@@ -927,8 +927,8 @@ 
 	 * @param int $order
 	 * @return boolean
 	 */
-	function set_order( $order ) {
-		$this->set( 'TKT_order', $order );
+	function set_order($order) {
+		$this->set('TKT_order', $order);
 	}
 
 
@@ -938,7 +938,7 @@ 
 	 * @return int
 	 */
 	function row() {
-		return $this->get( 'TKT_row' );
+		return $this->get('TKT_row');
 	}
 
 
@@ -948,8 +948,8 @@ 
 	 * @param int $row
 	 * @return boolean
 	 */
-	function set_row( $row ) {
-		$this->set( 'TKT_row', $row );
+	function set_row($row) {
+		$this->set('TKT_row', $row);
 	}
 
 
@@ -959,7 +959,7 @@ 
 	 * @return boolean
 	 */
 	function deleted() {
-		return $this->get( 'TKT_deleted' );
+		return $this->get('TKT_deleted');
 	}
 
 
@@ -969,8 +969,8 @@ 
 	 * @param boolean $deleted
 	 * @return boolean
 	 */
-	function set_deleted( $deleted ) {
-		$this->set( 'TKT_deleted', $deleted );
+	function set_deleted($deleted) {
+		$this->set('TKT_deleted', $deleted);
 	}
 
 
@@ -980,7 +980,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -990,8 +990,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);
 	}
 
 
@@ -1002,10 +1002,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();
 	}
 
 
@@ -1015,7 +1015,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'TKT_name' );
+		return $this->get('TKT_name');
 	}
 
 
@@ -1025,7 +1025,7 @@ 
 	 * @return float
 	 */
 	function price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -1035,8 +1035,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);
 	}
 
 
@@ -1047,8 +1047,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;
 	}
@@ -1060,7 +1060,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);
 	}
 
@@ -1085,7 +1085,7 @@ 
 	public function get_related_event() {
 		//get one datetime to use for getting the event
 		$datetime = $this->first_datetime();
-		if ( $datetime instanceof EE_Datetime ) {
+		if ($datetime instanceof EE_Datetime) {
 			return $datetime->event();
 		}
 		return null;

core/db_classes/EE_Ticket_Price.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '', $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = '', $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price
 	 */
-	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);
 	}
 
 

core/db_classes/EE_Transaction.class.php

Spacing +111 added lines, -111 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -26,7 +26,7 @@ 
  * @subpackage 	includes/classes/EE_Transaction.class.php
  * @author 				Brent Christensen
  */
-class EE_Transaction extends EE_Base_Class implements EEI_Transaction{
+class EE_Transaction extends EE_Base_Class implements EEI_Transaction {
 
 
 	/**
@@ -38,9 +38,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Transaction
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -67,9 +67,9 @@ 
 	 * @return 	void
 	 */
 	public function lock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		$locked_transactions[ $this->ID() ] = true;
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		$locked_transactions[$this->ID()] = true;
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @return 	void
 	 */
 	public function unlock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		unset( $locked_transactions[ $this->ID() ] );
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		unset($locked_transactions[$this->ID()]);
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 	/**
@@ -102,8 +102,8 @@ 
 	 * @return boolean
 	 */
 	public function is_locked() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		return isset( $locked_transactions[ $this->ID() ] ) ? true : false;
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		return isset($locked_transactions[$this->ID()]) ? true : false;
 	}
 
 
@@ -114,8 +114,8 @@ 
 	 * @access        public
 	 * @param        float $total total value of transaction
 	 */
-	public function set_total( $total = 0.00 ) {
-		$this->set( 'TXN_total', $total );
+	public function set_total($total = 0.00) {
+		$this->set('TXN_total', $total);
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @access        public
 	 * @param        float $total_paid total amount paid to date (sum of all payments)
 	 */
-	public function set_paid( $total_paid = 0.00 ) {
-		$this->set( 'TXN_paid', $total_paid );
+	public function set_paid($total_paid = 0.00) {
+		$this->set('TXN_paid', $total_paid);
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @access        public
 	 * @param        string $status whether the transaction is open, declined, accepted, or any number of custom values that can be set
 	 */
-	public function set_status( $status = '' ) {
-		$this->set( 'STS_ID', $status );
+	public function set_status($status = '') {
+		$this->set('STS_ID', $status);
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @access        public
 	 * @param        string $hash_salt required for some payment gateways
 	 */
-	public function set_hash_salt( $hash_salt = '' ) {
-		$this->set( 'TXN_hash_salt', $hash_salt );
+	public function set_hash_salt($hash_salt = '') {
+		$this->set('TXN_hash_salt', $hash_salt);
 	}
 
 
@@ -160,8 +160,8 @@ 
 	 * Sets TXN_reg_steps array
 	 * @param array $txn_reg_steps
 	 */
-	function set_reg_steps( $txn_reg_steps ) {
-		$this->set( 'TXN_reg_steps', $txn_reg_steps );
+	function set_reg_steps($txn_reg_steps) {
+		$this->set('TXN_reg_steps', $txn_reg_steps);
 	}
 
 
@@ -171,8 +171,8 @@ 
 	 * @return array
 	 */
 	function reg_steps() {
-		$TXN_reg_steps = $this->get( 'TXN_reg_steps' );
-		return is_array( $TXN_reg_steps ) ? $TXN_reg_steps : array();
+		$TXN_reg_steps = $this->get('TXN_reg_steps');
+		return is_array($TXN_reg_steps) ? $TXN_reg_steps : array();
 	}
 
 
@@ -182,7 +182,7 @@ 
 	 * @return string of transaction's total cost, with currency symbol and decimal
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -192,7 +192,7 @@ 
 	 * @return string
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -204,7 +204,7 @@ 
 	 * @return float amount remaining
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -215,7 +215,7 @@ 
 	 * @return float
 	 */
 	public function total() {
-		return $this->get( 'TXN_total' );
+		return $this->get('TXN_total');
 	}
 
 
@@ -226,7 +226,7 @@ 
 	 * @return float
 	 */
 	public function paid() {
-		return $this->get( 'TXN_paid' );
+		return $this->get('TXN_paid');
 	}
 
 
@@ -236,8 +236,8 @@ 
 	 * @access        public
 	 */
 	public function get_cart_session() {
-		$session_data = $this->get( 'TXN_session_data' );
-		return isset( $session_data[ 'cart' ] ) && $session_data[ 'cart' ] instanceof EE_Cart ? $session_data[ 'cart' ] : NULL;
+		$session_data = $this->get('TXN_session_data');
+		return isset($session_data['cart']) && $session_data['cart'] instanceof EE_Cart ? $session_data['cart'] : NULL;
 	}
 
 
@@ -247,9 +247,9 @@ 
 	 * @access        public
 	 */
 	public function session_data() {
-		$session_data = $this->get( 'TXN_session_data' );
-		if ( empty( $session_data ) ) {
-			$session_data = array( 'id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array() );
+		$session_data = $this->get('TXN_session_data');
+		if (empty($session_data)) {
+			$session_data = array('id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array());
 		}
 		return $session_data;
 	}
@@ -262,11 +262,11 @@ 
 	 * @access        public
 	 * @param        EE_Session|array $session_data
 	 */
-	public function set_txn_session_data( $session_data ) {
-		if ( $session_data instanceof EE_Session ) {
-			$this->set( 'TXN_session_data', $session_data->get_session_data( NULL, TRUE ));
+	public function set_txn_session_data($session_data) {
+		if ($session_data instanceof EE_Session) {
+			$this->set('TXN_session_data', $session_data->get_session_data(NULL, TRUE));
 		} else {
-			$this->set( 'TXN_session_data', $session_data );
+			$this->set('TXN_session_data', $session_data);
 		}
 	}
 
@@ -277,7 +277,7 @@ 
 	 * @access        public
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -297,13 +297,13 @@ 
 	 * @param 	boolean 	$gmt - whether to return a unix timestamp with UTC offset applied (default) or no UTC offset applied
 	 * @return 	string | int
 	 */
-	public function datetime( $format = FALSE, $gmt = FALSE ) {
-		if ( $format ) {
-			return $this->get_pretty( 'TXN_timestamp' );
-		} else if ( $gmt ) {
-			return $this->get_raw( 'TXN_timestamp' );
+	public function datetime($format = FALSE, $gmt = FALSE) {
+		if ($format) {
+			return $this->get_pretty('TXN_timestamp');
+		} else if ($gmt) {
+			return $this->get_raw('TXN_timestamp');
 		} else {
-			return $this->get( 'TXN_timestamp' );
+			return $this->get('TXN_timestamp');
 		}
 	}
 
@@ -315,10 +315,10 @@ 
 	 * @param        boolean $get_cached   TRUE to retrieve cached registrations or FALSE to pull from the db
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array(), $get_cached = FALSE ) {
-		$query_params = ( empty( $query_params ) || ! is_array( $query_params ) ) ? array( 'order_by' => array( 'Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC' ) ) : $query_params;
+	public function registrations($query_params = array(), $get_cached = FALSE) {
+		$query_params = (empty($query_params) || ! is_array($query_params)) ? array('order_by' => array('Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC')) : $query_params;
 		$query_params = $get_cached ? array() : $query_params;
-		return $this->get_many_related( 'Registration', $query_params );
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -329,7 +329,7 @@ 
 	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
-		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
+		return $this->get_many_related('Attendee', array(array('Registration.Transaction.TXN_ID' => $this->ID())));
 	}
 
 
@@ -339,8 +339,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Payment[]
 	 */
-	public function payments( $query_params = array() ) {
-		return $this->get_many_related( 'Payment', $query_params );
+	public function payments($query_params = array()) {
+		return $this->get_many_related('Payment', $query_params);
 	}
 
 
@@ -350,8 +350,8 @@ 
 	 * @return EE_Payment[]
 	 */
 	public function approved_payments() {
-		EE_Registry::instance()->load_model( 'Payment' );
-		return $this->get_many_related( 'Payment', array( array( 'STS_ID' => EEM_Payment::status_id_approved ), 'order_by' => array( 'PAY_timestamp' => 'DESC' ) ) );
+		EE_Registry::instance()->load_model('Payment');
+		return $this->get_many_related('Payment', array(array('STS_ID' => EEM_Payment::status_id_approved), 'order_by' => array('PAY_timestamp' => 'DESC')));
 	}
 
 
@@ -361,8 +361,8 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -372,10 +372,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Transaction::complete_status_code:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -392,7 +392,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-plus ee-icon-size-16 orange-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -402,7 +402,7 @@ 
 	 * @access        public
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * @return boolean
 	 */
 	public function is_free() {
-		return (float)$this->get( 'TXN_total' ) == 0 ? TRUE : FALSE;
+		return (float) $this->get('TXN_total') == 0 ? TRUE : FALSE;
 	}
 
 
@@ -480,12 +480,12 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function invoice_url( $type = 'html' ) {
+	public function invoice_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->invoice_url( $type );
+		return $REG->invoice_url($type);
 	}
 
 
@@ -495,7 +495,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function primary_registration() {
-		return $this->get_first_related( 'Registration', array( array( 'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT ) ) );
+		return $this->get_first_related('Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -505,12 +505,12 @@ 
 	 * @param string $type 'pdf' or 'html' (default is 'html')
 	 * @return string
 	 */
-	public function receipt_url( $type = 'html' ) {
+	public function receipt_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->receipt_url( $type );
+		return $REG->receipt_url($type);
 	}
 
 
@@ -535,15 +535,15 @@ 
 	 * @deprecated
 	 * @return boolean
 	 */
-	public function update_based_on_payments(){
+	public function update_based_on_payments() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this);
 	}
 
 
@@ -552,7 +552,7 @@ 
 	 * @return string
 	 */
 	public function gateway_response_on_transaction() {
-		$payment = $this->get_first_related( 'Payment' );
+		$payment = $this->get_first_related('Payment');
 		return $payment instanceof EE_Payment ? $payment->gateway_response() : '';
 	}
 
@@ -563,7 +563,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -573,8 +573,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Extra_Meta
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_registration( EE_Registration $registration ) {
-		return $this->_add_relation_to( $registration, 'Registration' );
+	public function add_registration(EE_Registration $registration) {
+		return $this->_add_relation_to($registration, 'Registration');
 	}
 
 
@@ -596,8 +596,8 @@ 
 	 * @param int $registration_or_id
 	 * @return EE_Base_Class that was removed from being related
 	 */
-	public function remove_registration_with_id( $registration_or_id ) {
-		return $this->_remove_relation_to( $registration_or_id, 'Registration' );
+	public function remove_registration_with_id($registration_or_id) {
+		return $this->_remove_relation_to($registration_or_id, 'Registration');
 	}
 
 
@@ -607,7 +607,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function items_purchased() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_line_item ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_line_item)));
 	}
 
 
@@ -617,8 +617,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_line_item( EE_Line_Item $line_item ) {
-		return $this->_add_relation_to( $line_item, 'Line_Item' );
+	public function add_line_item(EE_Line_Item $line_item) {
+		return $this->_add_relation_to($line_item, 'Line_Item');
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Line_Item[]
 	 */
-	public function line_items( $query_params = array() ) {
-		return $this->get_many_related( 'Line_Item', $query_params );
+	public function line_items($query_params = array()) {
+		return $this->get_many_related('Line_Item', $query_params);
 	}
 
 
@@ -639,7 +639,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function tax_items() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_tax ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_tax)));
 	}
 
 
@@ -650,10 +650,10 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
-			$item = EEH_Line_Item::create_total_line_item( $this );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
+			$item = EEH_Line_Item::create_total_line_item($this);
 		}
 		return $item;
 	}
@@ -667,7 +667,7 @@ 
 	 */
 	public function tax_total() {
 		$tax_line_item = $this->tax_total_line_item();
-		if ( $tax_line_item ) {
+		if ($tax_line_item) {
 			return $tax_line_item->total();
 		} else {
 			return 0;
@@ -681,7 +681,7 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function tax_total_line_item() {
-		return EEH_Line_Item::get_taxes_subtotal( $this->total_line_item() );
+		return EEH_Line_Item::get_taxes_subtotal($this->total_line_item());
 	}
 
 
@@ -690,20 +690,20 @@ 
 	 *  Gets the array of billing info for the gateway and for this transaction's primary registration's attendee.
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info(){
+	public function billing_info() {
 		$payment_method = $this->payment_method();
-		if ( !$payment_method){
+		if ( ! $payment_method) {
 			EE_Error::add_error(__("Could not find billing info for transaction because no gateway has been used for it yet", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $this->primary_registration();
-		if ( ! $primary_reg ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $primary_reg) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$attendee = $primary_reg->attendee();
-		if ( ! $attendee ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $attendee) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return $attendee->billing_info_for_payment_method($payment_method);
@@ -738,15 +738,15 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		$pm = $this->get_first_related('Payment_Method');
-		if( $pm instanceof EE_Payment_Method ){
+		if ($pm instanceof EE_Payment_Method) {
 			return $pm;
-		}else{
+		} else {
 			$last_payment = $this->last_payment();
-			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
+			if ($last_payment instanceof EE_Payment && $last_payment->payment_method()) {
 				return $last_payment->payment_method();
-			}else{
+			} else {
 				return NULL;
 			}
 		}
@@ -757,15 +757,15 @@ 
 	 * @return EE_Payment
 	 */
 	public function last_payment() {
-		return $this->get_first_related( 'Payment', array( 'order_by' => array( 'PAY_ID' => 'desc' ) ) );
+		return $this->get_first_related('Payment', array('order_by' => array('PAY_ID' => 'desc')));
 	}
 
 	/**
 	 * Gets all the line items which are unrelated to tickets on this transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function non_ticket_line_items(){
-		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction( $this->ID() );
+	public function non_ticket_line_items() {
+		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction($this->ID());
 	}
 
 

core/db_classes/EE_Venue.class.php

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
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -61,7 +61,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'VNU_name' );
+		return $this->get('VNU_name');
 	}
 
 
@@ -70,7 +70,7 @@ 
 	 * @return string
 	 */
 	function phone() {
-		return $this->get( 'VNU_phone' );
+		return $this->get('VNU_phone');
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @return string
 	 */
 	function venue_url() {
-		return $this->get( 'VNU_url' );
+		return $this->get('VNU_url');
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'VNU_desc' );
+		return $this->get('VNU_desc');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return string
 	 */
 	function excerpt() {
-		return $this->get( 'VNU_short_desc' );
+		return $this->get('VNU_short_desc');
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 * @return string
 	 */
 	function identifier() {
-		return $this->get( 'VNU_identifier' );
+		return $this->get('VNU_identifier');
 	}
 
 
@@ -119,7 +119,7 @@ 
 	 * @return string
 	 */
 	function address() {
-		return $this->get( 'VNU_address' );
+		return $this->get('VNU_address');
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 * @return string
 	 */
 	function address2() {
-		return $this->get( 'VNU_address2' );
+		return $this->get('VNU_address2');
 	}
 
 
@@ -140,7 +140,7 @@ 
 	 * @return string
 	 */
 	function city() {
-		return $this->get( 'VNU_city' );
+		return $this->get('VNU_city');
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @return int
 	 */
 	function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -157,7 +157,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');
 	}
 
 
@@ -166,7 +166,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');
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return EE_State
 	 */
 	function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 
@@ -188,7 +188,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();
@@ -202,7 +202,7 @@ 
 	 * @return string
 	 */
 	function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -211,7 +211,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');
 	}
 
 
@@ -221,7 +221,7 @@ 
 	 * @return EE_Country
 	 */
 	function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -233,7 +233,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();
@@ -247,7 +247,7 @@ 
 	 * @return string
 	 */
 	function zip() {
-		return $this->get( 'VNU_zip' );
+		return $this->get('VNU_zip');
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @return int
 	 */
 	function capacity() {
-		return $this->get_pretty( 'VNU_capacity', 'symbol' );
+		return $this->get_pretty('VNU_capacity', 'symbol');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	function created() {
-		return $this->get( 'VNU_created' );
+		return $this->get('VNU_created');
 	}
 
 
@@ -277,7 +277,7 @@ 
 	 * @return string
 	 */
 	function modified() {
-		return $this->get( 'VNU_modified' );
+		return $this->get('VNU_modified');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'VNU_order' );
+		return $this->get('VNU_order');
 	}
 
 
@@ -297,7 +297,7 @@ 
 	 * @return int
 	 */
 	function wp_user() {
-		return $this->get( 'VNU_wp_user' );
+		return $this->get('VNU_wp_user');
 	}
 
 
@@ -306,7 +306,7 @@ 
 	 * @return string
 	 */
 	function virtual_phone() {
-		return $this->get( 'VNU_virtual_phone' );
+		return $this->get('VNU_virtual_phone');
 	}
 
 
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	function virtual_url() {
-		return $this->get( 'VNU_virtual_url' );
+		return $this->get('VNU_virtual_url');
 	}
 
 
@@ -324,7 +324,7 @@ 
 	 * @return bool
 	 */
 	function enable_for_gmap() {
-		return $this->get( 'VNU_enable_for_gmap' );
+		return $this->get('VNU_enable_for_gmap');
 	}
 
 
@@ -333,7 +333,7 @@ 
 	 * @return string
 	 */
 	function google_map_link() {
-		return $this->get( 'VNU_google_map_link' );
+		return $this->get('VNU_google_map_link');
 	}
 
 
@@ -345,16 +345,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( '>',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) )
+					'Datetime.DTT_EVT_start' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'))
 				)
 			);
 		}
-		return $this->get_many_related( 'Event', $query_params );
+		return $this->get_many_related('Event', $query_params);
 	}
 
 
@@ -372,8 +372,8 @@ 
 	/**
 	 * Sets address
 	 */
-	function set_address( $address = '' ) {
-		$this->set( 'VNU_address', $address );
+	function set_address($address = '') {
+		$this->set('VNU_address', $address);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	/**
 	 * @param string $address2
 	 */
-	function set_address2( $address2 = '' ) {
-		$this->set( 'VNU_address2', $address2 );
+	function set_address2($address2 = '') {
+		$this->set('VNU_address2', $address2);
 	}
 
 
@@ -390,8 +390,8 @@ 
 	/**
 	 * @param string $city
 	 */
-	function set_city( $city = '' ) {
-		$this->set( 'VNU_city', $city );
+	function set_city($city = '') {
+		$this->set('VNU_city', $city);
 	}
 
 
@@ -399,8 +399,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);
 	}
 
 
@@ -411,8 +411,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');
 	}
 
 
@@ -420,8 +420,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);
 	}
 
 
@@ -430,7 +430,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');
 	}
 
@@ -439,8 +439,8 @@ 
 	/**
 	 * @param string $zip
 	 */
-	function set_zip( $zip = '' ) {
-		$this->set( 'VNU_zip', $zip );
+	function set_zip($zip = '') {
+		$this->set('VNU_zip', $zip);
 	}
 
 
@@ -448,8 +448,8 @@ 
 	/**
 	 * @param int $capacity
 	 */
-	function set_capacity( $capacity = 0 ) {
-		$this->set( 'VNU_capacity', $capacity );
+	function set_capacity($capacity = 0) {
+		$this->set('VNU_capacity', $capacity);
 	}
 
 
@@ -457,8 +457,8 @@ 
 	/**
 	 * @param string $created
 	 */
-	function set_created( $created = '' ) {
-		$this->set( 'VNU_created', $created );
+	function set_created($created = '') {
+		$this->set('VNU_created', $created);
 	}
 
 
@@ -466,8 +466,8 @@ 
 	/**
 	 * @param string $desc
 	 */
-	function set_description( $desc = '' ) {
-		$this->set( 'VNU_desc', $desc );
+	function set_description($desc = '') {
+		$this->set('VNU_desc', $desc);
 	}
 
 
@@ -475,8 +475,8 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	function set_identifier( $identifier = '' ) {
-		$this->set( 'VNU_identifier', $identifier );
+	function set_identifier($identifier = '') {
+		$this->set('VNU_identifier', $identifier);
 	}
 
 
@@ -484,8 +484,8 @@ 
 	/**
 	 * @param string $modified
 	 */
-	function set_modified( $modified = '' ) {
-		$this->set( 'VNU_modified', $modified );
+	function set_modified($modified = '') {
+		$this->set('VNU_modified', $modified);
 	}
 
 
@@ -493,8 +493,8 @@ 
 	/**
 	 * @param string $name
 	 */
-	function set_name( $name = '' ) {
-		$this->set( 'VNU_name', $name );
+	function set_name($name = '') {
+		$this->set('VNU_name', $name);
 	}
 
 
@@ -502,8 +502,8 @@ 
 	/**
 	 * @param int $order
 	 */
-	function set_order( $order = 0 ) {
-		$this->set( 'VNU_order', $order );
+	function set_order($order = 0) {
+		$this->set('VNU_order', $order);
 	}
 
 
@@ -511,8 +511,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_phone( $phone = '' ) {
-		$this->set( 'VNU_phone', $phone );
+	function set_phone($phone = '') {
+		$this->set('VNU_phone', $phone);
 	}
 
 
@@ -520,8 +520,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);
 	}
 
 
@@ -529,8 +529,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_venue_url( $url = '' ) {
-		$this->set( 'VNU_url', $url );
+	function set_venue_url($url = '') {
+		$this->set('VNU_url', $url);
 	}
 
 
@@ -538,8 +538,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);
 	}
 
 
@@ -547,8 +547,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);
 	}
 
 
@@ -556,8 +556,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);
 	}
 
 
@@ -565,8 +565,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/EEM_Transaction.model.php

Spacing +48 added lines, -48 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Transaction Model
@@ -68,35 +68,35 @@ 
 	 * 		Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *	@return EEM_Transaction
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Transaction','event_espresso');
-		$this->plural_item = __('Transactions','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Transaction', 'event_espresso');
+		$this->plural_item = __('Transactions', 'event_espresso');
 
 		$this->_tables = array(
-			'Transaction'=>new EE_Primary_Table('esp_transaction','TXN_ID')
+			'Transaction'=>new EE_Primary_Table('esp_transaction', 'TXN_ID')
 		);
 		$this->_fields = array(
 			'Transaction'=>array(
-				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso')),
-				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created','event_espresso'), false, time(), $timezone ),
-				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction','event_espresso'), false, 0),
-				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date','event_espresso'), false, 0),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
-				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data','event_espresso'), true, ''),
-				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt','event_espresso'), true, ''),
+				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso')),
+				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created', 'event_espresso'), false, time(), $timezone),
+				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction', 'event_espresso'), false, 0),
+				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date', 'event_espresso'), false, 0),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
+				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data', 'event_espresso'), true, ''),
+				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt', 'event_espresso'), true, ''),
 				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __("Last Used Payment Method", 'event_espresso'), true, NULL, 'Payment_Method'),
-				'TXN_reg_steps' => new EE_Serialized_Text_Field( 'TXN_reg_steps', __( 'Registration Steps', 'event_espresso' ), FALSE, array() ),
+				'TXN_reg_steps' => new EE_Serialized_Text_Field('TXN_reg_steps', __('Registration Steps', 'event_espresso'), FALSE, array()),
 			)
 		);
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'Payment'=>new EE_Has_Many_Relation(),
 			'Status'=>new EE_Belongs_To_Relation(),
-			'Line_Item'=>new EE_Has_Many_Relation(false),//you can delete a transaction without needing to delete its line items
+			'Line_Item'=>new EE_Has_Many_Relation(false), //you can delete a transaction without needing to delete its line items
 			'Payment_Method'=>new EE_Belongs_To_Relation(),
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -107,23 +107,23 @@ 
 	 * @param string $period
 	 * @return \stdClass[]
 	 */
-	public function get_revenue_per_day_report( $period = '-1 month' ) {
-		$sql_date = $this->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', strtotime( $period ) ), 'Y-m-d H:i:s', 'UTC' );
+	public function get_revenue_per_day_report($period = '-1 month') {
+		$sql_date = $this->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', strtotime($period)), 'Y-m-d H:i:s', 'UTC');
 
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'TXN_timestamp' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'TXN_timestamp');
 
 		$results = $this->_get_all_wpdb_results(
 			array(
 				array(
-				'TXN_timestamp' => array( '>=', $sql_date ) ),
+				'TXN_timestamp' => array('>=', $sql_date) ),
 				'group_by' => 'txnDate',
-				'order_by' => array( 'TXN_timestamp' => 'ASC' )
+				'order_by' => array('TXN_timestamp' => 'ASC')
 			),
 			OBJECT,
 			array(
-				'txnDate' => array( 'DATE(' . $query_interval . ')', '%s' ),
-				'revenue' => array( 'SUM(Transaction.TXN_paid)', '%d' )
+				'txnDate' => array('DATE('.$query_interval.')', '%s'),
+				'revenue' => array('SUM(Transaction.TXN_paid)', '%d')
 			)
 		);
 		return $results;
@@ -139,25 +139,25 @@ 
 	 * @throws \EE_Error
 	 * @return mixed
 	 */
-	public function get_revenue_per_event_report( $period = '-1 month' ) {
-		$date_sql = EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', date( 'Y-m-d H:i:s', strtotime( $period ) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'Registration.REG_date' => array( '>=', $date_sql ) );
+	public function get_revenue_per_event_report($period = '-1 month') {
+		$date_sql = EEM_Registration::instance()->convert_datetime_for_query('REG_date', date('Y-m-d H:i:s', strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('Registration.REG_date' => array('>=', $date_sql));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'revenue_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'revenue_per_event_report')) {
 			$where ['Registration.Event.EVT_wp_user'] = get_current_user_id();
 		}
 
 		$results = $this->_get_all_wpdb_results(
 			array(
 				$where,
-				'group_by' => array( 'Registration.Event.EVT_name' ),
+				'group_by' => array('Registration.Event.EVT_name'),
 				'order_by' => 'Registration.Event.EVT_name',
-				'limit' => array( 0, 24 )
+				'limit' => array(0, 24)
 			),
 			OBJECT,
 			array(
-				'event_name' => array( 'Registration___Event_CPT.post_title', '%s' ),
-				'revenue' => array( 'SUM(TXN_PAID)', '%d' )
+				'event_name' => array('Registration___Event_CPT.post_title', '%s'),
+				'revenue' => array('SUM(TXN_PAID)', '%d')
 			)
 		);
 		return $results;
@@ -175,10 +175,10 @@ 
 	 * @param string $reg_url_link
 	 * @return EE_Transaction
 	 */
-	public function get_transaction_from_reg_url_link( $reg_url_link = '' ){
-		return $this->get_one( array(
+	public function get_transaction_from_reg_url_link($reg_url_link = '') {
+		return $this->get_one(array(
 			array(
-				'Registration.REG_url_link' => ! empty( $reg_url_link ) ? $reg_url_link : EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' )
+				'Registration.REG_url_link' => ! empty($reg_url_link) ? $reg_url_link : EE_Registry::instance()->REQ->get('e_reg_url_link', '')
 			)
 		));
 	}
@@ -198,15 +198,15 @@ 
 	 * @param boolean $save_txn whether or not to save the transaction during this function call
 	 * @return boolean
 	 */
-	public function update_based_on_payments( $transaction_obj_or_id, $save_txn = TRUE ){
+	public function update_based_on_payments($transaction_obj_or_id, $save_txn = TRUE) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this->ensure_is_obj( $transaction_obj_or_id ));
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this->ensure_is_obj($transaction_obj_or_id));
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 			array(
 				0 => array(
 					'STS_ID' => EEM_Transaction::failed_status_code,
-					'TXN_timestamp' => array( '<', time() - $time_to_leave_alone )
+					'TXN_timestamp' => array('<', time() - $time_to_leave_alone)
 				)
 			),
 			$time_to_leave_alone
@@ -250,26 +250,26 @@ 
 		 */
 		$txn_ids = apply_filters(
 			'FHEE__EEM_Transaction__delete_junk_transactions__transaction_ids_to_delete',
-			EEM_Transaction::instance()->get_col( $ids_query, 'TXN_ID' ),
+			EEM_Transaction::instance()->get_col($ids_query, 'TXN_ID'),
 			$time_to_leave_alone
 		);
 
 		//now that we have the ids to delete, let's get deletin'
 		//Why no wpdb->prepare?  Because the data is trusted.  We got the ids from the original query to get them FROM
 		//the db (which is sanitized) so no need to prepare them again.
-		if ( $txn_ids ) {
-			$query   = '
+		if ($txn_ids) {
+			$query = '
 				DELETE
-				FROM ' . $this->table() . '
+				FROM ' . $this->table().'
 				WHERE
-					TXN_ID IN ( ' . implode( ",", $txn_ids ) . ')';
-			$deleted = $wpdb->query( $query );
+					TXN_ID IN ( ' . implode(",", $txn_ids).')';
+			$deleted = $wpdb->query($query);
 		}
-		if ( $deleted ) {
+		if ($deleted) {
 			/**
 			 * Allows code to do something after the transactions have been deleted.
 			 */
-			do_action( 'AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids );
+			do_action('AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids);
 		}
 		return $deleted;
 	}

core/helpers/EEH_Class_Tools.helper.php

Spacing +34 added lines, -34 removed lines

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

core/helpers/EEH_DTT_Helper.helper.php

Spacing +115 added lines, -116 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -53,12 +53,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_valid_timezone_string( $timezone_string = '' ) {
+	public static function get_valid_timezone_string($timezone_string = '') {
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// value from above exists, use that, else get timezone string from gmt_offset
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
-		EEH_DTT_Helper::validate_timezone( $timezone_string );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
+		EEH_DTT_Helper::validate_timezone($timezone_string);
 		return $timezone_string;
 	}
 
@@ -74,18 +74,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function validate_timezone( $timezone_string, $throw_error = true ) {
+	public static function validate_timezone($timezone_string, $throw_error = true) {
 		// 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 ) {
+			new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			// sometimes we take exception to exceptions
-			if ( ! $throw_error ) {
+			if ( ! $throw_error) {
 				return false;
 			}
 			throw new EE_Error(
 				sprintf(
-					__( 'The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+					__('The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 					$timezone_string,
 					'<a href="http://www.php.net/manual/en/timezones.php">',
 					'</a>'
@@ -104,19 +104,19 @@ 
 	 * @param string $gmt_offset
 	 * @return string
 	 */
-	public static function get_timezone_string_from_gmt_offset( $gmt_offset = '' ) {
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '') {
 		$timezone_string = 'UTC';
-		$gmt_offset = ! empty( $gmt_offset ) ? $gmt_offset : get_option( 'gmt_offset' );
-		if ( $gmt_offset !== '' ) {
+		$gmt_offset = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
+		if ($gmt_offset !== '') {
 			// convert GMT offset to seconds
 			$gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
 			// account for WP offsets that aren't valid UTC
-			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets( $gmt_offset );
+			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
 			// although we don't know the TZ abbreviation, we know the UTC offset
-			$timezone_string = timezone_name_from_abbr( null, $gmt_offset );
+			$timezone_string = timezone_name_from_abbr(null, $gmt_offset);
 		}
 		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
-		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
+		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
 		return $timezone_string;
 	}
 
@@ -129,10 +129,10 @@ 
 	 * @param int $gmt_offset
 	 * @return int
 	 */
-	public static function adjust_invalid_gmt_offsets( $gmt_offset = 0 ) {
+	public static function adjust_invalid_gmt_offsets($gmt_offset = 0) {
 		//make sure $gmt_offset is int
 		$gmt_offset = (int) $gmt_offset;
-		switch ( $gmt_offset ) {
+		switch ($gmt_offset) {
 
 			//			case -30600 :
 			//				$gmt_offset = -28800;
@@ -184,13 +184,13 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_timezone_string_from_abbreviations_list( $gmt_offset = 0 ) {
+	public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0) {
 		$abbreviations = timezone_abbreviations_list();
-		foreach ( $abbreviations as $abbreviation ) {
-			foreach ( $abbreviation as $city ) {
-				if ( $city['offset'] === $gmt_offset && $city['dst'] === FALSE ) {
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] === $gmt_offset && $city['dst'] === FALSE) {
 					// check if the timezone is valid but don't throw any errors if it isn't
-					if ( EEH_DTT_Helper::validate_timezone( $city['timezone_id'], false ) ) {
+					if (EEH_DTT_Helper::validate_timezone($city['timezone_id'], false)) {
 						return $city['timezone_id'];
 					}
 				}
@@ -198,7 +198,7 @@ 
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+				__('The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 				$gmt_offset,
 				'<a href="http://www.php.net/manual/en/timezones.php">',
 				'</a>'
@@ -212,23 +212,23 @@ 
 	 * @access public
 	 * @param string $timezone_string
 	 */
-	public static function timezone_select_input( $timezone_string = '' ) {
+	public static function timezone_select_input($timezone_string = '') {
 		// get WP date time format
-		$datetime_format = get_option('date_format') . ' '  . get_option('time_format');
+		$datetime_format = get_option('date_format').' '.get_option('time_format');
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// check if the timezone is valid but don't throw any errors if it isn't
-		$timezone_string = EEH_DTT_Helper::validate_timezone( $timezone_string, false );
+		$timezone_string = EEH_DTT_Helper::validate_timezone($timezone_string, false);
 		$gmt_offset = get_option('gmt_offset');
 
 		$check_zone_info = true;
-		if ( empty( $timezone_string )) {
+		if (empty($timezone_string)) {
 			// Create a UTC+- zone if no timezone string exists
 			$check_zone_info = false;
-			if ( $gmt_offset > 0 ) {
-				$timezone_string = 'UTC+' . $gmt_offset;
-			} elseif ( $gmt_offset < 0 ) {
-				$timezone_string = 'UTC' . $gmt_offset;
+			if ($gmt_offset > 0) {
+				$timezone_string = 'UTC+'.$gmt_offset;
+			} elseif ($gmt_offset < 0) {
+				$timezone_string = 'UTC'.$gmt_offset;
 			} else {
 				$timezone_string = 'UTC';
 			}
@@ -250,11 +250,11 @@ 
 					__('%1$sUTC%2$s time is %3$s'),
 					'<abbr title="Coordinated Universal Time">',
 					'</abbr>',
-					'<code>' . date_i18n( $datetime_format , false, 'gmt') . '</code>'
+					'<code>'.date_i18n($datetime_format, false, 'gmt').'</code>'
 				);
 				?></span>
-			<?php if ( ! empty( $timezone_string ) || ! empty( $gmt_offset )) : ?>
-				<br /><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n( $datetime_format ) . '</code>' ); ?></span>
+			<?php if ( ! empty($timezone_string) || ! empty($gmt_offset)) : ?>
+				<br /><span><?php printf(__('Local time is %1$s'), '<code>'.date_i18n($datetime_format).'</code>'); ?></span>
 		<?php endif; ?>
 
 				<?php if ($check_zone_info && $timezone_string) : ?>
@@ -286,10 +286,9 @@ 
 
 						if ($found) {
 							$message = $tr['isdst'] ?
-											__(' Daylight saving time begins on: %s.' ) :
-											__(' Standard time begins  on: %s.');
+											__(' Daylight saving time begins on: %s.') : __(' Standard time begins  on: %s.');
 							// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-							printf( $message, '<code >' . date_i18n( $datetime_format, $tr['ts'] + ( $tz_offset - $tr['offset'] ) ). '</code >' );
+							printf($message, '<code >'.date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])).'</code >');
 						} else {
 							_e('This timezone does not observe daylight saving time.');
 						}
@@ -319,14 +318,14 @@ 
 	 *
 	 * @return int      $unix_timestamp with the offset applied for the given timezone.
 	 */
-	public static function get_timestamp_with_offset( $unix_timestamp = 0, $timezone_string = '' ) {
+	public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '') {
 		$unix_timestamp = $unix_timestamp === 0 ? time() : (int) $unix_timestamp;
-		$timezone_string = self::get_valid_timezone_string( $timezone_string );
-		$TimeZone = new DateTimeZone( $timezone_string );
+		$timezone_string = self::get_valid_timezone_string($timezone_string);
+		$TimeZone = new DateTimeZone($timezone_string);
 
-		$DateTime = new DateTime( '@' . $unix_timestamp, $TimeZone );
-		$offset = timezone_offset_get( $TimeZone, $DateTime );
-		return (int)$DateTime->format( 'U' ) + (int)$offset;
+		$DateTime = new DateTime('@'.$unix_timestamp, $TimeZone);
+		$offset = timezone_offset_get($TimeZone, $DateTime);
+		return (int) $DateTime->format('U') + (int) $offset;
 	}
 
 
@@ -341,17 +340,17 @@ 
 	 * @param  string					$datetime_field_name 	the datetime fieldname to be manipulated
 	 * @return 	EE_Base_Class
 	 */
-	protected static function _set_date_time_field( EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name ) {
+	protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name) {
 		// grab current datetime format
 		$current_format = $obj->get_format();
 		// set new full timestamp format
-		$obj->set_date_format( EE_Datetime_Field::mysql_date_format );
-		$obj->set_time_format( EE_Datetime_Field::mysql_time_format );
+		$obj->set_date_format(EE_Datetime_Field::mysql_date_format);
+		$obj->set_time_format(EE_Datetime_Field::mysql_time_format);
 		// set the new date value using a full timestamp format so that no data is lost
-		$obj->set( $datetime_field_name, $DateTime->format( EE_Datetime_Field::mysql_timestamp_format ) );
+		$obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
 		// reset datetime formats
-		$obj->set_date_format( $current_format[0] );
-		$obj->set_time_format( $current_format[1] );
+		$obj->set_date_format($current_format[0]);
+		$obj->set_time_format($current_format[1]);
 		return $obj;
 	}
 
@@ -368,11 +367,11 @@ 
 	 * @param  integer 	$value    what you want to increment the time by
 	 * @return EE_Base_Class		   return the EE_Base_Class object so right away you can do something with it (chaining)
 	 */
-	public static function date_time_add( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date.
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -387,11 +386,11 @@ 
 	 * @param int            $value
 	 * @return \EE_Base_Class
 	 */
-	public static function date_time_subtract( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value, '-' );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -404,44 +403,44 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_datetime_object( DateTime $DateTime, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! $DateTime instanceof DateTime ) {
+	protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! $DateTime instanceof DateTime) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a PHP DateTime object, but instead received %1$s', 'event_espresso' ),
-					print_r( $DateTime, true )
+					__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
+					print_r($DateTime, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
-				$value = 'P' . $value . 'Y';
+				$value = 'P'.$value.'Y';
 				break;
 			case 'months' :
-				$value = 'P' . $value . 'M';
+				$value = 'P'.$value.'M';
 				break;
 			case 'weeks' :
-				$value = 'P' . $value . 'W';
+				$value = 'P'.$value.'W';
 				break;
 			case 'days' :
-				$value = 'P' . $value . 'D';
+				$value = 'P'.$value.'D';
 				break;
 			case 'hours' :
-				$value = 'PT' . $value . 'H';
+				$value = 'PT'.$value.'H';
 				break;
 			case 'minutes' :
-				$value = 'PT' . $value . 'M';
+				$value = 'PT'.$value.'M';
 				break;
 			case 'seconds' :
-				$value = 'PT' . $value . 'S';
+				$value = 'PT'.$value.'S';
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$DateTime->add( new DateInterval( $value ) );
+				$DateTime->add(new DateInterval($value));
 				break;
 			case '-':
-				$DateTime->sub( new DateInterval( $value ) );
+				$DateTime->sub(new DateInterval($value));
 				break;
 		}
 		return $DateTime;
@@ -457,16 +456,16 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_timestamp( $timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! preg_match( EE_Datetime_Field::unix_timestamp_regex, $timestamp ) ) {
+	protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a Unix timestamp, but instead received %1$s', 'event_espresso' ),
-					print_r( $timestamp, true )
+					__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
+					print_r($timestamp, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
 				$value = YEAR_IN_SECONDS * $value;
 				break;
@@ -486,9 +485,9 @@ 
 				$value = MINUTE_IN_SECONDS * $value;
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$timestamp  += $value;
+				$timestamp += $value;
 				break;
 			case '-':
 				$timestamp -= $value;
@@ -508,11 +507,11 @@ 
 	 * @param  string  $operand What operand you wish to use for the calculation
 	 * @return mixed string|DateTime          return whatever type came in.
 	 */
-	public static function calc_date( $DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( $DateTime_or_timestamp instanceof DateTime ) {
-			return EEH_DTT_Helper::_modify_datetime_object( $DateTime_or_timestamp, $period, $value, $operand );
-		} else if ( preg_match( EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp )) {
-			return EEH_DTT_Helper::_modify_timestamp( $DateTime_or_timestamp, $period, $value, $operand );
+	public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ($DateTime_or_timestamp instanceof DateTime) {
+			return EEH_DTT_Helper::_modify_datetime_object($DateTime_or_timestamp, $period, $value, $operand);
+		} else if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
+			return EEH_DTT_Helper::_modify_timestamp($DateTime_or_timestamp, $period, $value, $operand);
 		} else {
 			//error
 			return $DateTime_or_timestamp;
@@ -542,24 +541,24 @@ 
 	 * 			'moment' => //date and time format.
 	 * 		)
 	 */
-	public static function convert_php_to_js_and_moment_date_formats( $date_format_string = null, $time_format_string = null ) {
-		if ( $date_format_string === null ) {
-			$date_format_string = get_option( 'date_format' );
+	public static function convert_php_to_js_and_moment_date_formats($date_format_string = null, $time_format_string = null) {
+		if ($date_format_string === null) {
+			$date_format_string = get_option('date_format');
 		}
 
-		if ( $time_format_string === null ) {
-			$time_format_string = get_option( 'time_format' );
+		if ($time_format_string === null) {
+			$time_format_string = get_option('time_format');
 		}
 
-		$date_format = self::_php_to_js_moment_converter( $date_format_string );
-		$time_format = self::_php_to_js_moment_converter( $time_format_string );
+		$date_format = self::_php_to_js_moment_converter($date_format_string);
+		$time_format = self::_php_to_js_moment_converter($time_format_string);
 
 		return array(
 			'js' => array(
 				'date' => $date_format['js'],
 				'time' => $time_format['js']
 				),
-			'moment' => $date_format['moment'] . ' ' . $time_format['moment' ]
+			'moment' => $date_format['moment'].' '.$time_format['moment']
 			);
 	}
 
@@ -573,7 +572,7 @@ 
 	 *
 	 * @return array js and moment formats.
 	 */
-	protected static function _php_to_js_moment_converter( $format_string ) {
+	protected static function _php_to_js_moment_converter($format_string) {
 		/**
 		 * This is a map of symbols for formats.
 		 * The index is the php symbol, the equivalent values are in the array.
@@ -730,15 +729,15 @@ 
 		$jquery_ui_format = "";
 		$moment_format = "";
 		$escaping = false;
-		for ( $i = 0; $i < strlen($format_string); $i++ ) {
+		for ($i = 0; $i < strlen($format_string); $i++) {
 			$char = $format_string[$i];
-			if ( $char === '\\' )  { // PHP date format escaping character
+			if ($char === '\\') { // PHP date format escaping character
 				$i++;
-				if ( $escaping ) {
+				if ($escaping) {
 					$jquery_ui_format .= $format_string[$i];
 					$moment_format .= $format_string[$i];
 				} else {
-					$jquery_ui_format .= '\'' . $format_string[$i];
+					$jquery_ui_format .= '\''.$format_string[$i];
 					$moment_format .= $format_string[$i];
 				}
 				$escaping = true;
@@ -757,7 +756,7 @@ 
 				}
 			}
 		}
-		return array( 'js' => $jquery_ui_format, 'moment' => $moment_format );
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
 	}
 
 
@@ -772,25 +771,25 @@ 
 	 *                           		errors is returned.  So for client code calling, check for is_array() to
 	 *                           		indicate failed validations.
 	 */
-	public static function validate_format_string( $format_string ) {
+	public static function validate_format_string($format_string) {
 		$error_msg = array();
 		//time format checks
-		switch ( true ) {
-			case   strpos( $format_string, 'h' )  !== false  :
-			case   strpos( $format_string, 'g' ) !== false :
+		switch (true) {
+			case   strpos($format_string, 'h') !== false  :
+			case   strpos($format_string, 'g') !== false :
 				/**
 				 * if the time string has a lowercase 'h' which == 12 hour time format and there
 				 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
 				 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
 				 */
-				if ( strpos( strtoupper( $format_string ), 'A' )  === false ) {
-					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso' );
+				if (strpos(strtoupper($format_string), 'A') === false) {
+					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso');
 				}
 				break;
 
 		}
 
-		return empty( $error_msg ) ? true : $error_msg;
+		return empty($error_msg) ? true : $error_msg;
 	}
 
 
@@ -812,11 +811,11 @@ 
 	 * @param mixed $date_2
 	 * @return bool
 	 */
-	public static function dates_represent_one_24_hour_date( $date_1, $date_2 ) {
+	public static function dates_represent_one_24_hour_date($date_1, $date_2) {
 
 		if (
-			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime ) ||
-			( $date_1->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' || $date_2->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' )
+			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
+			($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
 		) {
 			return false;
 		}
@@ -833,11 +832,11 @@ 
 	 * @param string $field_for_interval  The Database field that is the interval is applied to in the query.
 	 * @return string
 	 */
-	public static function get_sql_query_interval_for_offset( $timezone_string, $field_for_interval ) {
+	public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval) {
 		try {
 			/** need to account for timezone offset on the selects */
-			$DateTimeZone = new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
+			$DateTimeZone = new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			$DateTimeZone = null;
 		}
 
@@ -845,10 +844,10 @@ 
 		 * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
 		 * Hence we do the calc for DateTimeZone::getOffset.
 		 */
-		$offset = $DateTimeZone instanceof DateTimeZone ? ( $DateTimeZone->getOffset( new DateTime('now') ) ) / HOUR_IN_SECONDS : get_option( 'gmt_offset' );
+		$offset = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
 		$query_interval = $offset < 0
-			? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset*-1 . ' HOUR)'
-			: 'DATE_ADD(' . $field_for_interval .', INTERVAL ' . $offset . ' HOUR)';
+			? 'DATE_SUB('.$field_for_interval.', INTERVAL '.$offset * -1.' HOUR)'
+			: 'DATE_ADD('.$field_for_interval.', INTERVAL '.$offset.' HOUR)';
 		return $query_interval;
 	}
 

core/helpers/EEH_Form_Fields.helper.php

Spacing +378 added lines, -378 removed lines

@@ -69,10 +69,10 @@ 
 	 * 	@return string
 	 * 	@todo: at some point we can break this down into other static methods to abstract it a bit better.
 	 */
-	static public function get_form_fields( $input_vars = array(), $id = FALSE ) {
+	static public function get_form_fields($input_vars = array(), $id = FALSE) {
 		
-		if ( empty($input_vars) ) {
-			EE_Error::add_error( __('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($input_vars)) {
+			EE_Error::add_error(__('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -98,25 +98,25 @@ 
 				'append_content' => ''
 				);
 
-			$input_value = wp_parse_args( $input_value, $defaults );
+			$input_value = wp_parse_args($input_value, $defaults);
 
 			// required fields get a *
 			$required = isset($input_value['required']) && $input_value['required'] ? ' <span>*</span>: ' : ': ';
 			// and the css class "required"
-			$css_class = isset( $input_value['css_class'] ) ? $input_value['css_class'] : '';
-			$styles = $input_value['required'] ? 'required ' . $css_class : $css_class;
+			$css_class = isset($input_value['css_class']) ? $input_value['css_class'] : '';
+			$styles = $input_value['required'] ? 'required '.$css_class : $css_class;
 
-			$field_id = ($id) ? $id . '-' . $input_key : $input_key;
-			$tabindex = !empty($input_value['tabindex']) ? ' tabindex="' . $input_value['tabindex'] . '"' : '';
+			$field_id = ($id) ? $id.'-'.$input_key : $input_key;
+			$tabindex = ! empty($input_value['tabindex']) ? ' tabindex="'.$input_value['tabindex'].'"' : '';
 
 			//rows or cols?
-			$rows = isset($input_value['rows'] ) ? $input_value['rows'] : '10';
-			$cols = isset($input_value['cols'] ) ? $input_value['cols'] : '80';
+			$rows = isset($input_value['rows']) ? $input_value['rows'] : '10';
+			$cols = isset($input_value['cols']) ? $input_value['cols'] : '80';
 
 			//any content?
 			$append_content = $input_value['append_content'];
 
-			$output .= (!$close) ? '<ul>' : '';
+			$output .= ( ! $close) ? '<ul>' : '';
 			$output .= '<li>';
 
 			// what type of input are we dealing with ?
@@ -124,15 +124,15 @@ 
 
 				// text inputs
 				case 'text' :
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" class="' . $styles . '" type="text" value="' . $input_value['value'] . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" class="'.$styles.'" type="text" value="'.$input_value['value'].'" name="'.$input_value['name'].'"'.$tabindex.'>';
 					break;
 
 				// dropdowns
 				case 'select' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<select id="' . $field_id . '" class="' . $styles . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<select id="'.$field_id.'" class="'.$styles.'" name="'.$input_value['name'].'"'.$tabindex.'>';
 
 					if (is_array($input_value['options'])) {
 						$options = $input_value['options'];
@@ -141,30 +141,30 @@ 
 					}
 
 					foreach ($options as $key => $value) {
-						$selected = isset( $input_value['value'] ) && $input_value['value'] == $key ? 'selected=selected' : '';
+						$selected = isset($input_value['value']) && $input_value['value'] == $key ? 'selected=selected' : '';
 						//$key = str_replace( ' ', '_', sanitize_key( $value ));
-						$output .= "\n\t\t\t\t" . '<option '. $selected . ' value="' . $key . '">' . $value . '</option>';
+						$output .= "\n\t\t\t\t".'<option '.$selected.' value="'.$key.'">'.$value.'</option>';
 					}
-					$output .= "\n\t\t\t" . '</select>';
+					$output .= "\n\t\t\t".'</select>';
 
 					break;
 
 				case 'textarea' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<textarea id="' . $field_id . '" class="' . $styles . '" rows="'.$rows.'" cols="'.$cols.'" name="' . $input_value['name'] . '"' . $tabindex . '>' . $input_value['value'] . '</textarea>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<textarea id="'.$field_id.'" class="'.$styles.'" rows="'.$rows.'" cols="'.$cols.'" name="'.$input_value['name'].'"'.$tabindex.'>'.$input_value['value'].'</textarea>';
 					break;
 
 				case 'hidden' :
 					$close = false;
 					$output .= "</li></ul>";
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" type="hidden" name="' . $input_value['name'] . '" value="' . $input_value['value'] . '">';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="hidden" name="'.$input_value['name'].'" value="'.$input_value['value'].'">';
 					break;
 
 				case 'checkbox' :
-					$checked = ( $input_value['value'] == 1 ) ? 'checked="checked"' : '';
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id. '" type="checkbox" name="' . $input_value['name'] . '" value="1"' . $checked . $tabindex . ' />';
+					$checked = ($input_value['value'] == 1) ? 'checked="checked"' : '';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="checkbox" name="'.$input_value['name'].'" value="1"'.$checked.$tabindex.' />';
 					break;
 
 				case 'wp_editor' :
@@ -177,19 +177,19 @@ 
 					);
 					$output .= '</li>';
 					$output .= '</ul>';
-					$output .= '<h4>' . $input_value['label'] . '</h4>';
-					if ( $append_content ) {
+					$output .= '<h4>'.$input_value['label'].'</h4>';
+					if ($append_content) {
 						$output .= $append_content;
 					}
 					ob_start();
-					wp_editor( $input_value['value'], $field_id, $editor_settings);
+					wp_editor($input_value['value'], $field_id, $editor_settings);
 					$editor = ob_get_contents();
 					ob_end_clean();
 					$output .= $editor;
 					break;
 
 				}
-				if ( $append_content && $input_value['input'] !== 'wp_editor' ) {
+				if ($append_content && $input_value['input'] !== 'wp_editor') {
 					$output .= $append_content;
 				}
 				$output .= ($close) ? '</li>' : '';
@@ -230,7 +230,7 @@ 
 		$form_fields = array();
 		$fields = (array) $fields;
 
-		foreach ( $fields as $field_name => $field_atts ) {
+		foreach ($fields as $field_name => $field_atts) {
 			//defaults:
 			$defaults = array(
 				'label' => '',
@@ -248,67 +248,67 @@ 
 				'wpeditor_args' => array()
 				);
 			// merge defaults with passed arguments
-			$_fields = wp_parse_args( $field_atts, $defaults);
-			extract( $_fields );
+			$_fields = wp_parse_args($field_atts, $defaults);
+			extract($_fields);
 			// generate label
-			$label = empty($label) ? '' : '<label for="' . $id . '">' . $label . '</label>';
+			$label = empty($label) ? '' : '<label for="'.$id.'">'.$label.'</label>';
 			// generate field name
-			$f_name = !empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
+			$f_name = ! empty($unique_id) ? $field_name.'['.$unique_id.']' : $field_name;
 
 			//tabindex
-			$tabindex_str = !empty( $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+			$tabindex_str = ! empty($tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 			//we determine what we're building based on the type
-			switch ( $type ) {
+			switch ($type) {
 
 				case 'textarea' :
-						$fld = '<textarea id="' . $id . '" class="' . $class . '" rows="' . $dimensions[1] . '" cols="' . $dimensions[0] . '" name="' . $f_name . '"' . $tabindex_str . '>' . $value . '</textarea>';
+						$fld = '<textarea id="'.$id.'" class="'.$class.'" rows="'.$dimensions[1].'" cols="'.$dimensions[0].'" name="'.$f_name.'"'.$tabindex_str.'>'.$value.'</textarea>';
 						$fld .= $extra_desc;
 					break;
 
 				case 'checkbox' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? ' class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '[]" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? ' class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'[]" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'radio' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? 'class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? 'class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'hidden' :
-						$fld = '<input name="' . $f_name . '" type="hidden" id="' . $id . '" class="' . $class . '" value="' . $value . '" />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="hidden" id="'.$id.'" class="'.$class.'" value="'.$value.'" />'."\n";
 					break;
 
 				case 'select' :
-						$fld = '<select name="' . $f_name . '" class="' . $class . '" id="' . $id . '"' . $tabindex_str . '>' . "\n";
-						foreach ( $value as $key => $val ) {
-							$checked = !empty($default) && $default == $val ? ' selected="selected"' : '';
-							$fld .= "\t" . '<option value="' . $val . '"' . $checked . '>' . $labels[$key] . '</option>' . "\n";
+						$fld = '<select name="'.$f_name.'" class="'.$class.'" id="'.$id.'"'.$tabindex_str.'>'."\n";
+						foreach ($value as $key => $val) {
+							$checked = ! empty($default) && $default == $val ? ' selected="selected"' : '';
+							$fld .= "\t".'<option value="'.$val.'"'.$checked.'>'.$labels[$key].'</option>'."\n";
 						}
 						$fld .= '</select>';
 					break;
@@ -320,21 +320,21 @@ 
 							'editor_class' => $class,
 							'tabindex' => $tabindex
 							);
-						$editor_settings = array_merge( $wpeditor_args, $editor_settings );
+						$editor_settings = array_merge($wpeditor_args, $editor_settings);
 						ob_start();
-						wp_editor( $value, $id, $editor_settings );
+						wp_editor($value, $id, $editor_settings);
 						$editor = ob_get_contents();
 						ob_end_clean();
 						$fld = $editor;
 					break;
 
 				default : //'text fields'
-						$fld = '<input name="' . $f_name . '" type="text" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $tabindex_str . ' />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="text" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$tabindex_str.' />'."\n";
 						$fld .= $extra_desc;
 
 			}
 
-			$form_fields[ $field_name ] = array( 'label' => $label, 'field' => $fld );
+			$form_fields[$field_name] = array('label' => $label, 'field' => $fld);
 		}
 
 		return $form_fields;
@@ -363,22 +363,22 @@ 
 	 */
 	static public function select_input($name, $values, $default = '', $parameters = '', $class = '', $autosize = true) {
 		//if $values was submitted in the wrong format, convert it over
-		if(!empty($values) && (!array_key_exists(0,$values) || !is_array($values[0]))){
-			$converted_values=array();
-			foreach($values as $id=>$text){
-				$converted_values[]=array('id'=>$id,'text'=>$text);
+		if ( ! empty($values) && ( ! array_key_exists(0, $values) || ! is_array($values[0]))) {
+			$converted_values = array();
+			foreach ($values as $id=>$text) {
+				$converted_values[] = array('id'=>$id, 'text'=>$text);
 			}
-			$values=$converted_values;
+			$values = $converted_values;
 		}
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//EE_Registry::instance()->load_helper( 'Formatter' );
 
-		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
+		$field = '<select id="'.EEH_Formatter::ee_tep_output_string($name).'" name="'.EEH_Formatter::ee_tep_output_string($name).'"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if (EEH_Formatter::ee_tep_not_null($parameters))
+			$field .= ' '.$parameters;
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
@@ -391,21 +391,21 @@ 
 			$size = '';
 		}
 
-		$field .= ' class="' . $class . ' ' . $size . '">';
+		$field .= ' class="'.$class.' '.$size.'">';
 
 		if (empty($default) && isset($GLOBALS[$name]))
 			$default = stripslashes($GLOBALS[$name]);
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {
-			$field .= '<option value="' . $values[$i]['id'] . '"';
+			$field .= '<option value="'.$values[$i]['id'].'"';
 			if ($default == $values[$i]['id']) {
 				$field .= ' selected = "selected"';
 			}
-			if ( isset( $values[$i]['class'] ) ) {
-				$field .= ' class="' . $values[$i]['class'] . '"';
+			if (isset($values[$i]['class'])) {
+				$field .= ' class="'.$values[$i]['class'].'"';
 			}
-			$field .= '>' . $values[$i]['text'] . '</option>';
+			$field .= '>'.$values[$i]['text'].'</option>';
 		}
 		$field .= '</select>';
 
@@ -423,38 +423,38 @@ 
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html( $question_groups = array(), $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html($question_groups = array(), $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 			//EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
+			foreach ($question_groups as $QSG) {
 				// check that questions exist
-				if ( ! empty( $QSG['QSG_questions'] )) {
+				if ( ! empty($QSG['QSG_questions'])) {
 					// use fieldsets
-					$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG['QSG_identifier'] . '">';
+					$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG['QSG_identifier'].'">';
 					// group_name
-					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . self::prep_answer( $QSG['QSG_name'] ) . '</h5>' : '';
+					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.self::prep_answer($QSG['QSG_name']).'</h5>' : '';
 					// group_desc
-					$html .= $QSG['QSG_show_group_desc'] && ! empty( $QSG['QSG_desc'] ) ? '<div class="espresso-question-group-desc-pg">' . self::prep_answer( $QSG['QSG_desc'] ) . '</div>' : '';
+					$html .= $QSG['QSG_show_group_desc'] && ! empty($QSG['QSG_desc']) ? '<div class="espresso-question-group-desc-pg">'.self::prep_answer($QSG['QSG_desc']).'</div>' : '';
 
 					$html .= $before_question_group_questions;
 					// loop thru questions
-					foreach ( $QSG['QSG_questions'] as $question ) {
+					foreach ($QSG['QSG_questions'] as $question) {
 //						EEH_Debug_Tools::printr( $question, '$question  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 						$QFI = new EE_Question_Form_Input(
 							$question['qst_obj'],
 							$question['ans_obj'],
 							$question
 						);
-						$html .= self::generate_form_input( $QFI );
+						$html .= self::generate_form_input($QFI);
 					}
 					$html .= $after_question_group_questions;
-					$html .= "\n\t" . '</' . $group_wrapper . '>';
+					$html .= "\n\t".'</'.$group_wrapper.'>';
 				}
 			}
 		}
@@ -474,11 +474,11 @@ 
 	 * @param string       $group_wrapper
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html2( $question_groups = array(), $q_meta = array(), 	$from_admin = FALSE, $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html2($question_groups = array(), $q_meta = array(), $from_admin = FALSE, $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
 		$default_q_meta = array(
 				'att_nmbr' => 1,
@@ -487,55 +487,55 @@ 
 				'input_id' => '',
 				'input_class' => ''
 		);
-		$q_meta = array_merge( $default_q_meta, $q_meta );
+		$q_meta = array_merge($default_q_meta, $q_meta);
 		//EEH_Debug_Tools::printr( $q_meta, '$q_meta  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 //			EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
-				if ( $QSG instanceof EE_Question_Group ) {
+			foreach ($question_groups as $QSG) {
+				if ($QSG instanceof EE_Question_Group) {
 					// check that questions exist
 
-					$where = array( 'QST_deleted' => 0 );
-					if ( ! $from_admin ) {
+					$where = array('QST_deleted' => 0);
+					if ( ! $from_admin) {
 						$where['QST_admin_only'] = 0;
 					}
-					$questions = $QSG->questions( array( $where, 'order_by' => array( 'Question_Group_Question.QGQ_order' => 'ASC' )));
-					if ( ! empty( $questions )) {
+					$questions = $QSG->questions(array($where, 'order_by' => array('Question_Group_Question.QGQ_order' => 'ASC')));
+					if ( ! empty($questions)) {
 						// use fieldsets
-						$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG->get( 'QSG_identifier' ) . '">';
+						$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG->get('QSG_identifier').'">';
 						// group_name
-						if ( $QSG->show_group_name() ) {
-							$html .=  "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . $QSG->get_pretty( 'QSG_name' ) . '</h5>';
+						if ($QSG->show_group_name()) {
+							$html .= "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.$QSG->get_pretty('QSG_name').'</h5>';
 						}
 						// group_desc
-						if ( $QSG->show_group_desc() ) {
-							$html .=  '<div class="espresso-question-group-desc-pg">' . $QSG->get_pretty( 'QSG_desc'  ) . '</div>';
+						if ($QSG->show_group_desc()) {
+							$html .= '<div class="espresso-question-group-desc-pg">'.$QSG->get_pretty('QSG_desc').'</div>';
 						}
 
 						$html .= $before_question_group_questions;
 						// loop thru questions
-						foreach ( $questions as $QST ) {
+						foreach ($questions as $QST) {
 							$qstn_id = $QST->is_system_question() ? $QST->system_ID() : $QST->ID();
 
 							$answer = NULL;
 
-							if (  isset( $_GET['qstn'] ) && isset( $q_meta['input_id'] ) && isset( $q_meta['att_nmbr'] )) {
+							if (isset($_GET['qstn']) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
 								// check for answer in $_GET in case we are reprocessing a form after an error
-								if ( isset( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] )) {
-									$answer = is_array( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] ) ? $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] : sanitize_text_field( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] );
+								if (isset($_GET['qstn'][$q_meta['input_id']][$qstn_id])) {
+									$answer = is_array($_GET['qstn'][$q_meta['input_id']][$qstn_id]) ? $_GET['qstn'][$q_meta['input_id']][$qstn_id] : sanitize_text_field($_GET['qstn'][$q_meta['input_id']][$qstn_id]);
 								}
-							} else if ( isset( $q_meta['attendee'] ) && $q_meta['attendee'] ) {
+							} else if (isset($q_meta['attendee']) && $q_meta['attendee']) {
 								//attendee data from the session
-								$answer = isset( $q_meta['attendee'][ $qstn_id ] ) ? $q_meta['attendee'][ $qstn_id ] : NULL;
+								$answer = isset($q_meta['attendee'][$qstn_id]) ? $q_meta['attendee'][$qstn_id] : NULL;
 							}
 
 
 
 							$QFI = new EE_Question_Form_Input(
 									$QST,
-									EE_Answer::new_instance ( array(
+									EE_Answer::new_instance(array(
 											'ANS_ID'=> 0,
 											'QST_ID'=> 0,
 											'REG_ID'=> 0,
@@ -544,10 +544,10 @@ 
 									$q_meta
 							);
 							//EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							$html .= self::generate_form_input( $QFI );
+							$html .= self::generate_form_input($QFI);
 						}
 						$html .= $after_question_group_questions;
-						$html .= "\n\t" . '</' . $group_wrapper . '>';
+						$html .= "\n\t".'</'.$group_wrapper.'>';
 					}
 				}
 			}
@@ -567,63 +567,63 @@ 
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
-	static function generate_form_input( EE_Question_Form_Input $QFI ) {
-		if ( isset( $QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin() ) {
+	static function generate_form_input(EE_Question_Form_Input $QFI) {
+		if (isset($QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin()) {
 			return '';
 		}
 
-		$QFI = self::_load_system_dropdowns( $QFI );
-		$QFI = self::_load_specialized_dropdowns( $QFI );
+		$QFI = self::_load_system_dropdowns($QFI);
+		$QFI = self::_load_specialized_dropdowns($QFI);
 
 		//we also need to verify
 
 		$display_text = $QFI->get('QST_display_text');
 		$input_name = $QFI->get('QST_input_name');
-		$answer = EE_Registry::instance()->REQ->is_set( $input_name ) ? EE_Registry::instance()->REQ->get( $input_name ) : $QFI->get('ANS_value');
+		$answer = EE_Registry::instance()->REQ->is_set($input_name) ? EE_Registry::instance()->REQ->get($input_name) : $QFI->get('ANS_value');
 		$input_id = $QFI->get('QST_input_id');
 		$input_class = $QFI->get('QST_input_class');
 //		$disabled = $QFI->get('QST_disabled') ? ' disabled="disabled"' : '';
 		$disabled = $QFI->get('QST_disabled') ? TRUE : FALSE;
-		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>' );
+		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>');
 		$QST_required = $QFI->get('QST_required');
-		$required = $QST_required ? array( 'label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required ) : array();
-		$use_html_entities = $QFI->get_meta( 'htmlentities' );
-		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __( 'This field is required', 'event_espresso' );
-		$required_text = $QST_required ? "\n\t\t\t" . '<div class="required-text hidden">' . self::prep_answer( $required_text, $use_html_entities ) . '</div>' : '';
+		$required = $QST_required ? array('label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required) : array();
+		$use_html_entities = $QFI->get_meta('htmlentities');
+		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __('This field is required', 'event_espresso');
+		$required_text = $QST_required ? "\n\t\t\t".'<div class="required-text hidden">'.self::prep_answer($required_text, $use_html_entities).'</div>' : '';
 		$label_class = 'espresso-form-input-lbl';
-		$QST_options = $QFI->options(true,$answer);
-		$options = is_array( $QST_options ) ? self::prep_answer_options( $QST_options ) : array();
+		$QST_options = $QFI->options(true, $answer);
+		$options = is_array($QST_options) ? self::prep_answer_options($QST_options) : array();
 		$system_ID = $QFI->get('QST_system');
-		$label_b4 = $QFI->get_meta( 'label_b4' );
-		$use_desc_4_label = $QFI->get_meta( 'use_desc_4_label' );
+		$label_b4 = $QFI->get_meta('label_b4');
+		$use_desc_4_label = $QFI->get_meta('use_desc_4_label');
 
 
-		switch ( $QFI->get('QST_type') ){
+		switch ($QFI->get('QST_type')) {
 
 			case 'TEXTAREA' :
-					return EEH_Form_Fields::textarea( $display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::textarea($display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'DROPDOWN' :
-					return EEH_Form_Fields::select( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE );
+					return EEH_Form_Fields::select($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE);
 				break;
 
 
 			case 'RADIO_BTN' :
-					return EEH_Form_Fields::radio( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label );
+					return EEH_Form_Fields::radio($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label);
 				break;
 
 			case 'CHECKBOX' :
-					return EEH_Form_Fields::checkbox( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $label_b4, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::checkbox($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $label_b4, $system_ID, $use_html_entities);
 				break;
 
 			case 'DATE' :
-					return EEH_Form_Fields::datepicker( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::datepicker($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'TEXT' :
 			default:
-					return EEH_Form_Fields::text( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::text($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 		}
@@ -649,31 +649,31 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function text( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function text($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" value="' . esc_attr( $answer ) . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled .' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" value="'.esc_attr($answer).'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -695,35 +695,35 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function textarea( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function textarea($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// make sure $dimensions is an array
-		$dimensions = is_array( $dimensions ) ? $dimensions : array();
+		$dimensions = is_array($dimensions) ? $dimensions : array();
 		// and set some defaults
-		$dimensions = array_merge( array( 'rows' => 3, 'cols' => 40 ), $dimensions );
+		$dimensions = array_merge(array('rows' => 3, 'cols' => 40), $dimensions);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-textarea-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<textarea name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  title="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>' . $answer . '</textarea>';
+		$input_html = "\n\t\t\t".'<textarea name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" rows="'.$dimensions['rows'].'" cols="'.$dimensions['cols'].'"  title="'.$required['msg'].'" '.$disabled.' '.$extra.'>'.$answer.'</textarea>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -746,47 +746,47 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function select( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE ) {
+	static function select($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE) {
 
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? self::prep_answer( array_shift( $answer ), $use_html_entities) : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? self::prep_answer(array_shift($answer), $use_html_entities) : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'wide' : 'espresso-select-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<select name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" title="' . esc_attr( $required['msg'] ) . '"' . $disabled . ' ' . $extra . '>';
+		$input_html = "\n\t\t\t".'<select name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" title="'.esc_attr($required['msg']).'"'.$disabled.' '.$extra.'>';
 		// recursively count array elements, to determine total number of options
-		$only_option = count( $options, 1 ) == 1 ? TRUE : FALSE;
-		if ( ! $only_option ) {
+		$only_option = count($options, 1) == 1 ? TRUE : FALSE;
+		if ( ! $only_option) {
 			// if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
 			$selected = $answer === NULL ? ' selected="selected"' : '';
-			$input_html .= $add_please_select_option ? "\n\t\t\t\t" . '<option value=""' . $selected . '>' . __(' - please select - ', 'event_espresso') . '</option>' : '';
+			$input_html .= $add_please_select_option ? "\n\t\t\t\t".'<option value=""'.$selected.'>'.__(' - please select - ', 'event_espresso').'</option>' : '';
 		}
-		foreach ( $options as $key => $value ) {
+		foreach ($options as $key => $value) {
 			// if value is an array, then create option groups, else create regular ol' options
-			$input_html .= is_array( $value ) ? self::_generate_select_option_group( $key, $value, $answer, $use_html_entities ) : self::_generate_select_option( $value->value(), $value->desc(), $answer, $only_option, $use_html_entities );
+			$input_html .= is_array($value) ? self::_generate_select_option_group($key, $value, $answer, $use_html_entities) : self::_generate_select_option($value->value(), $value->desc(), $answer, $only_option, $use_html_entities);
 		}
 
-		$input_html .= "\n\t\t\t" . '</select>';
+		$input_html .= "\n\t\t\t".'</select>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID );
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID);
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -804,12 +804,12 @@ 
 	 * @param boolean $use_html_entities
 	 * @return string
 	 */
-	private static function _generate_select_option_group( $opt_group, $QSOs, $answer, $use_html_entities = true ){
-		$html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value( $opt_group ) . '">';
-		foreach ( $QSOs as $QSO ) {
-			$html .= self::_generate_select_option( $QSO->value(), $QSO->desc(), $answer, false, $use_html_entities );
+	private static function _generate_select_option_group($opt_group, $QSOs, $answer, $use_html_entities = true) {
+		$html = "\n\t\t\t\t".'<optgroup label="'.self::prep_option_value($opt_group).'">';
+		foreach ($QSOs as $QSO) {
+			$html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer, false, $use_html_entities);
 		}
-		$html .= "\n\t\t\t\t" . '</optgroup>';
+		$html .= "\n\t\t\t\t".'</optgroup>';
 		return $html;
 	}
 
@@ -824,12 +824,12 @@ 
 	 * @param boolean $use_html_entities
 	 * @return string
 	 */
-	private static function _generate_select_option( $key, $value, $answer, $only_option = FALSE, $use_html_entities = true ){
-		$key = self::prep_answer( $key, $use_html_entities );
-		$value = self::prep_answer( $value, $use_html_entities );
-		$value = ! empty( $value ) ? $value : $key;
-		$selected = ( $answer == $key || $only_option ) ? ' selected="selected"' : '';
-		return "\n\t\t\t\t" . '<option value="' . self::prep_option_value( $key ) . '"' . $selected . '> ' . $value . '&nbsp;&nbsp;&nbsp;</option>';
+	private static function _generate_select_option($key, $value, $answer, $only_option = FALSE, $use_html_entities = true) {
+		$key = self::prep_answer($key, $use_html_entities);
+		$value = self::prep_answer($value, $use_html_entities);
+		$value = ! empty($value) ? $value : $key;
+		$selected = ($answer == $key || $only_option) ? ' selected="selected"' : '';
+		return "\n\t\t\t\t".'<option value="'.self::prep_option_value($key).'"'.$selected.'> '.$value.'&nbsp;&nbsp;&nbsp;</option>';
 	}
 
 
@@ -853,56 +853,56 @@ 
 	 * @param bool        $use_desc_4_label
 	 * @return string HTML
 	 */
-	static function radio( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE ) {
+	static function radio($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = ! empty( $class ) ? $class : 'espresso-radio-btn-inp';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = ! empty($class) ? $class : 'espresso-radio-btn-inp';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $label_class . ' ' . $class . '-ul">';
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-radio-btn-options-ul '.$label_class.' '.$class.'-ul">';
 
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
 
-		foreach ( $options as $OPT ) {
-			if ( $OPT instanceof EE_Question_Option ) {
-				$value = self::prep_option_value( $OPT->value() );
+		foreach ($options as $OPT) {
+			if ($OPT instanceof EE_Question_Option) {
+				$value = self::prep_option_value($OPT->value());
 				$label = $use_desc_4_label ? $OPT->desc() : $OPT->value();
-				$size = $use_desc_4_label ? self::get_label_size_class( $OPT->value() . ' ' . $OPT->desc() ) : self::get_label_size_class( $OPT->value() );
-				$desc = $OPT->desc();//no self::prep_answer
-				$answer = is_numeric( $value ) && empty( $answer ) ? 0 : $answer;
-				$checked = (string)$value == (string)$answer ? ' checked="checked"' : '';
-				$opt = '-' . sanitize_key( $value );
-
-				$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-				$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
-				$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t\t" . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-				$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span class="espresso-radio-btn-desc">' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t" . '</label>';
-				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
-				$input_html .= "\n\t\t\t\t" . '</li>';
+				$size = $use_desc_4_label ? self::get_label_size_class($OPT->value().' '.$OPT->desc()) : self::get_label_size_class($OPT->value());
+				$desc = $OPT->desc(); //no self::prep_answer
+				$answer = is_numeric($value) && empty($answer) ? 0 : $answer;
+				$checked = (string) $value == (string) $answer ? ' checked="checked"' : '';
+				$opt = '-'.sanitize_key($value);
+
+				$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+				$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-radio-btn-lbl">';
+				$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t\t".'<input type="radio" name="'.$name.'" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+				$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span class="espresso-radio-btn-desc">'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t".'</label>';
+				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">'.$desc.'</span>';
+				$input_html .= "\n\t\t\t\t".'</li>';
 			}
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -925,65 +925,65 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function checkbox( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function checkbox($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
-		$answer = maybe_unserialize( $answer );
+		$answer = maybe_unserialize($answer);
 
 		// prep the answer(s)
-		$answer = is_array( $answer ) ? $answer : array( sanitize_key( $answer ) => $answer );
+		$answer = is_array($answer) ? $answer : array(sanitize_key($answer) => $answer);
 
-		foreach ( $answer as $key => $value ) {
-			$key = self::prep_option_value( $key );
-			$answer[$key] = self::prep_answer( $value, $use_html_entities );
+		foreach ($answer as $key => $value) {
+			$key = self::prep_option_value($key);
+			$answer[$key] = self::prep_answer($value, $use_html_entities);
 		}
 
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = empty( $class ) ? 'espresso-radio-btn-inp' : $class;
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? 'espresso-radio-btn-inp' : $class;
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
-
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $label_class . ' ' . $class . '-ul">';
-
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
-
-		foreach ( $options as $OPT ) {
-			$value = $OPT->value();//self::prep_option_value( $OPT->value() );
-			$size = self::get_label_size_class(  $OPT->value() . ' ' . $OPT->desc() );
-			$text = self::prep_answer( $OPT->value() );
-			$desc = $OPT->desc() ;
-			$opt = '-' . sanitize_key( $value );
-
-			$checked = is_array( $answer ) && in_array( $text, $answer ) ? ' checked="checked"' : '';
-
-			$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-			$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
-			$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
-			$input_html .= "\n\t\t\t\t\t\t" . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-			$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
- 			$input_html .= "\n\t\t\t\t\t" . '</label>';
-			if ( ! empty( $desc ) && $desc != $text ) {
-	 			$input_html .= "\n\t\t\t\t\t" . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">' . $desc . '</div>';
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
+
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-checkbox-options-ul '.$label_class.' '.$class.'-ul">';
+
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
+
+		foreach ($options as $OPT) {
+			$value = $OPT->value(); //self::prep_option_value( $OPT->value() );
+			$size = self::get_label_size_class($OPT->value().' '.$OPT->desc());
+			$text = self::prep_answer($OPT->value());
+			$desc = $OPT->desc();
+			$opt = '-'.sanitize_key($value);
+
+			$checked = is_array($answer) && in_array($text, $answer) ? ' checked="checked"' : '';
+
+			$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+			$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-checkbox-lbl">';
+			$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+			$input_html .= "\n\t\t\t\t\t\t".'<input type="checkbox" name="'.$name.'['.$OPT->ID().']" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+			$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+ 			$input_html .= "\n\t\t\t\t\t".'</label>';
+			if ( ! empty($desc) && $desc != $text) {
+	 			$input_html .= "\n\t\t\t\t\t".' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'.$desc.'</div>';
 			}
-			$input_html .= "\n\t\t\t\t" . '</li>';
+			$input_html .= "\n\t\t\t\t".'</li>';
 
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -1005,36 +1005,36 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function datepicker( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function datepicker($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . ' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].' datepicker" value="'.$answer.'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
 		// enqueue scripts
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso-ui-theme');
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('jquery-ui-datepicker');
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -1046,7 +1046,7 @@ 
 	 * 	@access public
 	 * 	@return 	string
 	 */
-	public static function remove_label_keep_required_msg( $label_html, $required_text ) {
+	public static function remove_label_keep_required_msg($label_html, $required_text) {
 		return $required_text;
 	}
 
@@ -1060,9 +1060,9 @@ 
 	 * @param string $value
 	 * @return string HTML
 	 */
-	static function hidden_input( $name, $value, $id = '' ){
-		$id = ! empty( $id ) ? $id : $name;
-		return '<input id="' . $id . '" type="hidden" name="'.$name.'" value="' .  $value . '"/>';
+	static function hidden_input($name, $value, $id = '') {
+		$id = ! empty($id) ? $id : $name;
+		return '<input id="'.$id.'" type="hidden" name="'.$name.'" value="'.$value.'"/>';
 	}
 
 
@@ -1074,7 +1074,7 @@ 
 	 * @param string $question
 	 * @return string
 	 */
-	static function prep_question( $question ){
+	static function prep_question($question) {
 		return $question;
 //		$link = '';
 //		// does this label have a help link attached ?
@@ -1097,13 +1097,13 @@ 
 	 * @param mixed $answer
 	 * @return string
 	 */
-	static function prep_answer( $answer, $use_html_entities = TRUE ){
+	static function prep_answer($answer, $use_html_entities = TRUE) {
 		//make sure we convert bools first.  Otherwise (bool) false becomes an empty string which is NOT desired, we want "0".
-		if ( is_bool( $answer ) ) {
+		if (is_bool($answer)) {
 			$answer = $answer ? 1 : 0;
 		}
-		$answer = trim( stripslashes( str_replace( '&#039;', "'", $answer )));
-		return $use_html_entities ? htmlentities( $answer, ENT_QUOTES, 'UTF-8' ) : $answer;
+		$answer = trim(stripslashes(str_replace('&#039;', "'", $answer)));
+		return $use_html_entities ? htmlentities($answer, ENT_QUOTES, 'UTF-8') : $answer;
 	}
 
 
@@ -1113,18 +1113,18 @@ 
 	 * 	@param array $QSOs  array of EE_Question_Option objects
 	 * 	@return array
 	 */
-	public static function prep_answer_options( $QSOs = array() ){
+	public static function prep_answer_options($QSOs = array()) {
 		$prepped_answer_options = array();
-		if ( is_array( $QSOs ) && ! empty( $QSOs )) {
-			foreach( $QSOs as $key => $QSO ) {
-				if ( ! $QSO instanceof EE_Question_Option ) {
-					$QSO = EE_Question_Option::new_instance( array(
-						'QSO_value' => is_array( $QSO ) && isset( $QSO['id'] ) ? (string)$QSO['id'] : (string)$key,
-						'QSO_desc' => is_array( $QSO ) && isset( $QSO['text'] ) ? (string)$QSO['text'] : (string)$QSO
+		if (is_array($QSOs) && ! empty($QSOs)) {
+			foreach ($QSOs as $key => $QSO) {
+				if ( ! $QSO instanceof EE_Question_Option) {
+					$QSO = EE_Question_Option::new_instance(array(
+						'QSO_value' => is_array($QSO) && isset($QSO['id']) ? (string) $QSO['id'] : (string) $key,
+						'QSO_desc' => is_array($QSO) && isset($QSO['text']) ? (string) $QSO['text'] : (string) $QSO
 					));
 				}
-				if ( $QSO->opt_group() ) {
-					$prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
+				if ($QSO->opt_group()) {
+					$prepped_answer_options[$QSO->opt_group()][] = $QSO;
 				} else {
 					$prepped_answer_options[] = $QSO;
 				}
@@ -1140,8 +1140,8 @@ 
 	 * @param string $option_value
 	 * @return string
 	 */
-	static function prep_option_value( $option_value ){
-		return esc_attr( trim( stripslashes( $option_value ) ) );
+	static function prep_option_value($option_value) {
+		return esc_attr(trim(stripslashes($option_value)));
 	}
 
 
@@ -1152,11 +1152,11 @@ 
 	 * @param string|array 	$required
 	 * @return array
 	 */
-	static function prep_required( $required = array() ){
+	static function prep_required($required = array()) {
 		// make sure required is an array
-		$required = is_array( $required ) ? $required : array();
+		$required = is_array($required) ? $required : array();
 		// and set some defaults
-		$required = array_merge( array( 'label' => '', 'class' => '', 'msg' => '' ), $required );
+		$required = array_merge(array('label' => '', 'class' => '', 'msg' => ''), $required);
 		return $required;
 	}
 
@@ -1167,30 +1167,30 @@ 
 	 * @param string 	$value
 	 * @return string
 	 */
-	static function get_label_size_class( $value = FALSE ){
-			if ( $value === FALSE || $value == '' ) {
+	static function get_label_size_class($value = FALSE) {
+			if ($value === FALSE || $value == '') {
 				return ' class="medium-lbl"';
 			}
 			// determine length of option value
-			$val_size = strlen( $value );
-			switch( $val_size ){
+			$val_size = strlen($value);
+			switch ($val_size) {
 				case $val_size < 3 :
-					$size =  ' class="nano-lbl"';
+					$size = ' class="nano-lbl"';
 					break;
 				case $val_size < 6 :
-					$size =  ' class="micro-lbl"';
+					$size = ' class="micro-lbl"';
 					break;
 				case $val_size < 12 :
-					$size =  ' class="tiny-lbl"';
+					$size = ' class="tiny-lbl"';
 					break;
 				case $val_size < 25 :
-					$size =  ' class="small-lbl"';
+					$size = ' class="small-lbl"';
 					break;
 				case $val_size > 100 :
-					$size =  ' class="big-lbl"';
+					$size = ' class="big-lbl"';
 					break;
 				default:
-					$size =  ' class="medium-lbl"';
+					$size = ' class="medium-lbl"';
 					break;
 			}
 		return $size;
@@ -1204,20 +1204,20 @@ 
 	 * @param array 	$QFI
 	 * @return array
 	 */
-	private static function _load_system_dropdowns( $QFI ){
+	private static function _load_system_dropdowns($QFI) {
 		$QST_system = $QFI->get('QST_system');
-		switch ( $QST_system ) {
+		switch ($QST_system) {
 			case 'state' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'country' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 			case 'admin-state' :
-				$QFI = self::generate_state_dropdown( $QFI, TRUE );
+				$QFI = self::generate_state_dropdown($QFI, TRUE);
 				break;
 			case 'admin-country' :
-				$QFI = self::generate_country_dropdown( $QFI, TRUE );
+				$QFI = self::generate_country_dropdown($QFI, TRUE);
 				break;
 		}
 		return $QFI;
@@ -1234,13 +1234,13 @@ 
 	 *
 	 * @return EE_Question_Form_Input
 	 */
-	protected static function _load_specialized_dropdowns( $QFI ) {
-		switch( $QFI->get( 'QST_type' ) ) {
+	protected static function _load_specialized_dropdowns($QFI) {
+		switch ($QFI->get('QST_type')) {
 			case 'STATE' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'COUNTRY' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 		}
 		return $QFI;
@@ -1254,23 +1254,23 @@ 
 	 * @param bool  $get_all
 	 * @return array
 	 */
-	public static function generate_state_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_state_dropdown($QST, $get_all = FALSE) {
 		$states = $get_all ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_states_of_active_countries();
-		if ( $states && count( $states ) != count( $QST->options() )) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($states && count($states) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// if multiple countries, we'll create option groups within the dropdown
-			foreach ( $states as $state ) {
-				if ( $state instanceof EE_State ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $state->ID(),
 						'QSO_desc' => $state->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
 					// set option group
-					$QSO->set_opt_group( $state->country()->name() );
+					$QSO->set_opt_group($state->country()->name());
 					// add option to question
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1286,20 +1286,20 @@ 
 	 * @internal param array $question
 	 * @return array
 	 */
-	public static function generate_country_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_country_dropdown($QST, $get_all = FALSE) {
 		$countries = $get_all ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-		if ( $countries && count( $countries ) != count( $QST->options() ) ) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($countries && count($countries) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// now add countries
-			foreach ( $countries as $country ) {
-				if ( $country instanceof EE_Country ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $country->ID(),
 						'QSO_desc' => $country->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1316,11 +1316,11 @@ 
 	 */
 	public static function two_digit_months_dropdown_options() {
 		$options = array();
-		for ( $x = 1; $x <= 12; $x++ ) {
-			$mm = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$mm ] = (string)$mm;
+		for ($x = 1; $x <= 12; $x++) {
+			$mm = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $mm] = (string) $mm;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1335,11 +1335,11 @@ 
 		$options = array();
 		$current_year = date('y');
 		$next_decade = $current_year + 10;
-		for ( $x = $current_year; $x <= $next_decade; $x++ ) {
-			$yy = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$yy ] = (string)$yy;
+		for ($x = $current_year; $x <= $next_decade; $x++) {
+			$yy = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $yy] = (string) $yy;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1353,17 +1353,17 @@ 
 	 * @param  integer $evt_category Event Category ID if the Event Category filter is selected
 	 * @return string                html
 	 */
-	public static function generate_registration_months_dropdown( $cur_date = '', $status = '', $evt_category = 0 ) {
+	public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0) {
 		$_where = array();
-		if ( !empty( $status ) ) {
+		if ( ! empty($status)) {
 			$_where['STS_ID'] = $status;
 		}
 
-		if ( $evt_category > 0 ) {
+		if ($evt_category > 0) {
 			$_where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
 
-		$regdtts = EEM_Registration::instance()->get_reg_months_and_years( $_where );
+		$regdtts = EEM_Registration::instance()->get_reg_months_and_years($_where);
 
 		//setup vals for select input helper
 		$options = array(
@@ -1373,15 +1373,15 @@ 
 				)
 			);
 
-		foreach ( $regdtts as $regdtt ) {
-			$date = $regdtt->reg_month. ' ' . $regdtt->reg_year;
+		foreach ($regdtts as $regdtt) {
+			$date = $regdtt->reg_month.' '.$regdtt->reg_year;
 			$options[] = array(
 				'text' => $date,
 				'id' => $date
 				);
 		}
 
-		return self::select_input('month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1395,18 +1395,18 @@ 
 	 * @param  string $evt_active_status "upcoming", "expired", "active", or "inactive"
 	 * @return string                    html
 	 */
-	public static function generate_event_months_dropdown( $cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL ) {
+	public static function generate_event_months_dropdown($cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL) {
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
 			case 'all' :
-				$where['Event.status'] = array( 'NOT IN', array('trash') );
+				$where['Event.status'] = array('NOT IN', array('trash'));
 				break;
 
 			case 'draft' :
-				$where['Event.status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['Event.status'] = array('IN', array('draft', 'auto-draft'));
 
 			default :
 				$where['Event.status'] = $status;
@@ -1415,7 +1415,7 @@ 
 		//categories?
 
 
-		if ( !empty ( $evt_category ) ) {
+		if ( ! empty ($evt_category)) {
 			$where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
@@ -1423,7 +1423,7 @@ 
 
 //		$where['DTT_is_primary'] = 1;
 
-		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status );
+		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status);
 
 		//let's setup vals for select input helper
 		$options = array(
@@ -1438,9 +1438,9 @@ 
 		//translate month and date
 		global $wp_locale;
 
-		foreach ( $DTTS as $DTT ) {
-			$localized_date = $wp_locale->get_month( $DTT->dtt_month_num ) . ' ' . $DTT->dtt_year;
-			$id = $DTT->dtt_month . ' ' . $DTT->dtt_year;
+		foreach ($DTTS as $DTT) {
+			$localized_date = $wp_locale->get_month($DTT->dtt_month_num).' '.$DTT->dtt_year;
+			$id = $DTT->dtt_month.' '.$DTT->dtt_year;
 			$options[] = array(
 				'text' => $localized_date,
 				'id' => $id
@@ -1448,7 +1448,7 @@ 
 		}
 
 
-		return self::select_input( 'month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1459,7 +1459,7 @@ 
 	 * @param  integer $current_cat currently selected category
 	 * @return string               html for dropdown
 	 */
-	public static function generate_event_category_dropdown( $current_cat = -1 ) {
+	public static function generate_event_category_dropdown($current_cat = -1) {
 		$categories = EEM_Term::instance()->get_all_ee_categories(TRUE);
 		$options = array(
 			'0' => array(
@@ -1469,14 +1469,14 @@ 
 			);
 
 		//setup categories for dropdown
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$options[] = array(
 				'text' => $category->get('name'),
 				'id' => $category->ID()
 				);
 		}
 
-		return self::select_input( 'EVT_CAT', $options, $current_cat );
+		return self::select_input('EVT_CAT', $options, $current_cat);
 	}
 
 
@@ -1495,20 +1495,20 @@ 
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
 	 * @return    void
 	 */
-	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
+	public static function submit_button($url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '') {
 		$btn = '';
-		if ( empty( $url ) || empty( $ID )) {
+		if (empty($url) || empty($ID)) {
 			return $btn;
 		}
-		$text = ! empty( $text ) ? $text : __('Submit', 'event_espresso' );
-		$btn .= '<input id="' . $ID . '-btn" class="' . $class . '" type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
-		if ( ! $input_only ) {
-			$btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
-			$btn_frm .= ! empty( $nonce_action ) ? wp_nonce_field( $nonce_action, $nonce_action . '_nonce', TRUE, FALSE ) : '';
+		$text = ! empty($text) ? $text : __('Submit', 'event_espresso');
+		$btn .= '<input id="'.$ID.'-btn" class="'.$class.'" type="submit" value="'.$text.'" '.$extra_attributes.'/>';
+		if ( ! $input_only) {
+			$btn_frm = '<form id="'.$ID.'-frm" method="POST" action="'.$url.'">';
+			$btn_frm .= ! empty($nonce_action) ? wp_nonce_field($nonce_action, $nonce_action.'_nonce', TRUE, FALSE) : '';
 			$btn_frm .= $btn;
 			$btn_frm .= '</form>';
 			$btn = $btn_frm;
-			unset ( $btn_frm );
+			unset ($btn_frm);
 		}
 		return $btn;
 	}