eventespresso / event-espresso-core

core/db_classes/EE_Datetime_Ticket.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
@@ -31,9 +31,9 @@ 
 	 * @param null  $timezone
 	 * @return EE_Datetime_Ticket|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @param null  $timezone
 	 * @return EE_Datetime_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);
 	}
 } //end EE_Datetime_Ticket class
\ No newline at end of file

core/db_classes/EE_Line_Item.class.php

Braces +1 added lines, -1 removed lines

@@ -861,7 +861,7 @@
 
 				if ( $child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
 					$total += $child_line_item->total();
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				} elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
 					$total += $child_line_item->taxable_total();
 				}
 			}

Doc Comments +24 added lines, -25 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * Gets TXN_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function TXN_ID() {
 		return $this->get( 'TXN_ID' );
@@ -87,7 +87,7 @@ 
 	/**
 	 * Sets TXN_ID
 	 * @param int $TXN_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_TXN_ID( $TXN_ID ) {
 		$this->set( 'TXN_ID', $TXN_ID );
@@ -112,7 +112,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'LIN_name', $name );
@@ -122,7 +122,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function desc() {
 		return $this->get( 'LIN_desc' );
@@ -133,7 +133,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'LIN_desc', $desc );
@@ -143,7 +143,7 @@ 
 
 	/**
 	 * Gets quantity
-	 * @return int
+	 * @return boolean
 	 */
 	function quantity() {
 		return $this->get( 'LIN_quantity' );
@@ -154,7 +154,7 @@ 
 	/**
 	 * Sets quantity
 	 * @param int $quantity
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_quantity( $quantity ) {
 		$this->set( 'LIN_quantity', $quantity );
@@ -164,7 +164,7 @@ 
 
 	/**
 	 * Gets item_id
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get( 'OBJ_ID' );
@@ -175,7 +175,7 @@ 
 	/**
 	 * Sets item_id
 	 * @param string $item_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_ID( $item_id ) {
 		$this->set( 'OBJ_ID', $item_id );
@@ -185,7 +185,7 @@ 
 
 	/**
 	 * Gets item_type
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get( 'OBJ_type' );
@@ -196,7 +196,7 @@ 
 	/**
 	 * Sets item_type
 	 * @param string $OBJ_type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_type( $OBJ_type ) {
 		$this->set( 'OBJ_type', $OBJ_type );
@@ -206,7 +206,7 @@ 
 
 	/**
 	 * Gets unit_price
-	 * @return float
+	 * @return boolean
 	 */
 	function unit_price() {
 		return $this->get( 'LIN_unit_price' );
@@ -217,7 +217,7 @@ 
 	/**
 	 * Sets unit_price
 	 * @param float $unit_price
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_unit_price( $unit_price ) {
 		$this->set( 'LIN_unit_price', $unit_price );
@@ -249,7 +249,7 @@ 
 
 	/**
 	 * Gets percent (between 100-.001)
-	 * @return float
+	 * @return boolean
 	 */
 	function percent() {
 		return $this->get( 'LIN_percent' );
@@ -260,7 +260,7 @@ 
 	/**
 	 * Sets percent (between 100-0.01)
 	 * @param float $percent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_percent( $percent ) {
 		$this->set( 'LIN_percent', $percent );
@@ -270,7 +270,7 @@ 
 
 	/**
 	 * Gets total
-	 * @return float
+	 * @return boolean
 	 */
 	function total() {
 		return $this->get( 'LIN_total' );
@@ -281,7 +281,7 @@ 
 	/**
 	 * Sets total
 	 * @param float $total
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_total( $total ) {
 		$this->set( 'LIN_total', $total );
@@ -291,7 +291,7 @@ 
 
 	/**
 	 * Gets parent
-	 * @return int
+	 * @return boolean
 	 */
 	function parent_ID() {
 		return $this->get( 'LIN_parent' );
@@ -302,7 +302,7 @@ 
 	/**
 	 * Sets parent
 	 * @param int $parent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_parent_ID( $parent ) {
 		$this->set( 'LIN_parent', $parent );
@@ -312,7 +312,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get( 'LIN_type' );
@@ -323,7 +323,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'LIN_type', $type );
@@ -360,7 +360,7 @@ 
 
 	/**
 	 * Gets code
-	 * @return string
+	 * @return boolean
 	 */
 	function code() {
 		return $this->get( 'LIN_code' );
@@ -371,7 +371,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code( $code ) {
 		$this->set( 'LIN_code', $code );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Sets is_taxable
 	 * @param boolean $is_taxable
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_is_taxable( $is_taxable ) {
 		$this->set( 'LIN_is_taxable', $is_taxable );
@@ -670,7 +670,6 @@ 
 	 * Recursively goes through all the children and recalculates sub-totals EXCEPT for
 	 * tax-sub-totals (they're a an odd beast). Updates the 'total' on each line item according to either its
 	 * unit price * quantity or the total of all its children EXCEPT when we're only calculating the taxable total and when this is called on the grand total
-	 * @param bool $include_taxable_items_only. If FALSE (default), updates the line items and sub-totals. If TRUE, just finds the amount taxable in this line item's price or its children's.
 	 * @throws EE_Error
 	 * @return float
 	 */

Spacing +153 added lines, -153 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -41,9 +41,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Line_Item
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -53,8 +53,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Line_Item
 	 */
-	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);
 	}
 
 
@@ -65,10 +65,10 @@ 
 	 * @param bool   $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		parent::__construct( $fieldValues, $bydb, $timezone );
-		if ( !$this->get( 'LIN_code' ) ) {
-			$this->set_code( $this->generate_code() );
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		parent::__construct($fieldValues, $bydb, $timezone);
+		if ( ! $this->get('LIN_code')) {
+			$this->set_code($this->generate_code());
 		}
 	}
 
@@ -79,7 +79,7 @@ 
 	 * @return int
 	 */
 	function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param int $TXN_ID
 	 * @return boolean
 	 */
-	function set_TXN_ID( $TXN_ID ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -100,9 +100,9 @@ 
 	 * @return string
 	 */
 	function name() {
-		$name =  $this->get( 'LIN_name' );
-		if( ! $name ){
-			$name = ucwords( str_replace( '-', ' ', $this->type() ) );
+		$name = $this->get('LIN_name');
+		if ( ! $name) {
+			$name = ucwords(str_replace('-', ' ', $this->type()));
 		}
 		return $name;
 	}
@@ -114,8 +114,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'LIN_name', $name );
+	function set_name($name) {
+		$this->set('LIN_name', $name);
 	}
 
 
@@ -125,7 +125,7 @@ 
 	 * @return string
 	 */
 	function desc() {
-		return $this->get( 'LIN_desc' );
+		return $this->get('LIN_desc');
 	}
 
 
@@ -135,8 +135,8 @@ 
 	 * @param string $desc
 	 * @return boolean
 	 */
-	function set_desc( $desc ) {
-		$this->set( 'LIN_desc', $desc );
+	function set_desc($desc) {
+		$this->set('LIN_desc', $desc);
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @return int
 	 */
 	function quantity() {
-		return $this->get( 'LIN_quantity' );
+		return $this->get('LIN_quantity');
 	}
 
 
@@ -156,8 +156,8 @@ 
 	 * @param int $quantity
 	 * @return boolean
 	 */
-	function set_quantity( $quantity ) {
-		$this->set( 'LIN_quantity', $quantity );
+	function set_quantity($quantity) {
+		$this->set('LIN_quantity', $quantity);
 	}
 
 
@@ -167,7 +167,7 @@ 
 	 * @return string
 	 */
 	function OBJ_ID() {
-		return $this->get( 'OBJ_ID' );
+		return $this->get('OBJ_ID');
 	}
 
 
@@ -177,8 +177,8 @@ 
 	 * @param string $item_id
 	 * @return boolean
 	 */
-	function set_OBJ_ID( $item_id ) {
-		$this->set( 'OBJ_ID', $item_id );
+	function set_OBJ_ID($item_id) {
+		$this->set('OBJ_ID', $item_id);
 	}
 
 
@@ -188,7 +188,7 @@ 
 	 * @return string
 	 */
 	function OBJ_type() {
-		return $this->get( 'OBJ_type' );
+		return $this->get('OBJ_type');
 	}
 
 
@@ -198,8 +198,8 @@ 
 	 * @param string $OBJ_type
 	 * @return boolean
 	 */
-	function set_OBJ_type( $OBJ_type ) {
-		$this->set( 'OBJ_type', $OBJ_type );
+	function set_OBJ_type($OBJ_type) {
+		$this->set('OBJ_type', $OBJ_type);
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return float
 	 */
 	function unit_price() {
-		return $this->get( 'LIN_unit_price' );
+		return $this->get('LIN_unit_price');
 	}
 
 
@@ -219,8 +219,8 @@ 
 	 * @param float $unit_price
 	 * @return boolean
 	 */
-	function set_unit_price( $unit_price ) {
-		$this->set( 'LIN_unit_price', $unit_price );
+	function set_unit_price($unit_price) {
+		$this->set('LIN_unit_price', $unit_price);
 	}
 
 
@@ -231,14 +231,14 @@ 
 	 * @return boolean
 	 */
 	function is_percent() {
-		$unit_price = $this->get( 'LIN_unit_price' );
-		$percent = $this->get( 'LIN_percent' );
-		if ( $unit_price < .001 && $percent ) {
+		$unit_price = $this->get('LIN_unit_price');
+		$percent = $this->get('LIN_percent');
+		if ($unit_price < .001 && $percent) {
 			return TRUE;
-		} elseif ( $unit_price >= .001 && !$percent ) {
+		} elseif ($unit_price >= .001 && ! $percent) {
 			return FALSE;
-		} elseif ( $unit_price >= .001 && $percent ) {
-			throw new EE_Error( sprintf( __( "A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso" ), $unit_price, $percent ) );
+		} elseif ($unit_price >= .001 && $percent) {
+			throw new EE_Error(sprintf(__("A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso"), $unit_price, $percent));
 		} else {
 			// if they're both 0, assume its not a percent item
 			return FALSE;
@@ -252,7 +252,7 @@ 
 	 * @return float
 	 */
 	function percent() {
-		return $this->get( 'LIN_percent' );
+		return $this->get('LIN_percent');
 	}
 
 
@@ -262,8 +262,8 @@ 
 	 * @param float $percent
 	 * @return boolean
 	 */
-	function set_percent( $percent ) {
-		$this->set( 'LIN_percent', $percent );
+	function set_percent($percent) {
+		$this->set('LIN_percent', $percent);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return float
 	 */
 	function total() {
-		return $this->get( 'LIN_total' );
+		return $this->get('LIN_total');
 	}
 
 
@@ -283,8 +283,8 @@ 
 	 * @param float $total
 	 * @return boolean
 	 */
-	function set_total( $total ) {
-		$this->set( 'LIN_total', $total );
+	function set_total($total) {
+		$this->set('LIN_total', $total);
 	}
 
 
@@ -294,7 +294,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'LIN_parent' );
+		return $this->get('LIN_parent');
 	}
 
 
@@ -304,8 +304,8 @@ 
 	 * @param int $parent
 	 * @return boolean
 	 */
-	function set_parent_ID( $parent ) {
-		$this->set( 'LIN_parent', $parent );
+	function set_parent_ID($parent) {
+		$this->set('LIN_parent', $parent);
 	}
 
 
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	function type() {
-		return $this->get( 'LIN_type' );
+		return $this->get('LIN_type');
 	}
 
 
@@ -325,8 +325,8 @@ 
 	 * @param string $type
 	 * @return boolean
 	 */
-	function set_type( $type ) {
-		$this->set( 'LIN_type', $type );
+	function set_type($type) {
+		$this->set('LIN_type', $type);
 	}
 
 
@@ -336,7 +336,7 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function parent() {
-		return $this->get_model()->get_one_by_ID( $this->parent_ID() );
+		return $this->get_model()->get_one_by_ID($this->parent_ID());
 	}
 
 
@@ -346,10 +346,10 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function children() {
-		if ( $this->ID() ) {
-			return $this->get_model()->get_all( array( array( 'LIN_parent' => $this->ID() ) ) );
+		if ($this->ID()) {
+			return $this->get_model()->get_all(array(array('LIN_parent' => $this->ID())));
 		} else {
-			if ( !is_array( $this->_Line_Item ) ) {
+			if ( ! is_array($this->_Line_Item)) {
 				$this->_Line_Item = array();
 			}
 			return $this->_Line_Item;
@@ -363,7 +363,7 @@ 
 	 * @return string
 	 */
 	function code() {
-		return $this->get( 'LIN_code' );
+		return $this->get('LIN_code');
 	}
 
 
@@ -373,8 +373,8 @@ 
 	 * @param string $code
 	 * @return boolean
 	 */
-	function set_code( $code ) {
-		$this->set( 'LIN_code', $code );
+	function set_code($code) {
+		$this->set('LIN_code', $code);
 	}
 
 
@@ -384,7 +384,7 @@ 
 	 * @return boolean
 	 */
 	function is_taxable() {
-		return $this->get( 'LIN_is_taxable' );
+		return $this->get('LIN_is_taxable');
 	}
 
 
@@ -394,8 +394,8 @@ 
 	 * @param boolean $is_taxable
 	 * @return boolean
 	 */
-	function set_is_taxable( $is_taxable ) {
-		$this->set( 'LIN_is_taxable', $is_taxable );
+	function set_is_taxable($is_taxable) {
+		$this->set('LIN_is_taxable', $is_taxable);
 	}
 
 
@@ -407,11 +407,11 @@ 
 	 */
 	function get_object() {
 		$model_name_of_related_obj = $this->OBJ_type();
-		$is_model_name = EE_Registry::instance()->is_model_name( $model_name_of_related_obj );
-		if ( !$is_model_name ) {
+		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
+		if ( ! $is_model_name) {
 			return NULL;
 		} else {
-			return $this->get_first_related( $model_name_of_related_obj );
+			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
 
@@ -423,11 +423,11 @@ 
 	 * @param array $query_params
 	 * @return EE_Ticket
 	 */
-	function ticket( $query_params = array() ) {
+	function ticket($query_params = array()) {
 		//we're going to assume that when this method is called we always want to receive the attached ticket EVEN if that ticket is archived.  This can be overridden via the incoming $query_params argument
-		$remove_defaults = array( 'default_where_conditions' => 'none' );
-		$query_params = array_merge( $remove_defaults, $query_params );
-		return $this->get_first_related( 'Ticket', $query_params );
+		$remove_defaults = array('default_where_conditions' => 'none');
+		$query_params = array_merge($remove_defaults, $query_params);
+		return $this->get_first_related('Ticket', $query_params);
 	}
 
 
@@ -438,13 +438,13 @@ 
 	 * @return string
 	 */
 	function ticket_event_name() {
-		$event_name = __( "Unknown", "event_espresso" );
+		$event_name = __("Unknown", "event_espresso");
 		$ticket = $this->ticket();
-		if ( $ticket ) {
+		if ($ticket) {
 			$datetime = $ticket->first_datetime();
-			if ( $datetime instanceof EE_Datetime ) {
+			if ($datetime instanceof EE_Datetime) {
 				$event = $datetime->event();
-				if ( $event instanceof EE_Event ) {
+				if ($event instanceof EE_Event) {
 					$event_name = $event->name();
 				}
 			}
@@ -460,13 +460,13 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	function ticket_datetime_start( $date_format = '', $time_format = '' ) {
-		$first_datetime_string = __( "Unknown", "event_espresso" );
+	function ticket_datetime_start($date_format = '', $time_format = '') {
+		$first_datetime_string = __("Unknown", "event_espresso");
 		$ticket = $this->ticket();
-		if ( $ticket instanceof EE_Ticket ) {
+		if ($ticket instanceof EE_Ticket) {
 			$first_datetime = $ticket->first_datetime();
-			if ( $first_datetime ) {
-				$first_datetime_string = $first_datetime->start_date_and_time( $date_format, $time_format );
+			if ($first_datetime) {
+				$first_datetime_string = $first_datetime->start_date_and_time($date_format, $time_format);
 			}
 		}
 		return $first_datetime_string;
@@ -480,20 +480,20 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return boolean success
 	 */
-	function add_child_line_item( EE_Line_Item $line_item ) {
-		if ( $this->ID() ) {
+	function add_child_line_item(EE_Line_Item $line_item) {
+		if ($this->ID()) {
 			//check for any duplicate line items (with the same code), if so, thsi replaces it
-			$line_item_with_same_code = $this->get_child_line_item(  $line_item->code() );
-			if( $line_item_with_same_code instanceof EE_Line_Item ) {
-				$this->delete_child_line_item( $line_item_with_same_code->code() );
+			$line_item_with_same_code = $this->get_child_line_item($line_item->code());
+			if ($line_item_with_same_code instanceof EE_Line_Item) {
+				$this->delete_child_line_item($line_item_with_same_code->code());
 			}
-			$line_item->set_parent_ID( $this->ID() );
-			if( $this->TXN_ID() ){
-				$line_item->set_TXN_ID( $this->TXN_ID() );
+			$line_item->set_parent_ID($this->ID());
+			if ($this->TXN_ID()) {
+				$line_item->set_TXN_ID($this->TXN_ID());
 			}
 			return $line_item->save();
 		} else {
-			$this->_Line_Item[ $line_item->code() ] = $line_item;
+			$this->_Line_Item[$line_item->code()] = $line_item;
 			return TRUE;
 		}
 	}
@@ -507,11 +507,11 @@ 
 	 * @param string $code
 	 * @return EE_Line_Item
 	 */
-	function get_child_line_item( $code ) {
-		if ( $this->ID() ) {
-			return $this->get_model()->get_one( array( array( 'LIN_parent' => $this->ID(), 'LIN_code' => $code ) ) );
+	function get_child_line_item($code) {
+		if ($this->ID()) {
+			return $this->get_model()->get_one(array(array('LIN_parent' => $this->ID(), 'LIN_code' => $code)));
 		} else {
-			return $this->_Line_Item[ $code ];
+			return $this->_Line_Item[$code];
 		}
 	}
 
@@ -522,10 +522,10 @@ 
 	 * @return int
 	 */
 	function delete_children_line_items() {
-		if ( $this->ID() ) {
-			return $this->get_model()->delete( array( array( 'LIN_parent' => $this->ID() ) ) );
+		if ($this->ID()) {
+			return $this->get_model()->delete(array(array('LIN_parent' => $this->ID())));
 		} else {
-			$count = count( $this->_Line_Item );
+			$count = count($this->_Line_Item);
 			$this->_Line_Item = array();
 			return $count;
 		}
@@ -539,11 +539,11 @@ 
 	 * @param string $code
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	function delete_child_line_item( $code ) {
-		if ( $this->ID() ) {
-			return $this->get_model()->delete( array( array( 'LIN_code' => $code, 'LIN_parent' => $this->ID() ) ) );
+	function delete_child_line_item($code) {
+		if ($this->ID()) {
+			return $this->get_model()->delete(array(array('LIN_code' => $code, 'LIN_parent' => $this->ID())));
 		} else {
-			unset( $this->_Line_Item[ $code ] );
+			unset($this->_Line_Item[$code]);
 			return 1;
 		}
 	}
@@ -556,7 +556,7 @@ 
 	 */
 	function generate_code() {
 		// each line item in the cart requires a unique identifier
-		return md5( $this->get( 'OBJ_type' ) . $this->get( 'OBJ_ID' ) . time() );
+		return md5($this->get('OBJ_type').$this->get('OBJ_ID').time());
 	}
 
 
@@ -620,7 +620,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function unit_price_no_code() {
-		return $this->get_pretty( 'LIN_unit_price', 'no_currency_code' );
+		return $this->get_pretty('LIN_unit_price', 'no_currency_code');
 	}
 
 
@@ -630,7 +630,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function total_no_code() {
-		return $this->get_pretty( 'LIN_total', 'no_currency_code' );
+		return $this->get_pretty('LIN_total', 'no_currency_code');
 	}
 
 
@@ -646,9 +646,9 @@ 
 		$pre_tax_total = $this->recalculate_pre_tax_total();
 		$tax_total = $this->recalculate_taxes_and_tax_total();
 		$total = $pre_tax_total + $tax_total;
-		$this->set_total( $total );
-		if( $this->type() == EEM_Line_Item::type_total && $this->transaction() instanceof EE_Transaction ){
-			$this->transaction()->set_total( $total );
+		$this->set_total($total);
+		if ($this->type() == EEM_Line_Item::type_total && $this->transaction() instanceof EE_Transaction) {
+			$this->transaction()->set_total($total);
 		}
 		return $total;
 	}
@@ -666,20 +666,20 @@ 
 	function recalculate_pre_tax_total( ) {
 		$total = 0;
 		//completely ignore tax sub-totals when calculating the pre-tax-total
-		if ( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			return 0;
-		} elseif ( $this->is_sub_line_item() ) {
-			throw new EE_Error( sprintf( __( "Calculating the pretax-total on subline items doesn't make sense right now. You were trying to calculate it on %s", "event_espresso" ), d( $this ) ) );
-		} elseif ( $this->is_line_item() ) {
+		} elseif ($this->is_sub_line_item()) {
+			throw new EE_Error(sprintf(__("Calculating the pretax-total on subline items doesn't make sense right now. You were trying to calculate it on %s", "event_espresso"), d($this)));
+		} elseif ($this->is_line_item()) {
 			//we'll want to attach promotions here too. So maybe, if the line item has children, we'll need to take them into account too
 			$total = $this->unit_price() * $this->quantity();
-			$this->set_total( $total );
-		} elseif ( $this->is_sub_total() || $this->is_total() ) {
+			$this->set_total($total);
+		} elseif ($this->is_sub_total() || $this->is_total()) {
 			//get the total of all its children
-			foreach ( $this->children() as $child_line_item ) {
-				if ( $child_line_item instanceof EE_Line_Item ) {
+			foreach ($this->children() as $child_line_item) {
+				if ($child_line_item instanceof EE_Line_Item) {
 					//only recalculate sub-totals for NON-taxes
-					if ( $child_line_item->is_percent() ) {
+					if ($child_line_item->is_percent()) {
 						$total += $total * $child_line_item->percent() / 100;
 					} else {
 						$total += $child_line_item->recalculate_pre_tax_total();
@@ -688,8 +688,8 @@ 
 			}
 			//we only want to update sub-totals if we're including non-taxable items
 			//and grand totals shouldn't be updated when calculating pre-tax totals
-			if( $this->is_sub_total() ){
-				$this->set_total( $total );
+			if ($this->is_sub_total()) {
+				$this->set_total($total);
 			}
 		}
 		return $total;
@@ -708,10 +708,10 @@ 
 		//calculate the pretax total
 		$taxable_total = $this->taxable_total();
 		$tax_total = 0;
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			$total_on_this_tax = $taxable_total * $tax->percent() / 100;
 			//remember the total on this line item
-			$tax->set_total( $total_on_this_tax );
+			$tax->set_total($total_on_this_tax);
 			$tax_total += $tax->total();
 		}
 		$this->_recalculate_tax_sub_total();
@@ -725,18 +725,18 @@ 
 	 * @return void
 	 */
 	private function _recalculate_tax_sub_total() {
-		if ( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			$total = 0;
 			//simply loop through all its children (which should be taxes) and sum their total
-			foreach ( $this->children() as $child_tax ) {
-				if ( $child_tax instanceof EE_Line_Item ) {
+			foreach ($this->children() as $child_tax) {
+				if ($child_tax instanceof EE_Line_Item) {
 					$total += $child_tax->total();
 				}
 			}
-			$this->set_total( $total );
-		} elseif ( $this->is_total() ) {
-			foreach ( $this->children() as $maybe_tax_subtotal ) {
-				if ( $maybe_tax_subtotal instanceof EE_Line_Item ) {
+			$this->set_total($total);
+		} elseif ($this->is_total()) {
+			foreach ($this->children() as $maybe_tax_subtotal) {
+				if ($maybe_tax_subtotal instanceof EE_Line_Item) {
 					$maybe_tax_subtotal->_recalculate_tax_sub_total();
 				}
 			}
@@ -752,7 +752,7 @@ 
 	public function get_total_tax() {
 		$this->_recalculate_tax_sub_total();
 		$total = 0;
-		foreach ( $this->tax_descendants() as $tax_line_item ) {
+		foreach ($this->tax_descendants() as $tax_line_item) {
 			$total += $tax_line_item->total();
 		}
 		return $total;
@@ -765,8 +765,8 @@ 
 	 */
 	public function get_items_total() {
 		$total = 0;
-		foreach ( $this->_get_descendants_of_type( EEM_Line_Item::type_line_item ) as $item ) {
-			if ( $item instanceof EE_Line_Item ) {
+		foreach ($this->_get_descendants_of_type(EEM_Line_Item::type_line_item) as $item) {
+			if ($item instanceof EE_Line_Item) {
 				$total += $item->total();
 			}
 		}
@@ -781,7 +781,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function tax_descendants() {
-		return $this->_get_descendants_of_type( EEM_Line_Item::type_tax );
+		return $this->_get_descendants_of_type(EEM_Line_Item::type_tax);
 	}
 
 
@@ -791,7 +791,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function get_items() {
-		return $this->_get_descendants_of_type( EEM_Line_Item::type_line_item );
+		return $this->_get_descendants_of_type(EEM_Line_Item::type_line_item);
 	}
 
 
@@ -801,15 +801,15 @@ 
 	 * @param string $type one of the constants on EEM_Line_Item
 	 * @return EE_Line_Item[]
 	 */
-	protected function _get_descendants_of_type( $type ) {
+	protected function _get_descendants_of_type($type) {
 		$line_items_of_type = array();
-		foreach ( $this->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->type() == $type ) {
-					$line_items_of_type[ ] = $child_line_item;
+		foreach ($this->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->type() == $type) {
+					$line_items_of_type[] = $child_line_item;
 				} else {
 					//go-through-all-its children looking for taxes
-					$line_items_of_type = array_merge( $line_items_of_type, $child_line_item->_get_descendants_of_type( $type ) );
+					$line_items_of_type = array_merge($line_items_of_type, $child_line_item->_get_descendants_of_type($type));
 				}
 			}
 		}
@@ -822,15 +822,15 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public function get_nearest_descendant_of_type( $type ) {
-		foreach( $this->children() as $child ){
-			if( $child->type() == $type ){
+	public function get_nearest_descendant_of_type($type) {
+		foreach ($this->children() as $child) {
+			if ($child->type() == $type) {
 				return $child;
 			}
 		}
-		foreach($this->children() as $child ){
-			$descendant_found = $child->get_nearest_descendant_of_type( $type );
-			if( $descendant_found ){
+		foreach ($this->children() as $child) {
+			$descendant_found = $child->get_nearest_descendant_of_type($type);
+			if ($descendant_found) {
 				return $descendant_found;
 			}
 		}
@@ -846,12 +846,12 @@ 
 	 */
 	function taxable_total() {
 		$total = 0;
-		if ( $this->children() ) {
-			foreach ( $this->children() as $child_line_item ) {
+		if ($this->children()) {
+			foreach ($this->children() as $child_line_item) {
 
-				if ( $child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
+				if ($child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
 					$total += $child_line_item->total();
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				}elseif ($child_line_item->type() == EEM_Line_Item::type_sub_total) {
 					$total += $child_line_item->taxable_total();
 				}
 			}
@@ -866,7 +866,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -879,17 +879,17 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	public function save_this_and_descendants_to_txn( $txn_id = NULL ) {
-		if ( ! $txn_id ) {
+	public function save_this_and_descendants_to_txn($txn_id = NULL) {
+		if ( ! $txn_id) {
 			$txn_id = $this->TXN_ID();
 		}
-		$this->set_TXN_ID( $txn_id );
+		$this->set_TXN_ID($txn_id);
 		$children = $this->children();
 		$this->save();
-		foreach ( $children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$child_line_item->set_parent_ID( $this->ID() );
-				$child_line_item->save_this_and_descendants_to_txn( $txn_id );
+		foreach ($children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$child_line_item->set_parent_ID($this->ID());
+				$child_line_item->save_this_and_descendants_to_txn($txn_id);
 			}
 		}
 	}

core/db_models/EEM_Checkin.model.php

Spacing +8 added lines, -8 removed lines

@@ -23,8 +23,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Checkin.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Checkin.class.php');
 
 class EEM_Checkin extends EEM_Base {
 
@@ -40,12 +40,12 @@ 
 	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Check-In','event_espresso');
-		$this->plural_item = __('Check-Ins','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Check-In', 'event_espresso');
+		$this->plural_item = __('Check-Ins', 'event_espresso');
 
 		$this->_tables = array(
-			'Checkin'=>new EE_Primary_Table('esp_checkin','CHK_ID')
+			'Checkin'=>new EE_Primary_Table('esp_checkin', 'CHK_ID')
 		);
 		$this->_fields = array(
 			'Checkin'=> array(
@@ -53,7 +53,7 @@ 
 				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', 'Registration Id', false, 0, 'Registration'),
 				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', 'Datetime Id', false, 0, 'Datetime'),
 				'CHK_in'=>new EE_Boolean_Field('CHK_in', 'Whether a person has checked in or checked out', false, true),
-				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified','event_espresso'), false, current_time('timestamp'), $timezone )
+				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified', 'event_espresso'), false, current_time('timestamp'), $timezone)
 			)
 		);
 		$this->_model_relations = array(
@@ -61,7 +61,7 @@ 
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 

Braces +3 added lines, -1 removed lines

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

core/db_models/EEM_Event.model.php

Braces +12 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
 /**
  *
@@ -337,8 +339,9 @@ 
 			 	$questions[ $qg->ID() ] = $qg->model_field_array();
 			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
 			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
-			 			continue;
+			 		if ( $qst->is_system_question() ) {
+			 					 			continue;
+			 		}
 			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();
@@ -514,8 +517,9 @@ 
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
-		if ( isset( $where_params['status'] ) )
-			unset( $where_params['status'] );
+		if ( isset( $where_params['status'] ) ) {
+					unset( $where_params['status'] );
+		}
 		$where_params['OR'] = array( 'status' => array( '!=', 'publish' ), 'AND' => array('status' => 'publish', 'Datetime.DTT_EVT_end' => array( '<',  date('Y-m-d g:i:s', time() ) ) ) );
 		$query_params[0] = $where_params;
 		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all( $query_params );
@@ -538,8 +542,9 @@ 
 		}
 
 		//let's add in specific query_params for inactive events.
-		if ( isset( $where_params['status'] ) )
-			unset( $where_params['status'] );
+		if ( isset( $where_params['status'] ) ) {
+					unset( $where_params['status'] );
+		}
 
 		//we check for events that are not published OR are expired.
 

Spacing +124 added lines, -124 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
+require_once(EE_MODELS.'EEM_CPT_Base.model.php');
 /**
  *
  * EEM_Event Model
@@ -11,7 +11,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Event  extends EEM_CPT_Base{
+class EEM_Event  extends EEM_CPT_Base {
 
 	/**
 	 * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the event
@@ -45,15 +45,15 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of EEM_Event already exists
-		if ( ! self::$_instance instanceof EEM_Event ) {
+		if ( ! self::$_instance instanceof EEM_Event) {
 			// instantiate Espresso_model
-			self::$_instance = new self( $timezone );
+			self::$_instance = new self($timezone);
 		}
 		//we might have a timezone set, let set_timezone decide what to do with it
-		self::$_instance->set_timezone( $timezone );
+		self::$_instance->set_timezone($timezone);
 		// EEM_Event object
 		return self::$_instance;
 	}
@@ -64,12 +64,12 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	protected function __construct($timezone = null){
+	protected function __construct($timezone = null) {
 
-		EE_Registry::instance()->load_model( 'Registration' );
+		EE_Registry::instance()->load_model('Registration');
 
-		$this->singular_item = __('Event','event_espresso');
-		$this->plural_item = __('Events','event_espresso');
+		$this->singular_item = __('Event', 'event_espresso');
+		$this->plural_item = __('Events', 'event_espresso');
 
 		// to remove Cancelled events from the frontend, copy the following filter to your functions.php file
 		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
@@ -83,15 +83,15 @@ 
 			array(
 				EEM_Event::cancelled => array(
 					'label' => __('Cancelled', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE)
 				),
 				EEM_Event::postponed => array(
 					'label' => __('Postponed', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE)
 				),
 				EEM_Event::sold_out => array(
 					'label' => __('Sold Out', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE)
 				)
 			)
 		);
@@ -99,41 +99,41 @@ 
 		$default_registration_status = EE_Registry::instance()->CFG->registration instanceof EE_Registration_Config ? EE_Registry::instance()->CFG->registration->default_STS_ID : EEM_Registration::status_id_pending_payment;
 
 		$this->_tables = array(
-			'Event_CPT'=>new EE_Primary_Table( 'posts','ID' ),
-			'Event_Meta'=> new EE_Secondary_Table( 'esp_event_meta', 'EVTM_ID', 'EVT_ID' )
+			'Event_CPT'=>new EE_Primary_Table('posts', 'ID'),
+			'Event_Meta'=> new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID')
 		);
 
 		$this->_fields = array(
 			'Event_CPT'=>array(
-				'EVT_ID'=>new EE_Primary_Key_Int_Field( 'ID', __( 'Post ID for Event','event_espresso' )),
-				'EVT_name'=>new EE_Plain_Text_Field( 'post_title', __( 'Event Name','event_espresso' ), FALSE, '' ),
-				'EVT_desc'=>new EE_Post_Content_Field( 'post_content', __( 'Event Description', 'event_espresso' ), FALSE, '' ),
-				'EVT_slug'=>new EE_Slug_Field( 'post_name', __( 'Event Slug', 'event_espresso' ), FALSE, '' ),
-				'EVT_created'=>new EE_Datetime_Field( 'post_date', __( 'Date/Time Event Created', 'event_espresso' ), FALSE, current_time( 'timestamp' )),
-				'EVT_short_desc'=>new EE_Simple_HTML_Field( 'post_excerpt', __( 'Event Short Description', 'event_espresso' ), FALSE,'' ),
-				'EVT_modified'=>new EE_Datetime_Field( 'post_modified', __( 'Date/Time Event Modified', 'event_espresso' ), FALSE, current_time( 'timestamp' )),
-				'EVT_wp_user'=>new EE_WP_User_Field( 'post_author', __( 'Event Creator ID', 'event_espresso'), FALSE),
-				'parent'=>new EE_Integer_Field( 'post_parent', __( 'Event Parent ID', 'event_espresso' ), FALSE, 0 ),
-				'EVT_order'=>new EE_Integer_Field( 'menu_order', __( 'Event Menu Order', 'event_espresso' ), FALSE, 1 ),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'),// EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
-				'status' => new EE_WP_Post_Status_Field( 'post_status', __( 'Event Status', 'event_espresso' ), FALSE, 'draft', $this->_custom_stati )
+				'EVT_ID'=>new EE_Primary_Key_Int_Field('ID', __('Post ID for Event', 'event_espresso')),
+				'EVT_name'=>new EE_Plain_Text_Field('post_title', __('Event Name', 'event_espresso'), FALSE, ''),
+				'EVT_desc'=>new EE_Post_Content_Field('post_content', __('Event Description', 'event_espresso'), FALSE, ''),
+				'EVT_slug'=>new EE_Slug_Field('post_name', __('Event Slug', 'event_espresso'), FALSE, ''),
+				'EVT_created'=>new EE_Datetime_Field('post_date', __('Date/Time Event Created', 'event_espresso'), FALSE, current_time('timestamp')),
+				'EVT_short_desc'=>new EE_Simple_HTML_Field('post_excerpt', __('Event Short Description', 'event_espresso'), FALSE, ''),
+				'EVT_modified'=>new EE_Datetime_Field('post_modified', __('Date/Time Event Modified', 'event_espresso'), FALSE, current_time('timestamp')),
+				'EVT_wp_user'=>new EE_WP_User_Field('post_author', __('Event Creator ID', 'event_espresso'), FALSE),
+				'parent'=>new EE_Integer_Field('post_parent', __('Event Parent ID', 'event_espresso'), FALSE, 0),
+				'EVT_order'=>new EE_Integer_Field('menu_order', __('Event Menu Order', 'event_espresso'), FALSE, 1),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'), // EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
+				'status' => new EE_WP_Post_Status_Field('post_status', __('Event Status', 'event_espresso'), FALSE, 'draft', $this->_custom_stati)
 			),
 			'Event_Meta'=>array(
-				'EVTM_ID'=> new EE_DB_Only_Float_Field( 'EVTM_ID', __( 'Event Meta Row ID','event_espresso' ), FALSE ),
-				'EVT_ID_fk'=>new EE_DB_Only_Int_Field( 'EVT_ID', __( 'Foreign key to Event ID from Event Meta table', 'event_espresso' ), FALSE ),
-				'EVT_display_desc'=>new EE_Boolean_Field( 'EVT_display_desc', __( 'Display Description Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_display_ticket_selector'=>new EE_Boolean_Field( 'EVT_display_ticket_selector', __( 'Display Ticket Selector Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_visible_on'=>new EE_Datetime_Field( 'EVT_visible_on', __( 'Event Visible Date', 'event_espresso' ), TRUE, current_time( 'timestamp' )),
-				'EVT_additional_limit'=>new EE_Integer_Field( 'EVT_additional_limit', __( 'Limit of Additional Registrations on Same Transaction', 'event_espresso' ), TRUE, 10 ),
+				'EVTM_ID'=> new EE_DB_Only_Float_Field('EVTM_ID', __('Event Meta Row ID', 'event_espresso'), FALSE),
+				'EVT_ID_fk'=>new EE_DB_Only_Int_Field('EVT_ID', __('Foreign key to Event ID from Event Meta table', 'event_espresso'), FALSE),
+				'EVT_display_desc'=>new EE_Boolean_Field('EVT_display_desc', __('Display Description Flag', 'event_espresso'), FALSE, 1),
+				'EVT_display_ticket_selector'=>new EE_Boolean_Field('EVT_display_ticket_selector', __('Display Ticket Selector Flag', 'event_espresso'), FALSE, 1),
+				'EVT_visible_on'=>new EE_Datetime_Field('EVT_visible_on', __('Event Visible Date', 'event_espresso'), TRUE, current_time('timestamp')),
+				'EVT_additional_limit'=>new EE_Integer_Field('EVT_additional_limit', __('Limit of Additional Registrations on Same Transaction', 'event_espresso'), TRUE, 10),
 				'EVT_default_registration_status'=>new EE_Enum_Text_Field(
-					'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), FALSE, $default_registration_status, EEM_Registration::reg_status_array()
+					'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), FALSE, $default_registration_status, EEM_Registration::reg_status_array()
 				),
-				'EVT_member_only'=>new EE_Boolean_Field( 'EVT_member_only', __( 'Member-Only Event Flag', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __( 'Event Phone Number', 'event_espresso' ), FALSE ),
-				'EVT_allow_overflow'=>new EE_Boolean_Field(  'EVT_allow_overflow', __( 'Allow Overflow on Event', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_timezone_string'=>new EE_Plain_Text_Field( 'EVT_timezone_string', __( 'Timezone (name) for Event times', 'event_espresso' ), FALSE ),
-				'EVT_external_URL'=>new EE_Plain_Text_Field( 'EVT_external_URL', __( 'URL of Event Page if hosted elsewhere', 'event_espresso' ), TRUE ),
-				'EVT_donations'=>new EE_Boolean_Field( 'EVT_donations', __( 'Accept Donations?', 'event_espresso' ), FALSE, FALSE )
+				'EVT_member_only'=>new EE_Boolean_Field('EVT_member_only', __('Member-Only Event Flag', 'event_espresso'), FALSE, FALSE),
+				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __('Event Phone Number', 'event_espresso'), FALSE),
+				'EVT_allow_overflow'=>new EE_Boolean_Field('EVT_allow_overflow', __('Allow Overflow on Event', 'event_espresso'), FALSE, FALSE),
+				'EVT_timezone_string'=>new EE_Plain_Text_Field('EVT_timezone_string', __('Timezone (name) for Event times', 'event_espresso'), FALSE),
+				'EVT_external_URL'=>new EE_Plain_Text_Field('EVT_external_URL', __('URL of Event Page if hosted elsewhere', 'event_espresso'), TRUE),
+				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __('Accept Donations?', 'event_espresso'), FALSE, FALSE)
 
 			));
 
@@ -149,7 +149,7 @@ 
 		);
 
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_events', 'EVTM_ID');
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -164,9 +164,9 @@ 
 	*		@return 		array
 	*/
 	public function get_all_question_groups() {
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
-			array( 'QSG_deleted' => FALSE ),
-			'order_by' => array( 'QSG_order' => 'ASC' )
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
+			array('QSG_deleted' => FALSE),
+			'order_by' => array('QSG_order' => 'ASC')
 		));
 	}
 
@@ -182,13 +182,13 @@ 
 	* 		@param		int $EVT_ID
 	*		@return 		array
 	*/
-	public function get_all_event_question_groups( $EVT_ID = 0 ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_all_event_question_groups($EVT_ID = 0) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID)
 		));
 	}
 
@@ -204,13 +204,13 @@ 
 	* 		@param		boolean	$for_primary_attendee
 	*		@return 		array
 	*/
-	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = TRUE) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee)
 		));
 	}
 
@@ -227,10 +227,10 @@ 
 	* 		@param		EE_Registration 	$registration
 	*		@return 		array
 	*/
-	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
+	public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration) {
 
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -240,7 +240,7 @@ 
 			'QSG_deleted' => FALSE
 		);
 
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
 			$where_params,
 			'order_by' => array('QSG_order' => 'ASC')
 		));
@@ -260,16 +260,16 @@ 
 	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
 	*		@return 		array
 	*/
-	public function get_questions_in_groups( $QSG_IDs = '' ) {
+	public function get_questions_in_groups($QSG_IDs = '') {
 
-		if ( empty( $QSG_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Group IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QSG_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question Group IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question')->get_all(array(
 			array(
-				'Question_Group.QSG_ID' => array( 'IN', $QSG_IDs ),
+				'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
 				'QST_deleted' => FALSE,
 				'QST_admin_only' => is_admin()
 			),
@@ -291,16 +291,16 @@ 
 	* 		@param		string		$QST_IDs  csv list of $QST IDs
 	*		@return 		array
 	*/
-	public function get_options_for_question( $QST_IDs ) {
+	public function get_options_for_question($QST_IDs) {
 
-		if ( empty( $QST_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QST_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question_Option' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Option')->get_all(array(
 			array(
-				'Question.QST_ID' => array( 'IN', $QST_IDs ),
+				'Question.QST_ID' => array('IN', $QST_IDs),
 				'QSO_deleted' => FALSE
 			),
 			'order_by' => 'QSO_ID'
@@ -319,45 +319,45 @@ 
 	 * @throws EE_Error
 	 * @return 	array
 	 */
-	public function assemble_array_of_groups_questions_and_options( EE_Registration $registration, $EVT_ID = 0 ) {
+	public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0) {
 
-		if ( empty( $EVT_ID ) ) {
-			throw new EE_Error( __( 'An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso' ) );
+		if (empty($EVT_ID)) {
+			throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso'));
 		}
 
 		$questions = array();
 
 		// get all question groups for event
-		$qgs = $this->get_question_groups_for_event( $EVT_ID, $registration );
-		if ( !empty( $qgs ) ) {
-			foreach ( $qgs as $qg ) {
+		$qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
+		if ( ! empty($qgs)) {
+			foreach ($qgs as $qg) {
 			 	$qsts = $qg->questions();
-			 	$questions[ $qg->ID() ] = $qg->model_field_array();
-			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
-			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
+			 	$questions[$qg->ID()] = $qg->model_field_array();
+			 	$questions[$qg->ID()]['QSG_questions'] = array();
+			 	foreach ($qsts as $qst) {
+			 		if ($qst->is_system_question())
 			 			continue;
-			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
+			 		$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID())));
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();
 			 		$ans_id = $answer->ID();
-			 		$qst_name = !empty( $ans_id ) ?  '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+			 		$qst_name = ! empty($ans_id) ? '['.$qst_name.']['.$ans_id.']' : '['.$qst_name.']';
 			 		$input_name = '';
-			 		$input_id = sanitize_key( $qst->display_text() );
+			 		$input_id = sanitize_key($qst->display_text());
 			 		$input_class = '';
 			 		$questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
-		 			$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_name'] = 'qstn' . $input_name . $qst_name;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_id'] = $input_id . '-' . $qstn_id;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_class'] = $input_class;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'] = array();
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['qst_obj'] = $qst;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['ans_obj'] = $answer;
-
-					if ( $qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN' ) {
-						$QSOs = $qst->options(TRUE,$answer->value());
-						if ( is_array( $QSOs ) ) {
-							foreach ( $QSOs as $QSO_ID => $QSO ) {
-								$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'][ $QSO_ID ] = $QSO->model_field_array();
+		 			$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'.$input_name.$qst_name;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id.'-'.$qstn_id;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
+
+					if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
+						$QSOs = $qst->options(TRUE, $answer->value());
+						if (is_array($QSOs)) {
+							foreach ($QSOs as $QSO_ID => $QSO) {
+								$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
 							}
 						}
 					}
@@ -381,9 +381,9 @@ 
 	* 		@param		$QST
 	*		@return 		string		string
 	*/
-	private function _generate_question_input_name( $QST ) {
+	private function _generate_question_input_name($QST) {
 
-		if ( $QST->QST_system ) {
+		if ($QST->QST_system) {
 			$qst_name = $QST->QST_system;
 /*			switch( $QST->QST_system ) {
 
@@ -450,20 +450,20 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_active_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_active_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
-		$where_params['Datetime.DTT_EVT_start'] = array('>',  date('Y-m-d g:i:s', time() ) );
-		$where_params['Datetime.DTT_EVT_end'] = array('<', date('Y-m-d g:i:s', time() ) );
+		$where_params['Datetime.DTT_EVT_start'] = array('>', date('Y-m-d g:i:s', time()));
+		$where_params['Datetime.DTT_EVT_end'] = array('<', date('Y-m-d g:i:s', time()));
 		$query_params[0] = $where_params;
-		$events = $count ? $this->count($query_params, 'EVT_ID') : $this->get_all( $query_params );
+		$events = $count ? $this->count($query_params, 'EVT_ID') : $this->get_all($query_params);
 		return $events;
 	}
 
@@ -479,19 +479,19 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array               EE_Event objects
 	 */
-	public function get_upcoming_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_upcoming_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
-		$where_params['Datetime.DTT_EVT_start'] = array('>', date('Y-m-d g:i:s', time() ) );
+		$where_params['Datetime.DTT_EVT_start'] = array('>', date('Y-m-d g:i:s', time()));
 		$query_params[0] = $where_params;
-		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all($query_params);
 	}
 
 
@@ -503,20 +503,20 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_expired_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_expired_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
-		if ( isset( $where_params['status'] ) )
-			unset( $where_params['status'] );
-		$where_params['OR'] = array( 'status' => array( '!=', 'publish' ), 'AND' => array('status' => 'publish', 'Datetime.DTT_EVT_end' => array( '<',  date('Y-m-d g:i:s', time() ) ) ) );
+		if (isset($where_params['status']))
+			unset($where_params['status']);
+		$where_params['OR'] = array('status' => array('!=', 'publish'), 'AND' => array('status' => 'publish', 'Datetime.DTT_EVT_end' => array('<', date('Y-m-d g:i:s', time()))));
 		$query_params[0] = $where_params;
-		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all($query_params);
 	}
 
 
@@ -527,23 +527,23 @@ 
 	 * @param  boolean $count        whether to return the count or not (default FALSE)
 	 * @return EE_Event[]            array of EE_Event objects
 	 */
-	public function get_inactive_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_inactive_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//let's add in specific query_params for inactive events.
-		if ( isset( $where_params['status'] ) )
-			unset( $where_params['status'] );
+		if (isset($where_params['status']))
+			unset($where_params['status']);
 
 		//we check for events that are not published OR are expired.
 
-		$where_params['OR'] = array( 'status' => array( '!=', 'publish' ), 'Datetime.DTT_EVT_end' => array( '<', date('Y-m-d g:i:s', time() ) ) );
+		$where_params['OR'] = array('status' => array('!=', 'publish'), 'Datetime.DTT_EVT_end' => array('<', date('Y-m-d g:i:s', time())));
 		$query_params[0] = $where_params;
-		return $count ? $this->count( $query_params, 'EVT_ID' ) : $this->get_all( $query_params );
+		return $count ? $this->count($query_params, 'EVT_ID') : $this->get_all($query_params);
 	}
 
 
@@ -551,13 +551,13 @@ 
 	 * This is just injecting into the parent add_relationship_to so we do special handling on price relationships because we don't want to override any existing global default prices but instead insert NEW prices that get attached to the event.
 	 * See parent for param descriptions
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 
-		if ( $relationName == 'Price' ) {
+		if ($relationName == 'Price') {
 			//let's get the PRC object for the given ID to make sure that we aren't dealing with a default
 			$prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
 			//if EVT_ID = 0, then this is a default
-			if ( $prc_chk->get('EVT_ID') == 0 ) {
+			if ($prc_chk->get('EVT_ID') == 0) {
 				//let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
 				$prc_chk->set('PRC_ID', 0);
 			}
@@ -567,7 +567,7 @@ 
 		}
 
 		//otherwise carry on as normal
-		return parent::add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query);
+		return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
 	}
 
 

Indentation +43 added lines, -43 removed lines

@@ -179,11 +179,11 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_question_groups() {
 		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
 			array( 'QSG_deleted' => FALSE ),
@@ -197,12 +197,12 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 *		@return 		array
+	 */
 	public function get_all_event_question_groups( $EVT_ID = 0 ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -218,13 +218,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		boolean	$for_primary_attendee
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		boolean	$for_primary_attendee
+	 *		@return 		array
+	 */
 	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -241,13 +241,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		EE_Registration 	$registration
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		EE_Registration 	$registration
+	 *		@return 		array
+	 */
 	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
 
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
@@ -275,12 +275,12 @@ 
 
 
 	/**
-	*		get_question_target_db_column
-	*
-	* 		@access		public
-	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
-	*		@return 		array
-	*/
+	 *		get_question_target_db_column
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QSG_IDs  csv list of $QSG IDs
+	 *		@return 		array
+	 */
 	public function get_questions_in_groups( $QSG_IDs = '' ) {
 
 		if ( empty( $QSG_IDs )) {
@@ -306,12 +306,12 @@ 
 
 
 	/**
-	*		get_options_for_question
-	*
-	* 		@access		public
-	* 		@param		string		$QST_IDs  csv list of $QST IDs
-	*		@return 		array
-	*/
+	 *		get_options_for_question
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QST_IDs  csv list of $QST IDs
+	 *		@return 		array
+	 */
 	public function get_options_for_question( $QST_IDs ) {
 
 		if ( empty( $QST_IDs )) {
@@ -396,12 +396,12 @@ 
 
 
 	/**
-	*		_get_question_target_db_column
-	*
-	* 		@access		private
-	* 		@param		$QST
-	*		@return 		string		string
-	*/
+	 *		_get_question_target_db_column
+	 *
+	 * 		@access		private
+	 * 		@param		$QST
+	 *		@return 		string		string
+	 */
 	private function _generate_question_input_name( $QST ) {
 
 		if ( $QST->QST_system ) {

core/db_models/EEM_Transaction.model.php

Spacing +33 added lines, -33 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, current_time('timestamp'), $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, current_time('timestamp'), $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,19 +107,19 @@ 
 	 * @param string $period
 	 * @return \stdClass[]
 	 */
-	public function get_revenue_per_day_report( $period = '-1 month' ) {
+	public function get_revenue_per_day_report($period = '-1 month') {
 
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 		$results = $this->_get_all_wpdb_results(
 			array(
 				array(
 					'TXN_timestamp' => array('>=', $sql_date)),
 					'group_by' => 'txnDate',
-					'order_by' => array('TXN_timestamp' => 'DESC' )
+					'order_by' => array('TXN_timestamp' => 'DESC')
 					),
 				OBJECT,
 				array(
-					'txnDate' => array('DATE(Transaction.TXN_timestamp)','%s'),
+					'txnDate' => array('DATE(Transaction.TXN_timestamp)', '%s'),
 					'revenue' => array('SUM(Transaction.TXN_paid)', '%d')
 					));
 		return $results;
@@ -135,21 +135,21 @@ 
 	 * @throws \EE_Error
 	 * @return mixed
 	 */
-	public function get_revenue_per_event_report( $period = 'month' ) {
+	public function get_revenue_per_event_report($period = 'month') {
 		global $wpdb;
-		$date_mod = strtotime( '-1 ' . $period );
+		$date_mod = strtotime('-1 '.$period);
 
 		$SQL = 'SELECT post_title as event_name, SUM(TXN_paid) AS revenue';
-		$SQL .= ' FROM ' . $this->_get_main_table()->get_table_name() . ' txn';
-		$SQL .= ' LEFT JOIN ' . $wpdb->prefix . 'esp_registration reg ON reg.TXN_ID = txn.TXN_ID';
-		$SQL .= ' LEFT JOIN ' . $wpdb->posts . ' evt ON evt.ID = reg.EVT_ID';
+		$SQL .= ' FROM '.$this->_get_main_table()->get_table_name().' txn';
+		$SQL .= ' LEFT JOIN '.$wpdb->prefix.'esp_registration reg ON reg.TXN_ID = txn.TXN_ID';
+		$SQL .= ' LEFT JOIN '.$wpdb->posts.' evt ON evt.ID = reg.EVT_ID';
 		$SQL .= ' WHERE REG_count = 1';
 		$SQL .= ' AND REG_date >= %d';
 		$SQL .= ' GROUP BY event_name';
 		$SQL .= ' ORDER BY event_name';
 		$SQL .= ' LIMIT 0, 24';
 
-		return $this->_do_wpdb_query( 'get_results', array(  $wpdb->prepare( $SQL, $date_mod ) ) );
+		return $this->_do_wpdb_query('get_results', array($wpdb->prepare($SQL, $date_mod)));
 
 	}
 
@@ -165,10 +165,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', '')
 			)
 		));
 	}
@@ -188,15 +188,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));
 	}
 
 

Braces +3 added lines, -1 removed lines

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

core/db_models/fields/EE_Datetime_Field.php

Indentation +1 added lines, -1 removed lines

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

Spacing +107 added lines, -107 removed lines

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

Braces +10 added lines, -7 removed lines

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

Doc Comments +6 added lines, -6 removed lines

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

core/db_models/fields/EE_Enum_Integer_Field.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'fields/EE_Integer_Field.php' );
+require_once(EE_MODELS.'fields/EE_Integer_Field.php');
 /**
  * Class EE_Enum_Integer_Field
  *
@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Enum_Integer_Field extends EE_Integer_Field{
+class EE_Enum_Integer_Field extends EE_Integer_Field {
 
 	var $_allowed_enum_values;
 
@@ -20,7 +20,7 @@ 
 	 * @param int $default_value
 	 * @param array $allowed_enum_values  keys are values to be used in the DB, values are how they should be displayed
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values){
+	function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values) {
 		$this->_allowed_enum_values = $allowed_enum_values;
 		parent::__construct($table_column, $nicename, $nullable, $default_value);
 	}
@@ -32,21 +32,21 @@ 
 	 * @throws EE_Error
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if( $value_inputted_for_field_on_model_object !== NULL && ! array_key_exists( $value_inputted_for_field_on_model_object, $this->_allowed_enum_values )){
-			if( defined( 'WP_DEBUG' ) && WP_DEBUG ){
+		if ($value_inputted_for_field_on_model_object !== NULL && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
 				$msg = sprintf(
-					__('System is assigning incompatible value "%1$s" to field "%2$s"','event_espresso'),
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
 					$value_inputted_for_field_on_model_object,
 					$this->_name
 				);
 				$msg2 = sprintf(
-					__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"','event_espresso'),
+					__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
 					$this->_name,
-					implode( ', ', array_keys( $this->_allowed_enum_values )),
+					implode(', ', array_keys($this->_allowed_enum_values)),
 					$value_inputted_for_field_on_model_object
 				);
 				throw new EE_Error("$msg||$msg2");
-			}else{
+			} else {
 				return $this->get_default_value();
 			}
 		}
@@ -62,7 +62,7 @@ 
 	 * @param null         $schema
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = NULL ) {
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = NULL) {
 		return $this->_allowed_enum_values[$value_on_field_to_be_outputted];
 	}
 }

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 require_once( EE_MODELS . 'fields/EE_Integer_Field.php' );
 /**
  * Class EE_Enum_Integer_Field
@@ -46,7 +48,7 @@ 
 					$value_inputted_for_field_on_model_object
 				);
 				throw new EE_Error("$msg||$msg2");
-			}else{
+			} else{
 				return $this->get_default_value();
 			}
 		}

core/db_models/fields/EE_Enum_Text_Field.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
 /**
  *
  * Class EE_Enum_Text_Field
@@ -23,7 +23,7 @@ 
 	 * @param mixed $default_value
 	 * @param array $allowed_enum_values  keys are values to be used in the DB, values are how they should be displayed
 	 */
-	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values){
+	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values) {
 		$this->_allowed_enum_values = $allowed_enum_values;
 		parent::__construct($table_column, $nice_name, $nullable, $default_value);
 	}
@@ -38,12 +38,12 @@ 
 	 * @throws EE_Error
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($value_inputted_for_field_on_model_object!==null && !array_key_exists($value_inputted_for_field_on_model_object,$this->_allowed_enum_values)){
-			if(WP_DEBUG){
-				$msg = sprintf(__("System is assigning incompatible value '%s' to field '%s'",'event_espresso'),$value_inputted_for_field_on_model_object,$this->_name);
-				$msg2 = sprintf(__("Allowed values for '%s' are %s. You provided %s",'event_espresso'),$this->_name,implode(", ",array_keys($this->_allowed_enum_values)),$value_inputted_for_field_on_model_object);
+		if ($value_inputted_for_field_on_model_object !== null && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)) {
+			if (WP_DEBUG) {
+				$msg = sprintf(__("System is assigning incompatible value '%s' to field '%s'", 'event_espresso'), $value_inputted_for_field_on_model_object, $this->_name);
+				$msg2 = sprintf(__("Allowed values for '%s' are %s. You provided %s", 'event_espresso'), $this->_name, implode(", ", array_keys($this->_allowed_enum_values)), $value_inputted_for_field_on_model_object);
 				throw new EE_Error("$msg||$msg2");
-			}else{
+			} else {
 				return $this->get_default_value();
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 				$msg = sprintf(__("System is assigning incompatible value '%s' to field '%s'",'event_espresso'),$value_inputted_for_field_on_model_object,$this->_name);
 				$msg2 = sprintf(__("Allowed values for '%s' are %s. You provided %s",'event_espresso'),$this->_name,implode(", ",array_keys($this->_allowed_enum_values)),$value_inputted_for_field_on_model_object);
 				throw new EE_Error("$msg||$msg2");
-			}else{
+			} else{
 				return $this->get_default_value();
 			}
 		}

core/helpers/EEH_DTT_Helper.helper.php

Indentation +13 added lines, -13 removed lines

@@ -60,19 +60,19 @@
 	private static function _timezone_convert_to_string_from_offset( $offset ) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
-        $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr)
-        {
-                foreach ($abbr as $city)
-                {
-                        if ($city['offset'] === $offset && $city['dst'] === FALSE)
-                        {
-                                return $city['timezone_id'];
-                        }
-                }
-        }
-
-        return FALSE;
+		$abbrarray = timezone_abbreviations_list();
+		foreach ($abbrarray as $abbr)
+		{
+				foreach ($abbr as $city)
+				{
+						if ($city['offset'] === $offset && $city['dst'] === FALSE)
+						{
+								return $city['timezone_id'];
+						}
+				}
+		}
+
+		return FALSE;
 	}
 
 

Spacing +29 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -40,10 +40,10 @@ 
 	public static function get_timezone() {
 		$timezone = get_option('timezone_string');
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = self::_timezone_convert_to_string_from_offset( $offset );
+			$timezone = self::_timezone_convert_to_string_from_offset($offset);
 		}
 		return $timezone;
 	}
@@ -57,7 +57,7 @@ 
 	 * @param  string $offset GMT offset
 	 * @return string         timezone_string (valid for DateTimeZone)
 	 */
-	private static function _timezone_convert_to_string_from_offset( $offset ) {
+	private static function _timezone_convert_to_string_from_offset($offset) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
         $abbrarray = timezone_abbreviations_list();
@@ -77,14 +77,14 @@ 
 
 
 
-	public function prepare_dtt_from_db( $dttvalue, $format = 'U' ) {
+	public function prepare_dtt_from_db($dttvalue, $format = 'U') {
 		
 		$timezone = self::get_timezone();
 
-		$date_obj = new DateTime( $dttvalue, new DateTimeZone('UTC') );
-		if ( !$date_obj )
-			throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
-		$date_obj->setTimezone( new DateTimeZone($timezone) );
+		$date_obj = new DateTime($dttvalue, new DateTimeZone('UTC'));
+		if ( ! $date_obj)
+			throw new EE_Error(__('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso'));
+		$date_obj->setTimezone(new DateTimeZone($timezone));
 
 		return $date_obj->format($format);
 	}
@@ -94,7 +94,7 @@ 
 
 
 	public static function ddtimezone($tz_event = '') {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$timezone_format = _x('Y-m-d G:i:s', 'timezone date format');
 
@@ -112,9 +112,9 @@ 
 			if (0 == $current_offset)
 				$tzstring = 'UTC';
 			elseif ($current_offset < 0)
-				$tzstring = 'UTC' . $current_offset;
+				$tzstring = 'UTC'.$current_offset;
 			else
-				$tzstring = 'UTC+' . $current_offset;
+				$tzstring = 'UTC+'.$current_offset;
 		}
 		?>
 
@@ -126,7 +126,7 @@ 
 		</p>
 
 		<p><span><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
-			<?php if (get_option('timezone_string') || !empty($current_offset)) : ?>
+			<?php if (get_option('timezone_string') || ! empty($current_offset)) : ?>
 				<br /><span><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
 		<?php endif; ?>
 
@@ -159,10 +159,9 @@ 
 						if ($found) {
 							echo ' ';
 							$message = $tr['isdst'] ?
-											__('Daylight saving time begins on: <code>%s</code>.') :
-											__('Standard time begins  on: <code>%s</code>.');
+											__('Daylight saving time begins on: <code>%s</code>.') : __('Standard time begins  on: <code>%s</code>.');
 							// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-							printf($message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset'])));
+							printf($message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset'])));
 						} else {
 							_e('This timezone does not observe daylight saving time.');
 						}
@@ -177,16 +176,16 @@ 
 
 
 
-	public static function date_time_for_timezone( $timestamp, $format, $timezone ) {
-		$timezone = empty( $timezone ) ? self::get_timezone() : $timezone;
+	public static function date_time_for_timezone($timestamp, $format, $timezone) {
+		$timezone = empty($timezone) ? self::get_timezone() : $timezone;
 
 		//set timezone
-		date_default_timezone_set( $timezone );
+		date_default_timezone_set($timezone);
 
-		$date = date( $format, $timestamp );
+		$date = date($format, $timestamp);
 
 		//setback
-		date_default_timezone_set( 'UTC' );
+		date_default_timezone_set('UTC');
 		return $date;
 	}
 
@@ -199,7 +198,7 @@ 
 	 * @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, $dttfield, $what = 'years', $value = 1 ) {
+	public static function date_time_add(EE_Base_Class $obj, $dttfield, $what = 'years', $value = 1) {
 		//get the raw UTC date.
 		$dtt = $obj->get_raw($dttfield);
 		$new_date = self::calc_date($dtt, $what, $value);
@@ -209,7 +208,7 @@ 
 	}
 
 	//same as date_time_add except subtracting value instead of adding.
-	public static function date_time_subtract( EE_Base_Class $obj, $dttfield, $what = 'years', $value = 1 ) {
+	public static function date_time_subtract(EE_Base_Class $obj, $dttfield, $what = 'years', $value = 1) {
 		//get the raw UTC date
 		$dtt = $obj->get_raw($dttfield);
 		$new_date = self::calc_date($dtt, $what, $value, '-');
@@ -228,21 +227,21 @@ 
 	 * @param  string  $operand What operand you wish to use for the calculation
 	 * @return string          new UTC timestamp
 	 */
-	public static function calc_date( $utcdtt, $what = 'years', $value = 1, $operand = '+' ) {
+	public static function calc_date($utcdtt, $what = 'years', $value = 1, $operand = '+') {
 		$newdtt = '';
 
-		switch ( $what ) {
+		switch ($what) {
 			case 'years' :
-				$value = (60*60*24*364.5) * $value;
+				$value = (60 * 60 * 24 * 364.5) * $value;
 				break;
 			case 'months' :
-				$value = (60*60*24*30.375) * $value;
+				$value = (60 * 60 * 24 * 30.375) * $value;
 				break;
 			case 'days' :
-				$value = (60*60*24) * $value;
+				$value = (60 * 60 * 24) * $value;
 				break;
 			case 'hours' :
-				$value = (60*60) * $value;
+				$value = (60 * 60) * $value;
 				break;
 			case 'minutes' :
 				$value = 60 * $value;
@@ -252,7 +251,7 @@ 
 				break;
 		}
 
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
 				$newdtt = $utcdtt + $value;
 				break;

Braces +20 added lines, -15 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -82,8 +83,9 @@ 
 		$timezone = self::get_timezone();
 
 		$date_obj = new DateTime( $dttvalue, new DateTimeZone('UTC') );
-		if ( !$date_obj )
-			throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
+		if ( !$date_obj ) {
+					throw new EE_Error( __('Something went wrong with setting the date/time. Likely, either there is an invalid datetime string or an invalid timezone string being used.', 'event_espresso' ) );
+		}
 		$date_obj->setTimezone( new DateTimeZone($timezone) );
 
 		return $date_obj->format($format);
@@ -104,17 +106,19 @@ 
 		$check_zone_info = true;
 
 		// Remove old Etc mappings.  Fallback to gmt_offset.
-		if (false !== strpos($tzstring, 'Etc/GMT'))
-			$tzstring = '';
+		if (false !== strpos($tzstring, 'Etc/GMT')) {
+					$tzstring = '';
+		}
 
 		if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
 			$check_zone_info = false;
-			if (0 == $current_offset)
-				$tzstring = 'UTC';
-			elseif ($current_offset < 0)
-				$tzstring = 'UTC' . $current_offset;
-			else
-				$tzstring = 'UTC+' . $current_offset;
+			if (0 == $current_offset) {
+							$tzstring = 'UTC';
+			} elseif ($current_offset < 0) {
+							$tzstring = 'UTC' . $current_offset;
+			} else {
+							$tzstring = 'UTC+' . $current_offset;
+			}
 		}
 		?>
 
@@ -137,10 +141,11 @@ 
 					// Set TZ so localtime works.
 					date_default_timezone_set($tzstring);
 					$now = localtime(time(), true);
-					if ($now['tm_isdst'])
-						_e('This timezone is currently in daylight saving time.');
-					else
-						_e('This timezone is currently in standard time.');
+					if ($now['tm_isdst']) {
+											_e('This timezone is currently in daylight saving time.');
+					} else {
+											_e('This timezone is currently in standard time.');
+					}
 					?>
 					<br />
 					<?php