eventespresso / event-espresso-core

core/db_models/strategies/EE_Soft_Delete_Where_Conditions.strategy.php

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)));
 		}
 	}

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  * @since		 	   4.6.0
  */
-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
@@ -22,12 +22,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
@@ -39,12 +39,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

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 +31 added lines, -31 removed lines

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

core/helpers/EEH_Autoloader.helper.php

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 +52 added lines, -52 removed lines

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

Indentation +4 added lines, -4 removed lines

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

core/helpers/EEH_Base.helper.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/helpers/EEH_DTT_Helper.helper.php

Indentation -1 removed lines

@@ -799,7 +799,6 @@
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.

Braces +7 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -264,10 +265,11 @@ 
 					// Set TZ so localtime works.
 					date_default_timezone_set($timezone_string);
 					$now = localtime(time(), true);
-					if ($now['tm_isdst'])
-						_e('This timezone is currently in daylight saving time.');
-					else
-						_e('This timezone is currently in standard time.');
+					if ($now['tm_isdst']) {
+											_e('This timezone is currently in daylight saving time.');
+					} else {
+											_e('This timezone is currently in standard time.');
+					}
 					?>
 					<br />
 					<?php

Spacing +115 added lines, -116 removed lines

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

core/helpers/EEH_Event_View.helper.php

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -432,7 +434,7 @@ 
 		if($include_expired === null){
 			if($event instanceof EE_Event && $event->is_expired()){
 				$include_expired = true;
-			}else{
+			} else{
 				$include_expired = false;
 			}
 		}

Doc Comments +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @access    public
 	 * @param    int $EVT_ID
-	 * @return    object
+	 * @return    null|boolean
 	 */
 	public static function get_event( $EVT_ID = 0 ) {
 		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
@@ -116,7 +116,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -136,7 +136,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -322,7 +322,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_primary_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -347,7 +347,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_last_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -372,7 +372,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -422,7 +422,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]

Spacing +117 added lines, -117 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param    int $EVT_ID
 	 * @return    object
 	 */
