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_Log.core.php

Spacing +59 added lines, -59 removed lines

@@ -1,4 +1,4 @@ 
-<?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_Log
@@ -62,7 +62,7 @@ 
 	 * @return EE_Log
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Log ) {
+		if ( ! self::$_instance instanceof EE_Log) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,11 +74,11 @@ 
 	 */
 	private function __construct() {
 
-		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging ) {
+		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging) {
 			return;
 		}
 
-		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS;
+		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS;
 		$this->_log_file = EE_Registry::instance()->CFG->admin->log_file_name();
 		$this->_log = '';
 		$this->_debug_file = EE_Registry::instance()->CFG->admin->debug_file_name();
@@ -86,15 +86,15 @@ 
 		$this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
 		$this->_remote_log = '';
 
-		add_action( 'admin_init', array( $this, 'verify_filesystem' ), -10 );
-		add_action( 'AHEE_log', array( $this, 'log' ), 10, 4 );
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			add_action( 'shutdown', array( $this, 'write_log' ), 9999 );
+		add_action('admin_init', array($this, 'verify_filesystem'), -10);
+		add_action('AHEE_log', array($this, 'log'), 10, 4);
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			add_action('shutdown', array($this, 'write_log'), 9999);
 			// if WP_DEBUG
-			add_action( 'shutdown', array( $this, 'write_debug' ), 9999 );
+			add_action('shutdown', array($this, 'write_debug'), 9999);
 		}
-		if ( EE_Registry::instance()->CFG->admin->use_remote_logging ) {
-			add_action( 'shutdown', array( $this, 'send_log' ), 9999 );
+		if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			add_action('shutdown', array($this, 'send_log'), 9999);
 		}
 
 	}
