eventespresso / event-espresso-core

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

Indentation -1 removed lines

@@ -799,7 +799,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.

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

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,19 +104,19 @@ 
 	 * @param string $gmt_offset
 	 * @return string
 	 */
-	public static function get_timezone_string_from_gmt_offset( $gmt_offset = '' ) {
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '') {
 		$timezone_string = 'UTC';
-		$gmt_offset = ! empty( $gmt_offset ) ? $gmt_offset : get_option( 'gmt_offset' );
-		if ( $gmt_offset !== '' ) {
+		$gmt_offset = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
+		if ($gmt_offset !== '') {
 			// convert GMT offset to seconds
 			$gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
 			// account for WP offsets that aren't valid UTC
-			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets( $gmt_offset );
+			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
 			// although we don't know the TZ abbreviation, we know the UTC offset
-			$timezone_string = timezone_name_from_abbr( null, $gmt_offset );
+			$timezone_string = timezone_name_from_abbr(null, $gmt_offset);
 		}
 		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
-		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
+		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
 		return $timezone_string;
 	}
 	
@@ -127,15 +127,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);
 	}
 
 
@@ -147,10 +147,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;
@@ -202,13 +202,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'];
 					}
 				}
@@ -216,7 +216,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>'
@@ -230,23 +230,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';
 			}
@@ -268,11 +268,11 @@ 
 					__('%1$sUTC%2$s time is %3$s'),
 					'<abbr title="Coordinated Universal Time">',
 					'</abbr>',
-					'<code>' . date_i18n( $datetime_format , false, 'gmt') . '</code>'
+					'<code>'.date_i18n($datetime_format, false, 'gmt').'</code>'
 				);
 				?></span>
-			<?php if ( ! empty( $timezone_string ) || ! empty( $gmt_offset )) : ?>
-				<br /><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n( $datetime_format ) . '</code>' ); ?></span>
+			<?php if ( ! empty($timezone_string) || ! empty($gmt_offset)) : ?>
+				<br /><span><?php printf(__('Local time is %1$s'), '<code>'.date_i18n($datetime_format).'</code>'); ?></span>
 		<?php endif; ?>
 
 				<?php if ($check_zone_info && $timezone_string) : ?>
@@ -304,10 +304,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.');
 						}
@@ -337,14 +336,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;
 	}
 
 
@@ -359,17 +358,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;
 	}
 
@@ -386,11 +385,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);
 	}
 
 
@@ -405,11 +404,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);
 	}
 
 
@@ -422,44 +421,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;
@@ -475,16 +474,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;
@@ -504,9 +503,9 @@ 
 				$value = MINUTE_IN_SECONDS * $value;
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$timestamp  += $value;
+				$timestamp += $value;
 				break;
 			case '-':
 				$timestamp -= $value;
@@ -526,11 +525,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;
@@ -560,24 +559,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']
 			);
 	}
 
@@ -591,7 +590,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.
@@ -748,15 +747,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;
@@ -775,7 +774,7 @@ 
 				}
 			}
 		}
-		return array( 'js' => $jquery_ui_format, 'moment' => $moment_format );
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
 	}
 
 
@@ -790,25 +789,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;
 	}
 
 
@@ -830,11 +829,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;
 		}
@@ -851,11 +850,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;
 		}
 
@@ -863,10 +862,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;
 	}
 	
@@ -878,47 +877,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));
 	}
 
 

core/helpers/EEH_HTML.helper.php

Indentation +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EEH_HTML
- *
+  *
+  * Class EEH_HTML
+  *
   * Sometimes when writing PHP you need to generate some standard HTML,
   * but either not enough to warrant creating a template file,
   * or the amount of PHP conditionals and/or loops peppered throughout the HTML
   * just make it really ugly and difficult to read.
   * This class simply adds a bunch of methods for generating basic HTML tags.
   * Most of the methods have the same name as the HTML tag they generate, and most have the same set of parameters.
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 
 class EEH_HTML {
 

Spacing +121 added lines, -121 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_HTML ) {
+		if ( ! self::$_instance instanceof EEH_HTML) {
 			self::$_instance = new EEH_HTML();
 		}
 		return self::$_instance;
@@ -102,14 +102,14 @@ 
 		$other_attributes = '',
 		$force_close = false
 	) {
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		$html = EEH_HTML::nl( 0, $tag ) . '<' . $tag . $attributes . '>';
-		$html .= ! empty( $content ) ? EEH_HTML::nl( 1, $tag  ) . $content : '';
-		$indent = ! empty( $content ) || $force_close ? TRUE : FALSE;
-		$html .= ! empty( $content ) || $force_close ? EEH_HTML::_close_tag( $tag, $id, $class, $indent ) : '';
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		$html = EEH_HTML::nl(0, $tag).'<'.$tag.$attributes.'>';
+		$html .= ! empty($content) ? EEH_HTML::nl(1, $tag).$content : '';
+		$indent = ! empty($content) || $force_close ? TRUE : FALSE;
+		$html .= ! empty($content) || $force_close ? EEH_HTML::_close_tag($tag, $id, $class, $indent) : '';
 		return $html;
 	}
 
@@ -126,15 +126,15 @@ 
 	 * @param bool   $indent
 	 * @return string
 	 */