-	public static function get_event( $EVT_ID = 0 ) {
-		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
+	public static function get_event($EVT_ID = 0) {
+		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint($EVT_ID);
 		// do we already have the Event  you are looking for?
-		if ( EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID ) {
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
 			return EEH_Event_View::$_event;
 		}
 		EEH_Event_View::$_event = NULL;
 		// international newspaper?
 		global $post;
 		// if this is being called from an EE_Event post, then we can just grab the attached EE_Event object
-		 if ( isset( $post->post_type ) && $post->post_type == 'espresso_events' || $EVT_ID ) {
+		 if (isset($post->post_type) && $post->post_type == 'espresso_events' || $EVT_ID) {
 //			d( $post );
 			// grab the event we're looking for
-			if ( isset( $post->EE_Event ) && ( $EVT_ID == 0 || ( $EVT_ID == $post->ID ))) {
+			if (isset($post->EE_Event) && ($EVT_ID == 0 || ($EVT_ID == $post->ID))) {
 				EEH_Event_View::$_event = $post->EE_Event;
 //				d( EEH_Event_View::$_event );
 			}
 			// now if we STILL do NOT have an EE_Event model object, BUT we have an Event ID...
-			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID ) {
+			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
 				// sigh... pull it from the db
-				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 //				d( EEH_Event_View::$_event );
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -118,13 +118,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -140,45 +140,45 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
 		global $post;
 
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 
 			// admin has chosen "full description" for the "Event Espresso - Events > Templates > Display Description" option
 			the_content();
 
-		} else if (( is_archive() && has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() ) ) {
+		} else if ((is_archive() && has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// AND an excerpt actually exists
 			the_excerpt();
 
-		} else if (( is_archive() && ! has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() )) {
+		} else if ((is_archive() && ! has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// but NO excerpt actually exists, so we need to create one
-			if ( ! empty( $num_words )) {
-				if ( empty( $more )) {
-					$more_link_text = __( '(more…)' );
-					$more = ' <a href="' . get_permalink() . '" class="more-link">' . $more_link_text . '</a>';
-					$more = apply_filters( 'the_content_more_link', $more, $more_link_text );
+			if ( ! empty($num_words)) {
+				if (empty($more)) {
+					$more_link_text = __('(more&hellip;)');
+					$more = ' <a href="'.get_permalink().'" class="more-link">'.$more_link_text.'</a>';
+					$more = apply_filters('the_content_more_link', $more, $more_link_text);
 				}
-				$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+				$content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-				$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				$content = wp_trim_words($content, $num_words, ' ').$more;
 			} else {
-				$content =  get_the_content();
+				$content = get_the_content();
 			}
 			global $allowedtags;
-			$content = wp_kses( $content, $allowedtags );
-			$content = strip_shortcodes( $content );
-			echo apply_filters( 'the_content', $content );
+			$content = wp_kses($content, $allowedtags);
+			$content = strip_shortcodes($content);
+			echo apply_filters('the_content', $content);
 
 		} else {
 			// admin has chosen "none" for the "Event Espresso - Events > Templates > Display Description" option
-			echo apply_filters( 'the_content', '' );
+			echo apply_filters('the_content', '');
 		}
 		return ob_get_clean();
 	}
@@ -192,13 +192,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	EE_Ticket[]
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -214,22 +214,22 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a>';
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a>';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -243,10 +243,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -260,10 +260,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -277,10 +277,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -294,10 +294,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -309,13 +309,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime( 'DTT_EVT_start', 'M' );?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime('DTT_EVT_start', 'M'); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -330,17 +330,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -355,17 +355,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -380,17 +380,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -405,17 +405,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -433,17 +433,17 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === null){
-			if($event instanceof EE_Event && $event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === null) {
+			if ($event instanceof EE_Event && $event->is_expired()) {
 				$include_expired = true;
-			}else{
+			} else {
 				$include_expired = false;
 			}
 		}
 
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -459,11 +459,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -477,10 +477,10 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -497,23 +497,23 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this event');
+				$link = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';

core/helpers/EEH_Form_Fields.helper.php

Indentation +7 added lines, -7 removed lines

@@ -393,7 +393,7 @@ 
 
 	/**
 	 * generate_question_groups_html
- 	 *
+	 *
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
@@ -537,7 +537,7 @@ 
 
 	/**
 	 * generate_form_input
- 	 *
+	 *
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
@@ -612,7 +612,7 @@ 
 
 	/**
 	 * generates HTML for a form text input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -657,7 +657,7 @@ 
 
 	/**
 	 * generates HTML for a form textarea
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -708,7 +708,7 @@ 
 
 	/**
 	 * generates HTML for a form select input
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options			array of answer options where array key = option value and array value = option display text
@@ -885,7 +885,7 @@ 
 
 	/**
 	 * generates HTML for form checkbox inputs
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options 			array of options where array key = option value and array value = option display text
@@ -966,7 +966,7 @@ 
 
 	/**
 	 * generates HTML for a form datepicker input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute

Braces +9 added lines, -6 removed lines

@@ -366,14 +366,16 @@ 
 		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if ( EEH_Formatter::ee_tep_not_null($parameters)) {
+					$field .= ' ' . $parameters;
+		}
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
 				if ($values[$ii]['text']) {
-					if (strlen($values[$ii]['text']) > 5)
-						$size = 'wide';
+					if (strlen($values[$ii]['text']) > 5) {
+											$size = 'wide';
+					}
 				}
 			}
 		} else {
@@ -382,8 +384,9 @@ 
 
 		$field .= ' class="' . $class . ' ' . $size . '">';
 
-		if (empty($default) && isset($GLOBALS[$name]))
-			$default = stripslashes($GLOBALS[$name]);
+		if (empty($default) && isset($GLOBALS[$name])) {
+					$default = stripslashes($GLOBALS[$name]);
+		}
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {

Spacing +377 added lines, -377 removed lines

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

Doc Comments +5 added lines, -5 removed lines

@@ -797,7 +797,7 @@ 
 	 *
 	 * @param mixed $opt_group
 	 * @param mixed $QSOs
-	 * @param mixed $answer
+	 * @param string $answer
 	 * @param boolean $use_html_entities
 	 * @return string
 	 */
@@ -1147,7 +1147,7 @@ 
 	/**
 	 * 	prep_required
 	 * @param string|array 	$required
-	 * @return array
+	 * @return string
 	 */
 	static function prep_required( $required = array() ){
 		// make sure required is an array
@@ -1198,8 +1198,8 @@ 
 
 	/**
 	 * 	_load_system_dropdowns
-	 * @param array 	$QFI
-	 * @return array
+	 * @param EE_Question_Form_Input 	$QFI
+	 * @return EE_Question_Form_Input
 	 */
 	private static function _load_system_dropdowns( $QFI ){
 		$QST_system = $QFI->get('QST_system');
@@ -1490,7 +1490,7 @@ 
 	 * @param    string   $nonce_action     - if using nonces
 	 * @param    bool|string $input_only       - whether to print form header and footer. TRUE returns the input without the form
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
-	 * @return    void
+	 * @return    string
 	 */
 	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
 		$btn = '';

core/helpers/EEH_HTML.helper.php

Indentation +10 added lines, -10 removed lines

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

Spacing +121 added lines, -121 removed lines

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

core/helpers/EEH_Inflector.helper.php

Indentation +315 added lines, -315 removed lines

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

Spacing +42 added lines, -42 removed lines

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

Braces +1 added lines, -1 removed lines

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