@@ -108,14 +108,14 @@ 
 	 */
 	public function verify_filesystem() {
 		try {
-			EE_Registry::instance()->load_helper( 'File' );
-			EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR );
-			EEH_File::ensure_folder_exists_and_is_writable( $this->_logs_folder );
-			EEH_File::add_htaccess_deny_from_all( $this->_logs_folder );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_log_file );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_debug_file );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso logging could not be setup because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Registry::instance()->load_helper('File');
+			EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR);
+			EEH_File::ensure_folder_exists_and_is_writable($this->_logs_folder);
+			EEH_File::add_htaccess_deny_from_all($this->_logs_folder);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_log_file);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_debug_file);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso logging could not be setup because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -132,15 +132,15 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	private function _format_message( $file = '', $function = '', $message = '', $type = '' ) {
-		$msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$msg .= '[' . current_time( 'mysql' ) . '] ';
-		$msg .= ! empty( $file ) ? basename( $file ) : '';
-		$msg .= ! empty( $file ) && ! empty( $function ) ? ' -> ' : '';
-		$msg .= ! empty( $function ) ? $function . '()' : '';
+	private function _format_message($file = '', $function = '', $message = '', $type = '') {
+		$msg = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$msg .= '['.current_time('mysql').'] ';
+		$msg .= ! empty($file) ? basename($file) : '';
+		$msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
+		$msg .= ! empty($function) ? $function.'()' : '';
 		$msg .= PHP_EOL;
-		$type = ! empty( $type ) ? $type : 'log message';
-		$msg .= ! empty( $message ) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+		$type = ! empty($type) ? $type : 'log message';
+		$msg .= ! empty($message) ? "\t".'['.$type.'] '.$message.PHP_EOL : '';
 		return $msg;
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @param string $message
 	 * @param string $type
 	 */
-	public function log( $file = '', $function = '', $message = '', $type = '' ) {
-		$this->_log .= $this->_format_message( $file, $function, $message, $type );
+	public function log($file = '', $function = '', $message = '', $type = '') {
+		$this->_log .= $this->_format_message($file, $function, $message, $type);
 	}
 
 
@@ -168,10 +168,10 @@ 
 	public function write_log() {
 		try {
 			//get existing log file and append new log info
-			$this->_log = EEH_File::get_file_contents( $this->_logs_folder . $this->_log_file ) . $this->_log;
-			EEH_File::write_to_file( $this->_logs_folder . $this->_log_file, $this->_log, 'Event Espresso Log' );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			$this->_log = EEH_File::get_file_contents($this->_logs_folder.$this->_log_file).$this->_log;
+			EEH_File::write_to_file($this->_logs_folder.$this->_log_file, $this->_log, 'Event Espresso Log');
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Could not write to the Event Espresso log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -184,31 +184,31 @@ 
 	 */
 	public function send_log() {
 
-		if ( empty( $this->_remote_logging_url )) {
+		if (empty($this->_remote_logging_url)) {
 			return;
 		}
 
-		$data = 'domain=' . $_SERVER['HTTP_HOST'];
-		$data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-		$data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-		$data .= '&time=' . time();
-		$data .= '&remote_log=' . $this->_log;
-		$data .= '&request_array=' . json_encode( $_REQUEST );
+		$data = 'domain='.$_SERVER['HTTP_HOST'];
+		$data .= '&ip='.$_SERVER['SERVER_ADDR'];
+		$data .= '&server_type='.$_SERVER['SERVER_SOFTWARE'];
+		$data .= '&time='.time();
+		$data .= '&remote_log='.$this->_log;
+		$data .= '&request_array='.json_encode($_REQUEST);
 		$data .= '&action=save';
 
-		if ( defined( 'EELOGGING_PASS' )) {
-			$data .= '&pass=' . EELOGGING_PASS;
+		if (defined('EELOGGING_PASS')) {
+			$data .= '&pass='.EELOGGING_PASS;
 		}
-		if ( defined( 'EELOGGING_KEY' )) {
-			$data .= '&key=' . EELOGGING_KEY;
+		if (defined('EELOGGING_KEY')) {
+			$data .= '&key='.EELOGGING_KEY;
 		}
 
-		$c = curl_init( $this->_remote_logging_url );
-		curl_setopt( $c, CURLOPT_POST, TRUE );
-		curl_setopt( $c, CURLOPT_POSTFIELDS, $data );
-		curl_setopt( $c, CURLOPT_RETURNTRANSFER, TRUE );
-		curl_exec( $c );
-		curl_close( $c );
+		$c = curl_init($this->_remote_logging_url);
+		curl_setopt($c, CURLOPT_POST, TRUE);
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_exec($c);
+		curl_close($c);
 	}
 
 
@@ -219,18 +219,18 @@ 
 	 * previous entries are overwritten
 	 */
 	public function write_debug() {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$this->_debug_log = '';
-			foreach ( $_GET as $key => $value ) {
-				$this->_debug_log .= '$_GET["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_GET as $key => $value) {
+				$this->_debug_log .= '$_GET["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
-			foreach ( $_POST as $key => $value ) {
-				$this->_debug_log .= '$_POST["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_POST as $key => $value) {
+				$this->_debug_log .= '$_POST["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
 			try {
-				EEH_File::write_to_file( $this->_logs_folder . $this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log' );
-			} catch( EE_Error $e ){
-				EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso debug log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+				EEH_File::write_to_file($this->_logs_folder.$this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log');
+			} catch (EE_Error $e) {
+				EE_Error::add_error(sprintf(__('Could not write to the Event Espresso debug log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				return;
 			}
 		}
@@ -242,7 +242,7 @@ 
 	 * __clone
 	 */
 	public function __clone() {
-		trigger_error( __( 'Clone is not allowed.', 'event_espresso' ), E_USER_ERROR );
+		trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
 	}
 
 

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');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

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_Network_Config.core.php

Spacing +22 added lines, -22 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Network_Config )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Network_Config)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,15 +74,15 @@ 
 	 *  @return 	void
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Network_Config__construct__begin',$this );
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
 		//set defaults
-		$this->core = apply_filters( 'FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config() );
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
 		$this->addons = array();
 
 		$this->_load_config();
 
 		// construct__end hook
-		do_action( 'AHEE__EE_Network_Config__construct__end',$this );
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 */
 	private function _load_config() {
 		$config = $this->get_config();
-		foreach ( $config as $prop => $settings ) {
-			$prop_class = is_object( $settings ) ? get_class( $this->$prop ) : FALSE;
-			if ( ! empty( $settings ) && ( ! $prop_class || ( $settings instanceof $prop_class ))) {
+		foreach ($config as $prop => $settings) {
+			$prop_class = is_object($settings) ? get_class($this->$prop) : FALSE;
+			if ( ! empty($settings) && ( ! $prop_class || ($settings instanceof $prop_class))) {
 				$this->$prop = $settings;
 			}
 		}
@@ -114,8 +114,8 @@ 
 	 */
 	public function get_config() {
 		// grab network configuration
-		$CFG = get_site_option( 'ee_network_config', array() );
-		$CFG = apply_filters( 'FHEE__EE_Network_Config__get_config__CFG', $CFG );
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
 		return $CFG;
 	}
 
@@ -127,24 +127,24 @@ 
 	 *  @access 	public
 	 *  @return 	boolean success
 	 */
-	public function update_config( $add_success = FALSE, $add_error = TRUE ) {
-		do_action( 'AHEE__EE_Network_Config__update_config__begin',$this );
+	public function update_config($add_success = FALSE, $add_error = TRUE) {
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
 		// compare existing settings with what's already saved'
 		$saved_config = $this->get_config();
 		// update
-		$saved = $saved_config == $this ? TRUE : update_site_option( 'ee_network_config', $this );
-		do_action( 'AHEE__EE_Network_Config__update_config__end', $this, $saved );
+		$saved = $saved_config == $this ? TRUE : update_site_option('ee_network_config', $this);
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso' ) : __( 'Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso' );
-				EE_Error::add_success( $msg );
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso') : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings were not updated.', 'event_espresso' ) : __( 'Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso' );
-				EE_Error::add_error( $msg , __FILE__, __FUNCTION__, __LINE__ );
+			if ($add_error) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings were not updated.', 'event_espresso') : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -158,9 +158,9 @@ 
 	 *  @return 	array
 	 */
 	public function __sleep() {
-		return apply_filters( 'FHEE__EE_Network_Config__sleep',array(
+		return apply_filters('FHEE__EE_Network_Config__sleep', array(
 			'core',
-		) );
+		));
 	}
 
 } //end EE_Network_Config.

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 +134 added lines, -134 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,35 +64,35 @@ 
 	 * @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 = '' ) {
+	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 = '') {
 		// 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 ), $return_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $return_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;
@@ -108,14 +108,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(),
@@ -142,81 +142,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()
 				)
 			);
@@ -230,14 +230,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;
 	}
@@ -259,13 +259,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;
@@ -282,12 +282,12 @@ 
 	 * @internal param float $amount
 	 * @return EE_Payment
 	 */
-	public function process_refund( $payment_method, $payment_to_refund, $refund_info = array() ){
+	public function process_refund($payment_method, $payment_to_refund, $refund_info = array()) {
 		/** @type EE_Payment_Method $payment_method */
 		$payment_method = EEM_Payment_Method::instance()->ensure_is_ID($payment_method);
-		if ( $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 );
+		if ($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;
 	}
@@ -329,12 +329,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(
@@ -344,40 +344,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);
 		}
 	}
 
@@ -391,25 +391,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
@@ -421,28 +421,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__
 			);
@@ -459,17 +459,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;
 	}
@@ -484,19 +484,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();
 		}
@@ -512,21 +512,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;
 	}
@@ -544,12 +544,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__,
@@ -562,14 +562,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(
@@ -581,11 +581,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__,
@@ -596,9 +596,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__,
@@ -611,13 +611,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.core.php

Indentation +21 added lines, -21 removed lines

@@ -24,10 +24,10 @@ 
 final class EE_Admin {
 
    /**
-     * 	EE_Admin Object
-     * 	@private _instance
-	 * 	@private 	protected
-     */
+    * 	EE_Admin Object
+    * 	@private _instance
+    * 	@private 	protected
+    */
 	private static $_instance = NULL;
 
 	/**
@@ -56,8 +56,8 @@ 
 
 
    /**
-     * class constructor
-     */
+    * class constructor
+    */
 	protected function __construct() {
 		// define global EE_Admin constants
 		$this->_define_all_constants();
@@ -168,11 +168,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
@@ -463,11 +463,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -624,11 +624,11 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}

Braces +19 added lines, -10 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
  *
@@ -220,8 +222,9 @@ 
 	 */
 	public function remove_pages_from_nav_menu( $post_type ) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' )
-			return $post_type;
+		if ( $post_type->name !== 'page' ) {
+					return $post_type;
+		}
 
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
@@ -240,8 +243,9 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' )
-			return;
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+					return;
+		}
 
 		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories' ) );
 		$hidden_meta_boxes = array();
@@ -296,8 +300,9 @@ 
 	 * @return string  the (maybe) modified link
 	 */
 	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
-			return $link;
+		if ( ! $post = get_post( $id ) ) {
+					return $link;
+		}
 
 		if ( $post->post_type == 'espresso_attendees' ) {
 			$query_args = array(
@@ -337,7 +342,10 @@ 
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
 				<li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
 						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
 					</a>
 				</li>
@@ -864,8 +872,9 @@ 
 	 */
 	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
 		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) )
-			$config['page_path'] = $page_path;
+		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+					$config['page_path'] = $page_path;
+		}
 			EE_Register_Admin_Page::register( $page_basename, $config );
 	}
 

Spacing +172 added lines, -172 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -62,25 +62,25 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,12 +95,12 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
-		define( 'JQPLOT_URL', EE_GLOBAL_ASSETS_URL . 'scripts/jqplot/' );
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
+		define('JQPLOT_URL', EE_GLOBAL_ASSETS_URL.'scripts/jqplot/');
 	}
 
 
@@ -113,23 +113,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin == $main_file ) {
+		 if ($plugin == $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -144,8 +144,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -157,11 +157,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -176,36 +176,36 @@ 
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		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) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'save_post', array( 'EE_Admin', 'parse_post_content_on_save' ), 100, 2 );
-			add_action( 'update_option', array( $this, 'reset_page_for_posts_on_change' ), 100, 3 );
-			add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('save_post', array('EE_Admin', 'parse_post_content_on_save'), 100, 2);
+			add_action('update_option', array($this, 'reset_page_for_posts_on_change'), 100, 3);
+			add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items'), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter('get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 3 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 		}
 
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
 
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -218,9 +218,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' )
+		if ($post_type->name !== 'page')
 			return $post_type;
 
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -240,17 +240,17 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' )
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php')
 			return;
 
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories' ) );
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories'));
 		$hidden_meta_boxes = array();
 
-		foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-			foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-				foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-					if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-						unset( $box['id'] );
+		foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+			foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+				foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+					if (in_array($box['id'], $initial_meta_boxes)) {
+						unset($box['id']);
 					} else {
 						$hidden_meta_boxes[] = $box['id'];
 					}
@@ -259,7 +259,7 @@ 
 		}
 
 		$user = wp_get_current_user();
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -295,17 +295,17 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
+	public function modify_edit_post_link($link, $id, $context) {
+		if ( ! $post = get_post($id))
 			return $link;
 
-		if ( $post->post_type == 'espresso_attendees' ) {
+		if ($post->post_type == 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 				);
 			EE_Registry::instance()->load_helper('URL');
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -317,7 +317,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -336,9 +336,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' == $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -356,13 +356,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -370,18 +370,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -402,10 +402,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 * @param $menuitem
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menuitem ) {
+	private function _setup_extra_nav_menu_pages_items($menuitem) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -437,7 +437,7 @@ 
 			'xfn' => ''
 			);
 
-		foreach ( $keys as $key => $value) {
+		foreach ($keys as $key => $value) {
 			$menu_item->$key = isset($menuitem[$key]) ? $menuitem[$key] : $value;
 		}
 		return $menu_item;
@@ -477,10 +477,10 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'] ) && $_POST['action'] == 'editpost' ) {
-			if ( isset( $_POST['post_type'] ) ) {
-				EE_Registry::instance()->load_core( 'Register_CPTs' );
-				EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action']) && $_POST['action'] == 'editpost') {
+			if (isset($_POST['post_type'])) {
+				EE_Registry::instance()->load_core('Register_CPTs');
+				EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 			}
 		}
 
@@ -490,8 +490,8 @@ 
 		 * 'options-reading.php' core WordPress admin settings page.  This is for user-proofing.
 		 */
 		global $pagenow;
-		if ( $pagenow == 'options-reading.php' ) {
-			add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		if ($pagenow == 'options-reading.php') {
+			add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 		}
 
 	}
@@ -503,25 +503,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		$output = implode( "\n", $split_output );
+		$output = implode("\n", $split_output);
 
 		return $output;
 	}
@@ -537,37 +537,37 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -614,11 +614,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -639,26 +639,26 @@ 
 	 * @param $elements
 	 * @return array
 	 */
-	public function dashboard_glance_items( $elements ) {
+	public function dashboard_glance_items($elements) {
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -677,63 +677,63 @@ 
 	 * @param $post
 	 * @return    void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		// default post types
-		$post_types = array( 'post' => 0, 'page' => 1 );
+		$post_types = array('post' => 0, 'page' => 1);
 		// add CPTs
 		$CPTs = EE_Register_CPTs::get_CPTs();
-		$post_types = array_merge( $post_types, $CPTs );
+		$post_types = array_merge($post_types, $CPTs);
 		// for default or CPT posts...
-		if ( isset( $post_types[ $post->post_type ] )) {
+		if (isset($post_types[$post->post_type])) {
 			// post on frontpage ?
 			$page_for_posts = EE_Config::get_page_for_posts();
 			$maybe_remove_from_posts = array();
 			// critical page shortcodes that we do NOT want added to the Posts page (blog)
 			$critical_shortcodes = EE_Registry::instance()->CFG->core->get_critical_pages_shortcodes_array();
 			// array of shortcodes indexed by post name
-			EE_Registry::instance()->CFG->core->post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			EE_Registry::instance()->CFG->core->post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// whether to proceed with update, if an entry already exists for this post, then we want to update
-			$update_post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] ) ? true : false;
+			$update_post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name]) ? true : false;
 			// empty both arrays
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] = array();
+			EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name] = array();
 			// check that posts page is already being tracked
-			if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] ) ) {
+			if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 				// if not, then ensure that it is properly added
-				EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+				EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts] = array();
 			}
 			// loop thru shortcodes
