eventespresso / event-espresso-core

core/EE_Load_Textdomain.core.php

Spacing +12 added lines, -12 removed lines

@@ -39,13 +39,13 @@ 
 	public static function load_textdomain() {
 		self::_maybe_get_langfile();
 		//now load the textdomain
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo' ) ) {
+		EE_Registry::instance()->load_helper('File');
+		if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event_espresso-'.self::$_lang.'.mo')) {
 			load_plugin_textdomain('event_espresso', FALSE, EE_LANGUAGES_SAFE_LOC);
-		} else if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo' ) ) {
-			load_textdomain( 'event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'  );
+		} else if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo')) {
+			load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo');
 		} else {
-			load_plugin_textdomain( 'event_espresso', FALSE, dirname( EE_PLUGIN_BASENAME ) . '/languages/');
+			load_plugin_textdomain('event_espresso', FALSE, dirname(EE_PLUGIN_BASENAME).'/languages/');
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
+		if ($has_check = get_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION) || empty(self::$_lang))
 			return;
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
+		if (empty(self::$_lang) || self::$_lang == 'en_US')
 			return;
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(
-			'_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/',
-			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true',
-			'_new_file_name' => 'event_espresso-' . self::$_lang . '.mo'
+			'_upload_to' => EE_PLUGIN_DIR_PATH.'languages/',
+			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-'.self::$_lang.'.mo?raw=true',
+			'_new_file_name' => 'event_espresso-'.self::$_lang.'.mo'
 			);
 
 
-		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE );
+		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE);
 
 		$sideloader->sideload();