-	protected static function _close_tag( $tag = 'div', $id = '', $class = '', $indent = TRUE ) {
+	protected static function _close_tag($tag = 'div', $id = '', $class = '', $indent = TRUE) {
 		$comment = '';
-		if ( $id ) {
-			$comment = EEH_HTML::comment( 'close ' . $id ) . EEH_HTML::nl( 0, $tag );
-		} else if ( $class ) {
-			$comment = EEH_HTML::comment( 'close ' . $class ) . EEH_HTML::nl( 0, $tag );
+		if ($id) {
+			$comment = EEH_HTML::comment('close '.$id).EEH_HTML::nl(0, $tag);
+		} else if ($class) {
+			$comment = EEH_HTML::comment('close '.$class).EEH_HTML::nl(0, $tag);
 		}
 		$html = $indent ? EEH_HTML::nl( -1, $tag ) : '';
-		$html .= '</' . $tag . '>' . $comment;
+		$html .= '</'.$tag.'>'.$comment;
 		return $html;
 	}
 
@@ -153,8 +153,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function div( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'div', $content, $id, $class, $style, $other_attributes );
+	public static function div($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('div', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function divx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'div', $id, $class );
+	public static function divx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('div', $id, $class);
 	}
 
 
@@ -184,8 +184,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h1( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h1', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h1($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h1', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -201,8 +201,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h2( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h2', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h2($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h2', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -218,8 +218,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h3( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h3', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h3($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h3', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -235,8 +235,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h4( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h4', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h4($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h4', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -252,8 +252,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h5( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h5', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h5($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h5', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -269,8 +269,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function h6( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h6', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h6($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('h6', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -286,8 +286,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function p( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'p', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function p($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('p', $content, $id, $class, $style, $other_attributes, TRUE);
 	}
 
 
@@ -302,8 +302,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function ul( $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'ul', '', $id, $class, $style, $other_attributes );
+	public static function ul($id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('ul', '', $id, $class, $style, $other_attributes);
 	}
 
 
@@ -316,8 +316,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function ulx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'ul', $id, $class );
+	public static function ulx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('ul', $id, $class);
 	}
 
 
@@ -334,8 +334,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function li( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'li', $content, $id, $class, $style, $other_attributes );
+	public static function li($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('li', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -348,8 +348,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function lix( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'li', $id, $class );
+	public static function lix($id = '', $class = '') {
+		return EEH_HTML::_close_tag('li', $id, $class);
 	}
 
 
@@ -365,8 +365,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function table( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'table', $content, $id, $class, $style, $other_attributes );
+	public static function table($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('table', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -378,8 +378,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tablex( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'table', $id, $class );
+	public static function tablex($id = '', $class = '') {
+		return EEH_HTML::_close_tag('table', $id, $class);
 	}
 
 
@@ -395,8 +395,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function thead( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'thead', $content, $id, $class, $style, $other_attributes );
+	public static function thead($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('thead', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -408,8 +408,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function theadx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'thead', $id, $class );
+	public static function theadx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('thead', $id, $class);
 	}
 
 
@@ -425,8 +425,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function tbody( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'tbody', $content, $id, $class, $style, $other_attributes );
+	public static function tbody($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('tbody', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -438,8 +438,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tbodyx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'tbody', $id, $class );
+	public static function tbodyx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('tbody', $id, $class);
 	}
 
 
@@ -455,8 +455,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function tr( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'tr', $content, $id, $class, $style, $other_attributes );
+	public static function tr($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('tr', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -468,8 +468,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function trx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'tr', $id, $class );
+	public static function trx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('tr', $id, $class);
 	}
 
 
@@ -485,8 +485,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function th( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'th', $content, $id, $class, $style, $other_attributes );
+	public static function th($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('th', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -498,8 +498,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function thx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'th', $id, $class );
+	public static function thx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('th', $id, $class);
 	}
 
 
@@ -515,8 +515,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function td( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'td', $content, $id, $class, $style, $other_attributes );
+	public static function td($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_open_tag('td', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -528,8 +528,8 @@ 
 	 * @param string $class - html class attribute
 	 * @return string
 	 */
-	public static function tdx( $id = '', $class = '' ) {
-		return EEH_HTML::_close_tag( 'td', $id, $class );
+	public static function tdx($id = '', $class = '') {
+		return EEH_HTML::_close_tag('td', $id, $class);
 	}
 
 
@@ -543,10 +543,10 @@ 
 	 * @param int    $colspan
 	 * @return string
 	 */
-	public static function no_row( $content = '', $colspan = 2 ) {
+	public static function no_row($content = '', $colspan = 2) {
 		return EEH_HTML::tr(
-			EEH_HTML::td( $content, '', '',  'padding:0; border:none;', 'colspan="' . $colspan . '"' ),
-			'', '',  'padding:0; border:none;'
+			EEH_HTML::td($content, '', '', 'padding:0; border:none;', 'colspan="'.$colspan.'"'),
+			'', '', 'padding:0; border:none;'
 		);
 	}
 
@@ -566,14 +566,14 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function link( $href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$link_text = ! empty( $link_text ) ? $link_text : $href;
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $title ) ? ' title="' . esc_attr( $title ) . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<a href="' . $href . '" ' . $attributes . '>'  . $link_text  . '</a>';
+	public static function link($href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$link_text = ! empty($link_text) ? $link_text : $href;
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($title) ? ' title="'.esc_attr($title).'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<a href="'.$href.'" '.$attributes.'>'.$link_text.'</a>';
 	}
 
 
@@ -590,14 +590,14 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function img( $src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$attributes = ! empty( $src ) ? ' src="' . esc_url_raw( $src ) . '"' : '';
-		$attributes .= ! empty( $alt ) ? ' alt="' . esc_attr( $alt ) . '"' : '';
-		$attributes .= ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<img' . $attributes  . '/>';
+	public static function img($src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$attributes = ! empty($src) ? ' src="'.esc_url_raw($src).'"' : '';
+		$attributes .= ! empty($alt) ? ' alt="'.esc_attr($alt).'"' : '';
+		$attributes .= ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<img'.$attributes.'/>';
 	}
 
 
@@ -615,12 +615,12 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	protected static function _inline_tag( $tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		$attributes = ! empty( $id ) ? ' id="' . EEH_HTML::sanitize_id( $id ) . '"' : '';
-		$attributes .= ! empty( $class ) ? ' class="' . $class . '"' : '';
-		$attributes .= ! empty( $style ) ? ' style="' . $style . '"' : '';
-		$attributes .= ! empty( $other_attributes ) ? ' ' . $other_attributes : '';
-		return '<' . $tag . ' ' . $attributes . '>'  . $content  . '</' . $tag . '>';
+	protected static function _inline_tag($tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		$attributes = ! empty($id) ? ' id="'.EEH_HTML::sanitize_id($id).'"' : '';
+		$attributes .= ! empty($class) ? ' class="'.$class.'"' : '';
+		$attributes .= ! empty($style) ? ' style="'.$style.'"' : '';
+		$attributes .= ! empty($other_attributes) ? ' '.$other_attributes : '';
+		return '<'.$tag.' '.$attributes.'>'.$content.'</'.$tag.'>';
 	}
 
 
@@ -636,8 +636,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function label( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'label', $content, $id, $class, $style, $other_attributes );
+	public static function label($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('label', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -653,8 +653,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function span( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'span', $content, $id, $class, $style, $other_attributes );
+	public static function span($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('span', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -670,8 +670,8 @@ 
 	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
 	 * @return string
 	 */
-	public static function strong( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_inline_tag( 'strong', $content, $id, $class, $style, $other_attributes );
+	public static function strong($content = '', $id = '', $class = '', $style = '', $other_attributes = '') {
+		return EEH_HTML::_inline_tag('strong', $content, $id, $class, $style, $other_attributes);
 	}
 
 
@@ -683,8 +683,8 @@ 
 	 * @param string $comment
 	 * @return string
 	 */
-	public static function comment( $comment = '' ) {
-		return ! empty( $comment ) ? EEH_HTML::nl() . '<!-- ' . $comment . ' -->' : '';
+	public static function comment($comment = '') {
+		return ! empty($comment) ? EEH_HTML::nl().'<!-- '.$comment.' -->' : '';
 	}
 
 
@@ -695,8 +695,8 @@ 
 	 * @param int $nmbr - the number of line breaks to return
 	 * @return string
 	 */
-	public static function br( $nmbr = 1 ) {
-		return str_repeat( '<br />', $nmbr );
+	public static function br($nmbr = 1) {
+		return str_repeat('<br />', $nmbr);
 	}
 
 
@@ -707,8 +707,8 @@ 
 	 * @param int $nmbr - the number of non-breaking spaces to return
 	 * @return string
 	 */
-	public static function nbsp( $nmbr = 1 ) {
-		return str_repeat( '&nbsp;', $nmbr );
+	public static function nbsp($nmbr = 1) {
+		return str_repeat('&nbsp;', $nmbr);
 	}
 
 
@@ -722,9 +722,9 @@ 
 	 * @param string $id
 	 * @return string
 	 */
-	public static function sanitize_id( $id = '' ) {
-		$key = str_replace( ' ', '-', trim( $id ) );
-		return preg_replace( '/[^a-zA-Z0-9_\-]/', '', $key );
+	public static function sanitize_id($id = '') {
+		$key = str_replace(' ', '-', trim($id));
+		return preg_replace('/[^a-zA-Z0-9_\-]/', '', $key);
 	}
 
 
@@ -736,10 +736,10 @@ 
 	 * @param string $tag
 	 * @return string - newline character plus # of indents passed (can be + or -)
 	 */
-	public static function nl( $indent = 0, $tag = 'none' ) {
+	public static function nl($indent = 0, $tag = 'none') {
 		$html = "\n";
-		EEH_HTML::indent( $indent, $tag );
-		for ( $x = 0; $x < EEH_HTML::$_indent[ $tag ]; $x++ ) {
+		EEH_HTML::indent($indent, $tag);
+		for ($x = 0; $x < EEH_HTML::$_indent[$tag]; $x++) {
 			$html .= "\t";
 		}
 		return $html;
@@ -754,17 +754,17 @@ 
 	 * @param int    $indent can be negative to decrease the indentation level
 	 * @param string $tag
 	 */
-	public static function indent( $indent, $tag = 'none' ){
+	public static function indent($indent, $tag = 'none') {
 		static $default_indentation = FALSE;
-		if ( ! $default_indentation ) {
+		if ( ! $default_indentation) {
 			EEH_HTML::_set_default_indentation();
 			$default_indentation = TRUE;
 		}
-		if ( ! isset( EEH_HTML::$_indent[ $tag ] )) {
-			EEH_HTML::$_indent[ $tag ] = 0;
+		if ( ! isset(EEH_HTML::$_indent[$tag])) {
+			EEH_HTML::$_indent[$tag] = 0;
 		}
-		EEH_HTML::$_indent[ $tag ] += (int)$indent;
-		EEH_HTML::$_indent[ $tag ] = EEH_HTML::$_indent[ $tag ] >= 0 ? EEH_HTML::$_indent[ $tag ] : 0;
+		EEH_HTML::$_indent[$tag] += (int) $indent;
+		EEH_HTML::$_indent[$tag] = EEH_HTML::$_indent[$tag] >= 0 ? EEH_HTML::$_indent[$tag] : 0;
 	}
 
 
@@ -810,15 +810,15 @@ 
 	 * @global array $allowedtags
 	 * @return array
 	 */
-	public static function get_simple_tags(){
+	public static function get_simple_tags() {
 		global $allowedtags;
 		$tags_we_allow = $allowedtags;
-		$tags_we_allow['ol']=array();
-		$tags_we_allow['ul']=array();
-		$tags_we_allow['li']=array();
-		$tags_we_allow['br']=array();
-		$tags_we_allow['p']=array();
-		return apply_filters( 'FHEE__EEH_HTML__get_simple_tags', $tags_we_allow );
+		$tags_we_allow['ol'] = array();
+		$tags_we_allow['ul'] = array();
+		$tags_we_allow['li'] = array();
+		$tags_we_allow['br'] = array();
+		$tags_we_allow['p'] = array();
+		return apply_filters('FHEE__EEH_HTML__get_simple_tags', $tags_we_allow);
 	}
 
 

core/helpers/EEH_Inflector.helper.php

Indentation +315 added lines, -315 removed lines

@@ -35,9 +35,9 @@ 
  * @version $Revision 0.1 $
  */
 class EEH_Inflector{
-    // ------ CLASS METHODS ------ //
-    // ---- Public methods ---- //
-    // {{{ pluralize()
+	// ------ CLASS METHODS ------ //
+	// ---- Public methods ---- //
+	// {{{ pluralize()
 
 	/**
 	 * Just calls self::pluralize and strtolower on $word and returns it
@@ -51,319 +51,319 @@ 
 	static function singularize_and_upper( $word ) {
 		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
 	}
-    /**
-     * Pluralizes English nouns.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    English noun to pluralize
-     * @return string Plural noun
-     */
-    static function pluralize($word){
-        $plural = array(
-            '/(quiz)$/i'               => '\1zes',
-            '/^(ox)$/i'                => '\1en',
-            '/([m|l])ouse$/i'          => '\1ice',
-            '/(matr|vert|ind)ix|ex$/i' => '\1ices',
-            '/(x|ch|ss|sh)$/i'         => '\1es',
-            '/([^aeiouy]|qu)ies$/i'    => '\1y',
-            '/([^aeiouy]|qu)y$/i'      => '\1ies',
-            '/(hive)$/i'               => '\1s',
-            '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-            '/sis$/i'                  => 'ses',
-            '/([ti])um$/i'             => '\1a',
-            '/(buffal|tomat)o$/i'      => '\1oes',
-            '/(bu)s$/i'                => '\1ses',
-            '/(alias|status)/i'        => '\1es',
-            '/(octop|vir)us$/i'        => '\1i',
-            '/(ax|test)is$/i'          => '\1es',
-            '/s$/i'                    => 's',
-            '/$/'                      => 's');
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man'    => 'men',
-            'child'  => 'children',
-            'sex'    => 'sexes',
-            'move'   => 'moves');
-
-        $lowercased_word = strtolower($word);
-
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
+	/**
+	 * Pluralizes English nouns.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    English noun to pluralize
+	 * @return string Plural noun
+	 */
+	static function pluralize($word){
+		$plural = array(
+			'/(quiz)$/i'               => '\1zes',
+			'/^(ox)$/i'                => '\1en',
+			'/([m|l])ouse$/i'          => '\1ice',
+			'/(matr|vert|ind)ix|ex$/i' => '\1ices',
+			'/(x|ch|ss|sh)$/i'         => '\1es',
+			'/([^aeiouy]|qu)ies$/i'    => '\1y',
+			'/([^aeiouy]|qu)y$/i'      => '\1ies',
+			'/(hive)$/i'               => '\1s',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/sis$/i'                  => 'ses',
+			'/([ti])um$/i'             => '\1a',
+			'/(buffal|tomat)o$/i'      => '\1oes',
+			'/(bu)s$/i'                => '\1ses',
+			'/(alias|status)/i'        => '\1es',
+			'/(octop|vir)us$/i'        => '\1i',
+			'/(ax|test)is$/i'          => '\1es',
+			'/s$/i'                    => 's',
+			'/$/'                      => 's');
+
+		$uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
+
+		$irregular = array(
+			'person' => 'people',
+			'man'    => 'men',
+			'child'  => 'children',
+			'sex'    => 'sexes',
+			'move'   => 'moves');
+
+		$lowercased_word = strtolower($word);
+
+		foreach($uncountable as $_uncountable){
+			if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
 					! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
-                return $word;
-            }
-        }
-
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
-            }
-        }
-
-        foreach($plural as $rule => $replacement){
-            if(preg_match($rule, $word)){
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ singularize()
-
-    /**
-     * Singularizes English nouns.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    English noun to singularize
-     * @return string Singular noun.
-     */
-    static function singularize($word){
-        $singular = array(
-            '/(quiz)zes$/i'                                                    => '\1',
-            '/(matr)ices$/i'                                                   => '\1ix',
-            '/(vert|ind)ices$/i'                                               => '\1ex',
-            '/^(ox)en/i'                                                       => '\1',
-            '/(alias|status)es$/i'                                             => '\1',
-            '/([octop|vir])i$/i'                                               => '\1us',
-            '/(cris|ax|test)es$/i'                                             => '\1is',
-            '/(shoe)s$/i'                                                      => '\1',
-            '/(o)es$/i'                                                        => '\1',
-            '/(bus)es$/i'                                                      => '\1',
-            '/([m|l])ice$/i'                                                   => '\1ouse',
-            '/(x|ch|ss|sh)es$/i'                                               => '\1',
-            '/(m)ovies$/i'                                                     => '\1ovie',
-            '/(s)eries$/i'                                                     => '\1eries',
-            '/([^aeiouy]|qu)ies$/i'                                            => '\1y',
-            '/([lr])ves$/i'                                                    => '\1f',
-            '/(tive)s$/i'                                                      => '\1',
-            '/(hive)s$/i'                                                      => '\1',
-            '/([^f])ves$/i'                                                    => '\1fe',
-            '/(^analy)ses$/i'                                                  => '\1sis',
-            '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
-            '/([ti])a$/i'                                                      => '\1um',
-            '/(n)ews$/i'                                                       => '\1ews',
-            '/s$/i'                                                            => '',
-        );
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man'    => 'men',
-            'child'  => 'children',
-            'sex'    => 'sexes',
-            'move'   => 'moves');
-
-        $lowercased_word = strtolower($word);
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
-                return $word;
-            }
-        }
-
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
-            }
-        }
-
-        foreach($singular as $rule => $replacement){
-            if(preg_match($rule, $word)){
-                return preg_replace($rule, $replacement, $word);
-            }
-        }
-
-        return $word;
-    }
-
-    // }}}
-    // {{{ titleize()
-
-    /**
-     * Converts an underscored or CamelCase word into a English
-     * sentence.
-     *
-     * The titleize static function converts text like "WelcomePage",
-     * "welcome_page" or  "welcome page" to this "Welcome
-     * Page".
-     * If second parameter is set to 'first' it will only
-     * capitalize the first character of the title.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    Word to format as tile
-     * @param    string    $uppercase    If set to 'first' it will only uppercase the
-     * first character. Otherwise it will uppercase all
-     * the words in the title.
-     * @return string Text formatted as title
-     */
-    static function titleize($word, $uppercase = ''){
-        $uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
-        return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
-    }
-
-    // }}}
-    // {{{ camelize()
-
-    /**
-     * Returns given word as CamelCased
-     *
-     * Converts a word like "send_email" to "SendEmail". It
-     * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "WhoSOnline"
-     *
-     * @access public
-     * @static
-     * @see variablize
-     * @param    string    $word    Word to convert to camel case
-     * @return string UpperCamelCasedWord
-     */
-    static function camelize($word){
-        return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
-    }
-
-    // }}}
-    // {{{ underscore()
-
-    /**
-     * Converts a word "into_it_s_underscored_version"
-     *
-     * Convert any "CamelCased" or "ordinary Word" into an
-     * "underscored_word".
-     *
-     * This can be really useful for creating friendly URLs.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    Word to underscore
-     * @return string Underscored word
-     */
-    static function underscore($word){
-        return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
-    }
-
-    // }}}
-    // {{{ humanize()
-
-    /**
-     * Returns a human-readable string from $word
-     *
-     * Returns a human-readable string from $word, by replacing
-     * underscores with a space, and by upper-casing the initial
-     * character by default.
-     *
-     * If you need to uppercase all the words you just have to
-     * pass 'all' as a second parameter.
-     *
-     * @access public
-     * @static
-     * @param    string    $word    String to "humanize"
-     * @param    string    $uppercase    If set to 'all' it will uppercase all the words
-     * instead of just the first one.
-     * @return string Human-readable word
-     */
-    static function humanize($word, $uppercase = ''){
+				return $word;
+			}
+		}
+
+		foreach($irregular as $_plural => $_singular){
+			if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
+				return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+			}
+		}
+
+		foreach($plural as $rule => $replacement){
+			if(preg_match($rule, $word)){
+				return preg_replace($rule, $replacement, $word);
+			}
+		}
+		return false;
+	}
+
+	// }}}
+	// {{{ singularize()
+
+	/**
+	 * Singularizes English nouns.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    English noun to singularize
+	 * @return string Singular noun.
+	 */
+	static function singularize($word){
+		$singular = array(
+			'/(quiz)zes$/i'                                                    => '\1',
+			'/(matr)ices$/i'                                                   => '\1ix',
+			'/(vert|ind)ices$/i'                                               => '\1ex',
+			'/^(ox)en/i'                                                       => '\1',
+			'/(alias|status)es$/i'                                             => '\1',
+			'/([octop|vir])i$/i'                                               => '\1us',
+			'/(cris|ax|test)es$/i'                                             => '\1is',
+			'/(shoe)s$/i'                                                      => '\1',
+			'/(o)es$/i'                                                        => '\1',
+			'/(bus)es$/i'                                                      => '\1',
+			'/([m|l])ice$/i'                                                   => '\1ouse',
+			'/(x|ch|ss|sh)es$/i'                                               => '\1',
+			'/(m)ovies$/i'                                                     => '\1ovie',
+			'/(s)eries$/i'                                                     => '\1eries',
+			'/([^aeiouy]|qu)ies$/i'                                            => '\1y',
+			'/([lr])ves$/i'                                                    => '\1f',
+			'/(tive)s$/i'                                                      => '\1',
+			'/(hive)s$/i'                                                      => '\1',
+			'/([^f])ves$/i'                                                    => '\1fe',
+			'/(^analy)ses$/i'                                                  => '\1sis',
+			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/([ti])a$/i'                                                      => '\1um',
+			'/(n)ews$/i'                                                       => '\1ews',
+			'/s$/i'                                                            => '',
+		);
+
+		$uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
+
+		$irregular = array(
+			'person' => 'people',
+			'man'    => 'men',
+			'child'  => 'children',
+			'sex'    => 'sexes',
+			'move'   => 'moves');
+
+		$lowercased_word = strtolower($word);
+		foreach($uncountable as $_uncountable){
+			if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
+				return $word;
+			}
+		}
+
+		foreach($irregular as $_plural => $_singular){
+			if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
+				return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+			}
+		}
+
+		foreach($singular as $rule => $replacement){
+			if(preg_match($rule, $word)){
+				return preg_replace($rule, $replacement, $word);
+			}
+		}
+
+		return $word;
+	}
+
+	// }}}
+	// {{{ titleize()
+
+	/**
+	 * Converts an underscored or CamelCase word into a English
+	 * sentence.
+	 *
+	 * The titleize static function converts text like "WelcomePage",
+	 * "welcome_page" or  "welcome page" to this "Welcome
+	 * Page".
+	 * If second parameter is set to 'first' it will only
+	 * capitalize the first character of the title.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    Word to format as tile
+	 * @param    string    $uppercase    If set to 'first' it will only uppercase the
+	 * first character. Otherwise it will uppercase all
+	 * the words in the title.
+	 * @return string Text formatted as title
+	 */
+	static function titleize($word, $uppercase = ''){
+		$uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
+		return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
+	}
+
+	// }}}
+	// {{{ camelize()
+
+	/**
+	 * Returns given word as CamelCased
+	 *
+	 * Converts a word like "send_email" to "SendEmail". It
+	 * will remove non alphanumeric character from the word, so
+	 * "who's online" will be converted to "WhoSOnline"
+	 *
+	 * @access public
+	 * @static
+	 * @see variablize
+	 * @param    string    $word    Word to convert to camel case
+	 * @return string UpperCamelCasedWord
+	 */
+	static function camelize($word){
+		return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
+	}
+
+	// }}}
+	// {{{ underscore()
+
+	/**
+	 * Converts a word "into_it_s_underscored_version"
+	 *
+	 * Convert any "CamelCased" or "ordinary Word" into an
+	 * "underscored_word".
+	 *
+	 * This can be really useful for creating friendly URLs.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    Word to underscore
+	 * @return string Underscored word
+	 */
+	static function underscore($word){
+		return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
+	}
+
+	// }}}
+	// {{{ humanize()
+
+	/**
+	 * Returns a human-readable string from $word
+	 *
+	 * Returns a human-readable string from $word, by replacing
+	 * underscores with a space, and by upper-casing the initial
+	 * character by default.
+	 *
+	 * If you need to uppercase all the words you just have to
+	 * pass 'all' as a second parameter.
+	 *
+	 * @access public
+	 * @static
+	 * @param    string    $word    String to "humanize"
+	 * @param    string    $uppercase    If set to 'all' it will uppercase all the words
+	 * instead of just the first one.
+	 * @return string Human-readable word
+	 */
+	static function humanize($word, $uppercase = ''){
 		//make special exceptions for acronyms
 		$word = str_replace('wp_', 'WP_', $word );
-        $uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
-        return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
-    }
-
-    // }}}
-    // {{{ variablize()
-
-    /**
-     * Same as camelize but first char is underscored
-     *
-     * Converts a word like "send_email" to "sendEmail". It
-     * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "whoSOnline"
-     *
-     * @access public
-     * @static
-     * @see camelize
-     * @param    string    $word    Word to lowerCamelCase
-     * @return string Returns a lowerCamelCasedWord
-     */
-    static function variablize($word){
-        $word = EEH_Inflector::camelize($word);
-        return strtolower($word[0]) . substr($word, 1);
-    }
-
-    // }}}
-    // {{{ tableize()
-
-    /**
-     * Converts a class name to its table name according to rails
-     * naming conventions.
-     *
-     * Converts "Person" to "people"
-     *
-     * @access public
-     * @static
-     * @see classify
-     * @param    string    $class_name    Class name for getting related table_name.
-     * @return string plural_table_name
-     */
-    static function tableize($class_name){
-        return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
-    }
-
-    // }}}
-    // {{{ classify()
-
-    /**
-     * Converts a table name to its class name according to rails
-     * naming conventions.
-     *
-     * Converts "people" to "Person"
-     *
-     * @access public
-     * @static
-     * @see tableize
-     * @param    string    $table_name    Table name for getting related ClassName.
-     * @return string SingularClassName
-     */
-    static function classify($table_name){
-        return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
-    }
-
-    // }}}
-    // {{{ ordinalize()
-
-    /**
-     * Converts number to its ordinal English form.
-     *
-     * This method converts 13 to 13th, 2 to 2nd ...
-     *
-     * @access public
-     * @static
-     * @param    integer    $number    Number to get its ordinal value
-     * @return string Ordinal representation of given string.
-     */
-    static function ordinalize($number){
-        if(in_array(($number % 100), range(11, 13))){
-            return $number . 'th';
-        }else{
-            switch(($number % 10)){
-                case 1:
-                    return $number . 'st';
-                    break;
-                case 2:
-                    return $number . 'nd';
-                    break;
-                case 3:
-                    return $number . 'rd';
-                default:
-                    return $number . 'th';
-                    break;
-            }
-        }
-    }
+		$uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
+		return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
+	}
+
+	// }}}
+	// {{{ variablize()
+
+	/**
+	 * Same as camelize but first char is underscored
+	 *
+	 * Converts a word like "send_email" to "sendEmail". It
+	 * will remove non alphanumeric character from the word, so
+	 * "who's online" will be converted to "whoSOnline"
+	 *
+	 * @access public
+	 * @static
+	 * @see camelize
+	 * @param    string    $word    Word to lowerCamelCase
+	 * @return string Returns a lowerCamelCasedWord
+	 */
+	static function variablize($word){
+		$word = EEH_Inflector::camelize($word);
+		return strtolower($word[0]) . substr($word, 1);
+	}
+
+	// }}}
+	// {{{ tableize()
+
+	/**
+	 * Converts a class name to its table name according to rails
+	 * naming conventions.
+	 *
+	 * Converts "Person" to "people"
+	 *
+	 * @access public
+	 * @static
+	 * @see classify
+	 * @param    string    $class_name    Class name for getting related table_name.
+	 * @return string plural_table_name
+	 */
+	static function tableize($class_name){
+		return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
+	}
+
+	// }}}
+	// {{{ classify()
+
+	/**
+	 * Converts a table name to its class name according to rails
+	 * naming conventions.
+	 *
+	 * Converts "people" to "Person"
+	 *
+	 * @access public
+	 * @static
+	 * @see tableize
+	 * @param    string    $table_name    Table name for getting related ClassName.
+	 * @return string SingularClassName
+	 */
+	static function classify($table_name){
+		return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
+	}
+
+	// }}}
+	// {{{ ordinalize()
+
+	/**
+	 * Converts number to its ordinal English form.
+	 *
+	 * This method converts 13 to 13th, 2 to 2nd ...
+	 *
+	 * @access public
+	 * @static
+	 * @param    integer    $number    Number to get its ordinal value
+	 * @return string Ordinal representation of given string.
+	 */
+	static function ordinalize($number){
+		if(in_array(($number % 100), range(11, 13))){
+			return $number . 'th';
+		}else{
+			switch(($number % 10)){
+				case 1:
+					return $number . 'st';
+					break;
+				case 2:
+					return $number . 'nd';
+					break;
+				case 3:
+					return $number . 'rd';
+				default:
+					return $number . 'th';
+					break;
+			}
+		}
+	}
 }
\ No newline at end of file

Spacing +42 added lines, -42 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');
 }
 
 // +----------------------------------------------------------------------+
@@ -34,7 +34,7 @@ 
  * @since 0.1
  * @version $Revision 0.1 $
  */
-class EEH_Inflector{
+class EEH_Inflector {
     // ------ CLASS METHODS ------ //
     // ---- Public methods ---- //
     // {{{ pluralize()
@@ -44,12 +44,12 @@ 
 	 * @param string $word
 	 * @return string
 	 */
-	static function pluralize_and_lower( $word ){
-		return strtolower( self::pluralize( $word ) );
+	static function pluralize_and_lower($word) {
+		return strtolower(self::pluralize($word));
 	}
 
-	static function singularize_and_upper( $word ) {
-		return str_replace( ' ', '_', self::humanize( self::singularize( $word ), 'all' ) );
+	static function singularize_and_upper($word) {
+		return str_replace(' ', '_', self::humanize(self::singularize($word), 'all'));
 	}
     /**
      * Pluralizes English nouns.
@@ -59,7 +59,7 @@ 
      * @param    string    $word    English noun to pluralize
      * @return string Plural noun
      */
-    static function pluralize($word){
+    static function pluralize($word) {
         $plural = array(
             '/(quiz)$/i'               => '\1zes',
             '/^(ox)$/i'                => '\1en',
@@ -91,21 +91,21 @@ 
 
         $lowercased_word = strtolower($word);
 
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
-					! ctype_alpha( $lowercased_word[ strlen( $lowercased_word ) - strlen($_uncountable) ] ) ){
+        foreach ($uncountable as $_uncountable) {
+            if (substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable && //even though the word "price" ends in "rice", it can be pluralized, so check the previous character isnt a letter
+					! ctype_alpha($lowercased_word[strlen($lowercased_word) - strlen($_uncountable)])) {
                 return $word;
             }
         }
 
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_plural . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+        foreach ($irregular as $_plural => $_singular) {
+            if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
+                return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word);
             }
         }
 
-        foreach($plural as $rule => $replacement){
-            if(preg_match($rule, $word)){
+        foreach ($plural as $rule => $replacement) {
+            if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
         }
@@ -123,7 +123,7 @@ 
      * @param    string    $word    English noun to singularize
      * @return string Singular noun.
      */
-    static function singularize($word){
+    static function singularize($word) {
         $singular = array(
             '/(quiz)zes$/i'                                                    => '\1',
             '/(matr)ices$/i'                                                   => '\1ix',
@@ -161,20 +161,20 @@ 
             'move'   => 'moves');
 
         $lowercased_word = strtolower($word);
-        foreach($uncountable as $_uncountable){
-            if(substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable){
+        foreach ($uncountable as $_uncountable) {
+            if (substr($lowercased_word, (-1 * strlen($_uncountable))) == $_uncountable) {
                 return $word;
             }
         }
 
-        foreach($irregular as $_plural => $_singular){
-            if(preg_match('/(' . $_singular . ')$/i', $word, $arr)){
-                return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+        foreach ($irregular as $_plural => $_singular) {
+            if (preg_match('/('.$_singular.')$/i', $word, $arr)) {
+                return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word);
             }
         }
 
-        foreach($singular as $rule => $replacement){
-            if(preg_match($rule, $word)){
+        foreach ($singular as $rule => $replacement) {
+            if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
         }
@@ -203,7 +203,7 @@ 
      * the words in the title.
      * @return string Text formatted as title
      */
-    static function titleize($word, $uppercase = ''){
+    static function titleize($word, $uppercase = '') {
         $uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
         return $uppercase(EEH_Inflector::humanize(EEH_Inflector::underscore($word)));
     }
@@ -224,7 +224,7 @@ 
      * @param    string    $word    Word to convert to camel case
      * @return string UpperCamelCasedWord
      */
-    static function camelize($word){
+    static function camelize($word) {
         return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
     }
 
@@ -244,7 +244,7 @@ 
      * @param    string    $word    Word to underscore
      * @return string Underscored word
      */
-    static function underscore($word){
+    static function underscore($word) {
         return strtolower(preg_replace('/[^A-Z^a-z^0-9]+/', '_', preg_replace('/([a-zd])([A-Z])/', '1_2', preg_replace('/([A-Z]+)([A-Z][a-z])/', '1_2', $word))));
     }
 
@@ -268,9 +268,9 @@ 
      * instead of just the first one.
      * @return string Human-readable word
      */
-    static function humanize($word, $uppercase = ''){
+    static function humanize($word, $uppercase = '') {
 		//make special exceptions for acronyms
-		$word = str_replace('wp_', 'WP_', $word );
+		$word = str_replace('wp_', 'WP_', $word);
         $uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
         return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
     }
@@ -291,9 +291,9 @@ 
      * @param    string    $word    Word to lowerCamelCase
      * @return string Returns a lowerCamelCasedWord
      */
-    static function variablize($word){
+    static function variablize($word) {
         $word = EEH_Inflector::camelize($word);
-        return strtolower($word[0]) . substr($word, 1);
+        return strtolower($word[0]).substr($word, 1);
     }
 
     // }}}
@@ -311,7 +311,7 @@ 
      * @param    string    $class_name    Class name for getting related table_name.
      * @return string plural_table_name
      */
-    static function tableize($class_name){
+    static function tableize($class_name) {
         return EEH_Inflector::pluralize(EEH_Inflector::underscore($class_name));
     }
 
@@ -330,7 +330,7 @@ 
      * @param    string    $table_name    Table name for getting related ClassName.
      * @return string SingularClassName
      */
-    static function classify($table_name){
+    static function classify($table_name) {
         return EEH_Inflector::camelize(EEH_Inflector::singularize($table_name));
     }
 
@@ -347,21 +347,21 @@ 
      * @param    integer    $number    Number to get its ordinal value
      * @return string Ordinal representation of given string.
      */
-    static function ordinalize($number){
-        if(in_array(($number % 100), range(11, 13))){
-            return $number . 'th';
-        }else{
-            switch(($number % 10)){
+    static function ordinalize($number) {
+        if (in_array(($number % 100), range(11, 13))) {
+            return $number.'th';
+        } else {
+            switch (($number % 10)) {
                 case 1:
-                    return $number . 'st';
+                    return $number.'st';
                     break;
                 case 2:
-                    return $number . 'nd';
+                    return $number.'nd';
                     break;
                 case 3:
-                    return $number . 'rd';
+                    return $number.'rd';
                 default:
-                    return $number . 'th';
+                    return $number.'th';
                     break;
             }
         }

Braces +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
     static function ordinalize($number){
         if(in_array(($number % 100), range(11, 13))){
             return $number . 'th';
-        }else{
+        } else{
             switch(($number % 10)){
                 case 1:
                     return $number . 'st';

core/helpers/EEH_Money.helper.php

Indentation +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@
  */
 if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
  /**
- *
- * Money helper class.
- * This class has helper methods that help with money related conversions and calculations.
- *
- * @since %VER%
- *
- * @package		Event Espresso
- * @subpackage	helpers
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+  *
+  * Money helper class.
+  * This class has helper methods that help with money related conversions and calculations.
+  *
+  * @since %VER%
+  *
+  * @package		Event Espresso
+  * @subpackage	helpers
+  * @author		Darren Ethier
+  *
+  * ------------------------------------------------------------------------
+  */
 class EEH_Money extends EEH_Base  {
 
 

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_Money extends EEH_Base  {
+class EEH_Money extends EEH_Base {
 
 
 	/**
@@ -29,15 +29,15 @@ 
 	 * @param int|string $incoming_value
 	 * @return float
 	 */
-	public static function convert_to_float_from_localized_money( $incoming_value ) {
+	public static function convert_to_float_from_localized_money($incoming_value) {
 		//remove thousands separator
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value);
 
 		//replace decimal place with standard decimal.
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value);
 
 		//float it! and round to three decimal places
-		$money_value = round ( (float) $money_value, 3 );
+		$money_value = round((float) $money_value, 3);
 		return $money_value;
 	}
 
@@ -57,12 +57,12 @@ 
 	 * @throws \EE_Error
 	 */
 
-	public static function compare_floats( $float1, $float2, $operator='=' ) {
+	public static function compare_floats($float1, $float2, $operator = '=') {
 		// Check numbers to 5 digits of precision
 		$epsilon = 0.00001;
 
-		$float1 = (float)$float1;
-		$float2 = (float)$float2;
+		$float1 = (float) $float1;
+		$float2 = (float) $float2;
 
 		switch ($operator) {
 			// equal
@@ -116,7 +116,7 @@ 
 				}
 				break;
 			default:
-				throw new EE_Error(__( "Unknown operator '" . $operator . "' in EEH_Money::compare_floats()", 'event_espresso' ) );
+				throw new EE_Error(__("Unknown operator '".$operator."' in EEH_Money::compare_floats()", 'event_espresso'));
 		}
 
 		return false;
@@ -131,21 +131,21 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_format_for_jqplot( $CNT_ISO = '') {
+	public static function get_format_for_jqplot($CNT_ISO = '') {
 		//default format
 		$format = 'f';
 		//if CNT_ISO passed lets try to get currency settings for it.
-		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : null;
+		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
 		//default currency settings for site if not set
-		if ( ! $currency_config instanceof EE_Currency_Config ) {
+		if ( ! $currency_config instanceof EE_Currency_Config) {
 			$currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 		}
 
 		//first get the decimal place and number of places
-		$format = "%'." . $currency_config->dec_plc . $format;
+		$format = "%'.".$currency_config->dec_plc.$format;
 
 		//currency symbol on right side.
-		$format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+		$format = $currency_config->sign_b4 ? $currency_config->sign.$format : $format.$currency_config->sign;
 		return $format;
 	}
 
@@ -160,27 +160,27 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_format_for_google_charts( $CNT_ISO = '' ) {
+	public static function get_format_for_google_charts($CNT_ISO = '') {
 		//if CNT_ISO passed lets try to get currency settings for it.
-		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : null;
+		$currency_config = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
 		//default currency settings for site if not set
-		if ( ! $currency_config instanceof EE_Currency_Config ) {
+		if ( ! $currency_config instanceof EE_Currency_Config) {
 			$currency_config = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 		}
 
-		$decimal_places_placeholder = str_pad( '', $currency_config->dec_plc, '0' );
+		$decimal_places_placeholder = str_pad('', $currency_config->dec_plc, '0');
 
 		//first get the decimal place and number of places
-		$format = '#,##0.' . $decimal_places_placeholder;
+		$format = '#,##0.'.$decimal_places_placeholder;
 
 		//currency symbol on right side.
-		$format = $currency_config->sign_b4 ? $currency_config->sign . $format : $format . $currency_config->sign;
+		$format = $currency_config->sign_b4 ? $currency_config->sign.$format : $format.$currency_config->sign;
 		$formatterObject = array(
 			'decimalSymbol' => $currency_config->dec_mrk,
 			'groupingSymbol' => $currency_config->thsnds,
 			'fractionDigits' => $currency_config->dec_plc,
 		);
-		if ( $currency_config->sign_b4 ) {
+		if ($currency_config->sign_b4) {
 			$formatterObject['prefix'] = $currency_config->sign;
 		} else {
 			$formatterObject['suffix'] = $currency_config->sign;

core/helpers/EEH_Sideloader.helper.php

Spacing +37 added lines, -37 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 class EEH_Sideloader extends EEH_Base {
 
 	private $_upload_to;
@@ -43,8 +43,8 @@ 
 	 * @access public
 	 * @param array $init array fo initializing the sideloader if keys match the properties.
 	 */
-	public function __construct( $init = array() ) {
-		$this->_init( $init );
+	public function __construct($init = array()) {
+		$this->_init($init);
 	}
 
 
@@ -55,24 +55,24 @@ 
 	 * @param  array  $init array on init (keys match properties others ignored)
 	 * @return void
 	 */
-	private function _init( $init ) {
+	private function _init($init) {
 		$defaults = array(
 			'_upload_to' => $this->_get_wp_uploads_dir(),
 			'_upload_from' => '',
 			'_permissions' => 0644,
-			'_new_file_name' => 'EE_Sideloader_' . uniqid() . '.default'
+			'_new_file_name' => 'EE_Sideloader_'.uniqid().'.default'
 			);
 
-		$props = array_merge( $defaults, $init );
+		$props = array_merge($defaults, $init);
 
-		foreach ( $props as $key => $val ) {
-			if ( EEH_Class_Tools::has_property( $this, $key ) ) {
+		foreach ($props as $key => $val) {
+			if (EEH_Class_Tools::has_property($this, $key)) {
 				$this->$key = $val;
 			}
 		}
 
 		//make sure we include the required wp file for needed functions
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		require_once(ABSPATH.'wp-admin/includes/file.php');
 	}
 
 
@@ -80,16 +80,16 @@ 
 	private function _get_wp_uploads_dir() {}
 
 	//setters
-	public function set_upload_to( $upload_to_folder ) {
+	public function set_upload_to($upload_to_folder) {
 		$this->_upload_to = $upload_to_folder;
 	}
-	public function set_upload_from( $upload_from_folder ) {
+	public function set_upload_from($upload_from_folder) {
 		$this->_upload_from_folder = $upload_from_folder;
 	}
-	public function set_permissions( $permissions ) {
+	public function set_permissions($permissions) {
 		$this->_permissions = $permissions;
 	}
-	public function set_new_file_name( $new_file_name ) {
+	public function set_new_file_name($new_file_name) {
 		$this->_new_file_name = $new_file_name;
 	}
 
@@ -111,34 +111,34 @@ 
 	//upload methods
 	public function sideload() {
 		//setup temp dir
-		$temp_file = wp_tempnam( $this->_upload_from );
+		$temp_file = wp_tempnam($this->_upload_from);
 
-		if ( !$temp_file ) {
-			EE_Error::add_error( __('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $temp_file) {
+			EE_Error::add_error(__('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		do_action( 'AHEE__EEH_Sideloader__sideload__before', $this, $temp_file );
+		do_action('AHEE__EEH_Sideloader__sideload__before', $this, $temp_file);
 
-		$wp_remote_args = apply_filters( 'FHEE__EEH_Sideloader__sideload__wp_remote_args', array( 'timeout' => 500, 'stream' => true, 'filename' => $temp_file ), $this, $temp_file );
+		$wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array('timeout' => 500, 'stream' => true, 'filename' => $temp_file), $this, $temp_file);
 
-		$response = wp_safe_remote_get( $this->_upload_from, $wp_remote_args );
+		$response = wp_safe_remote_get($this->_upload_from, $wp_remote_args);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $temp_file );
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				EE_Error::add_error( sprintf( __('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export( $response, true ), $this->_upload_from ), __FILE__, __FUNCTION__, __LINE__ );
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
+			unlink($temp_file);
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				EE_Error::add_error(sprintf(__('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export($response, true), $this->_upload_from), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
 
 		//possible md5 check
-		$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-		if ( $content_md5 ) {
-			$md5_check = verify_file_md5( $temp_file, $content_md5 );
-			if ( is_wp_error( $md5_check ) ) {
-				unlink( $temp_file );
-				EE_Error::add_error( $md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+		$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+		if ($content_md5) {
+			$md5_check = verify_file_md5($temp_file, $content_md5);
+			if (is_wp_error($md5_check)) {
+				unlink($temp_file);
+				EE_Error::add_error($md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -146,24 +146,24 @@ 
 		$file = $temp_file;
 
 		//now we have the file, let's get it in the right directory with the right name.
-		$path = apply_filters( 'FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to . $this->_new_file_name, $this );
+		$path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to.$this->_new_file_name, $this);
 
 		//move file in
-		if ( false === @ rename( $file, $path ) ) {
-			unlink( $temp_file );
-			EE_Error::add_error(  sprintf( __('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso' ), $path ), __FILE__, __FUNCTION__, __LINE__ );
+		if (false === @ rename($file, $path)) {
+			unlink($temp_file);
+			EE_Error::add_error(sprintf(__('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso'), $path), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//set permissions
-		$permissions = apply_filters( 'FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this );
-		chmod( $path, $permissions );
+		$permissions = apply_filters('FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this);
+		chmod($path, $permissions);
 
 		//that's it.  let's allow for actions after file uploaded.
-		do_action( 'AHEE__EE_Sideloader__sideload_after', $this, $path );
+		do_action('AHEE__EE_Sideloader__sideload_after', $this, $path);
 
 		//unlink tempfile
-		@unlink( $temp_file );
+		@unlink($temp_file);
 		return true;
 	}