eventespresso / event-espresso-core

core/db_models/strategies/EE_Soft_Delete_Where_Conditions.strategy.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
 /*
  * Strategy specifically for adding where conditions specific to CPT models.
  */
-class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions {
 	/**
 	 * Strategy for setting default soft delete where conditions. This strategy will find
 	 * the field of type 'EE_Trashed_Flag_Field', and add a condition that it be FALSE on all queries involving
@@ -12,12 +12,12 @@ 
 	 * Eg,
 	 *
 	 */
-	function __construct(){}
+	function __construct() {}
 	/**
 	 * Gets the where default where conditions for a custom post type model
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		$trashed_field_name = $this->deleted_field_name();
 		return array(
 			$trashed_field_name => false
@@ -29,12 +29,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function deleted_field_name(){
+	private function deleted_field_name() {
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
 		if($field){
 			return $field->get_name();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
 		}
 	}

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 +15 added lines, -15 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'));
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	 * @param array $arr
 	 * @return boolean
 	 */
-	public static function is_associative_array($arr){
+	public static function is_associative_array($arr) {
 		return  array_keys($arr) !== range(0, count($arr) - 1);
 	}
 
@@ -45,7 +45,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;
@@ -56,16 +56,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!
 		}
 	}
 
@@ -76,8 +76,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;
 	}
 
 } //end EEH_Template class
\ No newline at end of file

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

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EEH_Autoloader

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -38,7 +38,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof  EEH_Autoloader ) {
+		if ( ! self::$_instance instanceof  EEH_Autoloader) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -55,7 +55,7 @@ 
 	private function __construct() {
 		self::$_autoloaders = array();
 		$this->_register_custom_autoloaders();
-		spl_autoload_register( array( $this, 'espresso_autoloader' ));
+		spl_autoload_register(array($this, 'espresso_autoloader'));
 	}
 
 
@@ -69,9 +69,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]);
 		}
 	}
 
@@ -87,26 +87,26 @@ 
 	 * @return void
 	 * @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 ( WP_DEBUG && $debug ) {
-					printr( self::$_autoloaders[ $class ], $class, __FILE__, __LINE__ );
+			if ( ! isset(self::$_autoloaders[$class])) {
+				self::$_autoloaders[$class] = str_replace(array('/', '\\'), DS, $path);
+				if (WP_DEBUG && $debug) {
+					printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
 				}
 			}
 		}
@@ -135,9 +135,9 @@ 
 	 * 	@return void
 	 */
 	private function _register_custom_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE );
-		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_CORE);
+		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_form_sections_autoloaders();
 	}
 
@@ -151,7 +151,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_form_sections_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
 	}
 
 
@@ -164,7 +164,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);
 	}
 
 
@@ -182,30 +182,30 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function register_autoloaders_for_each_file_in_folder( $folder, $recursive = false, $debug = false ){
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = false, $debug = false) {
 		// 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 ] = str_replace( array( '\/', '/' ), DS, $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] = str_replace(array('\/', '/'), DS, $filepath);
 				}
-			} else if ( $recursive ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $filepath, $recursive );
+			} else if ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive);
 			}
 		}
 		// 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 );
+		self::register_autoloader($class_to_filepath_map, false, $debug);
 	}
 
 

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_Class_Tools.helper.php

Spacing +34 added lines, -34 removed lines

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

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.

Spacing +109 added lines, -110 removed lines

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

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

core/helpers/EEH_Debug_Tools.helper.php

Braces +5 added lines, -4 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');
+}
 /**
  * Class EEH_Debug_Tools
  *
@@ -122,8 +124,7 @@ 
 				return;
 			}
 			echo '<h5>For Tag: '. $tag .'</h5>';
-		}
-		else {
+		} else {
 			$hook=$wp_filter;
 			ksort( $hook );
 		}
@@ -183,7 +184,7 @@ 
 		if( isset( $this->_start_times[ $timer_name ] ) ){
 			$start_time = $this->_start_times[ $timer_name ];
 			unset( $this->_start_times[ $timer_name ] );
-		}else{
+		} else{
 			$start_time = array_pop( $this->_start_times );
 		}
 		$total_time = microtime( TRUE ) - $start_time;

Spacing +114 added lines, -114 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.0
  *
  */
-class EEH_Debug_Tools{
+class EEH_Debug_Tools {
 
 	/**
 	 * 	instance of the EEH_Autoloader object
@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_Debug_Tools ) {
+		if ( ! self::$_instance instanceof EEH_Debug_Tools) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,19 +57,19 @@ 
 	 */
 	private function __construct() {
 		// load Kint PHP debugging library
-		if ( ! class_exists( 'Kint' ) &&  file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){
+		if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) {
 			// despite EE4 having a check for an existing copy of the Kint debugging class,
 			// if another plugin was loaded AFTER EE4 and they did NOT perform a similar check,
 			// then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error
 			// so we've moved it to our test folder so that it is not included with production releases
 			// plz use https://wordpress.org/plugins/kint-debugger/  if testing production versions of EE
-			require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' );
+			require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php');
 		}
-		if ( ! defined('DOING_AJAX') || ! isset( $_REQUEST['noheader'] ) || $_REQUEST['noheader'] != 'true' || ! isset( $_REQUEST['TB_iframe'] )) {
+		if ( ! defined('DOING_AJAX') || ! isset($_REQUEST['noheader']) || $_REQUEST['noheader'] != 'true' || ! isset($_REQUEST['TB_iframe'])) {
 			//add_action( 'shutdown', array($this,'espresso_session_footer_dump') );
 		}
-		add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' ));
+		add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name'));
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * 	@return void
 	 */
 	public static function show_db_name() {
-		if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) {
-			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>';
+		if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) {
+			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>';
 		}
 	}
 
@@ -93,9 +93,9 @@ 
 	 * 	@return void
 	 */
 	public function espresso_session_footer_dump() {
-		if ( class_exists('Kint') && function_exists( 'wp_get_current_user' ) && current_user_can('update_core') && ( defined('WP_DEBUG') && WP_DEBUG ) &&  ! defined('DOING_AJAX') && class_exists( 'EE_Registry' )) {
-			Kint::dump(  EE_Registry::instance()->SSN->id() );
-			Kint::dump( EE_Registry::instance()->SSN );
+		if (class_exists('Kint') && function_exists('wp_get_current_user') && current_user_can('update_core') && (defined('WP_DEBUG') && WP_DEBUG) && ! defined('DOING_AJAX') && class_exists('EE_Registry')) {
+			Kint::dump(EE_Registry::instance()->SSN->id());
+			Kint::dump(EE_Registry::instance()->SSN);
 //			Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() );
 			$this->espresso_list_hooked_functions();
 			$this->show_times();
@@ -112,27 +112,27 @@ 
 	 * @param bool $tag
 	 * @return void
 	 */
-	public function espresso_list_hooked_functions( $tag=FALSE ){
+	public function espresso_list_hooked_functions($tag = FALSE) {
 		global $wp_filter;
 		echo '<br/><br/><br/><h3>Hooked Functions</h3>';
-		if ( $tag ) {
-			$hook[$tag]=$wp_filter[$tag];
-			if ( ! is_array( $hook[$tag] )) {
-				trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING );
+		if ($tag) {
+			$hook[$tag] = $wp_filter[$tag];
+			if ( ! is_array($hook[$tag])) {
+				trigger_error("Nothing found for '$tag' hook", E_USER_WARNING);
 				return;
 			}
-			echo '<h5>For Tag: '. $tag .'</h5>';
+			echo '<h5>For Tag: '.$tag.'</h5>';
 		}
 		else {
-			$hook=$wp_filter;
-			ksort( $hook );
+			$hook = $wp_filter;
+			ksort($hook);
 		}
-		foreach( $hook as $tag => $priorities ) {
+		foreach ($hook as $tag => $priorities) {
 			echo "<br />&gt;&gt;&gt;&gt;&gt;\t<strong>$tag</strong><br />";
-			ksort( $priorities );
-			foreach( $priorities as $priority => $function ){
+			ksort($priorities);
+			foreach ($priorities as $priority => $function) {
 				echo $priority;
-				foreach( $function as $name => $properties ) {
+				foreach ($function as $name => $properties) {
 					echo "\t$name<br />";
 				}
 			}
@@ -148,15 +148,15 @@ 
 	 * @param string $hook_name
 	 * @return array
 	 */
-	public static function registered_filter_callbacks( $hook_name = '' ) {
+	public static function registered_filter_callbacks($hook_name = '') {
 		$filters = array();
 		global $wp_filter;
-		if ( isset( $wp_filter[ $hook_name ] ) ) {
-			$filters[ $hook_name ] = array();
-			foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) {
-				$filters[ $hook_name ][ $priority ] = array();
-				foreach ( $callbacks as $callback ) {
-					$filters[ $hook_name ][ $priority ][] = $callback['function'];
+		if (isset($wp_filter[$hook_name])) {
+			$filters[$hook_name] = array();
+			foreach ($wp_filter[$hook_name] as $priority => $callbacks) {
+				$filters[$hook_name][$priority] = array();
+				foreach ($callbacks as $callback) {
+					$filters[$hook_name][$priority][] = $callback['function'];
 				}
 			}
 		}
@@ -169,8 +169,8 @@ 
 	 * 	start_timer
 	 * @param null $timer_name
 	 */
-	public function start_timer( $timer_name = NULL ){
-		$this->_start_times[$timer_name] = microtime( TRUE );
+	public function start_timer($timer_name = NULL) {
+		$this->_start_times[$timer_name] = microtime(TRUE);
 	}
 
 
@@ -179,15 +179,15 @@ 
 	 * stop_timer
 	 * @param string $timer_name
 	 */
-	public function stop_timer($timer_name = 'default'){
-		if( isset( $this->_start_times[ $timer_name ] ) ){
-			$start_time = $this->_start_times[ $timer_name ];
-			unset( $this->_start_times[ $timer_name ] );
-		}else{
-			$start_time = array_pop( $this->_start_times );
+	public function stop_timer($timer_name = 'default') {
+		if (isset($this->_start_times[$timer_name])) {
+			$start_time = $this->_start_times[$timer_name];
+			unset($this->_start_times[$timer_name]);
+		} else {
+			$start_time = array_pop($this->_start_times);
 		}
-		$total_time = microtime( TRUE ) - $start_time;
-		switch ( $total_time ) {
+		$total_time = microtime(TRUE) - $start_time;
+		switch ($total_time) {
 			case $total_time < 0.00001 :
 				$color = '#8A549A';
 				$bold = 'normal';
@@ -213,7 +213,7 @@ 
 				$bold = 'bold';
 				break;
 		}
-		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0em 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">' . number_format( $total_time, 8 ) . '</div> ' . $timer_name;
+		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0em 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">'.number_format($total_time, 8).'</div> '.$timer_name;
 	 }
 	 /**
 	  * Measure the memory usage by PHP so far.
@@ -221,10 +221,10 @@ 
 	  * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
 	  * @return void
 	  */
-	 public function measure_memory( $label, $output_now = false ) {
-		 $memory_used = $this->convert( memory_get_peak_usage( true ) );
-		 $this->_memory_usage_points[ $label ] = $memory_used;
-		 if( $output_now ) {
+	 public function measure_memory($label, $output_now = false) {
+		 $memory_used = $this->convert(memory_get_peak_usage(true));
+		 $this->_memory_usage_points[$label] = $memory_used;
+		 if ($output_now) {
 			 echo "\r\n<br>$label : $memory_used";
 		 }
 	 }
@@ -234,9 +234,9 @@ 
 	  * @param int $size
 	  * @return string
 	  */
-	 public function convert( $size ) {
-		$unit=array('b','kb','mb','gb','tb','pb');
-		return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[ absint( $i ) ];
+	 public function convert($size) {
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[absint($i)];
 	 }
 
 
@@ -246,9 +246,9 @@ 
 	 * @param bool $output_now
 	 * @return string
 	 */
-	public function show_times($output_now=true){
-		$output = '<h2>Times:</h2>' . implode("<br>",$this->_times) . '<h2>Memory</h2>' . implode('<br>', $this->_memory_usage_points );
-		 if($output_now){
+	public function show_times($output_now = true) {
+		$output = '<h2>Times:</h2>'.implode("<br>", $this->_times).'<h2>Memory</h2>'.implode('<br>', $this->_memory_usage_points);
+		 if ($output_now) {
 			 echo $output;
 			 return '';
 		 }
@@ -263,27 +263,27 @@ 
 	 * 	@return void
 	 */
 	public static function ee_plugin_activation_errors() {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$activation_errors = ob_get_contents();
-			if ( class_exists( 'EE_Registry' )) {
-				EE_Registry::instance()->load_helper( 'File' );
+			if (class_exists('EE_Registry')) {
+				EE_Registry::instance()->load_helper('File');
 			} else {
-				include_once( EE_HELPERS . 'EEH_File.helper.php' );
+				include_once(EE_HELPERS.'EEH_File.helper.php');
 			}
-			if ( class_exists( 'EEH_File' )) {
+			if (class_exists('EEH_File')) {
 				try {
-					EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS );
-					EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' );
-					EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
-				} catch( EE_Error $e ){
-					EE_Error::add_error( sprintf( __(  'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+					EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS);
+					EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html');
+					EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
+				} catch (EE_Error $e) {
+					EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 				}
 			} else {
 				// old school attempt
-				file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
+				file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
 			}
-			$activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors;
-			update_option( 'ee_plugin_activation_errors', $activation_errors );
+			$activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors;
+			update_option('ee_plugin_activation_errors', $activation_errors);
 		}
 	}
 
@@ -298,10 +298,10 @@ 
 	 * @param  string $version  The version of Event Espresso where the error was added
 	 * @uses trigger_error()
 	 */
-	public function doing_it_wrong( $function, $message, $version ) {
-		do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
-		$version = is_null( $version ) ? '' : sprintf( __('(This message was added in version %s of Event Espresso.', 'event_espresso' ), $version );
-		trigger_error( sprintf( __('%1$s was called <strong>incorrectly</strong>. %2$s %3$s','event_espresso' ), $function, $message, $version ), E_USER_DEPRECATED );
+	public function doing_it_wrong($function, $message, $version) {
+		do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
+		$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s of Event Espresso.', 'event_espresso'), $version);
+		trigger_error(sprintf(__('%1$s was called <strong>incorrectly</strong>. %2$s %3$s', 'event_espresso'), $function, $message, $version), E_USER_DEPRECATED);
 	}
 
 
@@ -322,22 +322,22 @@ 
 	 * @param string $debug_index
 	 * @param string $debug_key
 	 */
-	public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false,  $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) {
-		if ( WP_DEBUG && false ) {
-			$debug_key = $debug_key . '_' . EE_Session::instance()->id();
-			$debug_data = get_option( $debug_key, array() );
+	public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') {
+		if (WP_DEBUG && false) {
+			$debug_key = $debug_key.'_'.EE_Session::instance()->id();
+			$debug_data = get_option($debug_key, array());
 			$default_data = array(
-				$class => $func . '() : ' . $line,
+				$class => $func.'() : '.$line,
 				'REQ'  => $display_request ? $_REQUEST : '',
 			);
 			// don't serialize objects
-			$info = self::strip_objects( $info );
-			$index = ! empty( $debug_index ) ? $debug_index : 0;
-			if ( ! isset( $debug_data[$index] ) ) {
+			$info = self::strip_objects($info);
+			$index = ! empty($debug_index) ? $debug_index : 0;
+			if ( ! isset($debug_data[$index])) {
 				$debug_data[$index] = array();
 			}
-			$debug_data[$index][microtime()] = array_merge( $default_data, $info );
-			update_option( $debug_key, $debug_data );
+			$debug_data[$index][microtime()] = array_merge($default_data, $info);
+			update_option($debug_key, $debug_data);
 		}
 	}
 
@@ -349,26 +349,26 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public static function strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value ) ) {
-				$info[ $key ] = self::strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value );
-				if ( method_exists( $value, 'ID' ) ) {
-					$info[ $object_class ][ 'ID' ] = $value->ID();
+	public static function strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = self::strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value);
+				if (method_exists($value, 'ID')) {
+					$info[$object_class]['ID'] = $value->ID();
 				}
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 
@@ -385,31 +385,31 @@ 
 	 * @param string $height
 	 * @param bool $die
 	 */
-	public static function printr( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $height = 'auto', $die = false ) {
+	public static function printr($var, $var_name = false, $file = __FILE__, $line = __LINE__, $height = 'auto', $die = false) {
 		//$print_r = false;
-		if ( is_object( $var ) ) {
+		if (is_object($var)) {
 			$var_name = ! $var_name ? 'object' : $var_name;
 			//$print_r = true;
-		} else if ( is_array( $var ) ) {
+		} else if (is_array($var)) {
 			$var_name = ! $var_name ? 'array' : $var_name;
 			//$print_r = true;
-		} else if ( is_numeric( $var ) ) {
+		} else if (is_numeric($var)) {
 			$var_name = ! $var_name ? 'numeric' : $var_name;
-		} else if ( is_string( $var ) ) {
+		} else if (is_string($var)) {
 			$var_name = ! $var_name ? 'string' : $var_name;
-		} else if ( is_null( $var ) ) {
+		} else if (is_null($var)) {
 			$var_name = ! $var_name ? 'null' : $var_name;
 		}
-		$var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) );
+		$var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name));
 		ob_start();
-		echo '<pre style="display:block; width:100%; height:' . $height . '; border:2px solid light-blue;">';
-		echo '<h5 style="color:#2EA2CC;"><b>' . $var_name . '</b></h5><span style="color:#E76700">';
+		echo '<pre style="display:block; width:100%; height:'.$height.'; border:2px solid light-blue;">';
+		echo '<h5 style="color:#2EA2CC;"><b>'.$var_name.'</b></h5><span style="color:#E76700">';
 		//$print_r ? print_r( $var ) : var_dump( $var );
-		var_dump( $var );
-		echo '</span><br /><span style="font-size:10px;font-weight:normal;">' . $file . '<br />line no: ' . $line . '</span></pre>';
+		var_dump($var);
+		echo '</span><br /><span style="font-size:10px;font-weight:normal;">'.$file.'<br />line no: '.$line.'</span></pre>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -426,8 +426,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) {
-	function dump_wp_query(){
+if (class_exists('Kint') && ! function_exists('dump_wp_query')) {
+	function dump_wp_query() {
 		global $wp_query;
 		d($wp_query);
 	}
@@ -437,8 +437,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) {
-	function dump_wp(){
+if (class_exists('Kint') && ! function_exists('dump_wp')) {
+	function dump_wp() {
 		global $wp;
 		d($wp);
 	}
@@ -448,8 +448,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) {
-	function dump_post(){
+if (class_exists('Kint') && ! function_exists('dump_post')) {
+	function dump_post() {
 		global $post;
 		d($post);
 	}

core/helpers/EEH_File.helper.php

Spacing +134 added lines, -134 removed lines

@@ -12,7 +12,7 @@ 
  * @ version		 	4.0
  *
  */
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 /**
  *
  * Class EEH_File
@@ -41,7 +41,7 @@ 
 	private static function _get_wp_filesystem() {
 		global $wp_filesystem;
 		// no filesystem setup ???
-		if ( ! $wp_filesystem instanceof WP_Filesystem_Base ) {
+		if ( ! $wp_filesystem instanceof WP_Filesystem_Base) {
 			// if some eager beaver's just trying to get in there too early...
 			// let them do it, because we are one of those eager beavers! :P
 			/**
@@ -54,29 +54,29 @@ 
 			 * and there may be troubles if the WP files are owned by a different user
 			 * than the server user. But both of these issues should exist in 4.4 and earlier too
 			 */
-			if ( FALSE && ! did_action( 'wp_loaded' )) {
+			if (FALSE && ! did_action('wp_loaded')) {
 				$msg = __('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso');
-				if ( WP_DEBUG ) {
-					$msg .= '<br />' .  __('The WP Filesystem can not be accessed until after the "wp_loaded" hook has run, so it\'s best not to attempt access until the "admin_init" hookpoint.', 'event_espresso');
+				if (WP_DEBUG) {
+					$msg .= '<br />'.__('The WP Filesystem can not be accessed until after the "wp_loaded" hook has run, so it\'s best not to attempt access until the "admin_init" hookpoint.', 'event_espresso');
 				}
-				throw new EE_Error( $msg );
+				throw new EE_Error($msg);
 			} else {
 				// should be loaded if we are past the wp_loaded hook...
-				if ( ! function_exists( 'WP_Filesystem' )) {
-					require_once( ABSPATH . 'wp-admin/includes/file.php' );
-					require_once( ABSPATH . 'wp-admin/includes/template.php' );
+				if ( ! function_exists('WP_Filesystem')) {
+					require_once(ABSPATH.'wp-admin/includes/file.php');
+					require_once(ABSPATH.'wp-admin/includes/template.php');
 				}
 				// basically check for direct or previously configured access
-				if ( ! WP_Filesystem() ) {
+				if ( ! WP_Filesystem()) {
 					// turn on output buffering so that we can capture the credentials form
 					ob_start();
-					$credentials = request_filesystem_credentials( '' );
+					$credentials = request_filesystem_credentials('');
 					// store credentials form for the time being
 					EEH_File::$_credentials_form = ob_get_clean();
 					// if credentials do NOT exist
-					if ( $credentials === FALSE ) {
-						add_action( 'admin_notices', array( 'EEH_File', 'display_request_filesystem_credentials_form' ), 999 );
-						throw new EE_Error( __('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso'));
+					if ($credentials === FALSE) {
+						add_action('admin_notices', array('EEH_File', 'display_request_filesystem_credentials_form'), 999);
+						throw new EE_Error(__('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso'));
 					}
 				}
 			}
@@ -89,8 +89,8 @@ 
 	 * display_request_filesystem_credentials_form
 	 */
 	public static function display_request_filesystem_credentials_form() {
-		if ( ! empty( EEH_File::$_credentials_form )) {
-			echo '<div class="updated espresso-notices-attention"><p>' . EEH_File::$_credentials_form . '</p></div>';
+		if ( ! empty(EEH_File::$_credentials_form)) {
+			echo '<div class="updated espresso-notices-attention"><p>'.EEH_File::$_credentials_form.'</p></div>';
 		}
 	}
 
@@ -108,29 +108,29 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function verify_filepath_and_permissions( $full_file_path = '', $file_name = '', $file_ext = '', $type_of_file = '' ) {
+	public static function verify_filepath_and_permissions($full_file_path = '', $file_name = '', $file_ext = '', $type_of_file = '') {
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		if ( ! $wp_filesystem->is_readable( $full_file_path )) {
-			$file_name = ! empty( $type_of_file ) ? $file_name . ' ' . $type_of_file : $file_name;
-			$file_name .= ! empty( $file_ext ) ? ' file' : ' folder';
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		if ( ! $wp_filesystem->is_readable($full_file_path)) {
+			$file_name = ! empty($type_of_file) ? $file_name.' '.$type_of_file : $file_name;
+			$file_name .= ! empty($file_ext) ? ' file' : ' folder';
 			$msg = sprintf(
-				__( 'The requested %1$s could not be found or is not readable, possibly due to an incorrect filepath, or incorrect file permissions.%2$s', 'event_espresso' ),
+				__('The requested %1$s could not be found or is not readable, possibly due to an incorrect filepath, or incorrect file permissions.%2$s', 'event_espresso'),
 				$file_name,
 				'<br />'
 			);
-			if ( EEH_File::exists( $full_file_path )) {
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path, $type_of_file );
+			if (EEH_File::exists($full_file_path)) {
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path, $type_of_file);
 			} else {
 				// no file permissions means the file was not found
 				$msg .= sprintf(
-					__( 'Please ensure the following path is correct: "%s".', 'event_espresso' ),
+					__('Please ensure the following path is correct: "%s".', 'event_espresso'),
 					$full_file_path
 				);
 			}
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				throw new EE_Error( $msg . '||' . $msg );
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				throw new EE_Error($msg.'||'.$msg);
 			}
 			return FALSE;
 		}
@@ -147,24 +147,24 @@ 
 	 * @param string $type_of_file - general type of file (ie: "module"), this is only used to improve error messages
 	 * @return string
 	 */
-	private static function _permissions_error_for_unreadable_filepath( $full_file_path = '', $type_of_file = '' ){
+	private static function _permissions_error_for_unreadable_filepath($full_file_path = '', $type_of_file = '') {
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
 		// check file permissions
-		$perms = $wp_filesystem->getchmod( $full_file_path );
-		if ( $perms ) {
+		$perms = $wp_filesystem->getchmod($full_file_path);
+		if ($perms) {
 			// file permissions exist, but way be set incorrectly
-			$type_of_file = ! empty( $type_of_file ) ? $type_of_file . ' ' : '';
-			$type_of_file .= ! empty( $type_of_file ) ? 'file' : 'folder';
+			$type_of_file = ! empty($type_of_file) ? $type_of_file.' ' : '';
+			$type_of_file .= ! empty($type_of_file) ? 'file' : 'folder';
 			return sprintf(
-				__( 'File permissions for the requested %1$s are currently set at "%2$s". The recommended permissions are 644 for files and 755 for folders.', 'event_espresso' ),
+				__('File permissions for the requested %1$s are currently set at "%2$s". The recommended permissions are 644 for files and 755 for folders.', 'event_espresso'),
 				$type_of_file,
 				$perms
 			);
 		} else {
 			// file exists but file permissions could not be read ?!?!
 			return sprintf(
-				__( 'Please ensure that the server and/or PHP configuration allows the current process to access the following file: "%s".', 'event_espresso' ),
+				__('Please ensure that the server and/or PHP configuration allows the current process to access the following file: "%s".', 'event_espresso'),
 				$full_file_path
 			);
 		}
@@ -179,33 +179,33 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_folder_exists_and_is_writable( $folder = '' ){
-		if ( empty( $folder )) {
+	public static function ensure_folder_exists_and_is_writable($folder = '') {
+		if (empty($folder)) {
 			return FALSE;
 		}
 		// remove ending DS
-		$folder = EEH_File::standardise_directory_separators( rtrim( $folder, '/\\' ));
+		$folder = EEH_File::standardise_directory_separators(rtrim($folder, '/\\'));
 		// determine parent folder
-		$folder_segments = explode( DS, $folder );
-		array_pop( $folder_segments );
-		$parent_folder = implode( DS, $folder_segments ) . DS;
+		$folder_segments = explode(DS, $folder);
+		array_pop($folder_segments);
+		$parent_folder = implode(DS, $folder_segments).DS;
 		// add DS to folder
-		$folder = EEH_File::end_with_directory_separator( $folder );
+		$folder = EEH_File::end_with_directory_separator($folder);
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		if ( ! $wp_filesystem->is_dir( $folder )) {
-			if ( ! EEH_File::verify_is_writable( $parent_folder, 'folder' )) {
+		if ( ! $wp_filesystem->is_dir($folder)) {
+			if ( ! EEH_File::verify_is_writable($parent_folder, 'folder')) {
 				return FALSE;
 			} else {
-				if ( ! $wp_filesystem->mkdir( $folder )) {
-					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-						$msg = sprintf( __( '"%s" could not be created.', 'event_espresso' ), $folder );
-						$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $folder );
-						throw new EE_Error( $msg );
+				if ( ! $wp_filesystem->mkdir($folder)) {
+					if (defined('WP_DEBUG') && WP_DEBUG) {
+						$msg = sprintf(__('"%s" could not be created.', 'event_espresso'), $folder);
+						$msg .= EEH_File::_permissions_error_for_unreadable_filepath($folder);
+						throw new EE_Error($msg);
 					}
 					return FALSE;
 				}
 			}
-		} elseif ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
+		} elseif ( ! EEH_File::verify_is_writable($folder, 'folder')) {
 			return FALSE;
 		}
 		return TRUE;
@@ -220,15 +220,15 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function verify_is_writable( $full_path = '', $file_or_folder = 'folder' ){
+	public static function verify_is_writable($full_path = '', $file_or_folder = 'folder') {
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		$full_path = EEH_File::standardise_directory_separators( $full_path );
-		if ( ! $wp_filesystem->is_writable( $full_path )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The "%1$s" %2$s is not writable.', 'event_espresso' ), $full_path, $file_or_folder );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_path );
-				throw new EE_Error( $msg );
+		$full_path = EEH_File::standardise_directory_separators($full_path);
+		if ( ! $wp_filesystem->is_writable($full_path)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The "%1$s" %2$s is not writable.', 'event_espresso'), $full_path, $file_or_folder);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -244,21 +244,21 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_file_exists_and_is_writable( $full_file_path = '' ) {
+	public static function ensure_file_exists_and_is_writable($full_file_path = '') {
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		if ( ! EEH_File::exists( $full_file_path )) {
-			if ( ! $wp_filesystem->touch( $full_file_path )) {
-				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-					$msg = sprintf( __( 'The "%s" file could not be created.', 'event_espresso' ), $full_file_path );
-					$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path );
-					throw new EE_Error( $msg );
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		if ( ! EEH_File::exists($full_file_path)) {
+			if ( ! $wp_filesystem->touch($full_file_path)) {
+				if (defined('WP_DEBUG') && WP_DEBUG) {
+					$msg = sprintf(__('The "%s" file could not be created.', 'event_espresso'), $full_file_path);
+					$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path);
+					throw new EE_Error($msg);
 				}
 				return FALSE;
 			}
 		}
-		if ( ! EEH_File::verify_is_writable( $full_file_path, 'file' )) {
+		if ( ! EEH_File::verify_is_writable($full_file_path, 'file')) {
 			return FALSE;
 		}
 		return TRUE;
@@ -271,12 +271,12 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_file_contents( $full_file_path = '' ){
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		if ( EEH_File::verify_filepath_and_permissions( $full_file_path, EEH_File::get_filename_from_filepath( $full_file_path ) , EEH_File::get_file_extension( $full_file_path ))) {
+	public static function get_file_contents($full_file_path = '') {
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		if (EEH_File::verify_filepath_and_permissions($full_file_path, EEH_File::get_filename_from_filepath($full_file_path), EEH_File::get_file_extension($full_file_path))) {
 			// load WP_Filesystem and set file permissions
 			$wp_filesystem = EEH_File::_get_wp_filesystem();
-			return $wp_filesystem->get_contents( $full_file_path );
+			return $wp_filesystem->get_contents($full_file_path);
 		}
 		return '';
 	}
@@ -291,26 +291,26 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function write_to_file( $full_file_path = '', $file_contents = '', $file_type = '' ){
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		$file_type = ! empty( $file_type ) ? rtrim( $file_type, ' ' ) . ' ' : '';
-		$folder = EEH_File::remove_filename_from_filepath( $full_file_path );
-		if ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The %1$sfile located at "%2$s" is not writable.', 'event_espresso' ), $file_type, $full_file_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path );
-				throw new EE_Error( $msg );
+	public static function write_to_file($full_file_path = '', $file_contents = '', $file_type = '') {
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		$file_type = ! empty($file_type) ? rtrim($file_type, ' ').' ' : '';
+		$folder = EEH_File::remove_filename_from_filepath($full_file_path);
+		if ( ! EEH_File::verify_is_writable($folder, 'folder')) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The %1$sfile located at "%2$s" is not writable.', 'event_espresso'), $file_type, $full_file_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
 		// write the file
-		if ( ! $wp_filesystem->put_contents( $full_file_path, $file_contents )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The %1$sfile located at "%2$s" could not be written to.', 'event_espresso' ), $file_type, $full_file_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path, 'f' );
-				throw new EE_Error( $msg );
+		if ( ! $wp_filesystem->put_contents($full_file_path, $file_contents)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The %1$sfile located at "%2$s" could not be written to.', 'event_espresso'), $file_type, $full_file_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path, 'f');
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -326,9 +326,9 @@ 
 	 * @param string $full_file_path
 	 * @return bool
 	 */
-	public static function exists( $full_file_path = '' ) {
+	public static function exists($full_file_path = '') {
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		return $wp_filesystem->exists( $full_file_path ) ? TRUE : FALSE;
+		return $wp_filesystem->exists($full_file_path) ? TRUE : FALSE;
 	}
 
 
@@ -340,9 +340,9 @@ 
 	 * @param string $full_file_path
 	 * @return bool
 	 */
-	public static function is_readable( $full_file_path = '' ) {
+	public static function is_readable($full_file_path = '') {
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		return $wp_filesystem->is_readable( $full_file_path ) ? TRUE : FALSE;
+		return $wp_filesystem->is_readable($full_file_path) ? TRUE : FALSE;
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function remove_filename_from_filepath( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_DIRNAME );
+	public static function remove_filename_from_filepath($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_DIRNAME);
 	}
 
 
@@ -365,8 +365,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_filename_from_filepath( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_BASENAME );
+	public static function get_filename_from_filepath($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_BASENAME);
 	}
 
 
@@ -376,8 +376,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_file_extension( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_EXTENSION );
+	public static function get_file_extension($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_EXTENSION);
 	}
 
 
@@ -387,10 +387,10 @@ 
 	 * @param string $folder
 	 * @return bool
 	 */
-	public static function add_htaccess_deny_from_all( $folder = '' ) {
-		$folder = EEH_File::standardise_and_end_with_directory_separator( $folder );
-		if ( ! EEH_File::exists( $folder . '.htaccess' ) ) {
-			if ( ! EEH_File::write_to_file( $folder . '.htaccess', 'deny from all', '.htaccess' )) {
+	public static function add_htaccess_deny_from_all($folder = '') {
+		$folder = EEH_File::standardise_and_end_with_directory_separator($folder);
+		if ( ! EEH_File::exists($folder.'.htaccess')) {
+			if ( ! EEH_File::write_to_file($folder.'.htaccess', 'deny from all', '.htaccess')) {
 				return FALSE;
 			}
 		}
@@ -405,11 +405,11 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function get_classname_from_filepath_with_standard_filename( $file_path ){
+	public static function get_classname_from_filepath_with_standard_filename($file_path) {
 		//extract file from path
-		$filename = basename( $file_path );
+		$filename = basename($file_path);
 		//now remove the first period and everything after
-		$pos_of_first_period = strpos( $filename,'.' );
+		$pos_of_first_period = strpos($filename, '.');
 		return substr($filename, 0, $pos_of_first_period);
 	}
 
@@ -421,8 +421,8 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function standardise_directory_separators( $file_path ){
-		return str_replace( array( '\\', '/' ), DS, $file_path );
+	public static function standardise_directory_separators($file_path) {
+		return str_replace(array('\\', '/'), DS, $file_path);
 	}
 
 
@@ -433,8 +433,8 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function end_with_directory_separator( $file_path ){
-		return rtrim( $file_path, '/\\' ) . DS;
+	public static function end_with_directory_separator($file_path) {
+		return rtrim($file_path, '/\\').DS;
 	}
 
 
@@ -444,8 +444,8 @@ 
 	 * @param $file_path
 	 * @return string
 	 */
-	public static function standardise_and_end_with_directory_separator( $file_path ){
-		return self::end_with_directory_separator( self::standardise_directory_separators( $file_path ));
+	public static function standardise_and_end_with_directory_separator($file_path) {
+		return self::end_with_directory_separator(self::standardise_directory_separators($file_path));
 	}
 
 
@@ -462,21 +462,21 @@ 
 	 *		if $index_numerically == FALSE (Default) keys are what the class names SHOULD be;
 	 *		 and values are their filepaths
 	 */
-	public static function get_contents_of_folders( $folder_paths = array(), $index_numerically = FALSE ){
+	public static function get_contents_of_folders($folder_paths = array(), $index_numerically = FALSE) {
 		$class_to_folder_path = array();
-		foreach( $folder_paths as $folder_path ){
-			$folder_path = self::standardise_and_end_with_directory_separator( $folder_path );
+		foreach ($folder_paths as $folder_path) {
+			$folder_path = self::standardise_and_end_with_directory_separator($folder_path);
 			// load WP_Filesystem and set file permissions
-			$files_in_folder = glob( $folder_path . '*' );
+			$files_in_folder = glob($folder_path.'*');
 			$class_to_folder_path = array();
-			if ( $files_in_folder ) {
-				foreach( $files_in_folder as $file_path ){
+			if ($files_in_folder) {
+				foreach ($files_in_folder as $file_path) {
 					//only add files, not folders
-					if ( ! is_dir( $file_path )) {
-						if ( $index_numerically ) {
+					if ( ! is_dir($file_path)) {
+						if ($index_numerically) {
 							$class_to_folder_path[] = $file_path;
 						} else {
-							$classname = self::get_classname_from_filepath_with_standard_filename( $file_path );
+							$classname = self::get_classname_from_filepath_with_standard_filename($file_path);
 							$class_to_folder_path[$classname] = $file_path;
 						}
 					}
@@ -496,24 +496,24 @@ 
 	 * @return boolean success
 	 * @throws EE_Error
 	 */
-	public static function copy( $source_file, $destination_file, $overwrite = FALSE ){
-		$full_source_path = EEH_File::standardise_directory_separators( $source_file );
-		if( ! EEH_File::exists( $full_source_path ) ){
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The file located at "%2$s" is not readable or doesn\'t exist.', 'event_espresso' ), $full_source_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_source_path );
-				throw new EE_Error( $msg );
+	public static function copy($source_file, $destination_file, $overwrite = FALSE) {
+		$full_source_path = EEH_File::standardise_directory_separators($source_file);
+		if ( ! EEH_File::exists($full_source_path)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The file located at "%2$s" is not readable or doesn\'t exist.', 'event_espresso'), $full_source_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_source_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
 
-		$full_dest_path = EEH_File::standardise_directory_separators( $destination_file );
-		$folder = EEH_File::remove_filename_from_filepath( $full_dest_path );
-		if ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The file located at "%2$s" is not writable.', 'event_espresso' ), $full_dest_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_dest_path );
-				throw new EE_Error( $msg );
+		$full_dest_path = EEH_File::standardise_directory_separators($destination_file);
+		$folder = EEH_File::remove_filename_from_filepath($full_dest_path);
+		if ( ! EEH_File::verify_is_writable($folder, 'folder')) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The file located at "%2$s" is not writable.', 'event_espresso'), $full_dest_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_dest_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -521,11 +521,11 @@ 
 		// load WP_Filesystem and set file permissions
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
 		// write the file
-		if ( ! $wp_filesystem->copy( $full_source_path, $full_dest_path, $overwrite )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'Attempted writing to file %1$s, but could not, probably because of permissions issues', 'event_espresso' ), $full_source_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_source_path, 'f' );
-				throw new EE_Error( $msg );
+		if ( ! $wp_filesystem->copy($full_source_path, $full_dest_path, $overwrite)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('Attempted writing to file %1$s, but could not, probably because of permissions issues', 'event_espresso'), $full_source_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_source_path, 'f');
+				throw new EE_Error($msg);
 			}
 			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_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 +115 added lines, -115 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;
@@ -93,15 +93,15 @@ 
 	 * @param bool   $force_close
 	 * @return string
 	 */
-	protected static function _open_tag( $tag = 'div', $content = '', $id = '', $class = '', $style = '', $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 ) : '';
+	protected static function _open_tag($tag = 'div', $content = '', $id = '', $class = '', $style = '', $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) : '';
 		return $html;
 	}
 
@@ -117,16 +117,16 @@ 
 	 * @param bool   $indent
 	 * @return string
 	 */
-	protected static function _close_tag( $tag = 'div', $id = '', $class = '', $indent = TRUE ) {
-		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 );
+	protected static function _close_tag($tag = 'div', $id = '', $class = '', $indent = TRUE) {
+		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);
 		} else {
 			$comment = '';
 		}
 		$html = $indent ? EEH_HTML::nl( -1, $tag ) : '';
-		$html .= '</' . $tag . '>' . $comment;
+		$html .= '</'.$tag.'>'.$comment;
 		return $html;
 	}
 
@@ -145,8 +145,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);
 	}
 
 
@@ -159,8 +159,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);
 	}
 
 
@@ -176,23 +176,23 @@ 
 	 * @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);
 	}
-	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);
 	}
-	public static function h3( $content = '', $id = '', $class = '', $style = '', $other_attributes = '' ) {
-		return EEH_HTML::_open_tag( 'h4', $content, $id, $class, $style, $other_attributes, TRUE );
+	public static function h3($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 );
+	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 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);
 	}
-	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);
 	}
 
 
@@ -208,8 +208,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);
 	}
 
 
@@ -224,8 +224,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);
 	}
 
 
@@ -238,8 +238,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);
 	}
 
 
@@ -256,8 +256,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);
 	}
 
 
@@ -270,8 +270,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);
 	}
 
 
@@ -287,8 +287,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);
 	}
 
 
@@ -300,8 +300,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);
 	}
 
 
@@ -317,8 +317,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);
 	}
 
 
@@ -330,8 +330,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);
 	}
 
 
@@ -347,8 +347,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);
 	}
 
 
@@ -360,8 +360,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);
 	}
 
 
@@ -377,8 +377,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);
 	}
 
 
@@ -390,8 +390,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);
 	}
 
 
@@ -407,8 +407,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);
 	}
 
 
@@ -420,8 +420,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);
 	}
 
 
@@ -437,8 +437,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);
 	}
 
 
@@ -450,8 +450,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);
 	}
 
 
@@ -465,10 +465,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;'
 		);
 	}
 
@@ -488,14 +488,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>';
 	}
 
 
@@ -512,14 +512,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.'/>';
 	}
 
 
@@ -537,12 +537,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.'>';
 	}
 
 
@@ -558,8 +558,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);
 	}
 
 
@@ -575,8 +575,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);
 	}
 
 
@@ -592,8 +592,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);
 	}
 
 
@@ -605,8 +605,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.' -->' : '';
 	}
 
 
@@ -617,8 +617,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);
 	}
 
 
@@ -629,8 +629,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);
 	}
 
 
@@ -644,9 +644,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);
 	}
 
 
@@ -658,10 +658,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;
@@ -676,17 +676,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 ] += intval( $indent );
-		EEH_HTML::$_indent[ $tag ] = EEH_HTML::$_indent[ $tag ] >= 0 ? EEH_HTML::$_indent[ $tag ] : 0;
+		EEH_HTML::$_indent[$tag] += intval($indent);
+		EEH_HTML::$_indent[$tag] = EEH_HTML::$_indent[$tag] >= 0 ? EEH_HTML::$_indent[$tag] : 0;
 	}