-		update_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1 );
+		update_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION, 1);
 	}
 } //end EE_Load_Textdomain

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -60,12 +62,14 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
-			return;
+		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) ) {
+					return;
+		}
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
-			return;
+		if ( empty( self::$_lang ) || self::$_lang == 'en_US' ) {
+					return;
+		}
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(

core/EE_Module_Request_Router.core.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 	/**
 	 * 	resolve_route
-	*
+	 *
 	 * 	this method simply takes a valid route, and resolves what module class method the route points to
 	 *
 	 *  @access 	public

Spacing +49 added lines, -49 removed lines

@@ -61,31 +61,31 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    string | NULL
 	 */
-	public function get_route( WP_Query $WP_Query ) {
+	public function get_route(WP_Query $WP_Query) {
 		$this->WP_Query = $WP_Query;
 		// assume this if first route being called
 		$previous_route = FALSE;
 		// but is it really ???
-		if ( ! empty( self::$_previous_routes )) {
+		if ( ! empty(self::$_previous_routes)) {
 			// get last run route
-			$previous_routes = array_values( self::$_previous_routes );
-			$previous_route = array_pop( $previous_routes );
+			$previous_routes = array_values(self::$_previous_routes);
+			$previous_route = array_pop($previous_routes);
 		}
 		//  has another route already been run ?
-		if ( $previous_route ) {
+		if ($previous_route) {
 			// check if  forwarding has been set
-			$current_route = $this->get_forward( $previous_route );
+			$current_route = $this->get_forward($previous_route);
 			try {
 				//check for recursive forwarding
-				if ( isset( self::$_previous_routes[ $current_route ] )) {
+				if (isset(self::$_previous_routes[$current_route])) {
 					throw new EE_Error(
 						sprintf(
-							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.','event_espresso'),
+							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.', 'event_espresso'),
 							$current_route
 						)
 					);
 				}
-			} catch ( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -95,13 +95,13 @@ 
 			// grab all routes
 			$routes = EE_Registry::instance()->CFG->get_routes();
 			//d( $routes );
-			foreach( $routes as $key => $route ) {
+			foreach ($routes as $key => $route) {
 				// check request for module route
-				if ( EE_Registry::instance()->REQ->is_set( $key )) {
+				if (EE_Registry::instance()->REQ->is_set($key)) {
 					//echo '<b style="color:#2EA2CC;">key : <span style="color:#E76700">' . $key . '</span></b><br />';
-					$current_route = sanitize_text_field( EE_Registry::instance()->REQ->get( $key ));
-					if ( $current_route ) {
-						$current_route = array( $key, $current_route );
+					$current_route = sanitize_text_field(EE_Registry::instance()->REQ->get($key));
+					if ($current_route) {
+						$current_route = array($key, $current_route);
 						//echo '<b style="color:#2EA2CC;">current_route : <span style="color:#E76700">' . $current_route . '</span></b><br />';
 						break;
 					}
@@ -109,7 +109,7 @@ 
 			}
 		}
 		// sorry, but I can't read what you route !
-		if ( empty( $current_route )) {
+		if (empty($current_route)) {
 			return NULL;
 		}
 		//add route to previous routes array
@@ -129,46 +129,46 @@ 
 	 *  @param 	string		$current_route
 	 *  @return 	mixed		EED_Module | boolean
 	 */
-	public function resolve_route( $key, $current_route ) {
+	public function resolve_route($key, $current_route) {
 		// get module method that route has been mapped to
-		$module_method = EE_Config::get_route( $current_route, $key );
+		$module_method = EE_Config::get_route($current_route, $key);
 		//EEH_Debug_Tools::printr( $module_method, '$module_method  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify result was returned
-		if ( empty( $module_method )) {
-			$msg = sprintf( __( 'The requested route %s could not be mapped to any registered modules.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($module_method)) {
+			$msg = sprintf(__('The requested route %s could not be mapped to any registered modules.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that result is an array
-		if ( ! is_array( $module_method )) {
-			$msg = sprintf( __( 'The %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($module_method)) {
+			$msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab module name
 		$module_name = $module_method[0];
 		// verify that a class method was registered properly
-		if ( ! isset( $module_method[1] )) {
-			$msg = sprintf( __( 'A class method for the %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($module_method[1])) {
+			$msg = sprintf(__('A class method for the %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab method
 		$method = $module_method[1];
 		// verify that class exists
-		if ( ! class_exists( $module_name )) {
-			$msg = sprintf( __( 'The requested %s class could not be found.', 'event_espresso' ), $module_name );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_name)) {
+			$msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that method exists
-		if ( ! method_exists( $module_name, $method )) {
-			$msg = sprintf( __( 'The class method %s for the %s route is in invalid.', 'event_espresso' ), $method, $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists($module_name, $method)) {
+			$msg = sprintf(__('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// instantiate module and call route method
-		return $this->_module_router( $module_name, $method );
+		return $this->_module_router($module_name, $method);
 	}
 
 
@@ -182,16 +182,16 @@ 
 	 * @param   string  $module_name
 	 * @return    EED_Module | NULL
 	 */
-	public static function module_factory( $module_name ) {
-		if ( $module_name == 'EED_Module' ) {
-			EE_Error::add_error( sprintf( __( 'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function module_factory($module_name) {
+		if ($module_name == 'EED_Module') {
+			EE_Error::add_error(sprintf(__('EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// let's pause to reflect on this...
-		$mod_reflector = new ReflectionClass( $module_name );
+		$mod_reflector = new ReflectionClass($module_name);
 		// ensure that class is actually a module
-		if ( ! $mod_reflector->isSubclassOf( 'EED_Module' )) {
-			EE_Error::add_error( sprintf( __( 'The requested %s module is not of the class EED_Module.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $mod_reflector->isSubclassOf('EED_Module')) {
+			EE_Error::add_error(sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// instantiate and return module class
@@ -209,14 +209,14 @@ 
 	 * @param   string  $method
 	 * @return    EED_Module | NULL
 	 */
-	private function _module_router( $module_name, $method ) {
+	private function _module_router($module_name, $method) {
 		// instantiate module class
-		$module = EE_Module_Request_Router::module_factory( $module_name );
-		if ( $module instanceof EED_Module ) {
+		$module = EE_Module_Request_Router::module_factory($module_name);
+		if ($module instanceof EED_Module) {
 			// and call whatever action the route was for
 			try {
-				call_user_func( array( $module, $method ), $this->WP_Query );
-			} catch ( EE_Error $e ) {
+				call_user_func(array($module, $method), $this->WP_Query);
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -233,8 +233,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_forward( $current_route ) {
-		return EE_Config::get_forward( $current_route );
+	public function get_forward($current_route) {
+		return EE_Config::get_forward($current_route);
 	}
 
 
@@ -246,8 +246,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_view( $current_route ) {
-		return EE_Config::get_view( $current_route );
+	public function get_view($current_route) {
+		return EE_Config::get_view($current_route);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 
 
 

Braces +3 added lines, -1 removed lines

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

core/EE_Object_Collection.core.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Object_Collection
@@ -37,14 +37,14 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
+	public function add($object, $info = null) {
 		$class = $this->interface;
-		if ( ! $object instanceof $class ) {
+		if ( ! $object instanceof $class) {
 			return false;
 		}
-		$this->attach( $object );
-		$this->set_info( $object, $info );
-		return $this->contains( $object );
+		$this->attach($object);
+		$this->set_info($object, $info);
+		return $this->contains($object);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = ! empty( $info ) ? $info : spl_object_hash( $object );
+	public function set_info($object, $info = null) {
+		$info = ! empty($info) ? $info : spl_object_hash($object);
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $object == $this->current() ) {
-				$this->setInfo( $info );
+		while ($this->valid()) {
+			if ($object == $this->current()) {
+				$this->setInfo($info);
 				$this->rewind();
 				return true;
 			}
@@ -86,10 +86,10 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
+	public function get_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				$object = $this->current();
 				$this->rewind();
 				return $object;
@@ -110,8 +110,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return $this->contains( $object );
+	public function has($object) {
+		return $this->contains($object);
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function remove( $object ) {
-		$this->detach( $object );
+	public function remove($object) {
+		$this->detach($object);
 	}
 
 
@@ -140,10 +140,10 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
+	public function set_current($object) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current() === $object ) {
+		while ($this->valid()) {
+			if ($this->current() === $object) {
 				break;
 			}
 			$this->next();
@@ -161,10 +161,10 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
+	public function set_current_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				break;
 			}
 			$this->next();

core/EE_Object_Repository.core.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Object_Repository
@@ -38,9 +38,9 @@ 
 	 * @param array $arguments	arrays of arguments that will be passed to the object's callback method
 	 * @return bool | int
 	 */
-	protected function _call_user_func_array_on_current( $callback = '', $arguments = array() ) {
-		if ( $callback !== '' && method_exists( $this->current(), $callback ) ) {
-			return call_user_func_array( array( $this->current(), $callback ), $arguments );
+	protected function _call_user_func_array_on_current($callback = '', $arguments = array()) {
+		if ($callback !== '' && method_exists($this->current(), $callback)) {
+			return call_user_func_array(array($this->current(), $callback), $arguments);
 		}
 		return false;
 	}
@@ -56,13 +56,13 @@ 
 	 * @param string $callback  name of method found on repository objects to be called
 	 * @return bool | int
 	 */
-	protected function _call_user_func_on_all( $callback = '' ) {
+	protected function _call_user_func_on_all($callback = '') {
 		$success = true;
-		if ( $this->valid() ) {
+		if ($this->valid()) {
 			$this->rewind();
-			while ( $this->valid() ) {
+			while ($this->valid()) {
 				// any negative result will toggle success to false
-				$success = $this->_call_user_func_array_on_current( $callback ) ? $success : false;
+				$success = $this->_call_user_func_array_on_current($callback) ? $success : false;
 				$this->next();
 			}
 			$this->rewind();
@@ -86,9 +86,9 @@ 
 	 * @param array 	$persistence_arguments	arrays of arguments that will be passed to the object's persistence method
 	 * @return bool | int
 	 */
-	public function persist( $persistence_callback = '', $persistence_arguments = array() ) {
-		$persistence_callback = ! empty( $persistence_callback ) ? $persistence_callback : $this->persist_method;
-		return $this->_call_user_func_array_on_current( $persistence_callback, $persistence_arguments );
+	public function persist($persistence_callback = '', $persistence_arguments = array()) {
+		$persistence_callback = ! empty($persistence_callback) ? $persistence_callback : $this->persist_method;
+		return $this->_call_user_func_array_on_current($persistence_callback, $persistence_arguments);
 	}
 
 
@@ -102,9 +102,9 @@ 
 	 * @param string 	$persistence_callback 		name of method found on object that can be used for persisting the object
 	 * @return bool | int
 	 */
-	public function persist_all( $persistence_callback = '' ) {
-		$persistence_callback = ! empty( $persistence_callback ) ? $persistence_callback : $this->persist_method;
-		return $this->_call_user_func_on_all( $persistence_callback );
+	public function persist_all($persistence_callback = '') {
+		$persistence_callback = ! empty($persistence_callback) ? $persistence_callback : $this->persist_method;
+		return $this->_call_user_func_on_all($persistence_callback);
 	}
 
 

core/EE_PUE.core.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	/**
 	 * This property is used to hold an array of EE_default_term objects assigned to a custom post type when the post for that post type is published with no terms set for the taxonomy.
-	  *
+	 *
 	 * @var array of EE_Default_Term objects
 	 */
 	protected $_default_terms = array();

Braces +69 added lines, -43 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -53,8 +55,9 @@ 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
 		//wp have no MONTH_IN_SECONDS constant.  So we approximate our own assuming all months are 4 weeks long.
-		if ( !defined('MONTH_IN_SECONDS' ) )
-			define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		if ( !defined('MONTH_IN_SECONDS' ) ) {
+					define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		}
 
 		if(EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
 			$this->_uxip_hooks();
@@ -101,42 +104,51 @@ 
 
 				//what is the current active theme?
 				$active_theme = get_option('uxip_ee_active_theme');
-				if ( !empty( $active_theme ) )
-					$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				if ( !empty( $active_theme ) ) {
+									$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				}
 
 				//event info regarding an all event count and all "active" event count
 				$all_events_count = get_option('uxip_ee4_all_events_count');
-				if ( !empty( $all_events_count ) )
-					$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				if ( !empty( $all_events_count ) ) {
+									$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				}
 				$active_events_count = get_option('uxip_ee4_active_events_count');
-				if ( !empty( $active_events_count ) )
-					$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				if ( !empty( $active_events_count ) ) {
+									$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				}
 
 				//datetime stuff
 				$dtt_count = get_option('uxip_ee_all_dtts_count');
-				if ( !empty( $dtt_count ) )
-					$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				if ( !empty( $dtt_count ) ) {
+									$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				}
 
 				$dtt_sold = get_option('uxip_ee_dtt_sold');
-				if ( !empty( $dtt_sold ) )
-					$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				if ( !empty( $dtt_sold ) ) {
+									$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				}
 
 				//ticket stuff
 				$all_tkt_count = get_option('uxip_ee_all_tkt_count');
-				if ( !empty( $all_tkt_count ) )
-					$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				if ( !empty( $all_tkt_count ) ) {
+									$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				}
 
 				$free_tkt_count = get_option('uxip_ee_free_tkt_count');
-				if ( !empty( $free_tkt_count ) )
-					$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				if ( !empty( $free_tkt_count ) ) {
+									$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				}
 
 				$paid_tkt_count = get_option('uxip_ee_paid_tkt_count');
-				if ( !empty( $paid_tkt_count ) )
-					$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				if ( !empty( $paid_tkt_count ) ) {
+									$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				}
 
 				$tkt_sold = get_option('uxip_ee_tkt_sold' );
-				if ( !empty($tkt_sold) )
-					$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				if ( !empty($tkt_sold) ) {
+									$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				}
 
 				//phpversion checking
 				$extra_stats['phpversion'] = function_exists('phpversion') ? phpversion() : 'unknown';
@@ -209,7 +221,9 @@ 
 
 	function espresso_data_collection_optin_notice() {
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
-		if ( $ueip_has_notified ) return;
+		if ( $ueip_has_notified ) {
+			return;
+		}
 		$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
 		$settings_url = $settings_url . '#UXIP_settings';
 		?>
@@ -249,7 +263,9 @@ 
 	function espresso_data_optin_ajax_handler() {
 
 		//verify nonce
-		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) exit();
+		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) {
+			exit();
+		}
 
 		//made it here so let's save the selection
 		$ueip_optin = isset( $_POST['selection'] ) ? $_POST['selection'] : 'no';
@@ -279,13 +295,15 @@ 
 		$current = get_site_transient( 'update_plugins' );
 
 		foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-			if ( isset( $current->response['plugin_file'] ) )
-				$update = true;
+			if ( isset( $current->response['plugin_file'] ) ) {
+							$update = true;
+			}
 		}
 
 		//it's possible that there is an update but an invalid site-license-key is in use
-		if ( get_site_option('pue_json_error_' . $basename ) )
-			$update = true;
+		if ( get_site_option('pue_json_error_' . $basename ) ) {
+					$update = true;
+		}
 
 		return $update;
 	}
@@ -329,46 +347,54 @@ 
 			$DTT = EE_Registry::instance()->load_model('Datetime');
 			$TKT = EE_Registry::instance()->load_model('Ticket');
 			$count = $EVT->count();
-			if ( $count > 0 )
-				update_option('uxip_ee4_all_events_count', $count);
+			if ( $count > 0 ) {
+							update_option('uxip_ee4_all_events_count', $count);
+			}
 
 			//next let's just get the number of ACTIVE events
 			$count_active = $EVT->get_active_events(array(), TRUE);
-			if ( $count_active > 0 )
-				update_option('uxip_ee4_active_events_count', $count_active);
+			if ( $count_active > 0 ) {
+							update_option('uxip_ee4_active_events_count', $count_active);
+			}
 
 			//datetimes!
 			$dtt_count = $DTT->count();
-			if ( $dtt_count > 0 )
-				update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			if ( $dtt_count > 0 ) {
+							update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			}
 
 
 			//dttsold
 			$dtt_sold = $DTT->sum(array(), 'DTT_sold');
-			if ( $dtt_sold > 0 )
-				update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			if ( $dtt_sold > 0 ) {
+							update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			}
 
 			//allticketcount
 			$all_tkt_count = $TKT->count();
-			if ( $all_tkt_count > 0 )
-				update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			if ( $all_tkt_count > 0 ) {
+							update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			}
 
 			//freetktcount
 			$_where = array( 'TKT_price' => 0 );
 			$free_tkt_count = $TKT->count(array($_where));
-			if ( $free_tkt_count > 0 )
-				update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			if ( $free_tkt_count > 0 ) {
+							update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			}
 
 			//paidtktcount
 			$_where = array( 'TKT_price' => array('>', 0) );
 			$paid_tkt_count = $TKT->count( array( $_where ) );
-			if ( $paid_tkt_count > 0 )
-				update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			if ( $paid_tkt_count > 0 ) {
+							update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			}
 
 			//tktsold
 			$tkt_sold = $TKT->sum( array(), 'TKT_sold' );
-			if( $tkt_sold > 0 )
-				update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			if( $tkt_sold > 0 ) {
+							update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			}
 
 
 			set_transient( 'ee4_event_info_check', 1, WEEK_IN_SECONDS * 2 );

Spacing +88 added lines, -88 removed lines

@@ -49,13 +49,13 @@ 
 	public function __construct() {
 //		throw new EE_Error('error');
 
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 
 		//wp have no MONTH_IN_SECONDS constant.  So we approximate our own assuming all months are 4 weeks long.
-		if ( !defined('MONTH_IN_SECONDS' ) )
-			define( 'MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4 );
+		if ( ! defined('MONTH_IN_SECONDS'))
+			define('MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4);
 
-		if(EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 			$this->_uxip_hooks();
 		}
 
@@ -64,12 +64,12 @@ 
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
 
 		//has optin been selected for data collection?
-		$espresso_data_optin = !empty($ueip_optin) ? $ueip_optin : NULL;
+		$espresso_data_optin = ! empty($ueip_optin) ? $ueip_optin : NULL;
 
-		if ( empty($ueip_has_notified) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_mode::level_2_complete_maintenance ) {
-			add_action('admin_notices', array( $this, 'espresso_data_collection_optin_notice' ), 10 );
-			add_action('admin_enqueue_scripts', array( $this, 'espresso_data_collection_enqueue_scripts' ), 10 );
-			add_action('wp_ajax_espresso_data_optin', array( $this, 'espresso_data_optin_ajax_handler' ), 10 );
+		if (empty($ueip_has_notified) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_mode::level_2_complete_maintenance) {
+			add_action('admin_notices', array($this, 'espresso_data_collection_optin_notice'), 10);
+			add_action('admin_enqueue_scripts', array($this, 'espresso_data_collection_enqueue_scripts'), 10);
+			add_action('wp_ajax_espresso_data_optin', array($this, 'espresso_data_optin_ajax_handler'), 10);
 			update_option('ee_ueip_optin', 'yes');
 			$espresso_data_optin = 'yes';
 		}
@@ -78,80 +78,80 @@ 
 		$extra_stats = array();
 
 		//only collect extra stats if the plugin user has opted in.
-		if ( !empty($espresso_data_optin) && $espresso_data_optin == 'yes' ) {
+		if ( ! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
 			//let's only setup extra data if transient has expired
-			if ( false === ( $transient = get_transient('ee_extra_data') ) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
+			if (false === ($transient = get_transient('ee_extra_data')) && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 
 				$current_site = is_multisite() ? get_current_site() : NULL;
-				$site_pre = ! is_main_site() && ! empty($current_site) ? trim( preg_replace('/\b\w\S\w\b/', '', $current_site->domain ), '.' ) . '_' : '';
+				$site_pre = ! is_main_site() && ! empty($current_site) ? trim(preg_replace('/\b\w\S\w\b/', '', $current_site->domain), '.').'_' : '';
 
 
 				//active gateways
 				$active_gateways = get_option('event_espresso_active_gateways');
-				if ( !empty($active_gateways ) ) {
-					foreach ( (array) $active_gateways as $gateway => $ignore ) {
-						$extra_stats[$site_pre . $gateway . '_gateway_active'] = 1;
+				if ( ! empty($active_gateways)) {
+					foreach ((array) $active_gateways as $gateway => $ignore) {
+						$extra_stats[$site_pre.$gateway.'_gateway_active'] = 1;
 					}
 				}
 
-				if ( is_multisite() && is_main_site() ) {
+				if (is_multisite() && is_main_site()) {
 					$extra_stats['is_multisite'] = true;
 				}
 
 				//what is the current active theme?
 				$active_theme = get_option('uxip_ee_active_theme');
-				if ( !empty( $active_theme ) )
-					$extra_stats[$site_pre . 'active_theme'] = $active_theme;
+				if ( ! empty($active_theme))
+					$extra_stats[$site_pre.'active_theme'] = $active_theme;
 
 				//event info regarding an all event count and all "active" event count
 				$all_events_count = get_option('uxip_ee4_all_events_count');
-				if ( !empty( $all_events_count ) )
-					$extra_stats[$site_pre . 'ee4_all_events_count'] = $all_events_count;
+				if ( ! empty($all_events_count))
+					$extra_stats[$site_pre.'ee4_all_events_count'] = $all_events_count;
 				$active_events_count = get_option('uxip_ee4_active_events_count');
-				if ( !empty( $active_events_count ) )
-					$extra_stats[$site_pre . 'ee4_active_events_count'] = $active_events_count;
+				if ( ! empty($active_events_count))
+					$extra_stats[$site_pre.'ee4_active_events_count'] = $active_events_count;
 
 				//datetime stuff
 				$dtt_count = get_option('uxip_ee_all_dtts_count');
-				if ( !empty( $dtt_count ) )
-					$extra_stats[$site_pre . 'all_dtts_count'] = $dtt_count;
+				if ( ! empty($dtt_count))
+					$extra_stats[$site_pre.'all_dtts_count'] = $dtt_count;
 
 				$dtt_sold = get_option('uxip_ee_dtt_sold');
-				if ( !empty( $dtt_sold ) )
-					$extra_stats[$site_pre . 'dtt_sold'] = $dtt_sold;
+				if ( ! empty($dtt_sold))
+					$extra_stats[$site_pre.'dtt_sold'] = $dtt_sold;
 
 				//ticket stuff
 				$all_tkt_count = get_option('uxip_ee_all_tkt_count');
-				if ( !empty( $all_tkt_count ) )
-					$extra_stats[$site_pre . 'all_tkt_count'] = $all_tkt_count;
+				if ( ! empty($all_tkt_count))
+					$extra_stats[$site_pre.'all_tkt_count'] = $all_tkt_count;
 
 				$free_tkt_count = get_option('uxip_ee_free_tkt_count');
-				if ( !empty( $free_tkt_count ) )
-					$extra_stats[$site_pre . 'free_tkt_count'] = $free_tkt_count;
+				if ( ! empty($free_tkt_count))
+					$extra_stats[$site_pre.'free_tkt_count'] = $free_tkt_count;
 
 				$paid_tkt_count = get_option('uxip_ee_paid_tkt_count');
-				if ( !empty( $paid_tkt_count ) )
-					$extra_stats[$site_pre . 'paid_tkt_count'] = $paid_tkt_count;
+				if ( ! empty($paid_tkt_count))
+					$extra_stats[$site_pre.'paid_tkt_count'] = $paid_tkt_count;
 
-				$tkt_sold = get_option('uxip_ee_tkt_sold' );
-				if ( !empty($tkt_sold) )
-					$extra_stats[$site_pre . 'tkt_sold'] = $tkt_sold;
+				$tkt_sold = get_option('uxip_ee_tkt_sold');
+				if ( ! empty($tkt_sold))
+					$extra_stats[$site_pre.'tkt_sold'] = $tkt_sold;
 
 				//phpversion checking
 				$extra_stats['phpversion'] = function_exists('phpversion') ? phpversion() : 'unknown';
 
 				//set transient
-				set_transient( 'ee_extra_data', $extra_stats, WEEK_IN_SECONDS );
+				set_transient('ee_extra_data', $extra_stats, WEEK_IN_SECONDS);
 			}
 		}
 
 
 
 		// PUE Auto Upgrades stuff
-		if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { //include the file
-			require_once(EE_THIRD_PARTY . 'pue/pue-client.php' );
+		if (is_readable(EE_THIRD_PARTY.'pue/pue-client.php')) { //include the file
+			require_once(EE_THIRD_PARTY.'pue/pue-client.php');
 
-			$api_key = isset( EE_Registry::instance()->NET_CFG->core->site_license_key ) ? EE_Registry::instance()->NET_CFG->core->site_license_key : '';
+			$api_key = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->site_license_key : '';
 			$host_server_url = 'http://eventespresso.com'; //this needs to be the host server where plugin update engine is installed. Note, if you leave this blank then it is assumed the WordPress repo will be used and we'll just check there.
 
 			//Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.  So it's important that you use a key for the version type that is unique and not found in another key.
@@ -163,9 +163,9 @@ 
 			//$plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
 			//..WOULD work!
 			$plugin_slug = array(
-				'free' => array( 'decaf' => 'event-espresso-core-decaf' ),
-				'premium' => array( 'p' => 'event-espresso-core-reg' ),
-				'prerelease' => array( 'beta' => 'event-espresso-core-pr' )
+				'free' => array('decaf' => 'event-espresso-core-decaf'),
+				'premium' => array('p' => 'event-espresso-core-reg'),
+				'prerelease' => array('beta' => 'event-espresso-core-pr')
 				);
 
 
@@ -192,14 +192,14 @@ 
 	 * The purpose of this function is to display information about Event Espresso data collection and a optin selection for extra data collecting by users.
 	 * @return string html.
 	 */
-	 public static function espresso_data_collection_optin_text( $extra = TRUE ) {
-	 	if ( ! $extra ) {
-			 echo '<h2 class="ee-admin-settings-hdr" '. (!$extra ? 'id="UXIP_settings"' : '').'>'.__('User eXperience Improvement Program (UXIP)', 'event_espresso').EEH_Template::get_help_tab_link('organization_logo_info').'</h2>';
-			 echo sprintf( __('%sPlease help us make Event Espresso better and vote for your favorite features.%s The %sUser eXperience Improvement Program (UXIP)%s, has been created so when you use Event Espresso you are voting for the features and settings that are important to you. The UXIP helps us understand how you use our products and services, track problems and in what context. If you opt-out of the UXIP you essentially elect for us to disregard how you use Event Espresso as we build new features and make changes. Participation in the program is completely voluntary but it is enabled by default. The end results of the UXIP are software improvements to better meet your needs. The data we collect will never be sold, traded, or misused in any way. %sPlease see our %sPrivacy Policy%s for more information.', 'event_espresso'), '<p><em>', '</em></p>','<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">','</a>','<br><br>','<a href="http://eventespresso.com/about/privacy-policy/" target="_blank">','</a>' );
+	 public static function espresso_data_collection_optin_text($extra = TRUE) {
+	 	if ( ! $extra) {
+			 echo '<h2 class="ee-admin-settings-hdr" '.( ! $extra ? 'id="UXIP_settings"' : '').'>'.__('User eXperience Improvement Program (UXIP)', 'event_espresso').EEH_Template::get_help_tab_link('organization_logo_info').'</h2>';
+			 echo sprintf(__('%sPlease help us make Event Espresso better and vote for your favorite features.%s The %sUser eXperience Improvement Program (UXIP)%s, has been created so when you use Event Espresso you are voting for the features and settings that are important to you. The UXIP helps us understand how you use our products and services, track problems and in what context. If you opt-out of the UXIP you essentially elect for us to disregard how you use Event Espresso as we build new features and make changes. Participation in the program is completely voluntary but it is enabled by default. The end results of the UXIP are software improvements to better meet your needs. The data we collect will never be sold, traded, or misused in any way. %sPlease see our %sPrivacy Policy%s for more information.', 'event_espresso'), '<p><em>', '</em></p>', '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">', '</a>', '<br><br>', '<a href="http://eventespresso.com/about/privacy-policy/" target="_blank">', '</a>');
 		} else {
-			$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
+			$settings_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), admin_url('admin.php?page=espresso_general_settings'));
 			$settings_url .= '#UXIP_settings';
-			echo sprintf( __( 'The Event Espresso UXIP feature is active on your site. For %smore info%s and to opt-out %sclick here%s.', 'event_espresso' ), '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" traget="_blank">', '</a>', '<a href="' . $settings_url . '" target="_blank">', '</a>' );
+			echo sprintf(__('The Event Espresso UXIP feature is active on your site. For %smore info%s and to opt-out %sclick here%s.', 'event_espresso'), '<a href="http://eventespresso.com/about/user-experience-improvement-program-uxip/" traget="_blank">', '</a>', '<a href="'.$settings_url.'" target="_blank">', '</a>');
 		}
 	}
 
@@ -208,9 +208,9 @@ 
 
 	function espresso_data_collection_optin_notice() {
 		$ueip_has_notified = EE_Registry::instance()->CFG->core->ee_ueip_has_notified;
-		if ( $ueip_has_notified ) return;
-		$settings_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default'), admin_url( 'admin.php?page=espresso_general_settings') );
-		$settings_url = $settings_url . '#UXIP_settings';
+		if ($ueip_has_notified) return;
+		$settings_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default'), admin_url('admin.php?page=espresso_general_settings'));
+		$settings_url = $settings_url.'#UXIP_settings';
 		?>
 		<div class="updated data-collect-optin" id="espresso-data-collect-optin-container">
 			<div id="data-collect-optin-options-container">
@@ -232,8 +232,8 @@ 
 	 * @return void
 	 */
 	function espresso_data_collection_enqueue_scripts() {
-		wp_register_script( 'ee-data-optin-js', EE_GLOBAL_ASSETS_URL . 'scripts/ee-data-optin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'ee-data-optin-css', EE_GLOBAL_ASSETS_URL . 'css/ee-data-optin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee-data-optin-js', EE_GLOBAL_ASSETS_URL.'scripts/ee-data-optin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('ee-data-optin-css', EE_GLOBAL_ASSETS_URL.'css/ee-data-optin.css', array(), EVENT_ESPRESSO_VERSION);
 
 		wp_enqueue_script('ee-data-optin-js');
 		wp_enqueue_style('ee-data-optin-css');
@@ -248,14 +248,14 @@ 
 	function espresso_data_optin_ajax_handler() {
 
 		//verify nonce
-		if ( isset($_POST['nonce']) && !wp_verify_nonce($_POST['nonce'], 'ee-data-optin') ) exit();
+		if (isset($_POST['nonce']) && ! wp_verify_nonce($_POST['nonce'], 'ee-data-optin')) exit();
 
 		//made it here so let's save the selection
-		$ueip_optin = isset( $_POST['selection'] ) ? $_POST['selection'] : 'no';
+		$ueip_optin = isset($_POST['selection']) ? $_POST['selection'] : 'no';
 
 		//update_option('ee_ueip_optin', $ueip_optin);
 		EE_Registry::instance()->CFG->core->ee_ueip_has_notified = 1;
-		EE_Registry::instance()->CFG->update_espresso_config( FALSE, FALSE );
+		EE_Registry::instance()->CFG->update_espresso_config(FALSE, FALSE);
 		exit();
 	}
 
@@ -268,22 +268,22 @@ 
 	 */
 	public static function is_update_available($basename = '') {
 
-		$basename = ! empty( $basename ) ? $basename : EE_PLUGIN_BASENAME;
+		$basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
 
 		$update = false;
 
-		$folder = DS . dirname($basename); // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
+		$folder = DS.dirname($basename); // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
 
 		$plugins = get_plugins($folder);
-		$current = get_site_transient( 'update_plugins' );
+		$current = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-			if ( isset( $current->response['plugin_file'] ) )
+		foreach ((array) $plugins as $plugin_file => $plugin_data) {
+			if (isset($current->response['plugin_file']))
 				$update = true;
 		}
 
 		//it's possible that there is an update but an invalid site-license-key is in use
-		if ( get_site_option('pue_json_error_' . $basename ) )
+		if (get_site_option('pue_json_error_'.$basename))
 			$update = true;
 
 		return $update;
@@ -301,9 +301,9 @@ 
 	 * @return void
 	 */
 	public function _uxip_hooks() {
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			add_action('admin_init', array( $this, 'track_active_theme' ) );
-			add_action('admin_init', array( $this, 'track_event_info' ) );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			add_action('admin_init', array($this, 'track_active_theme'));
+			add_action('admin_init', array($this, 'track_event_info'));
 		}
 	}
 
@@ -312,65 +312,65 @@ 
 
 	public function track_active_theme() {
 		//we only check this once a month.
-		if ( false === ( $transient = get_transient( 'ee_active_theme_check' ) ) ) {
+		if (false === ($transient = get_transient('ee_active_theme_check'))) {
 			$theme = wp_get_theme();
-			update_option('uxip_ee_active_theme', $theme->get('Name') );
-			set_transient('ee_active_theme_check', 1, MONTH_IN_SECONDS );
+			update_option('uxip_ee_active_theme', $theme->get('Name'));
+			set_transient('ee_active_theme_check', 1, MONTH_IN_SECONDS);
 		}
 	}
 
 
 	public function track_event_info() {
 		//we only check this once every couple weeks.
-		if ( false === ( $transient = get_transient( 'ee4_event_info_check') ) ) {
+		if (false === ($transient = get_transient('ee4_event_info_check'))) {
 			//first let's get the number for ALL events
 			$EVT = EE_Registry::instance()->load_model('Event');
 			$DTT = EE_Registry::instance()->load_model('Datetime');
 			$TKT = EE_Registry::instance()->load_model('Ticket');
 			$count = $EVT->count();
-			if ( $count > 0 )
+			if ($count > 0)
 				update_option('uxip_ee4_all_events_count', $count);
 
 			//next let's just get the number of ACTIVE events
 			$count_active = $EVT->get_active_events(array(), TRUE);
-			if ( $count_active > 0 )
+			if ($count_active > 0)
 				update_option('uxip_ee4_active_events_count', $count_active);
 
 			//datetimes!
 			$dtt_count = $DTT->count();
-			if ( $dtt_count > 0 )
-				update_option( 'uxip_ee_all_dtts_count', $dtt_count );
+			if ($dtt_count > 0)
+				update_option('uxip_ee_all_dtts_count', $dtt_count);
 
 
 			//dttsold
 			$dtt_sold = $DTT->sum(array(), 'DTT_sold');
-			if ( $dtt_sold > 0 )
-				update_option( 'uxip_ee_dtt_sold', $dtt_sold );
+			if ($dtt_sold > 0)
+				update_option('uxip_ee_dtt_sold', $dtt_sold);
 
 			//allticketcount
 			$all_tkt_count = $TKT->count();
-			if ( $all_tkt_count > 0 )
-				update_option( 'uxip_ee_all_tkt_count', $all_tkt_count );
+			if ($all_tkt_count > 0)
+				update_option('uxip_ee_all_tkt_count', $all_tkt_count);
 
 			//freetktcount
-			$_where = array( 'TKT_price' => 0 );
+			$_where = array('TKT_price' => 0);
 			$free_tkt_count = $TKT->count(array($_where));
-			if ( $free_tkt_count > 0 )
-				update_option( 'uxip_ee_free_tkt_count', $free_tkt_count );
+			if ($free_tkt_count > 0)
+				update_option('uxip_ee_free_tkt_count', $free_tkt_count);
 
 			//paidtktcount
-			$_where = array( 'TKT_price' => array('>', 0) );
-			$paid_tkt_count = $TKT->count( array( $_where ) );
-			if ( $paid_tkt_count > 0 )
-				update_option( 'uxip_ee_paid_tkt_count', $paid_tkt_count );
+			$_where = array('TKT_price' => array('>', 0));
+			$paid_tkt_count = $TKT->count(array($_where));
+			if ($paid_tkt_count > 0)
+				update_option('uxip_ee_paid_tkt_count', $paid_tkt_count);
 
 			//tktsold
-			$tkt_sold = $TKT->sum( array(), 'TKT_sold' );
-			if( $tkt_sold > 0 )
-				update_option( 'uxip_ee_tkt_sold', $tkt_sold );
+			$tkt_sold = $TKT->sum(array(), 'TKT_sold');
+			if ($tkt_sold > 0)
+				update_option('uxip_ee_tkt_sold', $tkt_sold);
 
 
-			set_transient( 'ee4_event_info_check', 1, WEEK_IN_SECONDS * 2 );
+			set_transient('ee4_event_info_check', 1, WEEK_IN_SECONDS * 2);
 		}
 	}
 

core/EE_Payment_Processor.core.php

Indentation +3 added lines, -4 removed lines

@@ -13,9 +13,9 @@ 
  */
 class EE_Payment_Processor extends EE_Processor_Base {
 	/**
-     * 	@var EE_Payment_Processor $_instance
+	 * 	@var EE_Payment_Processor $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance = NULL;
 
 
@@ -48,9 +48,8 @@ 
 
 
 	/**
-
 	 * Using the selected gateway, processes the payment for that transaction, and updates the transaction appropriately.
- 	 * Saves the payment that is generated
+	 * Saves the payment that is generated
 	 *
 	 * @param EE_Payment_Method 	$payment_method
 	 * @param EE_Transaction 				$transaction

Braces +7 added lines, -7 removed lines

@@ -148,11 +148,11 @@ 
 		EE_Processor_Base::set_IPN( $separate_IPN_request );
 		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
 			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+		} elseif( $payment_method instanceof EE_Payment ){
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		} elseif( $transaction instanceof EE_Transaction ){
 			$obj_for_log = $transaction;
-		}else{
+		} else{
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
@@ -180,7 +180,7 @@ 
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else{
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
@@ -201,11 +201,11 @@ 
 				$payment->save();
 				//  update the TXN
 				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+			} else{
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
 				if($payment_method){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				} elseif($transaction){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
@@ -236,7 +236,7 @@ 
 			foreach( $request_data as $key => $value ) {
 				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
 			}
-		}else{
+		} else{
 			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;

Spacing +136 added lines, -136 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -42,7 +42,7 @@ 
 	 *@return EE_Payment_Processor
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -64,42 +64,42 @@ 
 	 * @param string 	       						$cancel_url 	URL to return to if off-site payments are cancelled
 	 * @return EE_Payment
 	 */
-	public function process_payment( EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '' ) {
-		if( $amount < 0 ) {
+	public function process_payment(EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '') {
+		if ($amount < 0) {
 			throw new EE_Error( 
 					sprintf(
-							__( 'Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso' ),
+							__('Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso'),
 							$amount,
 							$transaction->ID() ) );
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ){
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $cancel_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -115,14 +115,14 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
-			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"),$transaction->ID()));
+		if ( ! $primary_reg instanceof EE_Registration) {
+			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"), $transaction->ID()));
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -149,81 +149,81 @@ 
 	 * @throws Exception
 	 * @return EE_Payment
 	 */
-	public function process_ipn( $_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true ){
-		$_req_data = $this->_remove_unusable_characters( $_req_data );
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
-		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
-			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+	public function process_ipn($_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true) {
+		$_req_data = $this->_remove_unusable_characters($_req_data);
+		EE_Registry::instance()->load_model('Change_Log');
+		EE_Processor_Base::set_IPN($separate_IPN_request);
+		if ($transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method) {
+			$obj_for_log = EEM_Payment::instance()->get_one(array(array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()), 'order_by' => array('PAY_timestamp' => 'desc')));
+		}elseif ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		}elseif ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-		}else{
+		} else {
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_pms = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_pms as $payment_method ){
-					try{
-						$payment = $payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_pms as $payment_method) {
+					try {
+						$payment = $payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -237,14 +237,14 @@ 
 	 * @param array $request_data
 	 * @return array|string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		if( is_array( $request_data ) ) {
+	protected function _remove_unusable_characters($request_data) {
+		if (is_array($request_data)) {
 			$return_data = array();
-			foreach( $request_data as $key => $value ) {
-				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+			foreach ($request_data as $key => $value) {
+				$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 			}
-		}else{
-			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
+		} else {
+			$return_data = preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;
 	}
@@ -266,13 +266,13 @@ 
 	 * @return EE_Payment
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO, to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -289,10 +289,10 @@ 
 	 * @internal param float $amount
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array() ){
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+	public function process_refund(EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array()) {
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -334,12 +334,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -349,40 +349,40 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if( $payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base ){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if ($payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved() ? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful' : $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
 			// if this is an IPN, then we want to know the initial TXN status prior to updating the TXN
 			// so that we know whether the status has changed and notifications should be triggered
-			if ( $IPN ) {
+			if ($IPN) {
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-				$transaction_processor->set_old_txn_status( $transaction->status_ID() );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+				$transaction_processor->set_old_txn_status($transaction->status_ID());
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -396,25 +396,25 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $registrations = array() ) {
+	public function process_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $registrations = array()) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
-			$registrations = $transaction->registrations( array(
+			$registrations = $transaction->registrations(array(
 				array(
 					// only these reg statuses can receive payments
-					'STS_ID'  => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-					'REG_final_price'  => array( '!=', 0 ),
-					'REG_final_price*' => array( '!=', 'REG_paid', true ),
+					'STS_ID'  => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+					'REG_final_price'  => array('!=', 0),
+					'REG_final_price*' => array('!=', 'REG_paid', true),
 				)
-			) );
+			));
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -426,28 +426,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -464,17 +464,17 @@ 
 	 * @param float $available_payment_amount
 	 * @return float
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -489,19 +489,19 @@ 
 	 * @param float $payment_amount
 	 * @return float
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -517,21 +517,21 @@ 
 	 * @param float $available_refund_amount - IMPORTANT !!! SEND AVAILABLE REFUND AMOUNT AS A POSITIVE NUMBER
 	 * @return float
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = abs( $available_refund_amount );
+			$available_refund_amount = abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, $registration->paid() );
+			$refund_amount = min($available_refund_amount, $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount = $available_refund_amount - $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = abs( $refund_amount ) * -1;
+			$refund_amount = abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -549,12 +549,12 @@ 
 	 * @param EE_Payment     $payment
 	 * @param bool           $IPN
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction_processor->reg_step_completed( $transaction, 'payment_options' );
+		$payment_options_step_completed = $transaction_processor->reg_step_completed($transaction, 'payment_options');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -567,14 +567,14 @@ 
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
-			$payment_options_step_completed = $transaction_processor->set_reg_step_completed( $transaction, 'payment_options' );
+			$payment_options_step_completed = $transaction_processor->set_reg_step_completed($transaction, 'payment_options');
 		}
 		// DEBUG LOG
 		//$this->log(
@@ -586,11 +586,11 @@ 
 		//	)
 		//);
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($transaction, false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' );
+		$finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -601,9 +601,9 @@ 
 		//	)
 		//);
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+			$finalized = $transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 			// DEBUG LOG
 			//$this->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -616,13 +616,13 @@ 
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			// DEBUG LOG
 			//$this->log( __CLASS__, __FUNCTION__, __LINE__, $transaction );
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		//$this->log(

core/admin/EE_Admin_Page_CPT_Init.core.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	public function do_initial_loads() {
 		//we want to use the corresponding admin page object (but not route it!).  To do this we just set _routing to false.  That way this page object is being loaded on all pages to make sure we hook into admin properly.  But note... we are ONLY doing this if the given page is NOT pages we WANT to load ;)
 		//This is important because we have hooks that help redirect custom post type saves
-		if ( !isset( $_REQUEST['page'] ) || ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] != $this->_menu_map->menu_slug ) ) {
+		if ( ! isset($_REQUEST['page']) || (isset($_REQUEST['page']) && $_REQUEST['page'] != $this->_menu_map->menu_slug)) {
 			$this->_routing = FALSE;
 			$this->_initialize_admin_page();
 		} else {
@@ -40,17 +40,17 @@ 
 			$this->_initialize_admin_page();
 			//added for 4.1 to completely disable autosave for our pages. This can be removed once we fully enable autosave functionality
 			remove_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
-			add_filter('wp_print_scripts', array($this, 'wp_just_in_time_script_localization'), 100 );
+			add_filter('wp_print_scripts', array($this, 'wp_just_in_time_script_localization'), 100);
 			//end removal of autosave functionality.
 		}
 	}
 
 	public function wp_just_in_time_script_localization() {
-		wp_localize_script( 'autosave', 'autosaveL10n', array(
+		wp_localize_script('autosave', 'autosaveL10n', array(
 			'autosaveInterval' => 172800,
 			'savingText' => __('Saving Draft…'),
 			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
-		) );
+		));
 	}
 
 

Braces +3 added lines, -1 removed lines

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

core/admin/EE_Admin_Page_Loader.core.php

Braces +14 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -237,8 +238,9 @@ 
 		//first let's order the menu groups by their internal menu order (note usort type hinting to ensure the incoming array is EE_Admin_Page_Menu_Map objects )
 		usort( $this->_admin_menu_groups, array( $this, '_sort_menu_maps' ) );
 		foreach ( $this->_admin_menu_groups as $group ) {
-			if ( ! $group instanceof EE_Admin_Page_Menu_Group )
-				throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+			if ( ! $group instanceof EE_Admin_Page_Menu_Group ) {
+							throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+			}
 			$groups[$group->menu_slug] = $group;
 		}
 		return $groups;
@@ -494,8 +496,9 @@ 
 		//let's sort the groups, make sure it's a valid group, add header (if to show).
 		foreach ( $pages_array as $group => $menu_maps ) {
 			//valid_group?
-			if ( ! array_key_exists( $group, $menu_groups ) )
-				continue;
+			if ( ! array_key_exists( $group, $menu_groups ) ) {
+							continue;
+			}
 
 			//sort pages.
 			usort( $menu_maps, array( $this, '_sort_menu_maps' ) );
@@ -510,8 +513,9 @@ 
 
 		//now let's setup the _prepped_menu_maps property
 		foreach ( $menu_groups as $group => $group_objs ) {
-			if ( isset( $pages_array[$group] ) )
-				$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+			if ( isset( $pages_array[$group] ) ) {
+							$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+			}
 		}/**/
 
 	}
@@ -656,8 +660,9 @@ 
 	 * @return int    sort order
 	 */
 	private function _sort_menu_maps( EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b ) {
-		if ( $a->menu_order == $b->menu_order )
-			return 0;
+		if ( $a->menu_order == $b->menu_order ) {
+					return 0;
+		}
 		return ($a->menu_order < $b->menu_order) ? -1 : 1;
 	}
 

Spacing +124 added lines, -124 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -110,7 +110,7 @@ 
 	 * @return \EE_Admin_Page_Loader
 	 */
 	public function __construct() {
-		EE_Admin::debug_log( __METHOD__ );
+		EE_Admin::debug_log(__METHOD__);
 		//load menu_map classes
 		EE_Registry::instance()->load_file(EE_ADMIN, 'EE_Admin_Page_Menu_Map', 'core');
 		//define the default "groups" for the admin_pages
@@ -120,8 +120,8 @@ 
 		//let's do a scan and see what installed pages we have
 		$this->_get_installed_pages();
 		//set menus (has to be done on every load - we're not actually loading the page just setting the menus and where they point to).
-		add_action('admin_menu', array( $this, 'set_menus' ));
-		add_action( 'network_admin_menu', array( $this, 'set_network_menus' ) );
+		add_action('admin_menu', array($this, 'set_menus'));
+		add_action('network_admin_menu', array($this, 'set_network_menus'));
 	}
 
 
@@ -134,13 +134,13 @@ 
 	 * @return void
 	 */
 	private function _define_caffeinated_constants() {
-		if ( ! defined( 'EE_CORE_CAF_ADMIN'  ) ) {
-			define( 'EE_CORE_CAF_ADMIN', EE_PLUGIN_DIR_PATH . 'caffeinated/admin/');
-			define( 'EE_CORE_CAF_ADMIN_URL', EE_PLUGIN_DIR_URL . 'caffeinated/admin/');
-			define( 'EE_CORE_CAF_ADMIN_NEW', EE_CORE_CAF_ADMIN . 'new/');
-			define( 'EE_CORE_CAF_ADMIN_EXTEND', EE_CORE_CAF_ADMIN . 'extend/');
-			define( 'EE_CORE_CAF_ADMIN_EXTEND_URL', EE_CORE_CAF_ADMIN_URL . 'extend/');
-			define( 'EE_CORE_CAF_ADMIN_HOOKS', EE_CORE_CAF_ADMIN . 'hooks/');
+		if ( ! defined('EE_CORE_CAF_ADMIN')) {
+			define('EE_CORE_CAF_ADMIN', EE_PLUGIN_DIR_PATH.'caffeinated/admin/');
+			define('EE_CORE_CAF_ADMIN_URL', EE_PLUGIN_DIR_URL.'caffeinated/admin/');
+			define('EE_CORE_CAF_ADMIN_NEW', EE_CORE_CAF_ADMIN.'new/');
+			define('EE_CORE_CAF_ADMIN_EXTEND', EE_CORE_CAF_ADMIN.'extend/');
+			define('EE_CORE_CAF_ADMIN_EXTEND_URL', EE_CORE_CAF_ADMIN_URL.'extend/');
+			define('EE_CORE_CAF_ADMIN_HOOKS', EE_CORE_CAF_ADMIN.'hooks/');
 		}
 	}
 
@@ -159,7 +159,7 @@ 
 
 		//set array of EE_Admin_Page_Menu_Group objects
 		$groups = array(
-			'main' => new EE_Admin_Page_Menu_Group( array(
+			'main' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Main', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::NONE,
 				'menu_slug' => 'main',
@@ -167,7 +167,7 @@ 
 				'menu_order' => 0,
 				'parent_slug' => 'espresso_events',
 				)),
-			'management' => new EE_Admin_Page_Menu_Group( array(
+			'management' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Management', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'management',
@@ -175,7 +175,7 @@ 
 				'menu_order' => 10,
 				'parent_slug' => 'espresso_events'
 				)),
-			'settings' => new EE_Admin_Page_Menu_Group( array(
+			'settings' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Settings', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'settings',
@@ -183,7 +183,7 @@ 
 				'menu_order' => 30,
 				'parent_slug' => 'espresso_events'
 				)),
-			'templates' => new EE_Admin_Page_Menu_Group( array(
+			'templates' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Templates', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'templates',
@@ -191,7 +191,7 @@ 
 				'menu_order' => 40,
 				'parent_slug' => 'espresso_events'
 				)),
-			'extras' => new EE_Admin_Page_Menu_Group( array(
+			'extras' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __('Extras', 'event_espresso'),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
 				'menu_slug' => 'extras',
@@ -200,7 +200,7 @@ 
 				'parent_slug' => 'espresso_events',
 				'maintenance_mode_parent' => 'espresso_maintenance_settings'
 				)),
-			'tools' => new EE_Admin_Page_Menu_Group( array(
+			'tools' => new EE_Admin_Page_Menu_Group(array(
 				'menu_label' => __("Tools", "event_espresso"),
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'menu_slug' => 'tools',
@@ -208,7 +208,7 @@ 
 				'menu_order' => 60,
 				'parent_slug' => 'espresso_events'
 				)),
-			'addons' => new EE_Admin_Page_Menu_Group( array(
+			'addons' => new EE_Admin_Page_Menu_Group(array(
 				'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
 				'menu_label' => __('Add-ons', 'event_espresso'),
 				'menu_slug' => 'addons',
@@ -218,7 +218,7 @@ 
 				))
 			);
 
-		$this->_admin_menu_groups = apply_filters( 'FHEE__EE_Admin_Page_Loader___set_menu_groups__admin_menu_groups', $groups );
+		$this->_admin_menu_groups = apply_filters('FHEE__EE_Admin_Page_Loader___set_menu_groups__admin_menu_groups', $groups);
 	}
 
 
@@ -236,10 +236,10 @@ 
 	private function _rearrange_menu_groups() {
 		$groups = array();
 		//first let's order the menu groups by their internal menu order (note usort type hinting to ensure the incoming array is EE_Admin_Page_Menu_Map objects )
-		usort( $this->_admin_menu_groups, array( $this, '_sort_menu_maps' ) );
-		foreach ( $this->_admin_menu_groups as $group ) {
-			if ( ! $group instanceof EE_Admin_Page_Menu_Group )
-				throw new EE_Error( sprintf( __('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE) ) );
+		usort($this->_admin_menu_groups, array($this, '_sort_menu_maps'));
+		foreach ($this->_admin_menu_groups as $group) {
+			if ( ! $group instanceof EE_Admin_Page_Menu_Group)
+				throw new EE_Error(sprintf(__('Unable to continue sorting the menu groups array because there is an invalid value for the menu groups.  All values in this array are required to be a EE_Admin_Page_Menu_Group object.  Instead there was: %s', 'event_espresso'), print_r($group, TRUE)));
 			$groups[$group->menu_slug] = $group;
 		}
 		return $groups;
@@ -257,48 +257,48 @@ 
 	 */
 	private function _get_installed_pages() {
 		$installed_refs = array();
-		$exclude = array( 'assets', 'templates' );
+		$exclude = array('assets', 'templates');
 		// grab everything in the  admin core directory
-		$admin_screens = glob( EE_ADMIN_PAGES . '*', GLOB_ONLYDIR );
-		if ( $admin_screens ) {
-			foreach( $admin_screens as $admin_screen ) {
+		$admin_screens = glob(EE_ADMIN_PAGES.'*', GLOB_ONLYDIR);
+		if ($admin_screens) {
+			foreach ($admin_screens as $admin_screen) {
 				// files and anything in the exclude array need not apply
-				if ( is_dir( $admin_screen ) && ! in_array( basename( $admin_screen ), $exclude )) {
+				if (is_dir($admin_screen) && ! in_array(basename($admin_screen), $exclude)) {
 					// these folders represent the different EE admin pages
-					$installed_refs[ basename( $admin_screen ) ] = $admin_screen;
+					$installed_refs[basename($admin_screen)] = $admin_screen;
 				}
 			}
 		}
 
-		if ( empty( $installed_refs ) ) {
+		if (empty($installed_refs)) {
 			$error_msg[] = __('There are no EE_Admin pages detected, it looks like EE did not install properly', 'event_espresso');
-			$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __('Check that the %s folder exists and is writable. Maybe try deactivating, then reactivating Event Espresso again.', 'event_espresso'), EE_ADMIN_PAGES );
-			throw new EE_Error( implode( '||', $error_msg ));
+			$error_msg[] = $error_msg[0]."\r\n".sprintf(__('Check that the %s folder exists and is writable. Maybe try deactivating, then reactivating Event Espresso again.', 'event_espresso'), EE_ADMIN_PAGES);
+			throw new EE_Error(implode('||', $error_msg));
 		}
 
 		//this just checks the caffeinated folder and takes care of setting up any caffeinated stuff.
 		$installed_refs = $this->_set_caffeinated($installed_refs);
 		//allow plugins to add in their own pages (note at this point they will need to have an autoloader defined for their class) OR hook into EEH_Autoloader::load_admin_page() to add their path.;
-		$installed_refs = apply_filters( 'FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', $installed_refs );
-		$this->_caffeinated_extends = apply_filters( 'FHEE__EE_Admin_Page_Loader___get_installed_pages__caffeinated_extends', $this->_caffeinated_extends );
+		$installed_refs = apply_filters('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', $installed_refs);
+		$this->_caffeinated_extends = apply_filters('FHEE__EE_Admin_Page_Loader___get_installed_pages__caffeinated_extends', $this->_caffeinated_extends);
 
 		//loop through admin pages and setup the $_installed_pages array.
 		$hooks_ref = array();
-		foreach ( $installed_refs as $page => $path ) {
+		foreach ($installed_refs as $page => $path) {
 			// set autoloaders for our admin page classes based on included path information
-			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $path );
+			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($path);
 			// build list of installed pages
-			$this->_installed_pages[$page] = $this->_load_admin_page( $page, $path );
+			$this->_installed_pages[$page] = $this->_load_admin_page($page, $path);
 			// verify returned object
-			if ( $this->_installed_pages[$page] instanceof EE_Admin_Page_Init ) {
-				if ( ! $this->_installed_pages[$page]->get_menu_map() instanceof EE_Admin_Page_Menu_Map ) {
+			if ($this->_installed_pages[$page] instanceof EE_Admin_Page_Init) {
+				if ( ! $this->_installed_pages[$page]->get_menu_map() instanceof EE_Admin_Page_Menu_Map) {
 					continue;
 				}
 
 				//skip if in full maintenance mode and maintenance_mode_parent is set
 				$maintenance_mode_parent = $this->_installed_pages[$page]->get_menu_map()->maintenance_mode_parent;
-				if ( empty( $maintenance_mode_parent ) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
-					unset( $installed_refs[$page] );
+				if (empty($maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+					unset($installed_refs[$page]);
 					continue;
 				}
 
@@ -306,45 +306,45 @@ 
 				//flag for register hooks on extended pages b/c extended pages use the default INIT.
 				$extend = FALSE;
 				//now that we've got the admin_init objects... lets see if there are any caffeinated pages extending the originals.  If there are then let's hook into the init admin filter and load our extend instead.
-				if ( isset( $this->_caffeinated_extends[$page] ) ) {
+				if (isset($this->_caffeinated_extends[$page])) {
 					$this->_current_caf_extend_slug = $page;
-					$path_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__' . $this->_installed_pages[$page]->get_menu_map()->menu_slug . '_' . $this->_installed_pages[$page]->get_admin_page_name();
-					$path_runtime = 'return "' . $this->_caffeinated_extends[$this->_current_caf_extend_slug]["path"] . '";';
-					$page_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__' . $this->_installed_pages[$page]->get_menu_map()->menu_slug . '_' . $this->_installed_pages[$page]->get_admin_page_name();
-					$page_runtime = 'return "' . $this->_caffeinated_extends[$this->_current_caf_extend_slug]["admin_page"] . '";';
+					$path_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__'.$this->_installed_pages[$page]->get_menu_map()->menu_slug.'_'.$this->_installed_pages[$page]->get_admin_page_name();
+					$path_runtime = 'return "'.$this->_caffeinated_extends[$this->_current_caf_extend_slug]["path"].'";';
+					$page_hook = 'FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__'.$this->_installed_pages[$page]->get_menu_map()->menu_slug.'_'.$this->_installed_pages[$page]->get_admin_page_name();
+					$page_runtime = 'return "'.$this->_caffeinated_extends[$this->_current_caf_extend_slug]["admin_page"].'";';
 
-					$hook_function_path = create_function( '$path_to_file', $path_runtime);
-					$hook_function_page = create_function( '$admin_page', $page_runtime );
+					$hook_function_path = create_function('$path_to_file', $path_runtime);
+					$hook_function_page = create_function('$admin_page', $page_runtime);
 
-					add_filter( $path_hook, $hook_function_path );
-					add_filter( $page_hook, $hook_function_page );
+					add_filter($path_hook, $hook_function_path);
+					add_filter($page_hook, $hook_function_page);
 					$extend = TRUE;
 				}
 				//let's do the registered hooks
-				$extended_hooks = $this->_installed_pages[$page]->register_hooks( $extend );
+				$extended_hooks = $this->_installed_pages[$page]->register_hooks($extend);
 				$hooks_ref = array_merge($hooks_ref, $extended_hooks);
 			}
 		}
 
 		//the hooks_ref is all the pages where we have $extended _Hooks files that will extend a class in a different folder.  So we want to make sure we load the file for the parent.
 		//first make sure we've got unique values
-		$hooks_ref = array_unique( $hooks_ref );
+		$hooks_ref = array_unique($hooks_ref);
 		//now let's loop and require!
-		foreach ( $hooks_ref as $path ) {
-			require_once( $path );
+		foreach ($hooks_ref as $path) {
+			require_once($path);
 		}
 		//make sure we have menu slugs global setup. Used in EE_Admin_Page->page_setup() to ensure we don't do a full class load for an admin page that isn't requested.
 		global $ee_menu_slugs;
 		$ee_menu_slugs = $this->_menu_slugs;
 
 		//we need to loop again to run any early code
-		foreach ( $installed_refs as $page => $path ) {
-			if ( $this->_installed_pages[$page] instanceof EE_Admin_Page_Init ) {
+		foreach ($installed_refs as $page => $path) {
+			if ($this->_installed_pages[$page] instanceof EE_Admin_Page_Init) {
 				$this->_installed_pages[$page]->do_initial_loads();
 			}
 		}
 
-		do_action( 'AHEE__EE_Admin_Page_Loader___get_installed_pages_loaded', $this->_installed_pages );
+		do_action('AHEE__EE_Admin_Page_Loader___get_installed_pages_loaded', $this->_installed_pages);
 
 	}
 
@@ -356,9 +356,9 @@ 
 	 * @param string $page_slug
 	 * @return EE_Admin_Page
 	 */
-	public function get_admin_page_object( $page_slug = '' ) {
-		if ( isset( $this->_installed_pages[ $page_slug ] )) {
-			return $this->_installed_pages[ $page_slug ]->loaded_page_object();
+	public function get_admin_page_object($page_slug = '') {
+		if (isset($this->_installed_pages[$page_slug])) {
+			return $this->_installed_pages[$page_slug]->loaded_page_object();
 		}
 		return NULL;
 	}
@@ -371,9 +371,9 @@ 
 	 * @param $dir_name
 	 * @return string
 	 */
-	private function _get_classname_for_admin_page( $dir_name = '' ) {
-		$class_name = str_replace( '_', ' ', strtolower( $dir_name ));
-		return str_replace( ' ', '_', ucwords( $class_name )) . '_Admin_Page';
+	private function _get_classname_for_admin_page($dir_name = '') {
+		$class_name = str_replace('_', ' ', strtolower($dir_name));
+		return str_replace(' ', '_', ucwords($class_name)).'_Admin_Page';
 	}
 
 
@@ -384,9 +384,9 @@ 
 	 * @param $dir_name
 	 * @return string
 	 */
-	private function _get_classname_for_admin_init_page( $dir_name = '' ) {
-		$class_name = str_replace( '_', ' ', strtolower( $dir_name ));
-		return str_replace( ' ', '_', ucwords( $class_name )) . '_Admin_Page_Init';
+	private function _get_classname_for_admin_init_page($dir_name = '') {
+		$class_name = str_replace('_', ' ', strtolower($dir_name));
+		return str_replace(' ', '_', ucwords($class_name)).'_Admin_Page_Init';
 	}
 
 
@@ -399,15 +399,15 @@ 
 	 * @throws EE_Error
 	 * @return object|bool  return page object if valid, bool false if not.
 	 */
-	private function _load_admin_page( $page = '', $path = '' ) {
-		$class_name = $this->_get_classname_for_admin_init_page( $page );
- 		EE_Registry::instance()->load_file( $path, $class_name, 'core' );
-		if ( ! class_exists( $class_name )) {
-			$error_msg[] = sprintf( __('Something went wrong with loading the %s admin page.', 'event_espresso' ), $page);
-			$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no Init class in place for the %s admin page.', 'event_espresso') . '<br />' . __( 'Make sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, $class_name );
-			throw new EE_Error( implode( '||', $error_msg ));
+	private function _load_admin_page($page = '', $path = '') {
+		$class_name = $this->_get_classname_for_admin_init_page($page);
+ 		EE_Registry::instance()->load_file($path, $class_name, 'core');
+		if ( ! class_exists($class_name)) {
+			$error_msg[] = sprintf(__('Something went wrong with loading the %s admin page.', 'event_espresso'), $page);
+			$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no Init class in place for the %s admin page.', 'event_espresso').'<br />'.__('Make sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, $class_name);
+			throw new EE_Error(implode('||', $error_msg));
 		}
-		EE_Admin::debug_log( __METHOD__ . ': ' . $class_name );
+		EE_Admin::debug_log(__METHOD__.': '.$class_name);
 		$a = new ReflectionClass($class_name);
 		return  $a->newInstance();
 	}
@@ -425,9 +425,9 @@ 
 	public function set_menus() {
 		//prep the menu pages (sort, group.)
 		$this->_prep_pages();
-		foreach( $this->_prepped_menu_maps as $menu_map ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( $menu_map->capability, $menu_map->menu_slug ) ) {
-				$menu_map->add_menu_page( FALSE );
+		foreach ($this->_prepped_menu_maps as $menu_map) {
+			if (EE_Registry::instance()->CAP->current_user_can($menu_map->capability, $menu_map->menu_slug)) {
+				$menu_map->add_menu_page(FALSE);
 			}
 		}
 	}
@@ -440,11 +440,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_network_menus(){
+	public function set_network_menus() {
 		$this->_prep_pages();
-		foreach( $this->_prepped_menu_maps as $menu_map ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( $menu_map->capability, $menu_map->menu_slug ) ) {
-				$menu_map->add_menu_page( TRUE );
+		foreach ($this->_prepped_menu_maps as $menu_map) {
+			if (EE_Registry::instance()->CAP->current_user_can($menu_map->capability, $menu_map->menu_slug)) {
+				$menu_map->add_menu_page(TRUE);
 			}
 		}
 	}
@@ -465,22 +465,22 @@ 
 		//rearrange _admin_menu_groups to be indexed by group slug.
 		$menu_groups = $this->_rearrange_menu_groups();
 
-		foreach( $this->_installed_pages as $page ) {
-			if ( $page instanceof EE_Admin_page_Init ) {
+		foreach ($this->_installed_pages as $page) {
+			if ($page instanceof EE_Admin_page_Init) {
 				$page_map = $page->get_menu_map();
 				//if we've got an array then the menu map is in the old format so let's throw a persistent notice that the admin system isn't setup correctly for this item.
-				if ( is_array( $page_map ) || empty( $page_map ) ) {
-					EE_Error::add_persistent_admin_notice( 'menu_map_warning_' . str_replace(' ', '_', $page->label) . '_' . EVENT_ESPRESSO_VERSION, sprintf( __('The admin page for %s was not correctly setup because it is using an older method for integrating with Event Espresso Core.  This means that full functionality for this component is not available.  This error message usually appears with an Add-on that is out of date.  Make sure you update all your Event Espresso 4 add-ons to the latest version to ensure they have necessary compatibility updates in place.', 'event_espresso' ), $page->label ) );
+				if (is_array($page_map) || empty($page_map)) {
+					EE_Error::add_persistent_admin_notice('menu_map_warning_'.str_replace(' ', '_', $page->label).'_'.EVENT_ESPRESSO_VERSION, sprintf(__('The admin page for %s was not correctly setup because it is using an older method for integrating with Event Espresso Core.  This means that full functionality for this component is not available.  This error message usually appears with an Add-on that is out of date.  Make sure you update all your Event Espresso 4 add-ons to the latest version to ensure they have necessary compatibility updates in place.', 'event_espresso'), $page->label));
 					continue;
 				}
 
 				//if page map is NOT a EE_Admin_Page_Menu_Map object then throw error.
-				if ( ! $page_map instanceof EE_Admin_Page_Menu_Map ) {
-					throw new EE_Error( sprintf( __('The menu map for %s must be an EE_Admin_Page_Menu_Map object.  Instead it is %s.  Please double check that the menu map has been configured correctly.', 'event_espresso'), $page->label, $page_map ) );
+				if ( ! $page_map instanceof EE_Admin_Page_Menu_Map) {
+					throw new EE_Error(sprintf(__('The menu map for %s must be an EE_Admin_Page_Menu_Map object.  Instead it is %s.  Please double check that the menu map has been configured correctly.', 'event_espresso'), $page->label, $page_map));
 				}
 
 				//use the maintenance_mode_parent property and maintenance mode status to determine if this page even gets added to array.
-				if ( empty( $page_map->maintenance_mode_parent ) &&  EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+				if (empty($page_map->maintenance_mode_parent) && EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 					continue;
 				}
 
@@ -489,21 +489,21 @@ 
 			}
 		}
 
-		if ( empty( $pages_array )) {
-			throw new EE_Error(__('Something went wrong when prepping the admin pages', 'event_espresso') );
+		if (empty($pages_array)) {
+			throw new EE_Error(__('Something went wrong when prepping the admin pages', 'event_espresso'));
 		}
 
 		//let's sort the groups, make sure it's a valid group, add header (if to show).
-		foreach ( $pages_array as $group => $menu_maps ) {
+		foreach ($pages_array as $group => $menu_maps) {
 			//valid_group?
-			if ( ! array_key_exists( $group, $menu_groups ) )
+			if ( ! array_key_exists($group, $menu_groups))
 				continue;
 
 			//sort pages.
-			usort( $menu_maps, array( $this, '_sort_menu_maps' ) );
+			usort($menu_maps, array($this, '_sort_menu_maps'));
 
 			//prepend header
-			array_unshift( $menu_maps, $menu_groups[$group] );
+			array_unshift($menu_maps, $menu_groups[$group]);
 
 			//reset $pages_array with prepped data
 			$pages_array[$group] = $menu_maps;
@@ -511,9 +511,9 @@ 
 
 
 		//now let's setup the _prepped_menu_maps property
-		foreach ( $menu_groups as $group => $group_objs ) {
-			if ( isset( $pages_array[$group] ) )
-				$this->_prepped_menu_maps = array_merge( $this->_prepped_menu_maps, $pages_array[$group] );
+		foreach ($menu_groups as $group => $group_objs) {
+			if (isset($pages_array[$group]))
+				$this->_prepped_menu_maps = array_merge($this->_prepped_menu_maps, $pages_array[$group]);
 		}/**/
 
 	}
@@ -533,10 +533,10 @@ 
 	 * @param array $installed_refs the original installed_refs array that may contain our NEW EE_Admin_Pages to be loaded.
 	 * @return array
 	 */
-	private function _set_caffeinated( $installed_refs ) {
+	private function _set_caffeinated($installed_refs) {
 
 		//first let's check if there IS a caffeinated folder. If there is not then lets get out.
-		if ( ! is_dir( EE_PLUGIN_DIR_PATH . 'caffeinated' . DS . 'admin' ) || ( defined( 'EE_DECAF' ) && EE_DECAF )) {
+		if ( ! is_dir(EE_PLUGIN_DIR_PATH.'caffeinated'.DS.'admin') || (defined('EE_DECAF') && EE_DECAF)) {
 			return $installed_refs;
 		}
 
@@ -545,15 +545,15 @@ 
 		$exclude = array('tickets');
 
 		//okay let's setup an "New" pages first (we'll return installed refs later)
-		$new_admin_screens = glob( EE_CORE_CAF_ADMIN . 'new/*', GLOB_ONLYDIR );
-		if ( $new_admin_screens ) {
-			foreach( $new_admin_screens as $admin_screen ) {
+		$new_admin_screens = glob(EE_CORE_CAF_ADMIN.'new/*', GLOB_ONLYDIR);
+		if ($new_admin_screens) {
+			foreach ($new_admin_screens as $admin_screen) {
 				// files and anything in the exclude array need not apply
-				if ( is_dir( $admin_screen ) && ! in_array( basename( $admin_screen ), $exclude )) {
+				if (is_dir($admin_screen) && ! in_array(basename($admin_screen), $exclude)) {
 					// these folders represent the different NEW EE admin pages
-					$installed_refs[ basename( $admin_screen ) ] = $admin_screen;
+					$installed_refs[basename($admin_screen)] = $admin_screen;
 					// set autoloaders for our admin page classes based on included path information
-					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $admin_screen );
+					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($admin_screen);
 //					$this->_caf_autoloader[] = array(
 //						'dir' => 'new',
 //						'folder' => basename( $admin_screen )
@@ -563,18 +563,18 @@ 
 		}
 
 		//let's see if there are any EXTENDS to setup in the $_caffeinated_extends array (that will be used later for hooking into the _initialize_admin_age in the related core_init admin page)
-		$extends = glob( EE_CORE_CAF_ADMIN . 'extend/*', GLOB_ONLYDIR );
-		if ( $extends ) {
-			foreach( $extends as $extend ) {
-				if ( is_dir( $extend ) ) {
-					$extend_ref = basename( $extend );
+		$extends = glob(EE_CORE_CAF_ADMIN.'extend/*', GLOB_ONLYDIR);
+		if ($extends) {
+			foreach ($extends as $extend) {
+				if (is_dir($extend)) {
+					$extend_ref = basename($extend);
 					//now let's make sure there is a file that matches the expected format
-					$filename = str_replace(' ', '_', ucwords( str_replace('_', ' ', $extend_ref ) ) );
-					$filename = 'Extend_' . $filename . '_Admin_Page';
-					$this->_caffeinated_extends[$extend_ref]['path'] = str_replace( array( '\\', '/' ), DS, EE_CORE_CAF_ADMIN . 'extend' . DS . $extend_ref . DS . $filename . '.core.php' );
+					$filename = str_replace(' ', '_', ucwords(str_replace('_', ' ', $extend_ref)));
+					$filename = 'Extend_'.$filename.'_Admin_Page';
+					$this->_caffeinated_extends[$extend_ref]['path'] = str_replace(array('\\', '/'), DS, EE_CORE_CAF_ADMIN.'extend'.DS.$extend_ref.DS.$filename.'.core.php');
 					$this->_caffeinated_extends[$extend_ref]['admin_page'] = $filename;
 					// set autoloaders for our admin page classes based on included path information
-					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( $extend );
+					EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder($extend);
 //					$this->_caf_autoloader[] = array(
 //						'dir' => 'extend',
 //						'folder' => $extend_ref
@@ -585,22 +585,22 @@ 
 
 		//let's see if there are any HOOK files and instantiate them if there are (so that hooks are loaded early!).
 		$ee_admin_hooks = array();
-		$hooks = glob( EE_CORE_CAF_ADMIN . 'hooks/*.class.php' );
-		if ( $hooks ) {
-			foreach ( $hooks as $hook ) {
-				if ( is_readable( $hook ) ) {
+		$hooks = glob(EE_CORE_CAF_ADMIN.'hooks/*.class.php');
+		if ($hooks) {
+			foreach ($hooks as $hook) {
+				if (is_readable($hook)) {
 					require_once $hook;
-					$classname = str_replace( EE_CORE_CAF_ADMIN . 'hooks/', '', $hook );
+					$classname = str_replace(EE_CORE_CAF_ADMIN.'hooks/', '', $hook);
 					$classname = str_replace('.class.php', '', $classname);
-					if ( class_exists( $classname ) ) {
-						$a = new ReflectionClass( $classname );
+					if (class_exists($classname)) {
+						$a = new ReflectionClass($classname);
 						$ee_admin_hooks[] = $a->newInstance();
 					}
 				}
 			}
 		}/**/
 
-		$ee_admin_hooks = apply_filters( 'FHEE__EE_Admin_Page_Loader__set_caffeinated__ee_admin_hooks', $ee_admin_hooks );
+		$ee_admin_hooks = apply_filters('FHEE__EE_Admin_Page_Loader__set_caffeinated__ee_admin_hooks', $ee_admin_hooks);
 
 		return $installed_refs;
 
@@ -657,8 +657,8 @@ 
 	 * @param  EE_Admin_Page_Menu_Map $b being compared to
 	 * @return int    sort order
 	 */
-	private function _sort_menu_maps( EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b ) {
-		if ( $a->menu_order == $b->menu_order )
+	private function _sort_menu_maps(EE_Admin_Page_Menu_Map $a, EE_Admin_Page_Menu_Map $b) {
+		if ($a->menu_order == $b->menu_order)
 			return 0;
 		return ($a->menu_order < $b->menu_order) ? -1 : 1;
 	}

core/admin/EE_Help_Tour_final_stop.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -60,7 +60,7 @@ 
 			'action' => 'admin_option_settings',
 			'page' => 'espresso_general_settings'
 			);
-		return '<p>' . sprintf( __('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php') ) . '">', '</a>' ) . '</p>';
+		return '<p>'.sprintf(__('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="'.EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')).'">', '</a>').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *