eventespresso / event-espresso-core

core/helpers/EEH_Array.helper.php

Spacing +36 added lines, -36 removed lines

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

core/exceptions/ExceptionStackTraceDisplay.php

Indentation +24 added lines, -24 removed lines

@@ -118,10 +118,10 @@ 
 			// add generic non-identifying messages for non-privileged users
 			if ( ! WP_DEBUG ) {
 				$output .= '<span class="ee-error-user-msg-spn">'
-				           . trim( $msg )
-				           . '</span> &nbsp; <sup>'
-				           . $code
-				           . '</sup><br />';
+						   . trim( $msg )
+						   . '</span> &nbsp; <sup>'
+						   . $code
+						   . '</sup><br />';
 			} else {
 				// or helpful developer messages if debugging is on
 				$output .= '
@@ -130,39 +130,39 @@ 
 				'
 				. sprintf(
 					__( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ),
-				    '<strong class="ee-error-dev-msg-str">',
+					'<strong class="ee-error-dev-msg-str">',
 					get_class( $exception ),
 					'</strong>  &nbsp; <span>',
 					$code . '</span>'
 				)
 				. '<br />
 				<span class="big-text">"'
-				           . trim( $msg )
-				           . '"</span><br/>
+						   . trim( $msg )
+						   . '"</span><br/>
 				<a id="display-ee-error-trace-1'
-				           . $time
-				           . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1'
-				           . $time
-				           . '">
+						   . $time
+						   . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-1'
+						   . $time
+						   . '">
 					'
-				           . __( 'click to view backtrace and class/method details', 'event_espresso' )
-				           . '
+						   . __( 'click to view backtrace and class/method details', 'event_espresso' )
+						   . '
 				</a><br />
 				'
-				           . $exception->getFile()
-				           . sprintf(
-					           __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
-					           ' &nbsp; <span class="small-text lt-grey-text">',
-					           $exception->getLine(),
-					           '</span>'
-				           )
-				           . '
+						   . $exception->getFile()
+						   . sprintf(
+							   __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
+							   ' &nbsp; <span class="small-text lt-grey-text">',
+							   $exception->getLine(),
+							   '</span>'
+						   )
+						   . '
 			</p>
 			<div id="ee-error-trace-1'
-				           . $time
-				           . '-dv" class="ee-error-trace-dv" style="display: none;">
+						   . $time
+						   . '-dv" class="ee-error-trace-dv" style="display: none;">
 				'
-				           . $trace_details;
+						   . $trace_details;
 				if ( ! empty( $class ) ) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;">

Spacing +99 added lines, -99 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,9 +22,9 @@ 
 	/**
 	 * @param \Exception $exception
 	 */
-	public function __construct( \Exception $exception ) {
-		if ( WP_DEBUG ) {
-			$this->displayException( $exception );
+	public function __construct(\Exception $exception) {
+		if (WP_DEBUG) {
+			$this->displayException($exception);
 		}
 	}
 
@@ -34,27 +34,27 @@ 
 	 * @access protected
 	 * @param \Exception $exception
 	 */
-	protected function displayException( \Exception $exception ) {
+	protected function displayException(\Exception $exception) {
 
 		$error_code = '';
 		$trace_details = '';
 		$time = time();
 		$trace = $exception->getTrace();
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $exception->getMessage() );
+		$msg = explode('||', $exception->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// start gathering output
 		$output = $this->exceptionStyles();
 		$output .= '
 <div id="ee-error-message" class="error">';
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 			// process trace info
-			if ( empty( $trace ) ) {
+			if (empty($trace)) {
 				$trace_details .= __(
 					'Sorry, but no trace information was available for this exception.',
 					'event_espresso'
@@ -67,47 +67,47 @@ 
 					<th scope="col" align="right" style="width:2.5%;">#</th>
 					<th scope="col" align="right" style="width:3.5%;">Line</th>
 					<th scope="col" align="left" style="width:40%;">File</th>
-					<th scope="col" align="left">' . __( 'Class', 'event_espresso' ) . '->' . __( 'Method( arguments )', 'event_espresso' ) . '</th>
+					<th scope="col" align="left">' . __('Class', 'event_espresso').'->'.__('Method( arguments )', 'event_espresso').'</th>
 				</tr>';
-				$last_on_stack = count( $trace ) - 1;
+				$last_on_stack = count($trace) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $trace );
-				foreach ( $sorted_trace as $nmbr => $trace ) {
-					$file = isset( $trace['file'] ) ? $trace['file'] : '';
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$args = isset( $trace['args'] ) && count( $trace['args'] ) > 4  ? ' <br />' . $args . '<br />' : $args;
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+				$sorted_trace = array_reverse($trace);
+				foreach ($sorted_trace as $nmbr => $trace) {
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$args = isset($trace['args']) && count($trace['args']) > 4 ? ' <br />'.$args.'<br />' : $args;
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 !== 0 ? ' odd' : '';
-					if ( empty( $file ) && ! empty( $class ) ) {
-						$a = new \ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new \ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function ) ) {
-							$b = new \ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new \ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
-					if ( $nmbr === $last_on_stack ) {
+					if ($nmbr === $last_on_stack) {
 						$file = $exception->getFile() !== '' ? $exception->getFile() : $file;
 						$line = $exception->getLine() !== '' ? $exception->getLine() : $line;
-						$error_code = $this->generate_error_code( $file, $trace['function'], $line );
+						$error_code = $this->generate_error_code($file, $trace['function'], $line);
 					}
-					$file = \EEH_File::standardise_directory_separators( $file );
-					$nmbr = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line = ! empty( $line ) ? $line : '&nbsp;';
-					$file = ! empty( $file ) ? $file : '&nbsp;';
-					$class_display = ! empty( $class ) ? $class : '';
-					$type = ! empty( $type ) ? $type : '';
-					$function = ! empty( $function ) ? $function : '';
-					$args = ! empty( $args ) ? '( ' . $args . ' )' : '()';
+					$file = \EEH_File::standardise_directory_separators($file);
+					$nmbr = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line = ! empty($line) ? $line : '&nbsp;';
+					$file = ! empty($file) ? $file : '&nbsp;';
+					$class_display = ! empty($class) ? $class : '';
+					$type = ! empty($type) ? $type : '';
+					$function = ! empty($function) ? $function : '';
+					$args = ! empty($args) ? '( '.$args.' )' : '()';
 					$trace_details .= '
 					<tr>
-						<td align="right" valign="top" class="' . $zebra . '">' . $nmbr . '</td>
-						<td align="right" valign="top" class="' . $zebra . '">' . $line . '</td>
-						<td align="left" valign="top" class="' . $zebra . '">' . $file . '</td>
-						<td align="left" valign="top" class="' . $zebra . '">' . $class_display . $type . $function . $args . '</td>
+						<td align="right" valign="top" class="' . $zebra.'">'.$nmbr.'</td>
+						<td align="right" valign="top" class="' . $zebra.'">'.$line.'</td>
+						<td align="left" valign="top" class="' . $zebra.'">'.$file.'</td>
+						<td align="left" valign="top" class="' . $zebra.'">'.$class_display.$type.$function.$args.'</td>
 					</tr>';
 				}
 				$trace_details .= '
@@ -116,9 +116,9 @@ 
 			}
 			$code = $exception->getCode() ? $exception->getCode() : $error_code;
 			// add generic non-identifying messages for non-privileged users
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 				$output .= '<span class="ee-error-user-msg-spn">'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '</span> &nbsp; <sup>'
 				           . $code
 				           . '</sup><br />';
@@ -129,15 +129,15 @@ 
 			<p class="ee-error-dev-msg-pg">
 				'
 				. sprintf(
-					__( '%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso' ),
+					__('%1$sAn %2$s was thrown!%3$s code: %4$s', 'event_espresso'),
 				    '<strong class="ee-error-dev-msg-str">',
-					get_class( $exception ),
+					get_class($exception),
 					'</strong>  &nbsp; <span>',
-					$code . '</span>'
+					$code.'</span>'
 				)
 				. '<br />
 				<span class="big-text">"'
-				           . trim( $msg )
+				           . trim($msg)
 				           . '"</span><br/>
 				<a id="display-ee-error-trace-1'
 				           . $time
@@ -145,13 +145,13 @@ 
 				           . $time
 				           . '">
 					'
-				           . __( 'click to view backtrace and class/method details', 'event_espresso' )
+				           . __('click to view backtrace and class/method details', 'event_espresso')
 				           . '
 				</a><br />
 				'
 				           . $exception->getFile()
 				           . sprintf(
-					           __( '%1$s( line no: %2$s )%3$s', 'event_espresso' ),
+					           __('%1$s( line no: %2$s )%3$s', 'event_espresso'),
 					           ' &nbsp; <span class="small-text lt-grey-text">',
 					           $exception->getLine(),
 					           '</span>'
@@ -163,14 +163,14 @@ 
 				           . '-dv" class="ee-error-trace-dv" style="display: none;">
 				'
 				           . $trace_details;
-				if ( ! empty( $class ) ) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #999; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #999; background:#fcfcfc;">
-						<h3>' . __( 'Class Details', 'event_espresso' ) . '</h3>';
-					$a = new \ReflectionClass( $class );
+						<h3>' . __('Class Details', 'event_espresso').'</h3>';
+					$a = new \ReflectionClass($class);
 					$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -180,16 +180,16 @@ 
 		<br />';
 			}
 		// remove last linebreak
-		$output = substr( $output, 0, count( $output ) - 7 );
-		if ( ! WP_DEBUG ) {
+		$output = substr($output, 0, count($output) - 7);
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
 		$output .= '
 </div>';
-		$output .= $this->printScripts( true );
-		if ( defined( 'DOING_AJAX' ) ) {
-			echo json_encode( array( 'error' => $output ) );
+		$output .= $this->printScripts(true);
+		if (defined('DOING_AJAX')) {
+			echo json_encode(array('error' => $output));
 			exit();
 		}
 		echo $output;
@@ -206,56 +206,56 @@ 
 	 * @param bool  $array
 	 * @return string
 	 */
-	private function _convert_args_to_string( $arguments = array(), $indent = 0, $array = false ) {
+	private function _convert_args_to_string($arguments = array(), $indent = 0, $array = false) {
 		$args = array();
-		$args_count = count( $arguments );
-		if ( $args_count > 2 ) {
+		$args_count = count($arguments);
+		if ($args_count > 2) {
 			$indent++;
 			$args[] = '<br />';
 		}
 		$x = 0;
-		foreach ( $arguments as $arg ) {
+		foreach ($arguments as $arg) {
 			$x++;
-			for( $i = 0; $i < $indent; $i++ ) {
+			for ($i = 0; $i < $indent; $i++) {
 				$args[] = ' &nbsp;&nbsp; ';
 			}
-			if ( is_string( $arg ) ) {
-				if ( ! $array && strlen( $arg ) > 75 ) {
+			if (is_string($arg)) {
+				if ( ! $array && strlen($arg) > 75) {
 					$args[] = "<br />";
-					for ( $i = 0; $i <= $indent; $i++ ) {
+					for ($i = 0; $i <= $indent; $i++) {
 						$args[] = ' &nbsp;&nbsp; ';
 					}
-					$args[] = "'" . $arg . "'<br />";
+					$args[] = "'".$arg."'<br />";
 				} else {
-					$args[] = " '" . $arg . "'";
+					$args[] = " '".$arg."'";
 				}
-			} elseif ( is_array( $arg ) ) {
-				$arg_count = count( $arg );
-				if ( $arg_count > 2 ) {
+			} elseif (is_array($arg)) {
+				$arg_count = count($arg);
+				if ($arg_count > 2) {
 					$indent++;
-					$args[] = " array(" . $this->_convert_args_to_string( $arg, $indent, true ) . ")";
+					$args[] = " array(".$this->_convert_args_to_string($arg, $indent, true).")";
 					$indent--;
-				} else if ( $arg_count === 0 ) {
+				} else if ($arg_count === 0) {
 					$args[] = " array()";
 				} else {
-					$args[] = " array( " . $this->_convert_args_to_string( $arg ) . " )";
+					$args[] = " array( ".$this->_convert_args_to_string($arg)." )";
 				}
-			} elseif ( $arg === null ) {
+			} elseif ($arg === null) {
 				$args[] = ' null';
-			} elseif ( is_bool( $arg ) ) {
+			} elseif (is_bool($arg)) {
 				$args[] = $arg ? ' true' : ' false';
-			} elseif ( is_object( $arg ) ) {
-				$args[] = get_class( $arg );
-			} elseif ( is_resource( $arg ) ) {
-				$args[] = get_resource_type( $arg );
+			} elseif (is_object($arg)) {
+				$args[] = get_class($arg);
+			} elseif (is_resource($arg)) {
+				$args[] = get_resource_type($arg);
 			} else {
 				$args[] = $arg;
 			}
-			if ( $x === $args_count ) {
-				if ( $args_count > 2 ) {
+			if ($x === $args_count) {
+				if ($args_count > 2) {
 					$args[] = "<br />";
 					$indent--;
-					for ( $i = 1; $i < $indent; $i++ ) {
+					for ($i = 1; $i < $indent; $i++) {
 						$args[] = ' &nbsp;&nbsp; ';
 					}
 				}
@@ -263,7 +263,7 @@ 
 				$args[] = $args_count > 2 ? ",<br />" : ', ';
 			}
 		}
-		return implode( '', $args );
+		return implode('', $args);
 	}
 
 
@@ -278,11 +278,11 @@ 
 	 * @param string $line
 	 * @return string
 	 */
-	protected function generate_error_code( $file = '', $func = '', $line = '' ) {
-		$file_bits = explode( '.', basename( $file ) );
-		$error_code = ! empty( $file_bits[0] ) ? $file_bits[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	protected function generate_error_code($file = '', $func = '', $line = '') {
+		$file_bits = explode('.', basename($file));
+		$error_code = ! empty($file_bits[0]) ? $file_bits[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -366,26 +366,26 @@ 
 	 * @param bool $force_print
 	 * @return string|void
 	 */
-	private function printScripts( $force_print = false ) {
-		if ( ! $force_print  && ( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' ) ) ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' ) ) {
+	private function printScripts($force_print = false) {
+		if ( ! $force_print && (did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts'))) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return '';
-			} else if ( wp_script_is( 'ee_error_js', 'registered' ) ) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js', 'ee_settings', array( 'wp_debug' => WP_DEBUG ) );
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug' => WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 		}
 		return '';

core/exceptions/InsufficientPermissionsException.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -24,8 +24,8 @@ 
 	 * @param  int $code
 	 * @param  \Exception $previous
 	 */
-	public function __construct( $action, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($action, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
 				__(
 					'We\'re sorry, but you do not have the required permissions to perform the following action: ',
@@ -34,7 +34,7 @@ 
 				$action
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 

core/libraries/form_sections/form_handlers/InvalidFormHandlerException.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\form_sections\form_handlers;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,8 +26,8 @@ 
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $actual, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($actual, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
 				__(
 					'A valid Form Handler was expected but instead "%1$s" was received.',
@@ -36,7 +36,7 @@ 
 				$actual
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/libraries/form_sections/form_handlers/FormHandlerInterface.php

Spacing +11 added lines, -11 removed lines

@@ -3,8 +3,8 @@ 
 
 use EE_Form_Section_Proper;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -36,7 +36,7 @@ 
 	/**
 	 * @param \EE_Form_Section_Proper $form
 	 */
-	public function setForm( \EE_Form_Section_Proper $form );
+	public function setForm(\EE_Form_Section_Proper $form);
 
 
 
@@ -53,7 +53,7 @@ 
 	/**
 	 * @param boolean $displayable
 	 */
-	public function setDisplayable( $displayable = false );
+	public function setDisplayable($displayable = false);
 
 
 
@@ -94,7 +94,7 @@ 
 	/**
 	 * @param string $submit_btn_text
 	 */
-	public function setSubmitBtnText( $submit_btn_text );
+	public function setSubmitBtnText($submit_btn_text);
 
 
 
@@ -108,14 +108,14 @@ 
 	/**
 	 * @param string $form_action
 	 */
-	public function setFormAction( $form_action );
+	public function setFormAction($form_action);
 
 
 
 	/**
 	 * @param array $form_args
 	 */
-	public function addFormActionArgs( $form_args = array() );
+	public function addFormActionArgs($form_args = array());
 
 
 
@@ -135,7 +135,7 @@ 
 	 *
 	 * @param string $form_config
 	 */
-	public function setFormConfig( $form_config );
+	public function setFormConfig($form_config);
 
 
 
@@ -187,7 +187,7 @@ 
 	 * @param array $submitted_form_data
 	 * @return bool
 	 */
-	public function process( $submitted_form_data = array() );
+	public function process($submitted_form_data = array());
 
 
 
@@ -197,7 +197,7 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateSubmitButton( $text = '' );
+	public function generateSubmitButton($text = '');
 
 
 
@@ -216,7 +216,7 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateCancelButton( $text = '' );
+	public function generateCancelButton($text = '');
 
 
 

core/libraries/form_sections/form_handlers/SequentialStepFormInterface.php

Spacing +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use InvalidArgumentException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -32,7 +32,7 @@ 
 	 * @param int $order
 	 * @throws InvalidArgumentException
 	 */
-	public function setOrder( $order );
+	public function setOrder($order);
 
 
 
@@ -48,7 +48,7 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function setRedirectUrl( $redirect_url );
+	public function setRedirectUrl($redirect_url);
 
 
 
@@ -57,7 +57,7 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function addRedirectArgs( $redirect_args = array() );
+	public function addRedirectArgs($redirect_args = array());
 
 
 
@@ -71,7 +71,7 @@ 
 	/**
 	 * @param string $redirect_to
 	 */
-	public function setRedirectTo( $redirect_to );
+	public function setRedirectTo($redirect_to);
 
 
 

core/libraries/form_sections/form_handlers/FormHandler.php

Indentation -2 removed lines

@@ -12,8 +12,6 @@
   KEY `group_id` (`group_id`),
   KEY `question_id` (`question_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8$$
-
-
  * 4.1 question group question model's tables and fields:
  $this->_tables = array(
 			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')

Spacing +70 added lines, -70 removed lines

@@ -10,8 +10,8 @@ 
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidFormSubmissionException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,7 +28,7 @@ 
  * @author        Brent Christensen
  * @since         4.9.0
  */
-abstract class FormHandler implements FormHandlerInterface{
+abstract class FormHandler implements FormHandlerInterface {
 
 	/**
 	 * will add opening and closing HTML form tags as well as a submit button
@@ -139,12 +139,12 @@ 
 		$form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
 		\EE_Registry $registry
 	) {
-		$this->setFormName( $form_name );
-		$this->setAdminName( $admin_name );
-		$this->setSlug( $slug );
-		$this->setFormAction( $form_action );
-		$this->setFormConfig( $form_config );
-		$this->setSubmitBtnText( __( 'Submit', 'event_espresso' ) );
+		$this->setFormName($form_name);
+		$this->setAdminName($admin_name);
+		$this->setSlug($slug);
+		$this->setFormAction($form_action);
+		$this->setFormConfig($form_config);
+		$this->setSubmitBtnText(__('Submit', 'event_espresso'));
 		$this->registry = $registry;
 	}
 
@@ -170,11 +170,11 @@ 
 	 * @throws \EE_Error
 	 * @throws \LogicException
 	 */
-	public function form( $for_display = false ) {
-		if ( ! $this->formIsValid() ) {
+	public function form($for_display = false) {
+		if ( ! $this->formIsValid()) {
 			return null;
 		}
-		if ( $for_display ) {
+		if ($for_display) {
 			$form_config = $this->formConfig();
 			if (
 				$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
@@ -194,9 +194,9 @@ 
 	 * @throws LogicException
 	 */
 	public function formIsValid() {
-		if ( ! $this->form instanceof \EE_Form_Section_Proper ) {
+		if ( ! $this->form instanceof \EE_Form_Section_Proper) {
 			static $generated = false;
-			if ( ! $generated ) {
+			if ( ! $generated) {
 				$generated = true;
 				$this->generate();
 			}
@@ -212,12 +212,12 @@ 
 	 * @throws LogicException
 	 */
 	public function verifyForm() {
-		if ( $this->form instanceof \EE_Form_Section_Proper ) {
+		if ($this->form instanceof \EE_Form_Section_Proper) {
 			return true;
 		}
 		throw new LogicException(
 			sprintf(
-				__( 'The "%1$s" form is invalid or missing', 'event_espresso' ),
+				__('The "%1$s" form is invalid or missing', 'event_espresso'),
 				$this->form_name
 			)
 		);
@@ -228,7 +228,7 @@ 
 	/**
 	 * @param \EE_Form_Section_Proper $form
 	 */
-	public function setForm( \EE_Form_Section_Proper $form ) {
+	public function setForm(\EE_Form_Section_Proper $form) {
 		$this->form = $form;
 	}
 
@@ -246,8 +246,8 @@ 
 	/**
 	 * @param boolean $displayable
 	 */
-	public function setDisplayable( $displayable = false ) {
-		$this->displayable = filter_var( $displayable, FILTER_VALIDATE_BOOLEAN );
+	public function setDisplayable($displayable = false) {
+		$this->displayable = filter_var($displayable, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -267,9 +267,9 @@ 
 	 * @param string $form_name
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormName( $form_name ) {
-		if ( ! is_string( $form_name ) ) {
-			throw new InvalidDataTypeException( '$form_name', $form_name, 'string' );
+	public function setFormName($form_name) {
+		if ( ! is_string($form_name)) {
+			throw new InvalidDataTypeException('$form_name', $form_name, 'string');
 		}
 		$this->form_name = $form_name;
 	}
@@ -291,9 +291,9 @@ 
 	 * @param string $admin_name
 	 * @throws InvalidDataTypeException
 	 */
-	public function setAdminName( $admin_name ) {
-		if ( ! is_string( $admin_name ) ) {
-			throw new InvalidDataTypeException( '$admin_name', $admin_name, 'string' );
+	public function setAdminName($admin_name) {
+		if ( ! is_string($admin_name)) {
+			throw new InvalidDataTypeException('$admin_name', $admin_name, 'string');
 		}
 		$this->admin_name = $admin_name;
 	}
@@ -315,9 +315,9 @@ 
 	 * @param string $slug
 	 * @throws InvalidDataTypeException
 	 */
-	public function setSlug( $slug ) {
-		if ( ! is_string( $slug ) ) {
-			throw new InvalidDataTypeException( '$slug', $slug, 'string' );
+	public function setSlug($slug) {
+		if ( ! is_string($slug)) {
+			throw new InvalidDataTypeException('$slug', $slug, 'string');
 		}
 		$this->slug = $slug;
 	}
@@ -336,13 +336,13 @@ 
 	/**
 	 * @param string $submit_btn_text
 	 */
-	public function setSubmitBtnText( $submit_btn_text ) {
-		if ( ! is_string( $submit_btn_text ) ) {
-			throw new InvalidDataTypeException( '$submit_btn_text', $submit_btn_text, 'string' );
+	public function setSubmitBtnText($submit_btn_text) {
+		if ( ! is_string($submit_btn_text)) {
+			throw new InvalidDataTypeException('$submit_btn_text', $submit_btn_text, 'string');
 		}
-		if ( empty( $submit_btn_text ) ) {
+		if (empty($submit_btn_text)) {
 			throw new InvalidArgumentException(
-				__( 'Can not set Submit button text because an empty string was provided.', 'event_espresso' )
+				__('Can not set Submit button text because an empty string was provided.', 'event_espresso')
 			);
 		}
 		$this->submit_btn_text = $submit_btn_text;
@@ -354,8 +354,8 @@ 
 	 * @return string
 	 */
 	public function formAction() {
-		return ! empty( $this->form_args )
-			? add_query_arg( $this->form_args, $this->form_action )
+		return ! empty($this->form_args)
+			? add_query_arg($this->form_args, $this->form_action)
 			: $this->form_action;
 	}
 
@@ -365,9 +365,9 @@ 
 	 * @param string $form_action
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormAction( $form_action ) {
-		if ( ! is_string( $form_action ) ) {
-			throw new InvalidDataTypeException( '$form_action', $form_action, 'string' );
+	public function setFormAction($form_action) {
+		if ( ! is_string($form_action)) {
+			throw new InvalidDataTypeException('$form_action', $form_action, 'string');
 		}
 		$this->form_action = $form_action;
 	}
@@ -379,20 +379,20 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 * @throws \InvalidArgumentException
 	 */
-	public function addFormActionArgs( $form_args = array() ) {
-		if ( is_object( $form_args ) ) {
+	public function addFormActionArgs($form_args = array()) {
+		if (is_object($form_args)) {
 			throw new InvalidDataTypeException(
 				'$form_args',
 				$form_args,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $form_args ) ) {
+		if (empty($form_args)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect arguments can not be an empty array.', 'event_espresso' )
+				__('The redirect arguments can not be an empty array.', 'event_espresso')
 			);
 		}
-		$this->form_args = array_merge( $this->form_args, $form_args );
+		$this->form_args = array_merge($this->form_args, $form_args);
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @param string $form_config
 	 * @throws DomainException
 	 */
-	public function setFormConfig( $form_config ) {
+	public function setFormConfig($form_config) {
 		if (
 			! in_array(
 				$form_config,
@@ -424,7 +424,7 @@ 
 		) {
 			throw new DomainException(
 				sprintf(
-					__( '"%1$s" is not a valid value for the form config. Please use one of the class constants on \EventEspresso\core\libraries\form_sections\form_handlers\Form', 'event_espresso' ),
+					__('"%1$s" is not a valid value for the form config. Please use one of the class constants on \EventEspresso\core\libraries\form_sections\form_handlers\Form', 'event_espresso'),
 					$form_config
 				)
 			);
@@ -444,7 +444,7 @@ 
 	 * @return boolean
 	 */
 	public function initialize() {
-		$this->form_has_errors = \EE_Error::has_error( true );
+		$this->form_has_errors = \EE_Error::has_error(true);
 		return true;
 	}
 
@@ -458,7 +458,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function enqueueStylesAndScripts() {
-		$this->form( false )->enqueue_js();
+		$this->form(false)->enqueue_js();
 
 	}
 
@@ -469,7 +469,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	abstract public function generate() ;
+	abstract public function generate();
 
 
 
@@ -479,15 +479,15 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateSubmitButton( $text = '' ) {
-		$text = ! empty( $text ) ? $text : $this->submitBtnText();
+	public function generateSubmitButton($text = '') {
+		$text = ! empty($text) ? $text : $this->submitBtnText();
 		return new EE_Submit_Input(
 			array(
-				'html_name'             => 'ee-form-submit-' . $this->slug(),
-				'html_id'               => 'ee-form-submit-' . $this->slug(),
+				'html_name'             => 'ee-form-submit-'.$this->slug(),
+				'html_id'               => 'ee-form-submit-'.$this->slug(),
 				'html_class'            => 'ee-form-submit',
 				'html_label'            => ' ',
-				'other_html_attributes' => ' rel="' . $this->slug() . '"',
+				'other_html_attributes' => ' rel="'.$this->slug().'"',
 				'default'               => $text
 			)
 		);
@@ -503,12 +503,12 @@ 
 	 * @throws \LogicException
 	 * @throws \EE_Error
 	 */
-	public function appendSubmitButton( $text = '' ) {
-		if ( $this->form->subsection_exists( $this->slug() . '-submit-btn' ) ) {
+	public function appendSubmitButton($text = '') {
+		if ($this->form->subsection_exists($this->slug().'-submit-btn')) {
 			return;
 		}
 		$this->form->add_subsections(
-			array( $this->slug() . '-submit-btn' => $this->generateSubmitButton( $text ) ),
+			array($this->slug().'-submit-btn' => $this->generateSubmitButton($text)),
 			null,
 			false
 		);
@@ -522,18 +522,18 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateCancelButton( $text = '' ) {
+	public function generateCancelButton($text = '') {
 		$cancel_button = new EE_Submit_Input(
 			array(
-				'html_name'             => 'ee-form-submit-' . $this->slug(), // YES! Same name as submit !!!
-				'html_id'               => 'ee-cancel-form-' . $this->slug(),
+				'html_name'             => 'ee-form-submit-'.$this->slug(), // YES! Same name as submit !!!
+				'html_id'               => 'ee-cancel-form-'.$this->slug(),
 				'html_class'            => 'ee-cancel-form',
 				'html_label'            => ' ',
-				'other_html_attributes' => ' rel="' . $this->slug() . '"',
-				'default'               => ! empty( $text ) ? $text : __( 'Cancel', 'event_espresso' )
+				'other_html_attributes' => ' rel="'.$this->slug().'"',
+				'default'               => ! empty($text) ? $text : __('Cancel', 'event_espresso')
 			)
 		);
-		$cancel_button->set_button_css_attributes( false );
+		$cancel_button->set_button_css_attributes(false);
 		return $cancel_button;
 	}
 
@@ -549,7 +549,7 @@ 
 		$this->form->add_subsections(
 			array(
 				'clear-submit-btn-float' => new \EE_Form_Section_HTML(
-					EEH_HTML::div( '', '', 'clear-float' ) . EEH_HTML::divx()
+					EEH_HTML::div('', '', 'clear-float').EEH_HTML::divx()
 				)
 			),
 			null,
@@ -574,9 +574,9 @@ 
 			$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
 			|| $form_config === FormHandler::ADD_FORM_TAGS_ONLY
 		) {
-			$form_html .= $this->form()->form_open( $this->formAction() );
+			$form_html .= $this->form()->form_open($this->formAction());
 		}
-		$form_html .= $this->form( true )->get_html( $this->form_has_errors );
+		$form_html .= $this->form(true)->get_html($this->form_has_errors);
 		if (
 			$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
 			|| $form_config === FormHandler::ADD_FORM_TAGS_ONLY
@@ -598,12 +598,12 @@ 
 	 * @throws \LogicException
 	 * @throws InvalidFormSubmissionException
 	 */
-	public function process( $submitted_form_data = array() ) {
-		if ( ! $this->form()->was_submitted( $submitted_form_data ) ) {
-			throw new InvalidFormSubmissionException( $this->form_name );
+	public function process($submitted_form_data = array()) {
+		if ( ! $this->form()->was_submitted($submitted_form_data)) {
+			throw new InvalidFormSubmissionException($this->form_name);
 		}
-		$this->form( true )->receive_form_submission( $submitted_form_data );
-		if ( ! $this->form()->is_valid() ) {
+		$this->form(true)->receive_form_submission($submitted_form_data);
+		if ( ! $this->form()->is_valid()) {
 			throw new InvalidFormSubmissionException(
 				$this->form_name,
 				sprintf(

core/libraries/form_sections/form_handlers/SequentialStepForm.php

Spacing +27 added lines, -27 removed lines

@@ -4,8 +4,8 @@ 
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use InvalidArgumentException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -86,8 +86,8 @@ 
 		$form_config = 'add_form_tags_and_submit',
 		\EE_Registry $registry
 	) {
-		$this->setOrder( $order );
-		parent::__construct( $form_name, $admin_name, $slug, $form_action, $form_config, $registry );
+		$this->setOrder($order);
+		parent::__construct($form_name, $admin_name, $slug, $form_action, $form_config, $registry);
 	}
 
 
@@ -105,11 +105,11 @@ 
 	 * @param int $order
 	 * @throws InvalidArgumentException
 	 */
-	public function setOrder( $order ) {
-		$order = absint( $order );
-		if ( ! $order > 0 ) {
+	public function setOrder($order) {
+		$order = absint($order);
+		if ( ! $order > 0) {
 			throw new InvalidArgumentException(
-				__( 'The form order property must be a positive integer.', 'event_espresso' )
+				__('The form order property must be a positive integer.', 'event_espresso')
 			);
 		}
 		$this->order = $order;
@@ -122,8 +122,8 @@ 
 	 * @return string
 	 */
 	public function redirectUrl() {
-		return ! empty( $this->redirect_args )
-			? add_query_arg( $this->redirect_args, $this->redirect_url )
+		return ! empty($this->redirect_args)
+			? add_query_arg($this->redirect_args, $this->redirect_url)
 			: $this->redirect_url;
 	}
 
@@ -134,13 +134,13 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function setRedirectUrl( $redirect_url ) {
-		if ( ! is_string( $redirect_url ) ) {
-			throw new InvalidDataTypeException( '$redirect_url', $redirect_url, 'string' );
+	public function setRedirectUrl($redirect_url) {
+		if ( ! is_string($redirect_url)) {
+			throw new InvalidDataTypeException('$redirect_url', $redirect_url, 'string');
 		}
-		if ( empty( $redirect_url ) ) {
+		if (empty($redirect_url)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect URL can not be an empty string.', 'event_espresso' )
+				__('The redirect URL can not be an empty string.', 'event_espresso')
 			);
 		}
 		$this->redirect_url = $redirect_url;
@@ -153,20 +153,20 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function addRedirectArgs( $redirect_args = array() ) {
-		if ( is_object( $redirect_args ) ) {
+	public function addRedirectArgs($redirect_args = array()) {
+		if (is_object($redirect_args)) {
 			throw new InvalidDataTypeException(
 				'$redirect_args',
 				$redirect_args,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $redirect_args ) ) {
+		if (empty($redirect_args)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect argument can not be an empty array.', 'event_espresso' )
+				__('The redirect argument can not be an empty array.', 'event_espresso')
 			);
 		}
-		$this->redirect_args = array_merge( $this->redirect_args, (array) $redirect_args );
+		$this->redirect_args = array_merge($this->redirect_args, (array) $redirect_args);
 	}
 
 
@@ -176,21 +176,21 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidArgumentException
 	 */
-	public function removeRedirectArgs( $redirect_arg_keys_to_remove = array() ) {
-		if ( is_object( $redirect_arg_keys_to_remove ) ) {
+	public function removeRedirectArgs($redirect_arg_keys_to_remove = array()) {
+		if (is_object($redirect_arg_keys_to_remove)) {
 			throw new InvalidDataTypeException(
 				'$redirect_arg_keys_to_remove',
 				$redirect_arg_keys_to_remove,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $redirect_arg_keys_to_remove ) ) {
+		if (empty($redirect_arg_keys_to_remove)) {
 			throw new InvalidArgumentException(
-				__( 'The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso' )
+				__('The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso')
 			);
 		}
-		foreach ( $redirect_arg_keys_to_remove as $redirect_arg_key ) {
-			unset( $this->redirect_args[ $redirect_arg_key ] );
+		foreach ($redirect_arg_keys_to_remove as $redirect_arg_key) {
+			unset($this->redirect_args[$redirect_arg_key]);
 		}
 	}
 
@@ -208,7 +208,7 @@ 
 	/**
 	 * @param string $redirect_to
 	 */
-	public function setRedirectTo( $redirect_to ) {
+	public function setRedirectTo($redirect_to) {
 		if (
 			! in_array(
 				$redirect_to,

core/libraries/form_sections/base/EE_Form_Section_Proper.form.php

Braces +4 added lines, -4 removed lines

@@ -299,7 +299,7 @@ 
 			if(isset($default_data[$subsection_name])){
 				if($subsection instanceof EE_Form_Input_Base){
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				} elseif($subsection instanceof EE_Form_Section_Proper){
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -625,7 +625,7 @@ 
 		foreach($this->subsections() as $subsection){
 			if( $subsection instanceof EE_Form_Input_Base ){
 				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+			} elseif($subsection instanceof EE_Form_Section_Proper ){
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -1116,7 +1116,7 @@ 
 	public function html_name_prefix(){
 		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
 			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+		} else{
 			return $this->name();
 		}
 	}
@@ -1178,7 +1178,7 @@ 
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
 				if( $subsection->form_data_present_in( $req_data ) ) {
 					return TRUE;
 				}

Spacing +208 added lines, -208 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	const SUBMITTED_FORM_DATA_SSN_KEY = 'submitted_form_data';
 
@@ -71,49 +71,49 @@ 
 	 *                               } @see EE_Form_Section_Validatable::__construct()
 	 * @throws \EE_Error
 	 */
-	public function __construct( $options_array = array() ){
-		$options_array = (array) apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
+	public function __construct($options_array = array()) {
+		$options_array = (array) apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = is_admin() ? new EE_Admin_Two_Column_Layout() : new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
 		//ok so we are definitely going to want the forms JS,
 		//so enqueue it or remember to enqueue it during wp_enqueue_scripts
-		if( did_action( 'wp_enqueue_scripts' )
-			|| did_action( 'admin_enqueue_scripts' ) ) {
+		if (did_action('wp_enqueue_scripts')
+			|| did_action('admin_enqueue_scripts')) {
 			//ok so they've constructed this object after when they should have.
 			//just enqueue the generic form scripts and initialize the form immediately in the JS
-			\EE_Form_Section_Proper::wp_enqueue_scripts( true );
+			\EE_Form_Section_Proper::wp_enqueue_scripts(true);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-			add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
+			add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+			add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
 		}
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 
-		if( isset( $options_array[ 'name' ] ) ) {
-			$this->_construct_finalize( null, $options_array[ 'name' ] );
+		if (isset($options_array['name'])) {
+			$this->_construct_finalize(null, $options_array['name']);
 		}
 	}
 
@@ -126,25 +126,25 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -165,7 +165,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -178,7 +178,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -203,21 +203,21 @@ 
 	 *                             (eg you validated the data then stored it in the DB)
 	 *                             you may want to skip this step.
 	 */
-	public function receive_form_submission( $req_data = null, $validate = true ){
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
-		if( $req_data === null ){
-			$req_data = array_merge( $_GET, $_POST );
+	public function receive_form_submission($req_data = null, $validate = true) {
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
+		if ($req_data === null) {
+			$req_data = array_merge($_GET, $_POST);
 		}
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this );
-		$this->_normalize( $req_data );
-		if( $validate ){
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this);
+		$this->_normalize($req_data);
+		if ($validate) {
 			$this->_validate();
 			//if it's invalid, we're going to want to re-display so remember what they submitted
-			if ( ! $this->is_valid() ) {
+			if ( ! $this->is_valid()) {
 				$this->store_submitted_form_data_in_session();
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
 	}
 
 
@@ -231,7 +231,7 @@ 
 	protected function store_submitted_form_data_in_session() {
 		return EE_Registry::instance()->SSN->set_session_data(
 			array(
-				\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values( true )
+				\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values(true)
 			)
 		);
 	}
@@ -259,7 +259,7 @@ 
 	 */
 	protected function flush_submitted_form_data_from_session() {
 		return EE_Registry::instance()->SSN->reset_data(
-			array( \EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY )
+			array(\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY)
 		);
 	}
 
@@ -275,12 +275,12 @@ 
 	 */
 	public function populate_from_session() {
 		$form_data_in_session = $this->get_submitted_form_data_from_session();
-		if ( empty( $form_data_in_session ) ) {
+		if (empty($form_data_in_session)) {
 			return false;
 		}
-		$this->receive_form_submission( $form_data_in_session );
+		$this->receive_form_submission($form_data_in_session);
 		$this->flush_submitted_form_data_from_session();
-		if ( $this->form_data_present_in( $form_data_in_session ) ) {
+		if ($this->form_data_present_in($form_data_in_session)) {
 			return true;
 		} else {
 			return false;
@@ -297,12 +297,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -317,8 +317,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	public function subsection_exists( $name ){
-		return isset( $this->_subsections[ $name ] ) ? true : false;
+	public function subsection_exists($name) {
+		return isset($this->_subsections[$name]) ? true : false;
 	}
 
 
@@ -336,11 +336,11 @@ 
 	 * @return EE_Form_Section_Base
 	 * @throws \EE_Error
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
-		return $this->subsection_exists( $name ) ? $this->_subsections[$name] : NULL;
+		return $this->subsection_exists($name) ? $this->_subsections[$name] : NULL;
 	}
 
 
@@ -349,10 +349,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -372,9 +372,9 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -382,8 +382,8 @@ 
 						'event_espresso'
 					),
 					$name,
-					get_class( $this ),
-					$subsection ? get_class( $subsection ) : __( "NULL", 'event_espresso' )
+					get_class($this),
+					$subsection ? get_class($subsection) : __("NULL", 'event_espresso')
 				)
 			);
 		}
@@ -403,14 +403,14 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
 			throw new EE_Error(
 				sprintf(
-					__( "Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso' ),
+					__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),
 					$name,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
@@ -427,7 +427,7 @@ 
 	 * @return mixed depending on the input's type and its normalization strategy
 	 * @throws \EE_Error
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -440,7 +440,7 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -450,16 +450,16 @@ 
 				)
 			);
 		}
-		if( ! parent::is_valid() ) {
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		// ok so no general errors to this entire form section.
 		// so let's check the subsections, but only set errors if that hasn't been done yet
 		$set_submission_errors = $this->submission_error_message() === '' ? true : false;
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '' ){
-				if ( $set_submission_errors ) {
-					$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '') {
+				if ($set_submission_errors) {
+					$this->set_submission_error_message($subsection->get_validation_error_string());
 				}
 				return false;
 			}
@@ -473,11 +473,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -493,7 +493,7 @@ 
 	 *             and get_html when you are about to display the form.
 	 * @throws \EE_Error
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		//no doing_it_wrong yet because we ourselves are still doing it wrong...
 		//and theoretically this CAN be used properly, provided its used during "wp_enqueue_scripts"
 		$this->enqueue_js();
@@ -508,9 +508,9 @@ 
 	 * @param bool $display_previously_submitted_data
 	 * @return string
 	 */
-	public function get_html( $display_previously_submitted_data = true ){
+	public function get_html($display_previously_submitted_data = true) {
 		$this->ensure_construct_finalized_called();
-		if ( $display_previously_submitted_data ) {
+		if ($display_previously_submitted_data) {
 			$this->populate_from_session();
 		}
 		return $this->_layout_strategy->layout_form();
@@ -524,9 +524,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
-		foreach( $this->subsections() as $subsection ) {
+		foreach ($this->subsections() as $subsection) {
 			$subsection->enqueue_js();
 		}
 	}
@@ -545,19 +545,19 @@ 
 	 *                                                    to be triggered automatically or not
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = true ){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+	public static function wp_enqueue_scripts($init_form_validation_automatically = true) {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		wp_register_script(
 			'ee_form_section_validation',
-			EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js',
-			array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ),
+			EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js',
+			array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
 		wp_localize_script(
 			'ee_form_section_validation',
 			'ee_form_section_validation_init',
-			array( 'init' => $init_form_validation_automatically ? true : false )
+			array('init' => $init_form_validation_automatically ? true : false)
 		);
 	}
 
@@ -570,14 +570,14 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -589,12 +589,12 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
+	public function localize_validation_rules($return_for_subsection = FALSE) {
 		// we only want to localize vars ONCE for the entire form,
 		// so if the form section doesn't have a parent, then it must be the top dog
-		if ( $return_for_subsection || ! $this->parent_section() ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ($return_for_subsection || ! $this->parent_section()) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'other_data' => $this->get_other_js_data(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
@@ -610,9 +610,9 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		foreach( $this->subsections() as $subsection ) {
-			$form_other_js_data = $subsection->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		foreach ($this->subsections() as $subsection) {
+			$form_other_js_data = $subsection->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -623,12 +623,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -641,12 +641,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -658,15 +658,15 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
-		do_action( 'AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin' );
+		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		$email_validation_level = isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+		$email_validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 			? EE_Registry::instance()->CFG->registration->email_validation_level
 			: 'wp_default';
 		EE_Form_Section_Proper::$_js_localization['email_validation_level'] = $email_validation_level;
-		wp_enqueue_script( 'ee_form_section_validation' );
+		wp_enqueue_script('ee_form_section_validation');
 		wp_localize_script(
 			'ee_form_section_validation',
 			'ee_form_section_vars',
@@ -679,8 +679,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -692,10 +692,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -725,9 +725,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$jquery_validation_rules = array_merge(
 				$jquery_validation_rules,
 				$subsection->get_jquery_validation_rules()
@@ -744,14 +744,14 @@ 
 	 * @param array $req_data like $_POST
 	 * @return void
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		$this->_received_submission = true;
 		$this->_validation_errors = array();
-		foreach ( $this->get_validatable_subsections() as $subsection ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			try {
-				$subsection->_normalize( $req_data );
-			} catch ( EE_Validation_Error $e ) {
-				$subsection->add_validation_error( $e );
+				$subsection->_normalize($req_data);
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -768,9 +768,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -782,13 +782,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -800,11 +800,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -816,10 +816,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -834,7 +834,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -856,8 +856,8 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -877,8 +877,8 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -896,19 +896,19 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty
 					? $subsection->pretty_value()
 					: $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -929,23 +929,23 @@ 
 	 *                                   where keys are always subsection names and values are either
 	 *                                   the input's normalized value, or an array like the top-level array
 	 */
-	public function submitted_values( $include_subforms = false ) {
+	public function submitted_values($include_subforms = false) {
 		$submitted_values = array();
-		foreach( $this->subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
 				// is this input part of an array of inputs?
-				if ( strpos( $subsection->html_name(), '[' ) !== false ) {
+				if (strpos($subsection->html_name(), '[') !== false) {
 					$full_input_name = \EEH_Array::convert_array_values_to_keys(
-						explode( '[', str_replace( ']', '', $subsection->html_name() ) ),
+						explode('[', str_replace(']', '', $subsection->html_name())),
 						$subsection->raw_value()
 					);
-					$submitted_values = array_replace_recursive( $submitted_values, $full_input_name );
+					$submitted_values = array_replace_recursive($submitted_values, $full_input_name);
 				} else {
-					$submitted_values[ $subsection->html_name() ] = $subsection->raw_value();
+					$submitted_values[$subsection->html_name()] = $subsection->raw_value();
 				}
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subforms ) {
-				$subform_input_values = $subsection->submitted_values( $include_subforms );
-				$submitted_values = array_replace_recursive( $submitted_values, $subform_input_values );
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subforms) {
+				$subform_input_values = $subsection->submitted_values($include_subforms);
+				$submitted_values = array_replace_recursive($submitted_values, $subform_input_values);
 			}
 		}
 		return $submitted_values;
@@ -960,7 +960,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -973,8 +973,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -985,8 +985,8 @@ 
 	 * @param array $inputs_to_hide
 	 * @throws \EE_Error
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -1016,21 +1016,21 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
-		foreach( $new_subsections as $subsection_name => $subsection ){
-			if( ! $subsection instanceof EE_Form_Section_Base ){
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
+		foreach ($new_subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__(
 							"Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.",
 							"event_espresso"
 						),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
 				);
-				unset( $new_subsections[ $subsection_name ] );
+				unset($new_subsections[$subsection_name]);
 			}
 		}
 		$this->_subsections = EEH_Array::insert_into_array(
@@ -1041,8 +1041,8 @@ 
 		);
 
 
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -1053,8 +1053,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -1064,10 +1064,10 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message )
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message)
 			? $form_submission_error_message
-			: __( 'Form submission failed due to errors', 'event_espresso' );
+			: __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -1084,10 +1084,10 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message )
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message)
 			? $form_submission_success_message
-			: __( 'Form submitted successfully', 'event_espresso' );
+			: __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -1110,10 +1110,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -1128,7 +1128,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -1139,7 +1139,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -1152,9 +1152,9 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -1166,17 +1166,17 @@ 
 	 * @param array $req_data
 	 * @return boolean
 	 */
-	public function form_data_present_in( $req_data = NULL ) {
-		if( $req_data === NULL){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -1193,14 +1193,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;
@@ -1222,24 +1222,24 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {
+	public function find_section_from_path($form_section_path) {
 		//check if we can find the input from purely going straight up the tree
-		$input = parent::find_section_from_path( $form_section_path );
-		if( $input instanceof EE_Form_Section_Base ) {
+		$input = parent::find_section_from_path($form_section_path);
+		if ($input instanceof EE_Form_Section_Base) {
 			return $input;
 		}
 
-		$next_slash_pos = strpos( $form_section_path, '/' );
-		if( $next_slash_pos !== false ) {
-			$child_section_name = substr( $form_section_path, 0, $next_slash_pos );
-			$subpath = substr( $form_section_path, $next_slash_pos + 1 );
+		$next_slash_pos = strpos($form_section_path, '/');
+		if ($next_slash_pos !== false) {
+			$child_section_name = substr($form_section_path, 0, $next_slash_pos);
+			$subpath = substr($form_section_path, $next_slash_pos + 1);
 		} else {
 			$child_section_name = $form_section_path;
 			$subpath = '';
 		}
-		$child_section =  $this->get_subsection( $child_section_name );
-		if ( $child_section instanceof EE_Form_Section_Base ) {
-			return $child_section->find_section_from_path( $subpath );
+		$child_section = $this->get_subsection($child_section_name);
+		if ($child_section instanceof EE_Form_Section_Base) {
+			return $child_section->find_section_from_path($subpath);
 		} else {
 			return null;
 		}