-			foreach ( EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+			foreach (EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
 				// convert to UPPERCASE to get actual shortcode
-				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				$EES_Shortcode = strtoupper($EES_Shortcode);
 				// is the shortcode in the post_content ?
-				if ( strpos( $post->post_content, $EES_Shortcode ) !== FALSE ) {
+				if (strpos($post->post_content, $EES_Shortcode) !== FALSE) {
 					// map shortcode to post names and post IDs
-					EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
 					// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-					if ( ! in_array( $EES_Shortcode, $critical_shortcodes )) {
+					if ( ! in_array($EES_Shortcode, $critical_shortcodes)) {
 						// add shortcode to "Posts page" tracking
-						EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = $post_ID;
+						EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = $post_ID;
 					}
 					$update_post_shortcodes = TRUE;
-					unset( $maybe_remove_from_posts[ $EES_Shortcode ] );
+					unset($maybe_remove_from_posts[$EES_Shortcode]);
 				} else {
-					$maybe_remove_from_posts[ $EES_Shortcode ] = $post_ID;
+					$maybe_remove_from_posts[$EES_Shortcode] = $post_ID;
 				}
 			}
-			if ( $update_post_shortcodes ) {
+			if ($update_post_shortcodes) {
 				// remove shortcodes from $maybe_remove_from_posts that are still being used
-				foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes ) {
-					if ( $post_name == $page_for_posts ) {
+				foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// compute difference between active post_shortcodes array and $maybe_remove_from_posts array
-					$maybe_remove_from_posts = array_diff_key( $maybe_remove_from_posts, $shortcodes );
+					$maybe_remove_from_posts = array_diff_key($maybe_remove_from_posts, $shortcodes);
 				}
 				// now unset unused shortcodes from the $page_for_posts post_shortcodes
-				foreach ( $maybe_remove_from_posts as $shortcode => $post_ID ) {
-					unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode ] );
+				foreach ($maybe_remove_from_posts as $shortcode => $post_ID) {
+					unset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode]);
 				}
-				EE_Registry::instance()->CFG->update_post_shortcodes( $page_for_posts );
+				EE_Registry::instance()->CFG->update_post_shortcodes($page_for_posts);
 			}
 		}
 	}
