eventespresso / event-espresso-core

core/db_models/strategies/EE_Restriction_Generator_Public.strategy.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -13,44 +13,44 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base {
 	protected function _generate_restrictions() {
 		//if there are no standard caps for this model, then for allow full access
-		if( ! $this->model()->cap_slug() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 			);
 		}
 
 		$restrictions = array();
 		//does the basic cap exist? (eg 'ee_read_registrations')
-		if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() ) ) {
-			if ( $this->model() instanceof EEM_CPT_Base ) {
-				$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) ] = new EE_Default_Where_Conditions(
-					array( 'status' => 'publish' )
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
+			if ($this->model() instanceof EEM_CPT_Base) {
+				$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
+					array('status' => 'publish')
 				);
-			} elseif ( $this->model() instanceof EEM_Soft_Delete_Base ) {
-				$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) ] = new EE_Default_Where_Conditions(
-					array( $this->model()->deleted_field_name() => false )
+			} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
+				$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
+					array($this->model()->deleted_field_name() => false)
 				);
 			} else {
 				//don't impose any restrictions if they don't have the basic reading cap
 			}
 			//does the others cap exist? (eg 'ee_read_others_registrations')
-			if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() . '_others' ) ) {//both caps exist
-				if ( $this->model() instanceof EEM_CPT_Base ) {
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {//both caps exist
+				if ($this->model() instanceof EEM_CPT_Base) {
 					//then if they don't have the others cap, AT MOST show them their own and other published ones
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) ] = new EE_Default_Where_Conditions(
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
 						array(
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => array(
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
 								'status' => 'publish'
 							)
 						) );
-				} elseif ( $this->model() instanceof EEM_Soft_Delete_Base ) {
+				} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
 					//then if they don't have the other cap, AT MOST show them their own or non deleted ones
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) ] = new EE_Default_Where_Conditions(
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
 						array(
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => array(
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
 								$this->model()->deleted_field_name() => false
 							)
@@ -59,13 +59,13 @@ 
 					//again, if they don't have the others cap, continue showing all because there are no inherently hidden ones
 				}
 				//does the private cap exist (eg 'ee_read_others_private_events')
-				if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() . '_private' ) && $this->model() instanceof EEM_CPT_Base ) {
+				if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_private') && $this->model() instanceof EEM_CPT_Base) {
 					//if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
-					$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_private' ) ] = new EE_Default_Where_Conditions(
+					$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private')] = new EE_Default_Where_Conditions(
 						array(
-							'OR*' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_private' ) => array(
+							'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => array(
 								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-								'status' => array( '!=', 'private' )
+								'status' => array('!=', 'private')
 							)
 						)
 					);

