eventespresso / event-espresso-core

core/helpers/EEH_Debug_Tools.helper.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Class EEH_Debug_Tools
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen, Michael Nelson
- * @since 				4.0
- *
- */
+	 * Class EEH_Debug_Tools
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Brent Christensen, Michael Nelson
+	 * @since 				4.0
+	 *
+	 */
 class EEH_Debug_Tools{
 
 	/**

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 	 *    @ access public
 	 *    @ return void
 	 *
-	 * @param mixed $var
+	 * @param string $var
 	 * @param bool $var_name
 	 * @param string $file
 	 * @param int $line

Spacing +137 added lines, -137 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.0
  *
  */
-class EEH_Debug_Tools{
+class EEH_Debug_Tools {
 
 	/**
 	 * 	instance of the EEH_Autoloader object
@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_Debug_Tools ) {
+		if ( ! self::$_instance instanceof EEH_Debug_Tools) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,21 +57,21 @@ 
 	 */
 	private function __construct() {
 		// load Kint PHP debugging library
-		if ( ! class_exists( 'Kint' ) &&  file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){
+		if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) {
 			// despite EE4 having a check for an existing copy of the Kint debugging class,
 			// if another plugin was loaded AFTER EE4 and they did NOT perform a similar check,
 			// then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error
 			// so we've moved it to our test folder so that it is not included with production releases
 			// plz use https://wordpress.org/plugins/kint-debugger/  if testing production versions of EE
-			require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' );
+			require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php');
 		}
-		if ( ! defined('DOING_AJAX') || ! isset( $_REQUEST['noheader'] ) || $_REQUEST['noheader'] != 'true' || ! isset( $_REQUEST['TB_iframe'] )) {
+		if ( ! defined('DOING_AJAX') || ! isset($_REQUEST['noheader']) || $_REQUEST['noheader'] != 'true' || ! isset($_REQUEST['TB_iframe'])) {
 			//add_action( 'shutdown', array($this,'espresso_session_footer_dump') );
 		}
-		$plugin = basename( EE_PLUGIN_DIR_PATH );
-		add_action( "activate_{$plugin}", array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' ));
+		$plugin = basename(EE_PLUGIN_DIR_PATH);
+		add_action("activate_{$plugin}", array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	 * 	@return void
 	 */
 	public static function show_db_name() {
-		if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) {
-			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>';
+		if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) {
+			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>';
 		}
 	}
 
@@ -95,9 +95,9 @@ 
 	 * 	@return void
 	 */
 	public function espresso_session_footer_dump() {
-		if ( class_exists('Kint') && function_exists( 'wp_get_current_user' ) && current_user_can('update_core') && ( defined('WP_DEBUG') && WP_DEBUG ) &&  ! defined('DOING_AJAX') && class_exists( 'EE_Registry' )) {
-			Kint::dump(  EE_Registry::instance()->SSN->id() );
-			Kint::dump( EE_Registry::instance()->SSN );
+		if (class_exists('Kint') && function_exists('wp_get_current_user') && current_user_can('update_core') && (defined('WP_DEBUG') && WP_DEBUG) && ! defined('DOING_AJAX') && class_exists('EE_Registry')) {
+			Kint::dump(EE_Registry::instance()->SSN->id());
+			Kint::dump(EE_Registry::instance()->SSN);
 			//			Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() );
 			$this->espresso_list_hooked_functions();
 			$this->show_times();
@@ -114,27 +114,27 @@ 
 	 * @param bool $tag
 	 * @return void
 	 */
-	public function espresso_list_hooked_functions( $tag=FALSE ){
+	public function espresso_list_hooked_functions($tag = FALSE) {
 		global $wp_filter;
 		echo '<br/><br/><br/><h3>Hooked Functions</h3>';
-		if ( $tag ) {
-			$hook[$tag]=$wp_filter[$tag];
-			if ( ! is_array( $hook[$tag] )) {
-				trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING );
+		if ($tag) {
+			$hook[$tag] = $wp_filter[$tag];
+			if ( ! is_array($hook[$tag])) {
+				trigger_error("Nothing found for '$tag' hook", E_USER_WARNING);
 				return;
 			}
-			echo '<h5>For Tag: '. $tag .'</h5>';
+			echo '<h5>For Tag: '.$tag.'</h5>';
 		}
 		else {
-			$hook=$wp_filter;
-			ksort( $hook );
+			$hook = $wp_filter;
+			ksort($hook);
 		}
-		foreach( $hook as $tag => $priorities ) {
+		foreach ($hook as $tag => $priorities) {
 			echo "<br />&gt;&gt;&gt;&gt;&gt;\t<strong>$tag</strong><br />";
-			ksort( $priorities );
-			foreach( $priorities as $priority => $function ){
+			ksort($priorities);
+			foreach ($priorities as $priority => $function) {
 				echo $priority;
-				foreach( $function as $name => $properties ) {
+				foreach ($function as $name => $properties) {
 					echo "\t$name<br />";
 				}
 			}
@@ -150,15 +150,15 @@ 
 	 * @param string $hook_name
 	 * @return array
 	 */
-	public static function registered_filter_callbacks( $hook_name = '' ) {
+	public static function registered_filter_callbacks($hook_name = '') {
 		$filters = array();
 		global $wp_filter;
-		if ( isset( $wp_filter[ $hook_name ] ) ) {
-			$filters[ $hook_name ] = array();
-			foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) {
-				$filters[ $hook_name ][ $priority ] = array();
-				foreach ( $callbacks as $callback ) {
-					$filters[ $hook_name ][ $priority ][] = $callback['function'];
+		if (isset($wp_filter[$hook_name])) {
+			$filters[$hook_name] = array();
+			foreach ($wp_filter[$hook_name] as $priority => $callbacks) {
+				$filters[$hook_name][$priority] = array();
+				foreach ($callbacks as $callback) {
+					$filters[$hook_name][$priority][] = $callback['function'];
 				}
 			}
 		}
@@ -171,8 +171,8 @@ 
 	 * 	start_timer
 	 * @param null $timer_name
 	 */
-	public function start_timer( $timer_name = NULL ){
-		$this->_start_times[$timer_name] = microtime( TRUE );
+	public function start_timer($timer_name = NULL) {
+		$this->_start_times[$timer_name] = microtime(TRUE);
 	}
 
 
@@ -181,15 +181,15 @@ 
 	 * stop_timer
 	 * @param string $timer_name
 	 */
-	public function stop_timer($timer_name = 'default'){
-		if( isset( $this->_start_times[ $timer_name ] ) ){
-			$start_time = $this->_start_times[ $timer_name ];
-			unset( $this->_start_times[ $timer_name ] );
-		}else{
-			$start_time = array_pop( $this->_start_times );
+	public function stop_timer($timer_name = 'default') {
+		if (isset($this->_start_times[$timer_name])) {
+			$start_time = $this->_start_times[$timer_name];
+			unset($this->_start_times[$timer_name]);
+		} else {
+			$start_time = array_pop($this->_start_times);
 		}
-		$total_time = microtime( TRUE ) - $start_time;
-		switch ( $total_time ) {
+		$total_time = microtime(TRUE) - $start_time;
+		switch ($total_time) {
 			case $total_time < 0.00001 :
 				$color = '#8A549A';
 				$bold = 'normal';
@@ -215,7 +215,7 @@ 
 				$bold = 'bold';
 				break;
 		}
-		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">' . number_format( $total_time, 8 ) . '</div> ' . $timer_name;
+		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">'.number_format($total_time, 8).'</div> '.$timer_name;
 	}
 	/**
 	 * Measure the memory usage by PHP so far.
@@ -223,10 +223,10 @@ 
 	 * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
 	 * @return void
 	 */
-	public function measure_memory( $label, $output_now = false ) {
-		$memory_used = $this->convert( memory_get_peak_usage( true ) );
-		$this->_memory_usage_points[ $label ] = $memory_used;
-		if( $output_now ) {
+	public function measure_memory($label, $output_now = false) {
+		$memory_used = $this->convert(memory_get_peak_usage(true));
+		$this->_memory_usage_points[$label] = $memory_used;
+		if ($output_now) {
 			echo "\r\n<br>$label : $memory_used";
 		}
 	}
@@ -236,9 +236,9 @@ 
 	 * @param int $size
 	 * @return string
 	 */
-	public function convert( $size ) {
-		$unit=array('b','kb','mb','gb','tb','pb');
-		return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[ absint( $i ) ];
+	public function convert($size) {
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[absint($i)];
 	}
 
 
@@ -248,9 +248,9 @@ 
 	 * @param bool $output_now
 	 * @return string
 	 */
-	public function show_times($output_now=true){
-		$output = '<h2>Times:</h2>' . implode("<br>",$this->_times) . '<h2>Memory</h2>' . implode('<br>', $this->_memory_usage_points );
-		if($output_now){
+	public function show_times($output_now = true) {
+		$output = '<h2>Times:</h2>'.implode("<br>", $this->_times).'<h2>Memory</h2>'.implode('<br>', $this->_memory_usage_points);
+		if ($output_now) {
 			echo $output;
 			return '';
 		}
@@ -265,25 +265,25 @@ 
 	 * 	@return void
 	 */
 	public static function ee_plugin_activation_errors() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$activation_errors = ob_get_contents();
-			if ( ! empty( $activation_errors ) ) {
-				$activation_errors = date( 'Y-m-d H:i:s' ) . "\n" . $activation_errors;
+			if ( ! empty($activation_errors)) {
+				$activation_errors = date('Y-m-d H:i:s')."\n".$activation_errors;
 			}
-			espresso_load_required( 'EEH_File', EE_HELPERS . 'EEH_File.helper.php' );
-			if ( class_exists( 'EEH_File' )) {
+			espresso_load_required('EEH_File', EE_HELPERS.'EEH_File.helper.php');
+			if (class_exists('EEH_File')) {
 				try {
-					EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' );
-					EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
-				} catch( EE_Error $e ){
-					EE_Error::add_error( sprintf( __(  'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+					EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html');
+					EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
+				} catch (EE_Error $e) {
+					EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				}
 			} else {
 				// old school attempt
-				file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
+				file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
 			}
-			$activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors;
-			update_option( 'ee_plugin_activation_errors', $activation_errors );
+			$activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors;
+			update_option('ee_plugin_activation_errors', $activation_errors);
 		}
 	}
 
@@ -299,22 +299,22 @@ 
 	 * @param int     $error_type
 	 * @uses trigger_error()
 	 */
-	public function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
-		$version = is_null( $version ) ? '' : sprintf( __('(This message was added in version %s of Event Espresso.', 'event_espresso' ), $version );
-		$error_message = sprintf( esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s','event_espresso' ), $function, '<strong>', '</strong>', $message, $version );
+	public function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
+		$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s of Event Espresso.', 'event_espresso'), $version);
+		$error_message = sprintf(esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s', 'event_espresso'), $function, '<strong>', '</strong>', $message, $version);
 
 		//don't trigger error if doing ajax, instead we'll add a transient EE_Error notice that in theory should show on the next request.
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$error_message .= esc_html__( 'This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso' );
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			$error_message .= esc_html__('This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso');
 			$error_message .= '<ul><li>';
-			$error_message .= implode( '</li><li>', EE_Registry::instance()->REQ->params() );
+			$error_message .= implode('</li><li>', EE_Registry::instance()->REQ->params());
 			$error_message .= '</ul>';
-			EE_Error::add_error( $error_message, 'debug::doing_it_wrong', $function, '42' );
+			EE_Error::add_error($error_message, 'debug::doing_it_wrong', $function, '42');
 			//now we set this on the transient so it shows up on the next request.
-			EE_Error::get_notices( is_admin(), true );
+			EE_Error::get_notices(is_admin(), true);
 		} else {
-			trigger_error( $error_message, $error_type );
+			trigger_error($error_message, $error_type);
 		}
 	}
 
@@ -336,22 +336,22 @@ 
 	 * @param string $debug_index
 	 * @param string $debug_key
 	 */
-	public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false,  $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) {
-		if ( WP_DEBUG && false ) {
-			$debug_key = $debug_key . '_' . EE_Session::instance()->id();
-			$debug_data = get_option( $debug_key, array() );
+	public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') {
+		if (WP_DEBUG && false) {
+			$debug_key = $debug_key.'_'.EE_Session::instance()->id();
+			$debug_data = get_option($debug_key, array());
 			$default_data = array(
-				$class => $func . '() : ' . $line,
+				$class => $func.'() : '.$line,
 				'REQ'  => $display_request ? $_REQUEST : '',
 			);
 			// don't serialize objects
-			$info = self::strip_objects( $info );
-			$index = ! empty( $debug_index ) ? $debug_index : 0;
-			if ( ! isset( $debug_data[$index] ) ) {
+			$info = self::strip_objects($info);
+			$index = ! empty($debug_index) ? $debug_index : 0;
+			if ( ! isset($debug_data[$index])) {
 				$debug_data[$index] = array();
 			}
-			$debug_data[$index][microtime()] = array_merge( $default_data, $info );
-			update_option( $debug_key, $debug_data );
+			$debug_data[$index][microtime()] = array_merge($default_data, $info);
+			update_option($debug_key, $debug_data);
 		}
 	}
 
@@ -363,26 +363,26 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public static function strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value ) ) {
-				$info[ $key ] = self::strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value );
-				if ( method_exists( $value, 'ID' ) ) {
-					$info[ $object_class ][ 'ID' ] = $value->ID();
+	public static function strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = self::strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value);
+				if (method_exists($value, 'ID')) {
+					$info[$object_class]['ID'] = $value->ID();
 				}
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 
@@ -399,24 +399,24 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printv( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
+	public static function printv($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
 		$var_name = ! $var_name ? 'string' : $var_name;
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( '$', '', $var_name ) );
-		$is_method = method_exists( $var_name, $var );
-		$var_name = ucwords( str_replace( '_', ' ', $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace('$', '', $var_name));
+		$is_method = method_exists($var_name, $var);
+		$var_name = ucwords(str_replace('_', ' ', $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo $is_method
-			? '<span style="color:#999">::</span><span style="color:#E76700">' . $var . '()</span><br />'
-			: '<span style="color:#999"> : </span><span style="color:#E76700">' . $var . '</span><br />';
-		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span>';
-		echo '</' . $heading_tag . '>';
+			? '<span style="color:#999">::</span><span style="color:#E76700">'.$var.'()</span><br />'
+			: '<span style="color:#999"> : </span><span style="color:#E76700">'.$var.'</span><br />';
+		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span>';
+		echo '</'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -435,35 +435,35 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printr( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
-		$file = str_replace( rtrim( ABSPATH, '\\/' ), '', $file );
+	public static function printr($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
+		$file = str_replace(rtrim(ABSPATH, '\\/'), '', $file);
 		//$print_r = false;
-		if ( is_string( $var ) ) {
-			EEH_Debug_Tools::printv( $var, $var_name, $file, $line, $header, $die );
+		if (is_string($var)) {
+			EEH_Debug_Tools::printv($var, $var_name, $file, $line, $header, $die);
 			return;
-		} else if ( is_object( $var ) ) {
+		} else if (is_object($var)) {
 			$var_name = ! $var_name ? 'object' : $var_name;
 			//$print_r = true;
-		} else if ( is_array( $var ) ) {
+		} else if (is_array($var)) {
 			$var_name = ! $var_name ? 'array' : $var_name;
 			//$print_r = true;
-		} else if ( is_numeric( $var ) ) {
+		} else if (is_numeric($var)) {
 			$var_name = ! $var_name ? 'numeric' : $var_name;
-		} else if ( is_null( $var ) ) {
+		} else if (is_null($var)) {
 			$var_name = ! $var_name ? 'null' : $var_name;
 		}
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo '<span style="color:#999"> : </span><span style="color:#E76700">';
-		var_dump( $var );
-		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span></' . $heading_tag . '>';
+		var_dump($var);
+		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span></'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -480,8 +480,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) {
-	function dump_wp_query(){
+if (class_exists('Kint') && ! function_exists('dump_wp_query')) {
+	function dump_wp_query() {
 		global $wp_query;
 		d($wp_query);
 	}
@@ -491,8 +491,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) {
-	function dump_wp(){
+if (class_exists('Kint') && ! function_exists('dump_wp')) {
+	function dump_wp() {
 		global $wp;
 		d($wp);
 	}
@@ -502,8 +502,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) {
-	function dump_post(){
+if (class_exists('Kint') && ! function_exists('dump_post')) {
+	function dump_post() {
 		global $post;
 		d($post);
 	}

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Indentation +1 added lines, -1 removed lines

@@ -715,7 +715,7 @@
 				}
 			}
 		}
-        }
+		}
 	/**
 	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;

core/db_models/EEM_Event.model.php

Indentation +43 added lines, -43 removed lines

@@ -179,11 +179,11 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 *		@return 		array
+	 */
 	public function get_all_question_groups() {
 		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
 			array( 'QSG_deleted' => FALSE ),
@@ -197,12 +197,12 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 *		@return 		array
+	 */
 	public function get_all_event_question_groups( $EVT_ID = 0 ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -218,13 +218,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		boolean	$for_primary_attendee
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		boolean	$for_primary_attendee
+	 *		@return 		array
+	 */
 	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
 			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
@@ -241,13 +241,13 @@ 
 
 
 	/**
-	*		get_question_groups
-	*
-	* 		@access		public
-	* 		@param		int $EVT_ID
-	* 		@param		EE_Registration 	$registration
-	*		@return 		array
-	*/
+	 *		get_question_groups
+	 *
+	 * 		@access		public
+	 * 		@param		int $EVT_ID
+	 * 		@param		EE_Registration 	$registration
+	 *		@return 		array
+	 */
 	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
 
 		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
@@ -275,12 +275,12 @@ 
 
 
 	/**
-	*		get_question_target_db_column
-	*
-	* 		@access		public
-	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
-	*		@return 		array
-	*/
+	 *		get_question_target_db_column
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QSG_IDs  csv list of $QSG IDs
+	 *		@return 		array
+	 */
 	public function get_questions_in_groups( $QSG_IDs = '' ) {
 
 		if ( empty( $QSG_IDs )) {
@@ -306,12 +306,12 @@ 
 
 
 	/**
-	*		get_options_for_question
-	*
-	* 		@access		public
-	* 		@param		string		$QST_IDs  csv list of $QST IDs
-	*		@return 		array
-	*/
+	 *		get_options_for_question
+	 *
+	 * 		@access		public
+	 * 		@param		string		$QST_IDs  csv list of $QST IDs
+	 *		@return 		array
+	 */
 	public function get_options_for_question( $QST_IDs ) {
 
 		if ( empty( $QST_IDs )) {
@@ -396,12 +396,12 @@ 
 
 
 	/**
-	*		_get_question_target_db_column
-	*
-	* 		@access		private
-	* 		@param		$QST
-	*		@return 		string		string
-	*/
+	 *		_get_question_target_db_column
+	 *
+	 * 		@access		private
+	 * 		@param		$QST
+	 *		@return 		string		string
+	 */
 	private function _generate_question_input_name( $QST ) {
 
 		if ( $QST->QST_system ) {

Spacing +161 added lines, -161 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_CPT_Base.model.php');
+require_once(EE_MODELS.'EEM_CPT_Base.model.php');
 /**
  *
  * EEM_Event Model
@@ -11,7 +11,7 @@ 
  * @author				Michael Nelson, Brent Christensen
  *
  */
-class EEM_Event  extends EEM_CPT_Base{
+class EEM_Event  extends EEM_CPT_Base {
 
 	/**
 	 * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the event
@@ -51,15 +51,15 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of EEM_Event already exists
-		if ( ! self::$_instance instanceof EEM_Event ) {
+		if ( ! self::$_instance instanceof EEM_Event) {
 			// instantiate Espresso_model
-			self::$_instance = new self( $timezone );
+			self::$_instance = new self($timezone);
 		}
 		//we might have a timezone set, let set_timezone decide what to do with it
-		self::$_instance->set_timezone( $timezone );
+		self::$_instance->set_timezone($timezone);
 		// EEM_Event object
 		return self::$_instance;
 	}
@@ -70,12 +70,12 @@ 
 	 * @param string $timezone
 	 * @return EEM_Event
 	 */
-	protected function __construct($timezone = null){
+	protected function __construct($timezone = null) {
 
-		EE_Registry::instance()->load_model( 'Registration' );
+		EE_Registry::instance()->load_model('Registration');
 
-		$this->singular_item = __('Event','event_espresso');
-		$this->plural_item = __('Events','event_espresso');
+		$this->singular_item = __('Event', 'event_espresso');
+		$this->plural_item = __('Events', 'event_espresso');
 
 		// to remove Cancelled events from the frontend, copy the following filter to your functions.php file
 		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
@@ -89,57 +89,57 @@ 
 			array(
 				EEM_Event::cancelled => array(
 					'label' => __('Cancelled', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', TRUE)
 				),
 				EEM_Event::postponed => array(
 					'label' => __('Postponed', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', TRUE)
 				),
 				EEM_Event::sold_out => array(
 					'label' => __('Sold Out', 'event_espresso'),
-					'public' => apply_filters( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE )
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', TRUE)
 				)
 			)
 		);
 
-		self::$_default_reg_status = empty( self::$_default_reg_status ) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
+		self::$_default_reg_status = empty(self::$_default_reg_status) ? EEM_Registration::status_id_pending_payment : self::$_default_reg_status;
 
 		$this->_tables = array(
-			'Event_CPT'=>new EE_Primary_Table( 'posts','ID' ),
-			'Event_Meta'=> new EE_Secondary_Table( 'esp_event_meta', 'EVTM_ID', 'EVT_ID' )
+			'Event_CPT'=>new EE_Primary_Table('posts', 'ID'),
+			'Event_Meta'=> new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID')
 		);
 
 		$this->_fields = array(
 			'Event_CPT'=>array(
-				'EVT_ID'=>new EE_Primary_Key_Int_Field( 'ID', __( 'Post ID for Event','event_espresso' )),
-				'EVT_name'=>new EE_Plain_Text_Field( 'post_title', __( 'Event Name','event_espresso' ), FALSE, '' ),
-				'EVT_desc'=>new EE_Post_Content_Field( 'post_content', __( 'Event Description', 'event_espresso' ), FALSE, '' ),
-				'EVT_slug'=>new EE_Slug_Field( 'post_name', __( 'Event Slug', 'event_espresso' ), FALSE, '' ),
-				'EVT_created'=>new EE_Datetime_Field( 'post_date', __( 'Date/Time Event Created', 'event_espresso' ), FALSE, time()),
-				'EVT_short_desc'=>new EE_Simple_HTML_Field( 'post_excerpt', __( 'Event Short Description', 'event_espresso' ), FALSE,'' ),
-				'EVT_modified'=>new EE_Datetime_Field( 'post_modified', __( 'Date/Time Event Modified', 'event_espresso' ), FALSE, time()),
-				'EVT_wp_user'=>new EE_WP_User_Field( 'post_author', __( 'Event Creator ID', 'event_espresso'), FALSE),
-				'parent'=>new EE_Integer_Field( 'post_parent', __( 'Event Parent ID', 'event_espresso' ), FALSE, 0 ),
-				'EVT_order'=>new EE_Integer_Field( 'menu_order', __( 'Event Menu Order', 'event_espresso' ), FALSE, 1 ),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'),// EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
-				'status' => new EE_WP_Post_Status_Field( 'post_status', __( 'Event Status', 'event_espresso' ), FALSE, 'draft', $this->_custom_stati )
+				'EVT_ID'=>new EE_Primary_Key_Int_Field('ID', __('Post ID for Event', 'event_espresso')),
+				'EVT_name'=>new EE_Plain_Text_Field('post_title', __('Event Name', 'event_espresso'), FALSE, ''),
+				'EVT_desc'=>new EE_Post_Content_Field('post_content', __('Event Description', 'event_espresso'), FALSE, ''),
+				'EVT_slug'=>new EE_Slug_Field('post_name', __('Event Slug', 'event_espresso'), FALSE, ''),
+				'EVT_created'=>new EE_Datetime_Field('post_date', __('Date/Time Event Created', 'event_espresso'), FALSE, time()),
+				'EVT_short_desc'=>new EE_Simple_HTML_Field('post_excerpt', __('Event Short Description', 'event_espresso'), FALSE, ''),
+				'EVT_modified'=>new EE_Datetime_Field('post_modified', __('Date/Time Event Modified', 'event_espresso'), FALSE, time()),
+				'EVT_wp_user'=>new EE_WP_User_Field('post_author', __('Event Creator ID', 'event_espresso'), FALSE),
+				'parent'=>new EE_Integer_Field('post_parent', __('Event Parent ID', 'event_espresso'), FALSE, 0),
+				'EVT_order'=>new EE_Integer_Field('menu_order', __('Event Menu Order', 'event_espresso'), FALSE, 1),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_events'), // EE_Plain_Text_Field( 'post_type', __( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
+				'status' => new EE_WP_Post_Status_Field('post_status', __('Event Status', 'event_espresso'), FALSE, 'draft', $this->_custom_stati)
 			),
 			'Event_Meta'=>array(
-				'EVTM_ID'=> new EE_DB_Only_Float_Field( 'EVTM_ID', __( 'Event Meta Row ID','event_espresso' ), FALSE ),
-				'EVT_ID_fk'=>new EE_DB_Only_Int_Field( 'EVT_ID', __( 'Foreign key to Event ID from Event Meta table', 'event_espresso' ), FALSE ),
-				'EVT_display_desc'=>new EE_Boolean_Field( 'EVT_display_desc', __( 'Display Description Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_display_ticket_selector'=>new EE_Boolean_Field( 'EVT_display_ticket_selector', __( 'Display Ticket Selector Flag', 'event_espresso' ), FALSE, 1 ),
-				'EVT_visible_on'=>new EE_Datetime_Field( 'EVT_visible_on', __( 'Event Visible Date', 'event_espresso' ), TRUE, time()),
-				'EVT_additional_limit'=>new EE_Integer_Field( 'EVT_additional_limit', __( 'Limit of Additional Registrations on Same Transaction', 'event_espresso' ), TRUE, 10 ),
+				'EVTM_ID'=> new EE_DB_Only_Float_Field('EVTM_ID', __('Event Meta Row ID', 'event_espresso'), FALSE),
+				'EVT_ID_fk'=>new EE_DB_Only_Int_Field('EVT_ID', __('Foreign key to Event ID from Event Meta table', 'event_espresso'), FALSE),
+				'EVT_display_desc'=>new EE_Boolean_Field('EVT_display_desc', __('Display Description Flag', 'event_espresso'), FALSE, 1),
+				'EVT_display_ticket_selector'=>new EE_Boolean_Field('EVT_display_ticket_selector', __('Display Ticket Selector Flag', 'event_espresso'), FALSE, 1),
+				'EVT_visible_on'=>new EE_Datetime_Field('EVT_visible_on', __('Event Visible Date', 'event_espresso'), TRUE, time()),
+				'EVT_additional_limit'=>new EE_Integer_Field('EVT_additional_limit', __('Limit of Additional Registrations on Same Transaction', 'event_espresso'), TRUE, 10),
 				'EVT_default_registration_status'=>new EE_Enum_Text_Field(
-					'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
+					'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), FALSE, EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
 				),
-				'EVT_member_only'=>new EE_Boolean_Field( 'EVT_member_only', __( 'Member-Only Event Flag', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __( 'Event Phone Number', 'event_espresso' ), FALSE ),
-				'EVT_allow_overflow'=>new EE_Boolean_Field(  'EVT_allow_overflow', __( 'Allow Overflow on Event', 'event_espresso' ), FALSE, FALSE ),
-				'EVT_timezone_string'=>new EE_Plain_Text_Field( 'EVT_timezone_string', __( 'Timezone (name) for Event times', 'event_espresso' ), FALSE ),
-				'EVT_external_URL'=>new EE_Plain_Text_Field( 'EVT_external_URL', __( 'URL of Event Page if hosted elsewhere', 'event_espresso' ), TRUE ),
-				'EVT_donations'=>new EE_Boolean_Field( 'EVT_donations', __( 'Accept Donations?', 'event_espresso' ), FALSE, FALSE )
+				'EVT_member_only'=>new EE_Boolean_Field('EVT_member_only', __('Member-Only Event Flag', 'event_espresso'), FALSE, FALSE),
+				'EVT_phone'=> new EE_Plain_Text_Field('EVT_phone', __('Event Phone Number', 'event_espresso'), FALSE),
+				'EVT_allow_overflow'=>new EE_Boolean_Field('EVT_allow_overflow', __('Allow Overflow on Event', 'event_espresso'), FALSE, FALSE),
+				'EVT_timezone_string'=>new EE_Plain_Text_Field('EVT_timezone_string', __('Timezone (name) for Event times', 'event_espresso'), FALSE),
+				'EVT_external_URL'=>new EE_Plain_Text_Field('EVT_external_URL', __('URL of Event Page if hosted elsewhere', 'event_espresso'), TRUE),
+				'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __('Accept Donations?', 'event_espresso'), FALSE, FALSE)
 
 			));
 
@@ -154,8 +154,8 @@ 
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
 	}
 
 
@@ -163,14 +163,14 @@ 
 	/**
 	 * @param string $default_reg_status
 	 */
-	public static function set_default_reg_status( $default_reg_status ) {
+	public static function set_default_reg_status($default_reg_status) {
 		self::$_default_reg_status = $default_reg_status;
 		//if EEM_Event has already been instantiated, then we need to reset the `EVT_default_reg_status` field to use the new default.
-		if ( self::$_instance instanceof EEM_Event ) {
+		if (self::$_instance instanceof EEM_Event) {
 			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status'] = new EE_Enum_Text_Field(
-				'EVT_default_registration_status', __( 'Default Registration Status on this Event', 'event_espresso' ), false, $default_reg_status, EEM_Registration::reg_status_array()
+				'EVT_default_registration_status', __('Default Registration Status on this Event', 'event_espresso'), false, $default_reg_status, EEM_Registration::reg_status_array()
 			);
-			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize( 'Event_Meta', 'EVT_default_registration_status', 'EEM_Event' );
+			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status']->_construct_finalize('Event_Meta', 'EVT_default_registration_status', 'EEM_Event');
 		}
 	}
 
@@ -183,9 +183,9 @@ 
 	*		@return 		array
 	*/
 	public function get_all_question_groups() {
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
-			array( 'QSG_deleted' => FALSE ),
-			'order_by' => array( 'QSG_order' => 'ASC' )
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
+			array('QSG_deleted' => FALSE),
+			'order_by' => array('QSG_order' => 'ASC')
 		));
 	}
 
@@ -201,13 +201,13 @@ 
 	* 		@param		int $EVT_ID
 	*		@return 		array
 	*/
-	public function get_all_event_question_groups( $EVT_ID = 0 ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_all_event_question_groups($EVT_ID = 0) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID)
 		));
 	}
 
@@ -223,13 +223,13 @@ 
 	* 		@param		boolean	$for_primary_attendee
 	*		@return 		array
 	*/
-	public function get_event_question_groups( $EVT_ID = 0, $for_primary_attendee = TRUE ) {
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = TRUE) {
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		return EE_Registry::instance()->load_model( 'Event_Question_Group' )->get_all( array(
-			array( 'EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee )
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(array(
+			array('EVT_ID' => $EVT_ID, 'EQG_primary' => $for_primary_attendee)
 		));
 	}
 
@@ -246,10 +246,10 @@ 
 	* 		@param		EE_Registration 	$registration
 	*		@return 		array
 	*/
-	public function get_question_groups_for_event( $EVT_ID = 0, EE_Registration $registration ) {
+	public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration) {
 
-		if ( ! isset( $EVT_ID) || ! absint( $EVT_ID )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(__('An error occurred. No Question Groups could be retrieved because an Event ID was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -259,7 +259,7 @@ 
 			'QSG_deleted' => FALSE
 		);
 
-		return EE_Registry::instance()->load_model( 'Question_Group' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(array(
 			$where_params,
 			'order_by' => array('QSG_order' => 'ASC')
 		));
@@ -279,16 +279,16 @@ 
 	* 		@param		string		$QSG_IDs  csv list of $QSG IDs
 	*		@return 		array
 	*/
-	public function get_questions_in_groups( $QSG_IDs = '' ) {
+	public function get_questions_in_groups($QSG_IDs = '') {
 
-		if ( empty( $QSG_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question Group IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QSG_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question Group IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question')->get_all(array(
 			array(
-				'Question_Group.QSG_ID' => array( 'IN', $QSG_IDs ),
+				'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
 				'QST_deleted' => FALSE,
 				'QST_admin_only' => is_admin()
 			),
@@ -310,16 +310,16 @@ 
 	* 		@param		string		$QST_IDs  csv list of $QST IDs
 	*		@return 		array
 	*/
-	public function get_options_for_question( $QST_IDs ) {
+	public function get_options_for_question($QST_IDs) {
 
-		if ( empty( $QST_IDs )) {
-			EE_Error::add_error( __( 'An error occurred. No Question IDs were received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($QST_IDs)) {
+			EE_Error::add_error(__('An error occurred. No Question IDs were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		return EE_Registry::instance()->load_model( 'Question_Option' )->get_all( array(
+		return EE_Registry::instance()->load_model('Question_Option')->get_all(array(
 			array(
-				'Question.QST_ID' => array( 'IN', $QST_IDs ),
+				'Question.QST_ID' => array('IN', $QST_IDs),
 				'QSO_deleted' => FALSE
 			),
 			'order_by' => 'QSO_ID'
@@ -338,46 +338,46 @@ 
 	 * @throws EE_Error
 	 * @return 	array
 	 */
-	public function assemble_array_of_groups_questions_and_options( EE_Registration $registration, $EVT_ID = 0 ) {
+	public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0) {
 
-		if ( empty( $EVT_ID ) ) {
-			throw new EE_Error( __( 'An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso' ) );
+		if (empty($EVT_ID)) {
+			throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.', 'event_espresso'));
 		}
 
 		$questions = array();
 
 		// get all question groups for event
-		$qgs = $this->get_question_groups_for_event( $EVT_ID, $registration );
-		if ( !empty( $qgs ) ) {
-			foreach ( $qgs as $qg ) {
+		$qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
+		if ( ! empty($qgs)) {
+			foreach ($qgs as $qg) {
 			 	$qsts = $qg->questions();
-			 	$questions[ $qg->ID() ] = $qg->model_field_array();
-			 	$questions[ $qg->ID() ]['QSG_questions'] = array();
-			 	foreach ( $qsts as $qst ) {
-			 		if ( $qst->is_system_question() )
+			 	$questions[$qg->ID()] = $qg->model_field_array();
+			 	$questions[$qg->ID()]['QSG_questions'] = array();
+			 	foreach ($qsts as $qst) {
+			 		if ($qst->is_system_question())
 			 			continue;
-			 		$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID() ) ) );
+			 		$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $qst->ID(), 'REG_ID' => $registration->ID())));
 			 		$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
 			 		$qst_name = $qstn_id = $qst->ID();
 			 		$ans_id = $answer->ID();
-			 		$qst_name = !empty( $ans_id ) ?  '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+			 		$qst_name = ! empty($ans_id) ? '['.$qst_name.']['.$ans_id.']' : '['.$qst_name.']';
 			 		$input_name = '';
-			 		$input_id = sanitize_key( $qst->display_text() );
+			 		$input_id = sanitize_key($qst->display_text());
 			 		$input_class = '';
 			 		$questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
-		 			$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_name'] = 'qstn' . $input_name . $qst_name;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_id'] = $input_id . '-' . $qstn_id;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_input_class'] = $input_class;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'] = array();
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['qst_obj'] = $qst;
-					$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['ans_obj'] = $answer;
+		 			$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'.$input_name.$qst_name;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id.'-'.$qstn_id;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
 					//leave responses as-is, don't convert stuff into html entities please!
-					$questions[ $qg->ID() ][ 'QSG_questions'][ $qst->ID() ][ 'htmlentities' ] = false;
-					if ( $qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN' ) {
-						$QSOs = $qst->options(TRUE,$answer->value());
-						if ( is_array( $QSOs ) ) {
-							foreach ( $QSOs as $QSO_ID => $QSO ) {
-								$questions[ $qg->ID() ]['QSG_questions'][ $qst->ID() ]['QST_options'][ $QSO_ID ] = $QSO->model_field_array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['htmlentities'] = false;
+					if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
+						$QSOs = $qst->options(TRUE, $answer->value());
+						if (is_array($QSOs)) {
+							foreach ($QSOs as $QSO_ID => $QSO) {
+								$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
 							}
 						}
 					}
@@ -401,9 +401,9 @@ 
 	* 		@param		$QST
 	*		@return 		string		string
 	*/
-	private function _generate_question_input_name( $QST ) {
+	private function _generate_question_input_name($QST) {
 
-		if ( $QST->QST_system ) {
+		if ($QST->QST_system) {
 			$qst_name = $QST->QST_system;
 /*			switch( $QST->QST_system ) {
 
@@ -470,36 +470,36 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_active_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_active_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if already have where params for DTT_EVT_start or DTT_EVT_end then append these conditions
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start******'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start******'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('<',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
-			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['Datetime.DTT_EVT_end*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		} else {
-			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+			$where_params['Datetime.DTT_EVT_end'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -514,30 +514,30 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array               EE_Event objects
 	 */
-	public function get_upcoming_events( $query_params, $count = FALSE ) {
-		if ( array_key_exists( 0, $query_params ) ) {
+	public function get_upcoming_events($query_params, $count = FALSE) {
+		if (array_key_exists(0, $query_params)) {
 			$where_params = $query_params[0];
-			unset( $query_params[0] );
+			unset($query_params[0]);
 		} else {
 			$where_params = array();
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
 		$where_params['status'] = 'publish';
 		//if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
-			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start*****'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		} else {
-			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) );
+			$where_params['Datetime.DTT_EVT_start'] = array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
 		}
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -549,56 +549,56 @@ 
 	 * @param bool    $count whether to return the count or not (default FALSE)
 	 * @return array 	EE_Event objects
 	 */
-	public function get_expired_events( $query_params, $count = FALSE ) {
+	public function get_expired_events($query_params, $count = FALSE) {
 
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//let's add specific query_params for active_events - keep in mind this will override any sent status in the query AND any date queries.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 		$exclude_query = $query_params;
-		if ( isset( $exclude_query[0] ) ) {
-			unset( $exclude_query[0] );
+		if (isset($exclude_query[0])) {
+			unset($exclude_query[0]);
 		}
-		$exclude_query[0] = array( 'Datetime.DTT_EVT_end' => array( '>', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) );
+		$exclude_query[0] = array('Datetime.DTT_EVT_end' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')));
 		//first get all events that have datetimes where its not expired.
-		$event_ids = $this->_get_all_wpdb_results( $exclude_query, OBJECT_K, 'Event_CPT.ID' );
-		$event_ids = array_keys( $event_ids );
+		$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Event_CPT.ID');
+		$event_ids = array_keys($event_ids);
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
 		$and_condition = array(
-			'Datetime.DTT_EVT_end' => array( '<', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ),
-			'EVT_ID' =>  array( 'NOT IN', $event_ids )
+			'Datetime.DTT_EVT_end' => array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')),
+			'EVT_ID' =>  array('NOT IN', $event_ids)
 			);
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$and_condition['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$and_condition['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$and_condition['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		//merge remaining $where params with the and conditions.
-		$and_condtion = array_merge( $and_condition, $where_params );
+		$and_condtion = array_merge($and_condition, $where_params);
 
 		$where_params['AND'] = $and_condition;
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -609,40 +609,40 @@ 
 	 * @param  boolean $count        whether to return the count or not (default FALSE)
 	 * @return EE_Event[]            array of EE_Event objects
 	 */
-	public function get_inactive_events( $query_params, $count = FALSE ) {
-		$where_params = isset( $query_params[0] ) ? $query_params[0] : array();
+	public function get_inactive_events($query_params, $count = FALSE) {
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
 
 		//let's add in specific query_params for inactive events.
-		if ( isset( $where_params['status'] ) ) {
-			unset( $where_params['status'] );
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
 		}
 
 		//if we have count make sure we don't include group by
-		if ( $count && isset( $query_params['group_by'] ) ) {
-			unset( $query_params['group_by'] );
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
 		}
 
 		//if we have any additional query_params, let's add them to the 'AND' condition
-		$where_params['AND']['status'] = array( '!=', 'publish' );
+		$where_params['AND']['status'] = array('!=', 'publish');
 
-		if ( isset( $where_params['OR'] ) ) {
+		if (isset($where_params['OR'])) {
 			$where_params['AND']['OR'] = $where_params['OR'];
-			unset( $where_params['OR'] );
+			unset($where_params['OR']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
 			$where_params['AND']['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-			unset( $where_params['Datetime.DTT_EVT_end'] );
+			unset($where_params['Datetime.DTT_EVT_end']);
 		}
 
-		if ( isset( $where_params['Datetime.DTT_EVT_start'] ) ) {
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
 			$where_params['AND']['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-			unset( $where_params['Datetime.DTT_EVT_start'] );
+			unset($where_params['Datetime.DTT_EVT_start']);
 		}
 
 		$query_params[0] = $where_params;
 		// don't use $query_params with count() because we don't want to include additional query clauses like "GROUP BY" 
-		return $count ? $this->count( array( $where_params ), 'EVT_ID', true ) : $this->get_all( $query_params );
+		return $count ? $this->count(array($where_params), 'EVT_ID', true) : $this->get_all($query_params);
 	}
 
 
@@ -650,13 +650,13 @@ 
 	 * This is just injecting into the parent add_relationship_to so we do special handling on price relationships because we don't want to override any existing global default prices but instead insert NEW prices that get attached to the event.
 	 * See parent for param descriptions
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 
-		if ( $relationName == 'Price' ) {
+		if ($relationName == 'Price') {
 			//let's get the PRC object for the given ID to make sure that we aren't dealing with a default
 			$prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
 			//if EVT_ID = 0, then this is a default
-			if ( $prc_chk->get('EVT_ID') == 0 ) {
+			if ($prc_chk->get('EVT_ID') == 0) {
 				//let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
 				$prc_chk->set('PRC_ID', 0);
 			}
@@ -666,7 +666,7 @@ 
 		}
 
 		//otherwise carry on as normal
-		return parent::add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query);
+		return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
 	}
 
 

core/EE_Registry.core.php

Indentation +38 added lines, -38 removed lines

@@ -1,35 +1,35 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
 * EE_Registry Class
- *
- * Centralized Application Data Storage and Management
- *
- * @package				Event Espresso
- * @subpackage			core
- * @author					Brent Christensen
- */
+	 *
+	 * Centralized Application Data Storage and Management
+	 *
+	 * @package				Event Espresso
+	 * @subpackage			core
+	 * @author					Brent Christensen
+	 */
 final class EE_Registry {
 
 	/**
-	* 	EE_Registry Object
-	* 	@var EE_Registry $_instance
-	* 	@access 	private
-	*/
+	 * 	EE_Registry Object
+	 * 	@var EE_Registry $_instance
+	 * 	@access 	private
+	 */
 	private static $_instance = NULL;
 
 
 	/**
-	* 	EE_Cart Object
-	* 	@access 	public
-	*	@var 	EE_Cart $CART
-	*/
+	 * 	EE_Cart Object
+	 * 	@access 	public
+	 *	@var 	EE_Cart $CART
+	 */
 	public $CART = NULL;
 
 	/**
-	* 	EE_Config Object
-	* 	@access 	public
-	*	@var 	EE_Config $CFG
-	*/
+	 * 	EE_Config Object
+	 * 	@access 	public
+	 *	@var 	EE_Config $CFG
+	 */
 	public $CFG = NULL;
 
 
@@ -44,9 +44,9 @@ 
 
 
 	/**
-	* 	StdClass object for storing library classes in
-	* 	@public LIB
-	*/
+	 * 	StdClass object for storing library classes in
+	 * 	@public LIB
+	 */
 	public $LIB = NULL;
 
 	/**
@@ -57,10 +57,10 @@ 
 	public $REQ = NULL;
 
 	/**
-	* 	EE_Session Object
-	* 	@access 	public
-	* 	@var 	EE_Session	 $SSN
-	*/
+	 * 	EE_Session Object
+	 * 	@access 	public
+	 * 	@var 	EE_Session	 $SSN
+	 */
 	public $SSN = NULL;
 
 
@@ -127,21 +127,21 @@ 
 
 
 	/**
-	* 	$i18n_js_strings - internationalization for JS strings
-	*  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
-	*  	in js file:  var translatedString = eei18n.string_key;
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$i18n_js_strings - internationalization for JS strings
+	 *  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
+	 *  	in js file:  var translatedString = eei18n.string_key;
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public static $i18n_js_strings = array();
 
 	/**
-	* 	$main_file - path to espresso.php
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$main_file - path to espresso.php
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public $main_file;
 
 

Spacing +119 added lines, -119 removed lines

@@ -156,7 +156,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Registry )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Registry)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -171,14 +171,14 @@ 
 	 * @return EE_Registry
 	 */
 	private function __construct() {
-		$this->load_core( 'Base' );
+		$this->load_core('Base');
 		// class library
 		$this->LIB = new StdClass();
 		$this->addons = new StdClass();
 		$this->modules = new StdClass();
 		$this->shortcodes = new StdClass();
 		$this->widgets = new StdClass();
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ));
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -191,10 +191,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER['HTTPS'] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings['ajax_url'] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings['wp_debug'] = defined( 'WP_DEBUG' ) ? WP_DEBUG : FALSE;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : FALSE;
 	}
 
 
@@ -205,14 +205,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -220,15 +220,15 @@ 
 	/**
 	 * @param mixed string | EED_Module $module
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' )) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
-			$this->modules->{$module} = EE_Module_Request_Router::module_factory( $module );
+			$this->modules->{$module} = EE_Module_Request_Router::module_factory($module);
 		}
 	}
 
@@ -238,8 +238,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL;
 	}
 
 
@@ -252,18 +252,18 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_core ( $class_name, $arguments = array(), $load_only = FALSE ) {
+	public function load_core($class_name, $arguments = array(), $load_only = FALSE) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS
+				EE_CORE.'data_migration_scripts'.DS
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_' , $class_name, 'core', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -276,9 +276,9 @@ 
 	 * @param mixed  $arguments
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function load_dms ( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_' , $class_name, 'dms', $arguments, FALSE, FALSE, FALSE );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, FALSE, FALSE, FALSE);
 	}
 
 
@@ -293,14 +293,14 @@ 
 	 *	@param bool   $load_only      whether or not to just load the file and NOT instantiate, or load AND instantiate (default)
 	 *	@return EE_Base_Class
 	 */
-	public function load_class ( $class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) {
-		$paths = apply_filters('FHEE__EE_Registry__load_class__paths',array(
+	public function load_class($class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
 		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -314,10 +314,10 @@ 
 	 * @param bool   $load_only
 	 * @return EEH_Base
 	 */
-	public function load_helper ( $class_name, $arguments = array(), $load_only = TRUE ) {
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS ) );
+	public function load_helper($class_name, $arguments = array(), $load_only = TRUE) {
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -331,16 +331,16 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_lib ( $class_name, $arguments = array(), $load_only = FALSE ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = FALSE) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, 'lib', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -353,13 +353,13 @@ 
 	 * @param bool   $load_only
 	 * @return EEM_Base
 	 */
-	public function load_model ( $class_name, $arguments = array(), $load_only = FALSE ) {
-		$paths = apply_filters('FHEE__EE_Registry__load_model__paths',array(
+	public function load_model($class_name, $arguments = array(), $load_only = FALSE) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
 		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_' , $class_name, 'model', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -372,15 +372,15 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_model_class ( $class_name, $arguments = array(), $load_only = TRUE ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = TRUE) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_' , $class_name, '', $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -392,8 +392,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ){
-		return isset( $this->models[ $model_name ] ) ? TRUE : FALSE;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? TRUE : FALSE;
 	}
 
 
@@ -408,9 +408,9 @@ 
 	 * @param bool   $load_only
 	 * @return mixed
 	 */
-	public function load_file ( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -425,9 +425,9 @@ 
 	 * @param bool   $load_only
 	 * @return EE_Addon
 	 */
-	public function load_addon ( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only);
 	}
 
 
@@ -445,15 +445,15 @@ 
 	 * @internal param string $file_path - file path including file name
 	 * @return bool | object
 	 */
-	private function _load ( $file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) {
+	private function _load($file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ));
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix != 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ));
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
 
 		$class_abbreviations = array(
@@ -465,61 +465,61 @@ 
 			'EE_Capabilities' => 'CAP'
 		);
 
-		$class_abbreviation = isset( $class_abbreviations[ $class_name ] )
-			? $class_abbreviations[ $class_name ]
+		$class_abbreviation = isset($class_abbreviations[$class_name])
+			? $class_abbreviations[$class_name]
 			: '';
 		// check if class has already been loaded, and return it if it has been
-		if ( $class_abbreviation !== '' && ! is_null( $this->{$class_abbreviation} )
+		if ($class_abbreviation !== '' && ! is_null($this->{$class_abbreviation} )
 		) {
 			return $this->{$class_abbreviation};
-		} else if ( isset ( $this->{$class_name} ) ) {
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->{$class_name} ) ) {
+		} else if (isset ($this->LIB->{$class_name} )) {
 			return $this->LIB->{$class_name};
-		} else if ( $class_prefix == 'addon' && isset ( $this->addons->{$class_name} ) ) {
+		} else if ($class_prefix == 'addon' && isset ($this->addons->{$class_name} )) {
 			return $this->addons->{$class_name};
 		}
 
 		// assume all paths lead nowhere
 		$path = FALSE;
 		// make sure $file_paths is an array
-		$file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths );
+		$file_paths = is_array($file_paths) ? $file_paths : array($file_paths);
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] )) {
-				$path = $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				$path = $file_paths[$key];
 				break;
 			}
 		}
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
-					sprintf (
-						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s','event_espresso'),
-						trim( $type, '.' ),
+				throw new EE_Error(
+					sprintf(
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, FALSE ) === FALSE ) {
+			if (class_exists($class_name, FALSE) === FALSE) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__('The %s file %s does not appear to contain the %s Class.','event_espresso'),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -527,7 +527,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 
@@ -535,38 +535,38 @@ 
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = new ReflectionClass( $class_name );
+			$reflector = new ReflectionClass($class_name);
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only ) {
+			if ($reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only) {
 //				$instantiation_mode = 0;
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				return TRUE;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 //				$instantiation_mode = 1;
-				$class_obj =  call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 //				$instantiation_mode = 2;
-				$class_obj =  call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' )) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 //				$instantiation_mode = 3;
-				$class_obj =  call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 //				$instantiation_mode = 4;
-				$class_obj =  $reflector->newInstance( $arguments );
-			} else if ( ! $load_only ) {
+				$class_obj = $reflector->newInstance($arguments);
+			} else if ( ! $load_only) {
 				// heh ? something's not right !
 //				$instantiation_mode = 5;
 				throw new EE_Error(
 					sprintf(
-						__('The %s file %s could not be instantiated.','event_espresso'),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 
@@ -578,15 +578,15 @@ 
 //	EEH_Debug_Tools::printr( $class_obj, '$class_obj  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 
-		if ( isset( $class_obj )) {
+		if (isset($class_obj)) {
 			// return newly instantiated class
-			if ( $class_abbreviation !== '' ) {
+			if ($class_abbreviation !== '') {
 				$this->{$class_abbreviation} = $class_obj;
-			} else if ( EEH_Class_Tools::has_property( $this, $class_name )) {
+			} else if (EEH_Class_Tools::has_property($this, $class_name)) {
 				$this->{$class_name} = $class_obj;
-			} else if ( $class_prefix == 'addon' && $cache  ) {
+			} else if ($class_prefix == 'addon' && $cache) {
 				$this->addons->{$class_name} = $class_obj;
-			} else if ( !$from_db && $cache  ) {
+			} else if ( ! $from_db && $cache) {
 				$this->LIB->{$class_name} = $class_obj;
 			}
 			return $class_obj;
@@ -611,7 +611,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __call($a,$b) {}
+	final function __call($a, $b) {}
 
 
 
@@ -626,7 +626,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 
 
 
@@ -666,7 +666,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final static function __callStatic($a,$b) {}
+	final static function __callStatic($a, $b) {}
 
 	/**
 	 * Gets the addon by its name/slug (not classname. For that, just
@@ -674,9 +674,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ){
-		foreach($this->addons as $addon){
-			if( $addon->name() == $name){
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() == $name) {
 				return $addon;
 			}
 		}
@@ -687,10 +687,10 @@ 
 	 *
 	 * @return EE_Addon[] where the KEYS are the addon's name()
 	 */
-	public function get_addons_by_name(){
+	public function get_addons_by_name() {
 		$addons = array();
-		foreach($this->addons as $addon){
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -705,14 +705,14 @@ 
 	 * @return EEM_Base
 	 * @throws EE_Error
 	 */
-	public function reset_model( $model_name ){
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->{$model_class_name} = $model::reset();
-		}else{
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+		} else {
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->{$model_class_name};
 	}
@@ -728,15 +728,15 @@ 
 	 * currently reinstantiate the singletons at the moment)
 	 * @return EE_Registry
 	 */
-	public static function reset( $hard = FALSE, $reinstantiate = TRUE ){
+	public static function reset($hard = FALSE, $reinstantiate = TRUE) {
 		$instance = self::instance();
 		$instance->load_helper('Activation');
 		EEH_Activation::reset();
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
 		$instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset();
 		$instance->LIB = new stdClass();
-		foreach( array_keys( $instance->non_abstract_db_models ) as $model_name ){
-			$instance->reset_model( $model_name );
+		foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+			$instance->reset_model($model_name);
 		}
 		return $instance;
 	}
@@ -747,9 +747,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $shortname => $classname ) {
-			if( is_subclass_of(  $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $shortname ] = $classname;
+		foreach ($this->non_abstract_db_models as $shortname => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$shortname] = $classname;
 			}
 		}
 		return $cpt_models;

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Indentation +39 added lines, -39 removed lines

@@ -1,13 +1,13 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- *
- * EEG_Mijireh
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- */
+		 *
+		 * EEG_Mijireh
+		 *
+		 * @package			Event Espresso
+		 * @subpackage
+		 * @author				Mike Nelson
+		 *
+		 */
 class EEG_Mijireh extends EE_Offsite_Gateway{
 
 	protected $_access_key;
@@ -99,45 +99,45 @@ 
 		'body'=>  json_encode($order)
 		);
 		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
-                $problems_string = false;
+				$problems_string = false;
 		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
 		if( ! $response instanceof WP_Error ){
 			$response_body = json_decode($response['body']);
 			if($response_body && isset($response_body->checkout_url)){
-                            $payment->set_redirect_url($response_body->checkout_url);
-                            $payment->set_txn_id_chq_nmbr($response_body->order_number);
-                            $payment->set_details($response['body']);
+							$payment->set_redirect_url($response_body->checkout_url);
+							$payment->set_txn_id_chq_nmbr($response_body->order_number);
+							$payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
-                                    }
-                            }else{
-                                    $problems_string = $response['body'];
-                            }
-                            if( ! $problems_string ) {
-                                //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
-                                }
-                            }
-                        }
+						   if( is_array( $response_body ) || is_object( $response_body)){
+									$response_body_as_array = (array)$response_body;
+									foreach($response_body_as_array as $problem_parameter => $problems){
+											$problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+									}
+							}else{
+									$problems_string = $response['body'];
+							}
+							if( ! $problems_string ) {
+								//no message to show? wack
+								if( isset( $response[ 'headers' ][ 'status' ] ) ){
+										$problems_string = $response[ 'headers' ][ 'status' ];
+								}else{
+										$problems_string = __( 'No response from Mijireh', 'event_espresso' );
+								}
+							}
+						}
 		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+					$problems_string = implode( ",", $response->get_error_messages() );
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
-                    //even though the payment's status is failed at this point anyways,
-                    //let's be explicit about it. The fact that the redirect url is null
-                    //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
-                }
+				if( $problems_string ) {
+					$payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
+					$payment->set_details( $response );
+					$payment->set_redirect_url( null );
+					//even though the payment's status is failed at this point anyways,
+					//let's be explicit about it. The fact that the redirect url is null
+					//should be enough to client code that they can't redirect the user
+					$payment->set_status( $this->_pay_model->failed_status() );
+				}
 		return $payment;
 	}
 

Spacing +58 added lines, -58 removed lines

@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EEG_Mijireh extends EE_Offsite_Gateway{
+class EEG_Mijireh extends EE_Offsite_Gateway {
 
 	protected $_access_key;
 
@@ -37,10 +37,10 @@ 
 		$primary_attendee = $primary_registrant->attendee();
 		$items = array();
 		//if we're are charging for the full amount, show the normal line items
-		if( $this->_can_easily_itemize_transaction_for( $payment )){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$total_line_item = $transaction->total_line_item();
 			$tax_total = $total_line_item->get_total_tax();
-			foreach($total_line_item->get_items() as $line_item){
+			foreach ($total_line_item->get_items() as $line_item) {
 				$items[] = array(
 					'name'=>apply_filters(
 						'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
@@ -54,7 +54,7 @@ 
 					'quantity'=>$line_item->quantity()
 				);
 			}
-		}else{//its a partial payment
+		} else {//its a partial payment
 			$tax_total = 0;
 			//partial payment, so just add 1 item
 			$items[] = array(
@@ -62,7 +62,7 @@ 
 					'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
 					sprintf(
 						__("Payment of %s for %s", 'event_espresso'),
-						$payment->get_pretty( 'PAY_amount', 'no_currency_code' ),
+						$payment->get_pretty('PAY_amount', 'no_currency_code'),
 						$primary_registrant->event_name()
 					),
 					$payment,
@@ -76,18 +76,18 @@ 
 		$order = array(
 			'total'=>$this->format_currency($payment->amount()),
 			'return_url'=>$return_url,
-			'items'=>$this->_prepare_for_mijireh( $items ),
+			'items'=>$this->_prepare_for_mijireh($items),
 			'email'=>$primary_attendee->email(),
 			'first_name'=>$primary_attendee->fname(),
 			'last_name'=>$primary_attendee->lname(),
 			'tax'=>$this->format_currency($tax_total),
 			'partner_id'=>'ee');
 		//setup address?
-		if(		$primary_attendee->address()  &&
-				$primary_attendee->city()  &&
-				$primary_attendee->state_ID()  &&
-				$primary_attendee->country_ID()  &&
-				$primary_attendee->zip()  ){
+		if ($primary_attendee->address() &&
+				$primary_attendee->city() &&
+				$primary_attendee->state_ID() &&
+				$primary_attendee->country_ID() &&
+				$primary_attendee->zip()) {
 			$shipping_address = array(
 				'first_name'=>$primary_attendee->fname(),
 				'last_name'=>$primary_attendee->lname(),
@@ -97,62 +97,62 @@ 
 				'zip_code' => $primary_attendee->zip(),
 				'country' => $primary_attendee->country_ID()
 			);
-			if( $primary_attendee->address2() ){
-				$shipping_address[ 'apt_suite' ] = $primary_attendee->address2();
+			if ($primary_attendee->address2()) {
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
 			}
-			if( $primary_attendee->phone() ){
-				$shipping_address[ 'phone' ] = $primary_attendee->phone();
+			if ($primary_attendee->phone()) {
+				$shipping_address['phone'] = $primary_attendee->phone();
 			}
-			$order[ 'shipping_address' ] = $shipping_address;
+			$order['shipping_address'] = $shipping_address;
 		}
-		$order = apply_filters( 'FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) );
+		$order = apply_filters('FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
 		$args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=>  json_encode($order)
 		);
-		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
+		$response = wp_remote_post($this->_mijireh_api_orders_url, $args);
                 $problems_string = false;
-		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
-		if( ! $response instanceof WP_Error ){
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
+		if ( ! $response instanceof WP_Error) {
 			$response_body = json_decode($response['body']);
-			if($response_body && isset($response_body->checkout_url)){
+			if ($response_body && isset($response_body->checkout_url)) {
                             $payment->set_redirect_url($response_body->checkout_url);
                             $payment->set_txn_id_chq_nmbr($response_body->order_number);
                             $payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+                           if (is_array($response_body) || is_object($response_body)) {
+                                    $response_body_as_array = (array) $response_body;
+                                    foreach ($response_body_as_array as $problem_parameter => $problems) {
+                                            $problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems));
                                     }
-                            }else{
+                            } else {
                                     $problems_string = $response['body'];
                             }
-                            if( ! $problems_string ) {
+                            if ( ! $problems_string) {
                                 //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
+                                if (isset($response['headers']['status'])) {
+                                        $problems_string = $response['headers']['status'];
+                                } else {
+                                        $problems_string = __('No response from Mijireh', 'event_espresso');
                                 }
                             }
                         }
-		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+		} else {
+                    $problems_string = implode(",", $response->get_error_messages());
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
+                if ($problems_string) {
+                    $payment->set_gateway_response(sprintf(__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string));
+                    $payment->set_details($response);
+                    $payment->set_redirect_url(null);
                     //even though the payment's status is failed at this point anyways,
                     //let's be explicit about it. The fact that the redirect url is null
                     //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
+                    $payment->set_status($this->_pay_model->failed_status());
                 }
 		return $payment;
 	}
@@ -165,16 +165,16 @@ 
 	 * @param mixed $data
 	 * @return mixed same type as $data
 	 */
-	private function _prepare_for_mijireh( $data ){
-		if( is_array( $data ) ){
+	private function _prepare_for_mijireh($data) {
+		if (is_array($data)) {
 			$prepared_data = array();
-			foreach($data as $key => $datum ){
-				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
+			foreach ($data as $key => $datum) {
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
-			return str_replace( '%', 'percent', $data );
-		}else{
+		}elseif (is_string($data)) {
+			return str_replace('%', 'percent', $data);
+		} else {
 			return $data;
 		}
 	}
@@ -195,30 +195,30 @@ 
 
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-		if ( ! $payment instanceof EEI_Payment ){
-			throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) );
+		if ( ! $payment instanceof EEI_Payment) {
+			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID()));
 		}
 
 		$request_args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			)
 		);
 
 		$response = wp_remote_get(
-			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(),
 			$request_args
 		);
 
 		$this->log(
-			array( 'get payment status request_args' => $request_args, 'response' => $response ),
+			array('get payment status request_args' => $request_args, 'response' => $response),
 			$payment
 		);
 		// validate response
-		$response_body = isset( $response[ 'body' ] ) ? json_decode( $response[ 'body' ] ) : '';
-		if( $response && $response_body ){
-			switch( $response_body->status ){
+		$response_body = isset($response['body']) ? json_decode($response['body']) : '';
+		if ($response && $response_body) {
+			switch ($response_body->status) {
 				case 'paid':
 					$payment->set_status($this->_pay_model->approved_status());
 					break;
@@ -230,9 +230,9 @@ 
 			}
 
 		} else {
-			$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
-			$payment->set_details( $response );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
+			$payment->set_details($response);
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 		// the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
 //		$payment->set_status( $this->_pay_model->pending_status() );

caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link				http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EED_Event_Single_Caff
- *
- * @package		Event Espresso
- * @subpackage	/modules/event_single_caff/
- * @author		Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+						 * Event Espresso
+						 *
+						 * Event Registration and Management Plugin for WordPress
+						 *
+						 * @ package			Event Espresso
+						 * @ author			Seth Shoultes
+						 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+						 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+						 * @ link				http://www.eventespresso.com
+						 * @ version		 	4.0
+						 *
+						 * ------------------------------------------------------------------------
+						 *
+						 * EED_Event_Single_Caff
+						 *
+						 * @package		Event Espresso
+						 * @subpackage	/modules/event_single_caff/
+						 * @author		Brent Christensen
+						 *
+						 * ------------------------------------------------------------------------
+						 */
 class EED_Event_Single_Caff  extends EED_Event_Single {
 
 

core/helpers/EEH_Template.helper.php

Indentation +15 added lines, -15 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @package     Event Espresso
- * @author      Event Espresso
- * @copyright	  (c)2009-2012 Event Espresso All Rights Reserved.
- * @license     http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing **
- * @link        http://www.eventespresso.com
- * @version		4.0
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @package     Event Espresso
+	 * @author      Event Espresso
+	 * @copyright	  (c)2009-2012 Event Espresso All Rights Reserved.
+	 * @license     http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing **
+	 * @link        http://www.eventespresso.com
+	 * @version		4.0
+	 */
 
 
 
@@ -99,7 +99,7 @@ 
 				return array();
 			}
 			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+				unset( $espresso_themes[ $key ] );
 			}
 			EEH_Template::$_espresso_themes = array();
 			foreach ( $espresso_themes as $espresso_theme ) {
@@ -709,9 +709,9 @@ 
 		);
 
 		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+			 || ! is_array( $items_label )
+			 || ! isset( $items_label['single'] )
+			 || ! isset( $items_label['plural'] ) ) {
 			$items_label = array(
 				'single' => __( '1 item', 'event_espresso' ),
 				'plural' => __( '%s items', 'event_espresso' )

Spacing +196 added lines, -196 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,80 +210,80 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			EE_Registry::instance()->load_helper('File');
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -296,21 +296,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -322,9 +322,9 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 		//require the template validator for verifying variables are set according to how the template requires
-		EE_Registry::instance()->load_helper( 'Template_Validator' );
+		EE_Registry::instance()->load_helper('Template_Validator');
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -335,26 +335,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -372,27 +372,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -408,50 +408,50 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
 		$amount = (float) $amount;
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -466,11 +466,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -483,9 +483,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -502,21 +502,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -528,31 +528,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -560,7 +560,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -581,31 +581,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h3>' . __('Status Legend', 'event_espresso') . '</h3>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h3>'.__('Status Legend', 'event_espresso').'</h3>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -618,8 +618,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	EE_Registry::instance()->load_helper('Array');
 	ob_start();
@@ -633,10 +633,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -650,7 +650,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -680,8 +680,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -705,13 +705,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -719,68 +719,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -789,29 +789,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 

core/libraries/batch/Helpers/JobParameters.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- *
- * Class JobParameters
- *
- * Class for storing information about a job. Takes care of serializing the
- * data for storing in a wordpress option
- *
- * @package         Event Espresso
- * @subpackage    batch
- * @author				Mike Nelson
- * @since		 	   4.8.26
- *
- */
+	 *
+	 * Class JobParameters
+	 *
+	 * Class for storing information about a job. Takes care of serializing the
+	 * data for storing in a wordpress option
+	 *
+	 * @package         Event Espresso
+	 * @subpackage    batch
+	 * @author				Mike Nelson
+	 * @since		 	   4.8.26
+	 *
+	 */
 namespace EventEspressoBatchRequest\Helpers;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }

Spacing +40 added lines, -40 removed lines

@@ -96,12 +96,12 @@ 
 	 * @param array $request_data
 	 * @param array $extra_data
 	 */
-	function __construct( $job_id, $classname, $request_data, $extra_data = array() ) {
-		$this->set_job_id( $job_id );
-		$this->set_classname( $classname );
-		$this->set_request_data( $request_data );
-		$this->set_extra_data( $extra_data );
-		$this->set_status( JobParameters::status_continue );
+	function __construct($job_id, $classname, $request_data, $extra_data = array()) {
+		$this->set_job_id($job_id);
+		$this->set_classname($classname);
+		$this->set_request_data($request_data);
+		$this->set_extra_data($extra_data);
+		$this->set_status(JobParameters::status_continue);
 	}
 
 
@@ -126,12 +126,12 @@ 
 	 * @param boolean $first
 	 * @return boolean success
 	 */
-	function save( $first = false ) {
-		$object_vars = wp_json_encode( get_object_vars( $this ) );
-		if( $first ) {
-			return add_option( $this->option_name(), $object_vars, null, 'no' );
-		} else{
-			return update_option( $this->option_name(), $object_vars );
+	function save($first = false) {
+		$object_vars = wp_json_encode(get_object_vars($this));
+		if ($first) {
+			return add_option($this->option_name(), $object_vars, null, 'no');
+		} else {
+			return update_option($this->option_name(), $object_vars);
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @return boolean
 	 */
 	function delete() {
-		return delete_option( $this->option_name() );
+		return delete_option($this->option_name());
 	}
 
 
@@ -154,26 +154,26 @@ 
 	 * @return JobParameters
 	 * @throws BatchRequestException
 	 */
-	static function load( $job_id ) {
-		$job_parameter_vars = json_decode( get_option( JobParameters::wp_option_prefix . $job_id ), true );
-		if(
-			! is_array( $job_parameter_vars ) ||
-			! isset( $job_parameter_vars[ '_classname' ] ) ||
-			! isset( $job_parameter_vars[ '_request_data' ] )
+	static function load($job_id) {
+		$job_parameter_vars = json_decode(get_option(JobParameters::wp_option_prefix.$job_id), true);
+		if (
+			! is_array($job_parameter_vars) ||
+			! isset($job_parameter_vars['_classname']) ||
+			! isset($job_parameter_vars['_request_data'])
 		) {
 			throw new BatchRequestException(
 				sprintf(
 					__('Could not retrieve job %1$s from the Wordpress options table, and so the job could not continue. The wordpress option was %2$s', 'event_espresso'),
 					$job_id,
-					get_option( JobParameters::wp_option_prefix . $job_id )
+					get_option(JobParameters::wp_option_prefix.$job_id)
 				)
 			);
 		}
 		$job_parameters = new JobParameters(
 				$job_id,
-				$job_parameter_vars[ '_classname' ],
-				$job_parameter_vars[ '_request_data'] );
-		foreach( $job_parameter_vars as $key => $value ) {
+				$job_parameter_vars['_classname'],
+				$job_parameter_vars['_request_data'] );
+		foreach ($job_parameter_vars as $key => $value) {
 			$job_parameters->{$key} = $value;
 		}
 		return $job_parameters;
@@ -217,9 +217,9 @@ 
 	 * @param string|array $default
 	 * @return string|array
 	 */
-	function request_datum( $key, $default = '' ) {
-		if( isset( $this->_request_data[ $key ] ) ) {
-			return $this->_request_data[ $key ];
+	function request_datum($key, $default = '') {
+		if (isset($this->_request_data[$key])) {
+			return $this->_request_data[$key];
 		} else {
 			return $default;
 		}
@@ -233,9 +233,9 @@ 
 	 * @param string|array $default
 	 * @return string|array
 	 */
-	function extra_datum( $key, $default = '' ) {
-		if( isset( $this->_extra_data[ $key ] ) ) {
-			return $this->_extra_data[ $key ];
+	function extra_datum($key, $default = '') {
+		if (isset($this->_extra_data[$key])) {
+			return $this->_extra_data[$key];
 		} else {
 			return $default;
 		}
@@ -248,8 +248,8 @@ 
 	 * @param string $key
 	 * @param string|int|array|null $value almost any extra data you want to store
 	 */
-	function add_extra_data( $key, $value ) {
-		$this->_extra_data[ $key ] = $value;
+	function add_extra_data($key, $value) {
+		$this->_extra_data[$key] = $value;
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * Sets the job size. You decide what units to use
 	 * @param int $size
 	 */
-	function set_job_size( $size ) {
+	function set_job_size($size) {
 		$this->_job_size = $size;
 	}
 
@@ -299,7 +299,7 @@ 
 	 * @param int $newly_processed
 	 * @return int updated units processed
 	 */
-	function mark_processed( $newly_processed ) {
+	function mark_processed($newly_processed) {
 		$this->_units_processed += $newly_processed;
 		return $this->_units_processed;
 	}
@@ -310,7 +310,7 @@ 
 	 * Sets the total count of units processed. You might prefer to use mark_processed
 	 * @param int $total_units_processed
 	 */
-	function set_units_processed( $total_units_processed ) {
+	function set_units_processed($total_units_processed) {
 		$this->_units_processed = $total_units_processed;
 	}
 
@@ -320,7 +320,7 @@ 
 	 * Sets the job's ID
 	 * @param string $job_id
 	 */
-	function set_job_id( $job_id ) {
+	function set_job_id($job_id) {
 		$this->_job_id = $job_id;
 	}
 
@@ -330,7 +330,7 @@ 
 	 * sets the classname
 	 * @param string $classname
 	 */
-	function set_classname( $classname ) {
+	function set_classname($classname) {
 		$this->_classname = $classname;
 	}
 
@@ -340,7 +340,7 @@ 
 	 * Sets the request data
 	 * @param array $request_data
 	 */
-	function set_request_data( $request_data ) {
+	function set_request_data($request_data) {
 		$this->_request_data = $request_data;
 	}
 
@@ -350,7 +350,7 @@ 
 	 * Sets the array of extra data we want to store on this request
 	 * @param array $extra_data
 	 */
-	function set_extra_data( $extra_data ) {
+	function set_extra_data($extra_data) {
 		$this->_extra_data = $extra_data;
 	}
 
@@ -361,7 +361,7 @@ 
 	 * @return string
 	 */
 	function option_name() {
-		return JobParameters::wp_option_prefix . $this->job_id();
+		return JobParameters::wp_option_prefix.$this->job_id();
 	}
 
 
@@ -380,7 +380,7 @@ 
 	 *
 	 * @param string $status on eof JobParameters::valid_stati()
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
 		$this->_status = $status;
 	}
 

caffeinated/admin/new/pricing/Prices_List_Table.class.php

Spacing +33 added lines, -33 removed lines

@@ -36,9 +36,9 @@ 
 	 */
 	protected $_price_types = array();
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$this->_PRT = EEM_Price_Type::instance();
 		$this->_price_types = $this->_PRT->get_all_deleted_and_undeleted();
 	}
@@ -48,9 +48,9 @@ 
 
 	protected function _setup_data() {
 		$trashed = $this->_admin_page->get_view() == 'trashed' ? true : false;
-		$this->_data = $this->_admin_page->get_prices_overview_data( $this->_per_page, false, $trashed );
-		$this->_all_data_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, false );
-		$this->_trashed_count = $this->_admin_page->get_prices_overview_data( $this->_per_page, true, true );
+		$this->_data = $this->_admin_page->get_prices_overview_data($this->_per_page, false, $trashed);
+		$this->_all_data_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, false);
+		$this->_trashed_count = $this->_admin_page->get_prices_overview_data($this->_per_page, true, true);
 	}
 
 
@@ -74,9 +74,9 @@ 
 
 			$this->_sortable_columns = array(
 						// true means its already sorted
-						'name' => array( 'name' => false ),
-						'type' => array( 'type' => false ),
-						'amount' => array( 'amount' => false )
+						'name' => array('name' => false),
+						'type' => array('type' => false),
+						'amount' => array('amount' => false)
 			);
 
         $this->_hidden_columns = array(
@@ -98,7 +98,7 @@ 
 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_all_data_count;
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price') ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed']['count'] = $this->_trashed_count;
 		}
 	}
@@ -112,16 +112,16 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row = $row_class;
 
-		if ( $item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4 )
+		if ($item->type_obj()->base_type() !== 1 && $item->type_obj()->base_type() !== 4)
 			$new_row .= ' rowsortable';
 
-		return ' class="' . $new_row . '"';
+		return ' class="'.$new_row.'"';
 	}
 
 
@@ -131,8 +131,8 @@ 
 
 
 	function column_cb($item) {
-		if ( $item->type_obj()->base_type() !== 1 )
-			return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID() );
+		if ($item->type_obj()->base_type() !== 1)
+			return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', /* $1%s */ $item->ID());
 		return '';
 	}
 
@@ -145,31 +145,31 @@ 
 		//Build row actions
 		$actions = array();
 		// edit price link
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'pricing_edit_price', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_price', 'id'=>$item->ID() ), PRICING_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'pricing_edit_price', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_price', 'id'=>$item->ID()), PRICING_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_default_price', 'edit_price', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Price', 'event_espresso' ) . '">' . stripslashes( $item->name() ) . '</a>' : $item->name();
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_default_price', 'edit_price', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Price', 'event_espresso').'">'.stripslashes($item->name()).'</a>' : $item->name();
 
-		if ( $item->type_obj()->base_type() !== 1 ) {
+		if ($item->type_obj()->base_type() !== 1) {
 			if ($this->_view == 'all') {
 				// trash price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_trash_price', $item->ID() ) ) {
-					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Price to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_trash_price', $item->ID())) {
+					$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Price to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
 				}
 			} else {
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_restore_price', $item->ID() ) ) {
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_restore_price', $item->ID())) {
 					// restore price link
-					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Price', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+					$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Price', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 				}
 
 				// delete price link
-				if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price', 'pricing_delete_price', $item->ID() ) ) {
-					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true ), PRICING_ADMIN_URL );
-					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Price Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price', 'pricing_delete_price', $item->ID())) {
+					$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_price', 'id'=>$item->ID(), 'noheader' => true), PRICING_ADMIN_URL);
+					$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Price Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 				}
 			}
 		}
@@ -178,7 +178,7 @@ 
 		return sprintf('%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->ID(),
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -195,7 +195,7 @@ 
 
 
 	function column_description($item) {
-		return stripslashes( $item->desc() );
+		return stripslashes($item->desc());
 	}
 
 
@@ -204,9 +204,9 @@ 
 
 	function column_amount($item) {
 		if ($this->_price_types[$item->type()]->is_percent()) {
-			return '<div class="pad-amnt-rght">' . number_format($item->amount(), 1) . '%</div>';
+			return '<div class="pad-amnt-rght">'.number_format($item->amount(), 1).'%</div>';
 		} else {
-			return '<div class="pad-amnt-rght">' . EEH_Template::format_currency( $item->amount() ) . '</div>';
+			return '<div class="pad-amnt-rght">'.EEH_Template::format_currency($item->amount()).'</div>';
 		}
 	}