@@ -751,32 +751,32 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+	public function check_for_invalid_datetime_formats($value, $option) {
+		EE_Registry::instance()->load_helper('DTT_Helper');
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -786,7 +786,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -812,14 +812,14 @@ 
 	 * @param 	$value
 	 * @return 	void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
-		if ( $option == 'page_for_posts' ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
+		if ($option == 'page_for_posts') {
 			global $wpdb;
-			$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-			$old_page_for_posts = $old_value ? $wpdb->get_var( $wpdb->prepare( $SQL, $old_value )) : 'posts';
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value )) : 'posts';
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $new_page_for_posts ] = EE_Registry::instance()->CFG->core->post_shortcodes[ $old_page_for_posts ];
-			EE_Registry::instance()->CFG->update_post_shortcodes( $new_page_for_posts );
+			$SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+			$old_page_for_posts = $old_value ? $wpdb->get_var($wpdb->prepare($SQL, $old_value)) : 'posts';
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+			EE_Registry::instance()->CFG->core->post_shortcodes[$new_page_for_posts] = EE_Registry::instance()->CFG->core->post_shortcodes[$old_page_for_posts];
+			EE_Registry::instance()->CFG->update_post_shortcodes($new_page_for_posts);
 		}
 	}
 
@@ -832,8 +832,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -846,9 +846,9 @@ 
 	 */
 	public function espresso_admin_footer() {
 		return sprintf(
-			__( 'Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso' ),
+			__('Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso'),
 			'<a href="http://eventespresso.com/" title="',
-			'">' . EVENT_ESPRESSO_POWERED_BY . '</a>'
+			'">'.EVENT_ESPRESSO_POWERED_BY.'</a>'
 		);
 	}
 
@@ -868,11 +868,11 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) )
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page'))
 			$config['page_path'] = $page_path;
-			EE_Register_Admin_Page::register( $page_basename, $config );
+			EE_Register_Admin_Page::register($page_basename, $config);
 	}