core/db_models/strategies/EE_Restriction_Generator_Reg_Form.strategy.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,7 +15,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base {
 
 	/**
 	 *
@@ -27,7 +27,7 @@ 
 	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
 	 * @param string $system_field_name
 	 */
-	public function __construct( $system_field_name ) {
+	public function __construct($system_field_name) {
 		$this->_system_field_name = $system_field_name;
 	}
 
@@ -40,18 +40,18 @@ 
 	protected function _generate_restrictions() {
 		//if there are no standard caps for this model, then for now all we know
 		//if they need the default cap to access this
-		if( ! $this->model()->cap_slug() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
 		}
 		return array(
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Return_None_Where_Conditions(),
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_system' ) => new EE_Default_Where_Conditions(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => new EE_Default_Where_Conditions(
 				array(
-					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_system' ) => array(
-						$this->_system_field_name       => array( 'IN', array( '', 0 ) ),
-						$this->_system_field_name . '*' => array( 'IS_NULL' )
+					'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => array(
+						$this->_system_field_name       => array('IN', array('', 0)),
+						$this->_system_field_name.'*' => array('IS_NULL')
 					)
 				)
 			)

core/db_models/strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base {
 
 	/**
 	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
@@ -24,28 +24,28 @@ 
 	 *
 	 * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
 	 */
-	public function __construct( $path_to_taxonomy_model ){
-		if( $path_to_taxonomy_model !== '' && substr( $path_to_taxonomy_model, -1, 1 ) != '.' ) {
+	public function __construct($path_to_taxonomy_model) {
+		if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
 			$path_to_taxonomy_model .= '.';
 		}
 		$this->_path_to_taxonomy_model = $path_to_taxonomy_model;
 	}
 	protected function _generate_restrictions() {
 		//if there are no standard caps for this model, then for allow full access
-		if( ! $this->model()->cap_slug() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 			);
 		}
 
 		return array(
-			'ee_manage_event_categories' => new EE_Default_Where_Conditions( array(
-				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
+			'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_event_categories' => array('!=', 'espresso_event_categories')
 			)),
-			'ee_manage_venue_categories' => new EE_Default_Where_Conditions( array(
-				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
+			'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_venue_categories' => array('!=', 'espresso_venue_categories')
 			)),
-			'ee_manage_event_types' => new EE_Default_Where_Conditions( array(
-				$this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
+			'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model.'taxonomy*ee_manage_event_types' => array('!=', 'espresso_event_types')
 			)),
 		);
 	}

core/db_models/strategies/EE_Restriction_Generator_WP_User.strategy.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,7 +15,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base {
 
 	/**
 	 * @return \EE_Default_Where_Conditions
@@ -24,7 +24,7 @@ 
 
 		return array(
 			//if they can't access users, they can still access themselves
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Default_Where_Conditions( array(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
 				EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
 			)),
 

core/db_models/strategies/EE_Return_None_Where_Conditions.strategy.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -14,12 +14,12 @@ 
  *
  */
 class EE_Return_None_Where_Conditions extends EE_Default_Where_Conditions {
-	protected function _get_default_where_conditions(){
-		if( $this->_model->has_primary_key_field() ) {
-			return array( $this->_model->primary_key_name() => array('<', 0 ) );
-		}else{
-			$fk_field = $this->_model->get_a_field_of_type( 'EE_Foreign_Key_Field_Base' );
-			return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
+	protected function _get_default_where_conditions() {
+		if ($this->_model->has_primary_key_field()) {
+			return array($this->_model->primary_key_name() => array('<', 0));
+		} else {
+			$fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
+			return array('AND*impossible' => array($fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL'));
 		}
 	}
 }

Braces +1 added lines, -1 removed lines

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

core/helpers/EEH_Array.helper.php

Braces +2 added lines, -2 removed lines

@@ -61,10 +61,10 @@
 			$first_item = reset($arr);
 			if(is_array($first_item)){
 				return true;//yep, there's at least 2 levels to this array
-			}else{
+			} else{
 				return false;//nope, only 1 level
 			}
-		}else{
+		} else{
 			return false;//its not an array at all!
 		}
 	}

Spacing +36 added lines, -36 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 
 /**
  * EE_Array
@@ -26,8 +26,8 @@ 
 	 * @param  array $array2 an array of objects
 	 * @return array         an array of objects found in array 1 that aren't found in array 2.
 	 */
-	public static function object_array_diff( $array1, $array2 ) {
-		return array_udiff( $array1, $array2, array('self', '_compare_objects' ));
+	public static function object_array_diff($array1, $array2) {
+		return array_udiff($array1, $array2, array('self', '_compare_objects'));
 	}
 
 	/**
@@ -36,8 +36,8 @@ 
 	 * @param array $array
 	 * @return boolean
 	 */
-	public static function is_associative_array( array $array ) {
-		return array_keys( $array ) !== range( 0, count( $array ) - 1 );
+	public static function is_associative_array(array $array) {
+		return array_keys($array) !== range(0, count($array) - 1);
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 * @param array $arr
 	 * @return mixed what ever is in the array
 	 */
-	public static function get_one_item_from_array($arr){
+	public static function get_one_item_from_array($arr) {
 		$item = end($arr);
 		reset($arr);
 		return $item;
@@ -57,16 +57,16 @@ 
 	 * @param mixed $arr
 	 * @return boolean
 	 */
-	public static function is_multi_dimensional_array($arr){
-		if(is_array($arr)){
+	public static function is_multi_dimensional_array($arr) {
+		if (is_array($arr)) {
 			$first_item = reset($arr);
-			if(is_array($first_item)){
-				return true;//yep, there's at least 2 levels to this array
-			}else{
-				return false;//nope, only 1 level
+			if (is_array($first_item)) {
+				return true; //yep, there's at least 2 levels to this array
+			} else {
+				return false; //nope, only 1 level
 			}
-		}else{
-			return false;//its not an array at all!
+		} else {
+			return false; //its not an array at all!
 		}
 	}
 
@@ -77,8 +77,8 @@ 
 	 * @param mixed $default
 	 * @return mixed
 	 */
-	public static function is_set( $arr, $index, $default ) {
-		return isset( $arr[ $index ] ) ? $arr[ $index ] : $default;
+	public static function is_set($arr, $index, $default) {
+		return isset($arr[$index]) ? $arr[$index] : $default;
 	}
 
 	/**
@@ -86,12 +86,12 @@ 
 	 * @param mixed $value usually a string, but could be an array or object
 	 * @return mixed the UN-serialized data
 	 */
-	public static function maybe_unserialize( $value ) {
+	public static function maybe_unserialize($value) {
 		$data = maybe_unserialize($value);
 		//it's possible that this still has serialized data if its the session.  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesnt' unserialize this automatically.
 		$token = 'C';
 		$data = is_string($data) ? trim($data) : $data;
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
 			return unserialize($data);
 		} else {
 			return $data;
@@ -110,30 +110,30 @@ 
 	 * @param bool $preserve_keys 		whether or not to reset numerically indexed arrays
 	 * @return array
 	 */
-	public static function insert_into_array( $target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true ) {
+	public static function insert_into_array($target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true) {
 		// ensure incoming arrays are actually arrays
-		$target_array 		= (array)$target_array;
-		$array_to_insert	= (array)$array_to_insert;
+		$target_array = (array) $target_array;
+		$array_to_insert = (array) $array_to_insert;
 		// if no offset key was supplied
-		if ( empty( $offset )) {
+		if (empty($offset)) {
 			// use start or end of $target_array based on whether we are adding before or not
-			$offset = $add_before ? 0 : count( $target_array );
+			$offset = $add_before ? 0 : count($target_array);
 		}
 		// if offset key is a string, then find the corresponding numeric location for that element
-		$offset = is_int( $offset ) ? $offset : array_search( $offset, array_keys( $target_array ) );
+		$offset = is_int($offset) ? $offset : array_search($offset, array_keys($target_array));
 		// add one to the offset if adding after
 		$offset = $add_before ? $offset : $offset + 1;
 		// but ensure offset does not exceed the length of the array
-		$offset = $offset > count( $target_array ) ? count( $target_array ) : $offset;
+		$offset = $offset > count($target_array) ? count($target_array) : $offset;
 		// reindex array ???
-		if ( $preserve_keys ) {
+		if ($preserve_keys) {
 			// take a slice of the target array from the beginning till the offset,
 			// then add the new data
 			// then add another slice that starts at the offset and goes till the end
-			return array_slice( $target_array, 0, $offset, true ) + $array_to_insert + array_slice( $target_array, $offset, null, true );
+			return array_slice($target_array, 0, $offset, true) + $array_to_insert + array_slice($target_array, $offset, null, true);
 		} else {
 			// since we don't want to preserve keys, we can use array_splice
-			array_splice( $target_array, $offset, 0, $array_to_insert );
+			array_splice($target_array, $offset, 0, $array_to_insert);
 			return $target_array;
 		}
 	}
@@ -151,9 +151,9 @@ 
 	 * @param array $array2
 	 * @return array
 	 */
-	public static function merge_arrays_and_overwrite_keys( array $array1, array $array2 ) {
-		foreach ( $array2 as $key => $value ) {
-			$array1[ $key ] = $value;
+	public static function merge_arrays_and_overwrite_keys(array $array1, array $array2) {
+		foreach ($array2 as $key => $value) {
+			$array1[$key] = $value;
 		}
 		return $array1;
 	}
@@ -171,14 +171,14 @@ 
 	 * @param mixed $final_value
 	 * @return array
 	 */
-	public static function convert_array_values_to_keys( array $flat_array, $final_value = null ) {
+	public static function convert_array_values_to_keys(array $flat_array, $final_value = null) {
 		$multidimensional = array();
 		$reference = &$multidimensional;
-		foreach ( $flat_array as $key ) {
-			$reference[ $key ] = array();
-			$reference = &$reference[ $key ];
+		foreach ($flat_array as $key) {
+			$reference[$key] = array();
+			$reference = &$reference[$key];
 		}
-		if ( $final_value !== null ) {
+		if ($final_value !== null) {
 			$reference = $final_value;
 		}
 		return $multidimensional;

core/helpers/EEH_Autoloader.helper.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 	private static $_instance = NULL;
 
 	/**
-	* 	$_autoloaders
-	* 	@var array $_autoloaders
-	* 	@access 	private
-	*/
+	 * 	$_autoloaders
+	 * 	@var array $_autoloaders
+	 * 	@access 	private
+	 */
 	private static $_autoloaders;
 
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +52 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -50,10 +50,10 @@ 
 	 * @return \EEH_Autoloader
 	 */
 	private function __construct() {
-		if ( self::$_autoloaders === null ) {
+		if (self::$_autoloaders === null) {
 			self::$_autoloaders = array();
 			$this->_register_custom_autoloaders();
-			spl_autoload_register( array( $this, 'espresso_autoloader' ) );
+			spl_autoload_register(array($this, 'espresso_autoloader'));
 		}
 	}
 
@@ -65,7 +65,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EEH_Autoloader ) {
+		if ( ! self::$_instance instanceof EEH_Autoloader) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -82,9 +82,9 @@ 
 	 * @internal  param string $class_name - simple class name ie: session
 	 * @return 	void
 	 */
-	public static function espresso_autoloader( $class_name ) {
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
-			require_once( self::$_autoloaders[ $class_name ] );
+	public static function espresso_autoloader($class_name) {
+		if (isset(self::$_autoloaders[$class_name])) {
+			require_once(self::$_autoloaders[$class_name]);
 		}
 	}
 
@@ -99,26 +99,26 @@ 
 	 * @param bool           $debug **deprecated**
 	 * @throws \EE_Error
 	 */
-	public static function register_autoloader( $class_paths, $read_check = true, $debug = false ) {
-		$class_paths = is_array( $class_paths ) ? $class_paths : array( $class_paths );
-		foreach ( $class_paths as $class => $path ) {
+	public static function register_autoloader($class_paths, $read_check = true, $debug = false) {
+		$class_paths = is_array($class_paths) ? $class_paths : array($class_paths);
+		foreach ($class_paths as $class => $path) {
 			// don't give up! you gotta...
 			// get some class
-			if ( empty( $class )) {
-				throw new EE_Error ( sprintf( __( 'No Class name was specified while registering an autoloader for the following path: %s.','event_espresso' ), $path ));
+			if (empty($class)) {
+				throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
 			}
 			// one day you will find the path young grasshopper
-			if ( empty( $path )) {
-				throw new EE_Error ( sprintf( __( 'No path was specified while registering an autoloader for the %s class.','event_espresso' ), $class ));
+			if (empty($path)) {
+				throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
 			}
 			// is file readable ?
-			if ( $read_check && ! is_readable( $path )) {
-				throw new EE_Error ( sprintf( __( 'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s','event_espresso' ), $class, $path ));
+			if ($read_check && ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
 			}
-			if ( ! isset( self::$_autoloaders[ $class ] )) {
-				self::$_autoloaders[ $class ] = str_replace( array( '/', '\\' ), DS, $path );
-				if ( EE_DEBUG && ( EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug ) ) {
-					EEH_Debug_Tools::printr( self::$_autoloaders[ $class ], $class, __FILE__, __LINE__ );
+			if ( ! isset(self::$_autoloaders[$class])) {
+				self::$_autoloaders[$class] = str_replace(array('/', '\\'), DS, $path);
+				if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
+					EEH_Debug_Tools::printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
 				}
 			}
 		}
@@ -149,14 +149,14 @@ 
 	private function _register_custom_autoloaders() {
 		EEH_Autoloader::$debug = '';
 		\EEH_Autoloader::register_helpers_autoloaders();
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'interfaces' );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_INTERFACES, true );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_MODELS, true );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CLASSES );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'messages' );
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' ) {
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces');
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'messages');
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
 			EEH_Debug_Tools::instance()->show_times();
 		}
 	}
@@ -169,7 +169,7 @@ 
 	 * @access public
 	 */
 	public static function register_helpers_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_HELPERS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
 	}
 
 
@@ -195,7 +195,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_line_item_display_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_display' , true );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
 	}
 
 
@@ -208,7 +208,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_line_item_filter_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_filters' , true );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
 	}
 
 
@@ -221,7 +221,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_template_part_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'template_parts', true );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
 	}
 
 
@@ -238,35 +238,35 @@ 
 	 * @param bool   $debug  **deprecated**
 	 * @throws \EE_Error
 	 */
-	public static function register_autoloaders_for_each_file_in_folder( $folder, $recursive = false, $debug = false ){
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug ) {
-			EEH_Debug_Tools::instance()->start_timer( basename( $folder ) );
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false) {
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
+			EEH_Debug_Tools::instance()->start_timer(basename($folder));
 		}
 		// make sure last char is a /
-		$folder .= $folder[strlen($folder)-1] !== DS ? DS : '';
+		$folder .= $folder[strlen($folder) - 1] !== DS ? DS : '';
 		$class_to_filepath_map = array();
-		$exclude = array( 'index' );
+		$exclude = array('index');
 		//get all the files in that folder that end in php
-		$filepaths = glob( $folder.'*');
+		$filepaths = glob($folder.'*');
 
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
 
-		foreach( $filepaths as $filepath ) {
-			if ( substr( $filepath, -4, 4 ) === '.php' ) {
-				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename( $filepath );
-				if ( ! in_array( $class_name, $exclude )) {
-					$class_to_filepath_map [ $class_name ] = $filepath;
+		foreach ($filepaths as $filepath) {
+			if (substr($filepath, -4, 4) === '.php') {
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
+				if ( ! in_array($class_name, $exclude)) {
+					$class_to_filepath_map [$class_name] = $filepath;
 				}
-			} else if ( $recursive ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $filepath, $recursive, $debug );
+			} else if ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
 			}
 		}
 		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
-		self::register_autoloader( $class_to_filepath_map, false, $debug );
-		if ( EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' ) {
-			EEH_Debug_Tools::instance()->stop_timer( basename( $folder ) );
+		self::register_autoloader($class_to_filepath_map, false, $debug);
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			EEH_Debug_Tools::instance()->stop_timer(basename($folder));
 		}
 	}
 
@@ -280,9 +280,9 @@ 
 	 * @param string $class_name - simple class name ie: EE_Session
 	 * @param string $alias - variation on class name ie: EE_session, session, etc
 	 */
-	public static function add_alias( $class_name, $alias ) {
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
-			self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
+	public static function add_alias($class_name, $alias) {
+		if (isset(self::$_autoloaders[$class_name])) {
+			self::$_autoloaders[$alias] = self::$_autoloaders[$class_name];
 		}
 	}
 

core/helpers/EEH_Base.helper.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *		@ override magic methods
 	 *		@ return void
 	 */	
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __get($a) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { return FALSE; }

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/helpers/EEH_DTT_Helper.helper.php

Braces +7 added lines, -5 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
@@ -264,10 +265,11 @@ 
 					// Set TZ so localtime works.
 					date_default_timezone_set($timezone_string);
 					$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

Indentation +2 added lines, -3 removed lines

@@ -117,8 +117,8 @@ 
 		}
 		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
 		$timezone_string = $timezone_string !== false
-            ? $timezone_string
-            : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
+			? $timezone_string
+			: EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
 		return $timezone_string;
 	}
 
@@ -819,7 +819,6 @@ 
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.

Spacing +142 added lines, -143 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -53,12 +53,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_valid_timezone_string( $timezone_string = '' ) {
+	public static function get_valid_timezone_string($timezone_string = '') {
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// value from above exists, use that, else get timezone string from gmt_offset
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
-		EEH_DTT_Helper::validate_timezone( $timezone_string );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
+		EEH_DTT_Helper::validate_timezone($timezone_string);
 		return $timezone_string;
 	}
 
@@ -74,18 +74,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function validate_timezone( $timezone_string, $throw_error = true ) {
+	public static function validate_timezone($timezone_string, $throw_error = true) {
 		// easiest way to test a timezone string is just see if it throws an error when you try to create a DateTimeZone object with it
 		try {
-			new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
+			new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			// sometimes we take exception to exceptions
-			if ( ! $throw_error ) {
+			if ( ! $throw_error) {
 				return false;
 			}
 			throw new EE_Error(
 				sprintf(
-					__( 'The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+					__('The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 					$timezone_string,
 					'<a href="http://www.php.net/manual/en/timezones.php">',
 					'</a>'
@@ -104,21 +104,21 @@ 
 	 * @param string $gmt_offset
 	 * @return string
 	 */
-	public static function get_timezone_string_from_gmt_offset( $gmt_offset = '' ) {
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '') {
 		$timezone_string = 'UTC';
-		$gmt_offset = ! empty( $gmt_offset ) ? $gmt_offset : get_option( 'gmt_offset' );
-		if ( $gmt_offset !== '' ) {
+		$gmt_offset = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
+		if ($gmt_offset !== '') {
 			// convert GMT offset to seconds
 			$gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
 			// account for WP offsets that aren't valid UTC
-			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets( $gmt_offset );
+			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
 			// although we don't know the TZ abbreviation, we know the UTC offset
-			$timezone_string = timezone_name_from_abbr( null, $gmt_offset );
+			$timezone_string = timezone_name_from_abbr(null, $gmt_offset);
 		}
 		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
 		$timezone_string = $timezone_string !== false
             ? $timezone_string
-            : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
+            : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
 		return $timezone_string;
 	}
 
@@ -129,15 +129,15 @@ 
 	 * @return int seconds offset
 	 */
 	public static function get_site_timezone_gmt_offset() {
-		$timezone_string = get_option( 'timezone_string' );
-		if ( $timezone_string ) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
 			try {
-				$timezone = new DateTimeZone( $timezone_string );
-				return $timezone->getOffset( new DateTime() ); //in WordPress DateTime defaults to UTC
-			} catch( Exception $e ){}
+				$timezone = new DateTimeZone($timezone_string);
+				return $timezone->getOffset(new DateTime()); //in WordPress DateTime defaults to UTC
+			} catch (Exception $e) {}
 		}
-		$offset = get_option( 'gmt_offset' );
-		return (int) ( $offset * HOUR_IN_SECONDS );
+		$offset = get_option('gmt_offset');
+		return (int) ($offset * HOUR_IN_SECONDS);
 	}
 
 
@@ -149,10 +149,10 @@ 
 	 * @param int $gmt_offset
 	 * @return int
 	 */
-	public static function adjust_invalid_gmt_offsets( $gmt_offset = 0 ) {
+	public static function adjust_invalid_gmt_offsets($gmt_offset = 0) {
 		//make sure $gmt_offset is int
 		$gmt_offset = (int) $gmt_offset;
-		switch ( $gmt_offset ) {
+		switch ($gmt_offset) {
 
 			//			case -30600 :
 			//				$gmt_offset = -28800;
@@ -204,13 +204,13 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_timezone_string_from_abbreviations_list( $gmt_offset = 0 ) {
+	public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0) {
 		$abbreviations = timezone_abbreviations_list();
-		foreach ( $abbreviations as $abbreviation ) {
-			foreach ( $abbreviation as $city ) {
-				if ( $city['offset'] === $gmt_offset && $city['dst'] === FALSE ) {
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] === $gmt_offset && $city['dst'] === FALSE) {
 					// check if the timezone is valid but don't throw any errors if it isn't
-					if ( EEH_DTT_Helper::validate_timezone( $city['timezone_id'], false ) ) {
+					if (EEH_DTT_Helper::validate_timezone($city['timezone_id'], false)) {
 						return $city['timezone_id'];
 					}
 				}
@@ -218,7 +218,7 @@ 
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+				__('The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 				$gmt_offset,
 				'<a href="http://www.php.net/manual/en/timezones.php">',
 				'</a>'
@@ -232,23 +232,23 @@ 
 	 * @access public
 	 * @param string $timezone_string
 	 */
-	public static function timezone_select_input( $timezone_string = '' ) {
+	public static function timezone_select_input($timezone_string = '') {
 		// get WP date time format
-		$datetime_format = get_option('date_format') . ' '  . get_option('time_format');
+		$datetime_format = get_option('date_format').' '.get_option('time_format');
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// check if the timezone is valid but don't throw any errors if it isn't
-		$timezone_string = EEH_DTT_Helper::validate_timezone( $timezone_string, false );
+		$timezone_string = EEH_DTT_Helper::validate_timezone($timezone_string, false);
 		$gmt_offset = get_option('gmt_offset');
 
 		$check_zone_info = true;
-		if ( empty( $timezone_string )) {
+		if (empty($timezone_string)) {
 			// Create a UTC+- zone if no timezone string exists
 			$check_zone_info = false;
-			if ( $gmt_offset > 0 ) {
-				$timezone_string = 'UTC+' . $gmt_offset;
-			} elseif ( $gmt_offset < 0 ) {
-				$timezone_string = 'UTC' . $gmt_offset;
+			if ($gmt_offset > 0) {
+				$timezone_string = 'UTC+'.$gmt_offset;
+			} elseif ($gmt_offset < 0) {
+				$timezone_string = 'UTC'.$gmt_offset;
 			} else {
 				$timezone_string = 'UTC';
 			}
@@ -270,11 +270,11 @@ 
 					__('%1$sUTC%2$s time is %3$s'),
 					'<abbr title="Coordinated Universal Time">',
 					'</abbr>',
-					'<code>' . date_i18n( $datetime_format , false, true ) . '</code>'
+					'<code>'.date_i18n($datetime_format, false, true).'</code>'
 				);
 				?></span>
-			<?php if ( ! empty( $timezone_string ) || ! empty( $gmt_offset )) : ?>
-				<br /><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n( $datetime_format ) . '</code>' ); ?></span>
+			<?php if ( ! empty($timezone_string) || ! empty($gmt_offset)) : ?>
+				<br /><span><?php printf(__('Local time is %1$s'), '<code>'.date_i18n($datetime_format).'</code>'); ?></span>
 		<?php endif; ?>
 
 				<?php if ($check_zone_info && $timezone_string) : ?>
@@ -306,10 +306,9 @@ 
 
 						if ($found) {
 							$message = $tr['isdst'] ?
-											__(' Daylight saving time begins on: %s.' ) :
-											__(' Standard time begins  on: %s.');
+											__(' Daylight saving time begins on: %s.') : __(' Standard time begins  on: %s.');
 							// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-							printf( $message, '<code >' . date_i18n( $datetime_format, $tr['ts'] + ( $tz_offset - $tr['offset'] ) ). '</code >' );
+							printf($message, '<code >'.date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])).'</code >');
 						} else {
 							_e('This timezone does not observe daylight saving time.');
 						}
@@ -339,14 +338,14 @@ 
 	 *
 	 * @return int      $unix_timestamp with the offset applied for the given timezone.
 	 */
-	public static function get_timestamp_with_offset( $unix_timestamp = 0, $timezone_string = '' ) {
+	public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '') {
 		$unix_timestamp = $unix_timestamp === 0 ? time() : (int) $unix_timestamp;
-		$timezone_string = self::get_valid_timezone_string( $timezone_string );
-		$TimeZone = new DateTimeZone( $timezone_string );
+		$timezone_string = self::get_valid_timezone_string($timezone_string);
+		$TimeZone = new DateTimeZone($timezone_string);
 
-		$DateTime = new DateTime( '@' . $unix_timestamp, $TimeZone );
-		$offset = timezone_offset_get( $TimeZone, $DateTime );
-		return (int)$DateTime->format( 'U' ) + (int)$offset;
+		$DateTime = new DateTime('@'.$unix_timestamp, $TimeZone);
+		$offset = timezone_offset_get($TimeZone, $DateTime);
+		return (int) $DateTime->format('U') + (int) $offset;
 	}
 
 
@@ -361,17 +360,17 @@ 
 	 * @param  string					$datetime_field_name 	the datetime fieldname to be manipulated
 	 * @return 	EE_Base_Class
 	 */
-	protected static function _set_date_time_field( EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name ) {
+	protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name) {
 		// grab current datetime format
 		$current_format = $obj->get_format();
 		// set new full timestamp format
-		$obj->set_date_format( EE_Datetime_Field::mysql_date_format );
-		$obj->set_time_format( EE_Datetime_Field::mysql_time_format );
+		$obj->set_date_format(EE_Datetime_Field::mysql_date_format);
+		$obj->set_time_format(EE_Datetime_Field::mysql_time_format);
 		// set the new date value using a full timestamp format so that no data is lost
-		$obj->set( $datetime_field_name, $DateTime->format( EE_Datetime_Field::mysql_timestamp_format ) );
+		$obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
 		// reset datetime formats
-		$obj->set_date_format( $current_format[0] );
-		$obj->set_time_format( $current_format[1] );
+		$obj->set_date_format($current_format[0]);
+		$obj->set_time_format($current_format[1]);
 		return $obj;
 	}
 
@@ -388,11 +387,11 @@ 
 	 * @param  integer 	$value    what you want to increment the time by
 	 * @return EE_Base_Class		   return the EE_Base_Class object so right away you can do something with it (chaining)
 	 */
-	public static function date_time_add( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date.
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -407,11 +406,11 @@ 
 	 * @param int            $value
 	 * @return \EE_Base_Class
 	 */
-	public static function date_time_subtract( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value, '-' );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -424,44 +423,44 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_datetime_object( DateTime $DateTime, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! $DateTime instanceof DateTime ) {
+	protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! $DateTime instanceof DateTime) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a PHP DateTime object, but instead received %1$s', 'event_espresso' ),
-					print_r( $DateTime, true )
+					__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
+					print_r($DateTime, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
-				$value = 'P' . $value . 'Y';
+				$value = 'P'.$value.'Y';
 				break;
 			case 'months' :
-				$value = 'P' . $value . 'M';
+				$value = 'P'.$value.'M';
 				break;
 			case 'weeks' :
-				$value = 'P' . $value . 'W';
+				$value = 'P'.$value.'W';
 				break;
 			case 'days' :
-				$value = 'P' . $value . 'D';
+				$value = 'P'.$value.'D';
 				break;
 			case 'hours' :
-				$value = 'PT' . $value . 'H';
+				$value = 'PT'.$value.'H';
 				break;
 			case 'minutes' :
-				$value = 'PT' . $value . 'M';
+				$value = 'PT'.$value.'M';
 				break;
 			case 'seconds' :
-				$value = 'PT' . $value . 'S';
+				$value = 'PT'.$value.'S';
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$DateTime->add( new DateInterval( $value ) );
+				$DateTime->add(new DateInterval($value));
 				break;
 			case '-':
-				$DateTime->sub( new DateInterval( $value ) );
+				$DateTime->sub(new DateInterval($value));
 				break;
 		}
 		return $DateTime;
@@ -477,16 +476,16 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_timestamp( $timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! preg_match( EE_Datetime_Field::unix_timestamp_regex, $timestamp ) ) {
+	protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a Unix timestamp, but instead received %1$s', 'event_espresso' ),
-					print_r( $timestamp, true )
+					__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
+					print_r($timestamp, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
 				$value = YEAR_IN_SECONDS * $value;
 				break;
@@ -506,9 +505,9 @@ 
 				$value = MINUTE_IN_SECONDS * $value;
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$timestamp  += $value;
+				$timestamp += $value;
 				break;
 			case '-':
 				$timestamp -= $value;
@@ -528,11 +527,11 @@ 
 	 * @param  string  $operand What operand you wish to use for the calculation
 	 * @return mixed string|DateTime          return whatever type came in.
 	 */
-	public static function calc_date( $DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( $DateTime_or_timestamp instanceof DateTime ) {
-			return EEH_DTT_Helper::_modify_datetime_object( $DateTime_or_timestamp, $period, $value, $operand );
-		} else if ( preg_match( EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp )) {
-			return EEH_DTT_Helper::_modify_timestamp( $DateTime_or_timestamp, $period, $value, $operand );
+	public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ($DateTime_or_timestamp instanceof DateTime) {
+			return EEH_DTT_Helper::_modify_datetime_object($DateTime_or_timestamp, $period, $value, $operand);
+		} else if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
+			return EEH_DTT_Helper::_modify_timestamp($DateTime_or_timestamp, $period, $value, $operand);
 		} else {
 			//error
 			return $DateTime_or_timestamp;
@@ -562,24 +561,24 @@ 
 	 * 			'moment' => //date and time format.
 	 * 		)
 	 */
-	public static function convert_php_to_js_and_moment_date_formats( $date_format_string = null, $time_format_string = null ) {
-		if ( $date_format_string === null ) {
-			$date_format_string = get_option( 'date_format' );
+	public static function convert_php_to_js_and_moment_date_formats($date_format_string = null, $time_format_string = null) {
+		if ($date_format_string === null) {
+			$date_format_string = get_option('date_format');
 		}
 
-		if ( $time_format_string === null ) {
-			$time_format_string = get_option( 'time_format' );
+		if ($time_format_string === null) {
+			$time_format_string = get_option('time_format');
 		}
 
-		$date_format = self::_php_to_js_moment_converter( $date_format_string );
-		$time_format = self::_php_to_js_moment_converter( $time_format_string );
+		$date_format = self::_php_to_js_moment_converter($date_format_string);
+		$time_format = self::_php_to_js_moment_converter($time_format_string);
 
 		return array(
 			'js' => array(
 				'date' => $date_format['js'],
 				'time' => $time_format['js']
 				),
-			'moment' => $date_format['moment'] . ' ' . $time_format['moment' ]
+			'moment' => $date_format['moment'].' '.$time_format['moment']
 			);
 	}
 
@@ -593,7 +592,7 @@ 
 	 *
 	 * @return array js and moment formats.
 	 */
-	protected static function _php_to_js_moment_converter( $format_string ) {
+	protected static function _php_to_js_moment_converter($format_string) {
 		/**
 		 * This is a map of symbols for formats.
 		 * The index is the php symbol, the equivalent values are in the array.
@@ -750,15 +749,15 @@ 
 		$jquery_ui_format = "";
 		$moment_format = "";
 		$escaping = false;
-		for ( $i = 0; $i < strlen($format_string); $i++ ) {
+		for ($i = 0; $i < strlen($format_string); $i++) {
 			$char = $format_string[$i];
-			if ( $char === '\\' )  { // PHP date format escaping character
+			if ($char === '\\') { // PHP date format escaping character
 				$i++;
-				if ( $escaping ) {
+				if ($escaping) {
 					$jquery_ui_format .= $format_string[$i];
 					$moment_format .= $format_string[$i];
 				} else {
-					$jquery_ui_format .= '\'' . $format_string[$i];
+					$jquery_ui_format .= '\''.$format_string[$i];
 					$moment_format .= $format_string[$i];
 				}
 				$escaping = true;
@@ -777,7 +776,7 @@ 
 				}
 			}
 		}
-		return array( 'js' => $jquery_ui_format, 'moment' => $moment_format );
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
 	}
 
 
@@ -792,25 +791,25 @@ 
 	 *                           		errors is returned.  So for client code calling, check for is_array() to
 	 *                           		indicate failed validations.
 	 */
-	public static function validate_format_string( $format_string ) {
+	public static function validate_format_string($format_string) {
 		$error_msg = array();
 		//time format checks
-		switch ( true ) {
-			case   strpos( $format_string, 'h' )  !== false  :
-			case   strpos( $format_string, 'g' ) !== false :
+		switch (true) {
+			case   strpos($format_string, 'h') !== false  :
+			case   strpos($format_string, 'g') !== false :
 				/**
 				 * if the time string has a lowercase 'h' which == 12 hour time format and there
 				 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
 				 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
 				 */
-				if ( strpos( strtoupper( $format_string ), 'A' )  === false ) {
-					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso' );
+				if (strpos(strtoupper($format_string), 'A') === false) {
+					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso');
 				}
 				break;
 
 		}
 
-		return empty( $error_msg ) ? true : $error_msg;
+		return empty($error_msg) ? true : $error_msg;
 	}
 
 
@@ -832,11 +831,11 @@ 
 	 * @param mixed $date_2
 	 * @return bool
 	 */
-	public static function dates_represent_one_24_hour_date( $date_1, $date_2 ) {
+	public static function dates_represent_one_24_hour_date($date_1, $date_2) {
 
 		if (
-			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime ) ||
-			( $date_1->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' || $date_2->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' )
+			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
+			($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
 		) {
 			return false;
 		}
@@ -853,11 +852,11 @@ 
 	 * @param string $field_for_interval  The Database field that is the interval is applied to in the query.
 	 * @return string
 	 */
-	public static function get_sql_query_interval_for_offset( $timezone_string, $field_for_interval ) {
+	public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval) {
 		try {
 			/** need to account for timezone offset on the selects */
-			$DateTimeZone = new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
+			$DateTimeZone = new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			$DateTimeZone = null;
 		}
 
@@ -865,10 +864,10 @@ 
 		 * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
 		 * Hence we do the calc for DateTimeZone::getOffset.
 		 */
-		$offset = $DateTimeZone instanceof DateTimeZone ? ( $DateTimeZone->getOffset( new DateTime('now') ) ) / HOUR_IN_SECONDS : get_option( 'gmt_offset' );
+		$offset = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
 		$query_interval = $offset < 0
-			? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset*-1 . ' HOUR)'
-			: 'DATE_ADD(' . $field_for_interval .', INTERVAL ' . $offset . ' HOUR)';
+			? 'DATE_SUB('.$field_for_interval.', INTERVAL '.$offset * -1.' HOUR)'
+			: 'DATE_ADD('.$field_for_interval.', INTERVAL '.$offset.' HOUR)';
 		return $query_interval;
 	}
 
@@ -880,47 +879,47 @@ 
 	 * @return string
 	 */
 	public static function get_timezone_string_for_display() {
-		$pretty_timezone = apply_filters( 'FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '' );
-		if( ! empty( $pretty_timezone ) ) {
-			return esc_html( $pretty_timezone );
+		$pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
+		if ( ! empty($pretty_timezone)) {
+			return esc_html($pretty_timezone);
 		}
-		$timezone_string = get_option( 'timezone_string' );
-		if( $timezone_string ) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
 			static $mo_loaded = false;
 			// Load translations for continents and cities just like wp_timezone_choice does
-			if ( ! $mo_loaded ) {
+			if ( ! $mo_loaded) {
 				$locale = get_locale();
-				$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-				load_textdomain( 'continents-cities', $mofile );
+				$mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
+				load_textdomain('continents-cities', $mofile);
 				$mo_loaded = true;
 			}
 			//well that was easy.
-			$parts = explode('/', $timezone_string );
+			$parts = explode('/', $timezone_string);
 			//remove the continent
-			unset( $parts[0] );
+			unset($parts[0]);
 			$t_parts = array();
-			foreach( $parts as $part ) {
-				$t_parts[] = translate( str_replace( '_', ' ', $part ), 'continents-cities' );
+			foreach ($parts as $part) {
+				$t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
 			}
-			return implode( ' - ', $t_parts );
+			return implode(' - ', $t_parts);
 		}
 		//they haven't set the timezone string, so let's return a string like "UTC+1"
-		$gmt_offset = get_option( 'gmt_offset' );
-		if( intval( $gmt_offset ) >= 0 ) {
+		$gmt_offset = get_option('gmt_offset');
+		if (intval($gmt_offset) >= 0) {
 			$prefix = '+';
 		} else {
 			$prefix = '';
 		}
-		$parts = explode( '.', (string) $gmt_offset );
-		if( count( $parts ) === 1 ) {
+		$parts = explode('.', (string) $gmt_offset);
+		if (count($parts) === 1) {
 			$parts[1] = '00';
 		} else {
 			//convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
 			//to minutes, eg 30 or 15, respectively
-			$hour_fraction = (float)( '0.' . $parts[1] );
-			$parts[1] = (string)$hour_fraction * 60;
+			$hour_fraction = (float) ('0.'.$parts[1]);
+			$parts[1] = (string) $hour_fraction * 60;
 		}
-		return sprintf( __( 'UTC%1$s', 'event_espresso' ), $prefix . implode( ':', $parts ) );
+		return sprintf(__('UTC%1$s', 'event_espresso'), $prefix.implode(':', $parts));
 	}