eventespresso / event-espresso-core

core/EE_Load_Espresso_Core.core.php

Spacing +16 added lines, -16 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// central repository for classes
@@ -58,14 +58,14 @@ 
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// PSR4 Autoloaders
-		EE_Registry::instance()->load_core( 'EE_Psr4AutoloaderInit' );
+		EE_Registry::instance()->load_core('EE_Psr4AutoloaderInit');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		//// WP cron jobs
-		EE_Registry::instance()->load_core( 'Cron_Tasks' );
-		EE_Registry::instance()->load_core( 'EE_System' );
+		EE_Registry::instance()->load_core('Cron_Tasks');
+		EE_Registry::instance()->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -79,12 +79,12 @@ 
 	 * 	@return void
 	 */
 	private function _load_registry() {
-		if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) {
-			require_once( EE_CORE . 'EE_Registry.core.php' );
+		if (is_readable(EE_CORE.'EE_Registry.core.php')) {
+			require_once(EE_CORE.'EE_Registry.core.php');
 		} else {
-			$msg = __( 'The EE_Registry core class could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-			wp_die( EE_Error::get_notices() );
+			$msg = __('The EE_Registry core class could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -96,11 +96,11 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
-			require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 		} else {
-			$msg = __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();

core/EE_Registry.core.php

Spacing +119 added lines, -119 removed lines

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

Indentation +31 added lines, -31 removed lines

@@ -11,25 +11,25 @@ 
 final class EE_Registry {
 
 	/**
-	* 	EE_Registry Object
-	* 	@var EE_Registry $_instance
-	* 	@access 	private
-	*/
+	 * 	EE_Registry Object
+	 * 	@var EE_Registry $_instance
+	 * 	@access 	private
+	 */
 	private static $_instance = NULL;
 
 
 	/**
-	* 	EE_Cart Object
-	* 	@access 	public
-	*	@var 	EE_Cart $CART
-	*/
+	 * 	EE_Cart Object
+	 * 	@access 	public
+	 *	@var 	EE_Cart $CART
+	 */
 	public $CART = NULL;
 
 	/**
-	* 	EE_Config Object
-	* 	@access 	public
-	*	@var 	EE_Config $CFG
-	*/
+	 * 	EE_Config Object
+	 * 	@access 	public
+	 *	@var 	EE_Config $CFG
+	 */
 	public $CFG = NULL;
 
 
@@ -44,9 +44,9 @@ 
 
 
 	/**
-	* 	StdClass object for storing library classes in
-	* 	@public LIB
-	*/
+	 * 	StdClass object for storing library classes in
+	 * 	@public LIB
+	 */
 	public $LIB = NULL;
 
 	/**
@@ -57,10 +57,10 @@ 
 	public $REQ = NULL;
 
 	/**
-	* 	EE_Session Object
-	* 	@access 	public
-	* 	@var 	EE_Session	 $SSN
-	*/
+	 * 	EE_Session Object
+	 * 	@access 	public
+	 * 	@var 	EE_Session	 $SSN
+	 */
 	public $SSN = NULL;
 
 
@@ -127,21 +127,21 @@ 
 
 
 	/**
-	* 	$i18n_js_strings - internationalization for JS strings
-	*  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
-	*  	in js file:  var translatedString = eei18n.string_key;
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$i18n_js_strings - internationalization for JS strings
+	 *  	usage:   EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' );
+	 *  	in js file:  var translatedString = eei18n.string_key;
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public static $i18n_js_strings = array();
 
 	/**
-	* 	$main_file - path to espresso.php
-	*
-	* 	@access 	public
-	*	@var 	array
-	*/
+	 * 	$main_file - path to espresso.php
+	 *
+	 * 	@access 	public
+	 *	@var 	array
+	 */
 	public $main_file;
 
 

core/admin/EE_Admin_Page_CPT.core.php

Spacing +228 added lines, -228 removed lines

@@ -113,7 +113,7 @@ 
 	 * @param  object $post    The post object of the cpt that was saved.
 	 * @return void
 	 */
-	abstract protected function _insert_update_cpt_item( $post_id, $post );
+	abstract protected function _insert_update_cpt_item($post_id, $post);
 
 
 
@@ -126,7 +126,7 @@ 
 	 * @param  string $post_id The ID of the cpt that was trashed
 	 * @return void
 	 */
-	abstract public function trash_cpt_item( $post_id );
+	abstract public function trash_cpt_item($post_id);
 
 
 
@@ -137,7 +137,7 @@ 
 	 * @param  string $post_id theID of the cpt that was untrashed
 	 * @return void
 	 */
-	abstract public function restore_cpt_item( $post_id );
+	abstract public function restore_cpt_item($post_id);
 
 
 
@@ -148,7 +148,7 @@ 
 	 * @param  string $post_id the ID of the cpt that was deleted
 	 * @return void
 	 */
-	abstract public function delete_cpt_item( $post_id );
+	abstract public function delete_cpt_item($post_id);
 
 
 
@@ -161,32 +161,32 @@ 
 	 */
 	protected function _before_page_setup() {
 
-		$page = isset( $this->_req_data['page'] ) ? $this->_req_data['page'] : $this->page_slug;
+		$page = isset($this->_req_data['page']) ? $this->_req_data['page'] : $this->page_slug;
 
-		$this->_cpt_routes = array_merge(array('create_new'=>$this->page_slug, 'edit' => $this->page_slug, 'trash' => $this->page_slug), $this->_cpt_routes );
+		$this->_cpt_routes = array_merge(array('create_new'=>$this->page_slug, 'edit' => $this->page_slug, 'trash' => $this->page_slug), $this->_cpt_routes);
 
 		//let's see if the current route has a value for cpt_object_slug if it does we use that instead of the page
-		$this->_cpt_object = isset($this->_req_data['action']) && isset( $this->_cpt_routes[$this->_req_data['action']] ) ? get_post_type_object($this->_cpt_routes[$this->_req_data['action']]) : get_post_type_object( $page );
+		$this->_cpt_object = isset($this->_req_data['action']) && isset($this->_cpt_routes[$this->_req_data['action']]) ? get_post_type_object($this->_cpt_routes[$this->_req_data['action']]) : get_post_type_object($page);
 
 		//tweak pagenow for page loading.
-		if( ! $this->_pagenow_map ) {
+		if ( ! $this->_pagenow_map) {
 			$this->_pagenow_map = array(
 				'create_new' => 'post-new.php',
 				'edit' => 'post.php',
 				'trash' => 'post.php'
 				);
 		}
-		add_action( 'current_screen', array( $this, 'modify_pagenow') );
+		add_action('current_screen', array($this, 'modify_pagenow'));
 
 
 		//TODO the below will need to be reworked to account for the cpt routes that are NOT based off of page but action param.
 		//get current page from autosave
-		$current_page = isset( $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] ) ? $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] : NULL;
-		$this->_current_page = isset( $this->_req_data['current_page'] ) ? $this->_req_data['current_page'] : $current_page;
+		$current_page = isset($this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page']) ? $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] : NULL;
+		$this->_current_page = isset($this->_req_data['current_page']) ? $this->_req_data['current_page'] : $current_page;
 
 
 		//autosave... make sure its only for the correct page
-		if ( !empty($this->_current_page ) && $this->_current_page == $this->page_slug ) {
+		if ( ! empty($this->_current_page) && $this->_current_page == $this->page_slug) {
 			//setup autosave ajax hook
 			//add_action('wp_ajax_ee-autosave', array( $this, 'do_extra_autosave_stuff' ), 10 ); //TODO reactivate when 4.2 autosave is implemented
 		}
@@ -202,10 +202,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function modify_pagenow( $current_screen ) {
+	public function modify_pagenow($current_screen) {
 		global $pagenow;
 		//possibly reset pagenow.
-		if ( ! empty( $this->_req_data['page'] ) && $this->_req_data['page'] == $this->page_slug && !empty( $this->_req_data['action'] ) && isset( $this->_pagenow_map[$this->_req_data['action'] ] ) ) {
+		if ( ! empty($this->_req_data['page']) && $this->_req_data['page'] == $this->page_slug && ! empty($this->_req_data['action']) && isset($this->_pagenow_map[$this->_req_data['action']])) {
 			$pagenow = $this->_pagenow_map[$this->_req_data['action']];
 		}
 	}
@@ -220,8 +220,8 @@ 
 	 * @param  array $ids an array of ids for containers that hold form inputs we want autosave to pickup.  Typically you would send along the id of a metabox container.
 	 * @return void
 	 */
-	protected function _register_autosave_containers( $ids ) {
-		$this->_autosave_containers = array_merge( $this->_autosave_fields, (array) $ids );
+	protected function _register_autosave_containers($ids) {
+		$this->_autosave_containers = array_merge($this->_autosave_fields, (array) $ids);
 	}
 
 
@@ -236,22 +236,22 @@ 
 
 		$containers = array();
 
-		if ( empty( $wp_meta_boxes ) )
+		if (empty($wp_meta_boxes))
 			return;
 
-		$current_metaboxes = isset( $wp_meta_boxes[$this->page_slug] ) ? $wp_meta_boxes[$this->page_slug] : array();
+		$current_metaboxes = isset($wp_meta_boxes[$this->page_slug]) ? $wp_meta_boxes[$this->page_slug] : array();
 
-		foreach ( $current_metaboxes as $box_context ) {
-			foreach ( $box_context as $box_details ) {
-				foreach ( $box_details as $box ) {
-					if ( is_array( $box['callback'] ) && ( $box['callback'][0] instanceof EE_Admin_Page || $box['callback'][0] instanceof EE_Admin_Hooks ) ){
+		foreach ($current_metaboxes as $box_context) {
+			foreach ($box_context as $box_details) {
+				foreach ($box_details as $box) {
+					if (is_array($box['callback']) && ($box['callback'][0] instanceof EE_Admin_Page || $box['callback'][0] instanceof EE_Admin_Hooks)) {
 						$containers[] = $box['id'];
 					}
 				}
 			}
 		}
 
-		$this->_autosave_containers = array_merge( $this->_autosave_containers, $containers );
+		$this->_autosave_containers = array_merge($this->_autosave_containers, $containers);
 
 		//add hidden inputs container
 		$this->_autosave_containers[] = 'ee-cpt-hidden-inputs';
@@ -268,13 +268,13 @@ 
 		wp_enqueue_script('cpt-autosave');/**/ //todo re-enable when we start doing autosave again in 4.2
 
 		//filter _autosave_containers
-		$containers = apply_filters( 'FHEE__EE_Admin_Page_CPT___load_autosave_scripts_styles__containers', $this->_autosave_containers, $this );
-		$containers = apply_filters( 'FHEE__EE_Admin_Page_CPT__' . get_class($this) . '___load_autosave_scripts_styles__containers', $containers, $this );
+		$containers = apply_filters('FHEE__EE_Admin_Page_CPT___load_autosave_scripts_styles__containers', $this->_autosave_containers, $this);
+		$containers = apply_filters('FHEE__EE_Admin_Page_CPT__'.get_class($this).'___load_autosave_scripts_styles__containers', $containers, $this);
 
-		wp_localize_script('event_editor_js', 'EE_AUTOSAVE_IDS', $containers ); //todo once we enable autosaves, this needs to be switched to localize with "cpt-autosave"
+		wp_localize_script('event_editor_js', 'EE_AUTOSAVE_IDS', $containers); //todo once we enable autosaves, this needs to be switched to localize with "cpt-autosave"
 
 		$unsaved_data_msg = array(
-			'eventmsg' => sprintf( __("The changes you made to this %s will be lost if you navigate away from this page.", 'event_espresso'), $this->_cpt_object->labels->singular_name),
+			'eventmsg' => sprintf(__("The changes you made to this %s will be lost if you navigate away from this page.", 'event_espresso'), $this->_cpt_object->labels->singular_name),
 			'inputChanged' => 0
 			);
 
@@ -286,7 +286,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -302,7 +302,7 @@ 
 	protected function _load_page_dependencies() {
 
 		//we only add stuff if this is a cpt_route!
-		if ( !$this->_cpt_route ) {
+		if ( ! $this->_cpt_route) {
 			parent::_load_page_dependencies();
 			return;
 		}
@@ -312,72 +312,72 @@ 
 
 		//the following filters are for setting all the redirects on DEFAULT WP custom post type actions
 		//let's add a hidden input to the post-edit form so we know when we have to trigger our custom redirects!  Otherwise the redirects will happen on ALL post saves which wouldn't be good of course!
-		add_action('edit_form_after_title', array( $this, 'cpt_post_form_hidden_input') );
+		add_action('edit_form_after_title', array($this, 'cpt_post_form_hidden_input'));
 
 		//inject our Admin page nav tabs...
 		//let's make sure the nav tabs are set if they aren't already
 		//if ( empty( $this->_nav_tabs ) ) $this->_set_nav_tabs();
-		add_action('post_edit_form_tag', array( $this, 'inject_nav_tabs' ) );
+		add_action('post_edit_form_tag', array($this, 'inject_nav_tabs'));
 
 		//modify the post_updated messages array
-		add_action('post_updated_messages', array( $this, 'post_update_messages' ), 10 );
+		add_action('post_updated_messages', array($this, 'post_update_messages'), 10);
 
 		//add shortlink button to cpt edit screens.  We can do this as a universal thing BECAUSE, cpts use the same format for shortlinks as posts!
-		add_filter( 'pre_get_shortlink', array( $this, 'add_shortlink_button_to_editor' ), 10, 4 );
+		add_filter('pre_get_shortlink', array($this, 'add_shortlink_button_to_editor'), 10, 4);
 
 		//This basically allows us to change the title of the "publish" metabox area on CPT pages by setting a 'publishbox' value in the $_labels property array in the child class.
-		if ( !empty($this->_labels['publishbox'] ) ) {
+		if ( ! empty($this->_labels['publishbox'])) {
 
-			$box_label = is_array( $this->_labels['publishbox'] ) && isset( $this->_labels['publishbox'][$this->_req_action]) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+			$box_label = is_array($this->_labels['publishbox']) && isset($this->_labels['publishbox'][$this->_req_action]) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 
-			remove_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core' );
-			add_meta_box( 'submitdiv', $box_label, 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core' );
+			remove_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core');
+			add_meta_box('submitdiv', $box_label, 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core');
 		}
 
 		//let's add page_templates metabox if this cpt added support for it.
-		if ( $this->_supports_page_templates($this->_cpt_object->name) ) {
-			add_meta_box( 'page_templates', __('Page Template', 'event_espresso' ), array( $this, 'page_template_meta_box' ), $this->_cpt_routes[$this->_req_action], 'side', 'default' );
+		if ($this->_supports_page_templates($this->_cpt_object->name)) {
+			add_meta_box('page_templates', __('Page Template', 'event_espresso'), array($this, 'page_template_meta_box'), $this->_cpt_routes[$this->_req_action], 'side', 'default');
 		}/**/
 
 
 		//this is a filter that allows the addition of extra html after the permalink field on the wp post edit-form
-		if ( method_exists( $this, 'extra_permalink_field_buttons' ) )
-			add_filter('get_sample_permalink_html', array( $this, 'extra_permalink_field_buttons' ), 10, 4 );
+		if (method_exists($this, 'extra_permalink_field_buttons'))
+			add_filter('get_sample_permalink_html', array($this, 'extra_permalink_field_buttons'), 10, 4);
 
 		//add preview button
-		add_filter('get_sample_permalink_html', array($this, 'preview_button_html'), 5, 4 );
+		add_filter('get_sample_permalink_html', array($this, 'preview_button_html'), 5, 4);
 
 
 		//insert our own post_stati dropdown
-		add_action('post_submitbox_misc_actions', array($this, 'custom_post_stati_dropdown' ), 10 );
+		add_action('post_submitbox_misc_actions', array($this, 'custom_post_stati_dropdown'), 10);
 
 		//This allows adding additional information to the publish post submitbox on the wp post edit form
-		if ( method_exists( $this, 'extra_misc_actions_publish_box' ) )
-			add_action('post_submitbox_misc_actions', array( $this, 'extra_misc_actions_publish_box' ), 10 );
+		if (method_exists($this, 'extra_misc_actions_publish_box'))
+			add_action('post_submitbox_misc_actions', array($this, 'extra_misc_actions_publish_box'), 10);
 
 		//This allows for adding additional stuff after the title field on the wp post edit form.  This is also before the wp_editor for post description field.
-		if ( method_exists( $this, 'edit_form_after_title' ) )
-			add_action('edit_form_after_title', array( $this, 'edit_form_after_title' ), 10 );
+		if (method_exists($this, 'edit_form_after_title'))
+			add_action('edit_form_after_title', array($this, 'edit_form_after_title'), 10);
 
 
 		/**
 		 * Filtering WP's esc_url to capture urls pointing to core wp routes so they point to our route.
 		 */
-		add_filter( 'clean_url', array( $this, 'switch_core_wp_urls_with_ours' ), 10, 3 );
+		add_filter('clean_url', array($this, 'switch_core_wp_urls_with_ours'), 10, 3);
 
 
 		parent::_load_page_dependencies();
 
 		//notice we are ALSO going to load the pagenow hook set for this route (see _before_page_setup for the reset of the pagenow global ). This is for any plugins that are doing things properly and hooking into the load page hook for core wp cpt routes.
 		global $pagenow;
-		do_action( 'load-' . $pagenow );
+		do_action('load-'.$pagenow);
 
 		$this->modify_current_screen();
-		add_action( 'admin_enqueue_scripts', array( $this, 'setup_autosave_hooks'), 30 );
+		add_action('admin_enqueue_scripts', array($this, 'setup_autosave_hooks'), 30);
 		//we route REALLY early.
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -396,21 +396,21 @@ 
 	 *
 	 * @return string possibly a new url for our route.
 	 */
-	public function switch_core_wp_urls_with_ours( $good_protocol_url, $original_url, $_context ) {
+	public function switch_core_wp_urls_with_ours($good_protocol_url, $original_url, $_context) {
 		$routes_to_match = array(
 			0 => array(
 				'edit.php?post_type=espresso_attendees',
 				'admin.php?page=espresso_registrations&action=contact_list'
 				),
 			 1 => array(
-			 	'edit.php?post_type=' . $this->_cpt_object->name,
-			 	'admin.php?page=' . $this->_cpt_object->name
+			 	'edit.php?post_type='.$this->_cpt_object->name,
+			 	'admin.php?page='.$this->_cpt_object->name
 				)
 			);
 
-		foreach( $routes_to_match as $route_matches ) {
-			if ( strpos( $good_protocol_url, $route_matches[0] ) !== false ) {
-				return str_replace( $route_matches[0], $route_matches[1], $good_protocol_url );
+		foreach ($routes_to_match as $route_matches) {
+			if (strpos($good_protocol_url, $route_matches[0]) !== false) {
+				return str_replace($route_matches[0], $route_matches[1], $good_protocol_url);
 
 			}
 		}
@@ -426,10 +426,10 @@ 
 	 * @param string $cpt_name The cpt slug we're checking on.
 	 * @return bool True supported, false not.
 	 */
-	private function _supports_page_templates( $cpt_name ) {
+	private function _supports_page_templates($cpt_name) {
 		$cpt_args = EE_Register_CPTs::get_CPTs();
-		$cpt_args = isset( $cpt_args[$cpt_name] ) ? $cpt_args[$cpt_name]['args'] : array();
-		return ! empty( $cpt_args['page_templates'] ) ? TRUE : FALSE;
+		$cpt_args = isset($cpt_args[$cpt_name]) ? $cpt_args[$cpt_name]['args'] : array();
+		return ! empty($cpt_args['page_templates']) ? TRUE : FALSE;
 	}
 
 
@@ -444,9 +444,9 @@ 
 	public function page_template_meta_box() {
 		global $post;
 		$template = '';
-		if ( count( get_page_templates( $post ) ) != 0 ) {
-			$page_template = get_post_meta( $post->ID, '_wp_page_template', TRUE );
-			$template = !empty( $page_template ) ? $page_template : '';
+		if (count(get_page_templates($post)) != 0) {
+			$page_template = get_post_meta($post->ID, '_wp_page_template', TRUE);
+			$template = ! empty($page_template) ? $page_template : '';
 		}
 		?>
 		<p><strong><?php _e('Template') ?></strong></p>
@@ -470,10 +470,10 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function preview_button_html( $return, $id, $new_title, $new_slug ) {
-		$post = get_post( $id );
-		if ( 'publish' != get_post_status( $post ) ) {
-			$return .= '<span_id="view-post-btn"><a href="' . wp_get_shortlink($id, 'post') . '" class="button button-small">' . __('Preview', 'event_espresso') . '</a></span>' . "\n";
+	public function preview_button_html($return, $id, $new_title, $new_slug) {
+		$post = get_post($id);
+		if ('publish' != get_post_status($post)) {
+			$return .= '<span_id="view-post-btn"><a href="'.wp_get_shortlink($id, 'post').'" class="button button-small">'.__('Preview', 'event_espresso').'</a></span>'."\n";
 		}
 		return $return;
 	}
@@ -493,18 +493,18 @@ 
 			'cur_status' =>  $this->_cpt_model_obj->status(),
 			'statuses' => $statuses,
 			'cur_status_label' => $cur_status_label,
-			'localized_status_save' => sprintf( __('Save %s', 'event_espresso'), $cur_status_label )
+			'localized_status_save' => sprintf(__('Save %s', 'event_espresso'), $cur_status_label)
 			);
 
 		//we'll add a trash post status (WP doesn't add one for some reason)
-		if ( $this->_cpt_model_obj->status() == 'trash' ) {
+		if ($this->_cpt_model_obj->status() == 'trash') {
 			$template_args['cur_status_label'] = __('Trashed', 'event_espresso');
 			$statuses['trash'] = __('Trashed', 'event_espresso');
 			$template_args['statuses'] = $statuses;
 		}
 
-		$template = EE_ADMIN_TEMPLATE . 'status_dropdown.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_ADMIN_TEMPLATE.'status_dropdown.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -543,22 +543,22 @@ 
 	public function do_extra_autosave_stuff() {
 
 		//next let's check for the autosave nonce (we'll use _verify_nonce )
-		$nonce = isset( $this->_req_data['autosavenonce'] ) ? $this->_req_data['autosavenonce'] : NULL;
-		$this->_verify_nonce( $nonce, 'autosave' );
+		$nonce = isset($this->_req_data['autosavenonce']) ? $this->_req_data['autosavenonce'] : NULL;
+		$this->_verify_nonce($nonce, 'autosave');
 
 
 		//make sure we define doing autosave (cause WP isn't triggering this we want to make sure we define it)
-		if ( !defined('DOING_AUTOSAVE') ) define('DOING_AUTOSAVE', true);
+		if ( ! defined('DOING_AUTOSAVE')) define('DOING_AUTOSAVE', true);
 
 		//if we made it here then the nonce checked out.  Let's run our methods and actions
-		if ( method_exists( $this, '_ee_autosave_' . $this->_current_view ) ) {
-			call_user_func( array( $this, '_ee_autosave_' . $this->_current_view ) );
+		if (method_exists($this, '_ee_autosave_'.$this->_current_view)) {
+			call_user_func(array($this, '_ee_autosave_'.$this->_current_view));
 		} else {
 			$this->_template_args['success'] = TRUE;
 		}
 
-		do_action( 'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__global_after', $this );
-		do_action( 'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_' . get_class( $this ), $this );
+		do_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__global_after', $this);
+		do_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_'.get_class($this), $this);
 
 		//now let's return json
 		$this->_return_json();
@@ -578,18 +578,18 @@ 
 	protected function _extend_page_config_for_cpt() {
 
 		//before doing anything we need to make sure this runs ONLY when the loaded page matches the set page_slug
-		if ( ( isset( $this->_req_data['page'] ) && $this->_req_data['page'] != $this->page_slug ) )
+		if ((isset($this->_req_data['page']) && $this->_req_data['page'] != $this->page_slug))
 			return;
 
 		//set page routes and page config but ONLY if we're not viewing a custom setup cpt route as defined in _cpt_routes
-		if ( !empty( $this->_cpt_object ) ) {
-			$this->_page_routes = array_merge( array(
+		if ( ! empty($this->_cpt_object)) {
+			$this->_page_routes = array_merge(array(
 				'create_new' => '_create_new_cpt_item',
 				'edit' => '_edit_cpt_item'
-				), $this->_page_routes );
+				), $this->_page_routes);
 
 
-			$this->_page_config = array_merge( array(
+			$this->_page_config = array_merge(array(
 				'create_new' => array(
 					'nav' => array(
 						'label' => $this->_cpt_object->labels->add_new_item,
@@ -611,23 +611,23 @@ 
 		}
 
 		//load the next section only if this is a matching cpt route as set in the cpt routes array.
-		if ( !isset( $this->_cpt_routes[$this->_req_action] ) )
+		if ( ! isset($this->_cpt_routes[$this->_req_action]))
 			return;
 
 
-		$this->_cpt_route = isset( $this->_cpt_routes[$this->_req_action] ) ? TRUE : FALSE;
+		$this->_cpt_route = isset($this->_cpt_routes[$this->_req_action]) ? TRUE : FALSE;
 		//add_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', array( $this, 'modify_current_screen') );
 
 
-		if ( empty( $this->_cpt_object ) ) {
-			$msg = sprintf( __('This page has been set as being related to a registered custom post type, however, the custom post type object could not be retrieved. There are two possible reasons for this:  1. The "%s" does not match a registered post type. or 2. The custom post type is not registered for the "%s" action as indexed in the "$_cpt_routes" property on this class (%s).'), $this->page_slug, $this->_req_action, get_class($this) );
-			throw new EE_Error( $msg );
+		if (empty($this->_cpt_object)) {
+			$msg = sprintf(__('This page has been set as being related to a registered custom post type, however, the custom post type object could not be retrieved. There are two possible reasons for this:  1. The "%s" does not match a registered post type. or 2. The custom post type is not registered for the "%s" action as indexed in the "$_cpt_routes" property on this class (%s).'), $this->page_slug, $this->_req_action, get_class($this));
+			throw new EE_Error($msg);
 		}
 
 
-		if ( $this->_cpt_route ) {
-			$id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-			$this->_set_model_object( $id );
+		if ($this->_cpt_route) {
+			$id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+			$this->_set_model_object($id);
 		}
 
 	}
@@ -643,17 +643,17 @@ 
 	 * @param int $id The id to retrieve the model object for. If empty we set a default object.
 	 * @return void
 	 */
-	protected function _set_model_object( $id = NULL ) {
+	protected function _set_model_object($id = NULL) {
 
-		if ( empty( $this->_cpt_model_names ) || ! isset( $this->_cpt_routes[ $this->_req_action ] ) || ( is_object( $this->_cpt_model_obj ) && $this->_cpt_model_obj->ID() == $id )) {
+		if (empty($this->_cpt_model_names) || ! isset($this->_cpt_routes[$this->_req_action]) || (is_object($this->_cpt_model_obj) && $this->_cpt_model_obj->ID() == $id)) {
 			//get out cuz we either don't have a model name OR the object has already been set and it has the same id as what has been sent.
 			return;
 		}
 		// load CPT object model
-		$model = EE_Registry::instance()->load_model( $this->_cpt_model_names[$this->_req_action] );
-		$this->_cpt_model_obj = ! empty( $id ) ? $model->get_one_by_ID( $id ) : $model->create_default_object();
+		$model = EE_Registry::instance()->load_model($this->_cpt_model_names[$this->_req_action]);
+		$this->_cpt_model_obj = ! empty($id) ? $model->get_one_by_ID($id) : $model->create_default_object();
 		//d( $this->_cpt_model_obj );
-		do_action( 'AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object' );
+		do_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object');
 	}
 
 
@@ -667,47 +667,47 @@ 
 	 */
 	public function admin_init_global() {
 
-		$post = isset( $this->_req_data['post'] ) ? get_post( $this->_req_data['post'] ) : NULL;
+		$post = isset($this->_req_data['post']) ? get_post($this->_req_data['post']) : NULL;
 
 		//its possible this is a new save so let's catch that instead
-		$post = isset( $this->_req_data['post_ID'] ) ? get_post( $this->_req_data['post_ID'] ) : $post;
+		$post = isset($this->_req_data['post_ID']) ? get_post($this->_req_data['post_ID']) : $post;
 		$post_type = $post ? $post->post_type : false;
 
 		$current_route = isset($this->_req_data['current_route']) ? $this->_req_data['current_route'] : 'shouldneverwork';
 
-		$route_to_check = $post_type && isset( $this->_cpt_routes[$current_route]) ? $this->_cpt_routes[$current_route] : '';
+		$route_to_check = $post_type && isset($this->_cpt_routes[$current_route]) ? $this->_cpt_routes[$current_route] : '';
 
-		add_filter( 'get_delete_post_link', array( $this, 'modify_delete_post_link'), 10, 3 );
-		add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link'), 10, 3 );
+		add_filter('get_delete_post_link', array($this, 'modify_delete_post_link'), 10, 3);
+		add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 
 
-		if ( $post_type === $route_to_check ) {
-			add_filter('redirect_post_location', array( $this, 'cpt_post_location_redirect'), 10, 2 );
+		if ($post_type === $route_to_check) {
+			add_filter('redirect_post_location', array($this, 'cpt_post_location_redirect'), 10, 2);
 			//catch trashed wp redirect
-			add_filter('wp_redirect', array( $this, 'cpt_trash_post_location_redirect' ), 10, 2 );
+			add_filter('wp_redirect', array($this, 'cpt_trash_post_location_redirect'), 10, 2);
 		}
 
 		//now let's filter redirect if we're on a revision page and the revision is for an event CPT.
-		$revision = isset( $this->_req_data['revision'] ) ? $this->_req_data['revision'] : NULL;
+		$revision = isset($this->_req_data['revision']) ? $this->_req_data['revision'] : NULL;
 
 		/**var_dump($this->_req_data);
 		exit();/**/
 
-		if ( !empty( $revision ) ) {
-			$action = isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : NULL;
+		if ( ! empty($revision)) {
+			$action = isset($this->_req_data['action']) ? $this->_req_data['action'] : NULL;
 
 			//doing a restore?
-			if ( !empty( $action ) && $action == 'restore' ) {
+			if ( ! empty($action) && $action == 'restore') {
 
 				//get post for revision
-				$rev_post = get_post( $revision );
-				$rev_parent = get_post( $rev_post->post_parent );
+				$rev_post = get_post($revision);
+				$rev_parent = get_post($rev_post->post_parent);
 
 				//only do our redirect filter AND our restore revision action if the post_type for the parent is one of our cpts.
-				if ( $rev_parent && $rev_parent->post_type == $this->page_slug ) {
-					add_filter('wp_redirect', array($this, 'revision_redirect'), 10, 2 );
+				if ($rev_parent && $rev_parent->post_type == $this->page_slug) {
+					add_filter('wp_redirect', array($this, 'revision_redirect'), 10, 2);
 					//restores of revisions
-					add_action('wp_restore_post_revision', array($this, 'restore_revision'), 10, 2 );
+					add_action('wp_restore_post_revision', array($this, 'restore_revision'), 10, 2);
 				}
 			}
 
@@ -716,15 +716,15 @@ 
 		//NOTE we ONLY want to run these hooks if we're on the right class for the given post type.  Otherwise we could see some really freaky things happen!
 
 
-		if ( $post_type && $post_type === $route_to_check ) {
+		if ($post_type && $post_type === $route_to_check) {
 			//$post_id, $post
-			add_action('save_post', array( $this, 'insert_update'), 10, 2 );
+			add_action('save_post', array($this, 'insert_update'), 10, 2);
 
 			//$post_id
-			add_action('trashed_post', array( $this, 'trash_cpt_item' ), 10 );
-			add_action('trashed_post', array( $this, 'dont_permanently_delete_ee_cpts'), 10 );
-			add_action('untrashed_post', array( $this, 'restore_cpt_item'), 10 );
-			add_action('after_delete_post', array( $this, 'delete_cpt_item'), 10 );
+			add_action('trashed_post', array($this, 'trash_cpt_item'), 10);
+			add_action('trashed_post', array($this, 'dont_permanently_delete_ee_cpts'), 10);
+			add_action('untrashed_post', array($this, 'restore_cpt_item'), 10);
+			add_action('after_delete_post', array($this, 'delete_cpt_item'), 10);
 		}
 
 	}
@@ -739,15 +739,15 @@ 
 	 * @return void
 	 */
 	public function verify_cpt_object() {
-		$label = !empty( $this->_cpt_object ) ? $this->_cpt_object->labels->singular_name : $this->page_label;
+		$label = ! empty($this->_cpt_object) ? $this->_cpt_object->labels->singular_name : $this->page_label;
 		// verify event object
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base ) {
-			throw new EE_Error( sprintf( __('Something has gone wrong with the page load because we are unable to set up the object for the %1$s.  This usually happens when the given id for the page route is NOT for the correct custom post type for this page', 'event_espresso' ), $label ) );
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base) {
+			throw new EE_Error(sprintf(__('Something has gone wrong with the page load because we are unable to set up the object for the %1$s.  This usually happens when the given id for the page route is NOT for the correct custom post type for this page', 'event_espresso'), $label));
 		}
 		//if auto-draft then throw an error
-		if ( $this->_cpt_model_obj->get('status') == 'auto-draft' ) {
+		if ($this->_cpt_model_obj->get('status') == 'auto-draft') {
 			EE_Error::overwrite_errors();
-			EE_Error::add_error( sprintf( __('This %1$s was saved without a title, description, or excerpt which means that none of the extra details you added were saved properly.  All autodrafts will show up in the "draft" view of your event list table.  You can delete them from there. Please click the "Add %1$s" button to refresh and restart.'), $label ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__('This %1$s was saved without a title, description, or excerpt which means that none of the extra details you added were saved properly.  All autodrafts will show up in the "draft" view of your event list table.  You can delete them from there. Please click the "Add %1$s" button to refresh and restart.'), $label), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -776,22 +776,22 @@ 
 	public function load_global_scripts_styles() {
 		parent::load_global_scripts_styles();
 
-		if ( $this->_cpt_model_obj instanceof EE_CPT_Base ) {
+		if ($this->_cpt_model_obj instanceof EE_CPT_Base) {
 			//setup custom post status object for localize script but only if we've got a cpt object
 			$statuses = $this->_cpt_model_obj->get_custom_post_statuses();
 
-			if ( !empty($statuses) ) {
+			if ( ! empty($statuses)) {
 				//get ALL statuses!
 				$statuses = $this->_cpt_model_obj->get_all_post_statuses();
 				//setup object
 				$ee_cpt_statuses = array();
-				foreach ( $statuses as $status => $label ) {
+				foreach ($statuses as $status => $label) {
 					$ee_cpt_statuses[$status] = array(
 						'label' => $label,
-						'save_label' => sprintf( __('Save as %s', 'event_espresso'), $label )
+						'save_label' => sprintf(__('Save as %s', 'event_espresso'), $label)
 						);
 				}
-				wp_localize_script('ee_admin_js', 'eeCPTstatuses', $ee_cpt_statuses );
+				wp_localize_script('ee_admin_js', 'eeCPTstatuses', $ee_cpt_statuses);
 			}
 		}
 	}
@@ -805,10 +805,10 @@ 
 	 * @param  WP_Post $post    Post object from WP
 	 * @return void
 	 */
-	public function insert_update( $post_id, $post ) {
+	public function insert_update($post_id, $post) {
 
 		//make sure that if this is a revision OR trash action that we don't do any updates!
-		if ( isset( $this->_req_data['action'] ) && ( $this->_req_data['action'] == 'restore' || $this->_req_data['action'] == 'trash' ) )
+		if (isset($this->_req_data['action']) && ($this->_req_data['action'] == 'restore' || $this->_req_data['action'] == 'trash'))
 			return;
 
 		//check for autosave and update our req_data property accordingly.
@@ -823,19 +823,19 @@ 
 		}/**/ //TODO reactivate after autosave is implemented in 4.2
 
 		//take care of updating any selected page_template IF this cpt supports it.
-		if ( $this->_supports_page_templates($post->post_type ) && !empty( $this->_req_data['page_template'] ) ) {
+		if ($this->_supports_page_templates($post->post_type) && ! empty($this->_req_data['page_template'])) {
 			$post->page_template = $this->_req_data['page_template'];
-			$page_templates = wp_get_theme()->get_page_templates( $post );
-			if ( 'default' != $this->_req_data['page_template']  && ! isset( $page_templates[ $this->_req_data['page_template'] ] ) ) {
-				EE_Error::add_error( __('Invalid Page Template.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			$page_templates = wp_get_theme()->get_page_templates($post);
+			if ('default' != $this->_req_data['page_template'] && ! isset($page_templates[$this->_req_data['page_template']])) {
+				EE_Error::add_error(__('Invalid Page Template.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				update_post_meta( $post_id, '_wp_page_template', $this->_req_data['page_template'] );
+				update_post_meta($post_id, '_wp_page_template', $this->_req_data['page_template']);
 			}
 		}
 
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 			return; //TODO we'll remove this after reimplementing autosave in 4.2
-		$this->_insert_update_cpt_item( $post_id, $post );
+		$this->_insert_update_cpt_item($post_id, $post);
 	}
 
 
@@ -848,8 +848,8 @@ 
 	 * @param  int    $post_id ID of the post
 	 * @return void
 	 */
-	public function dont_permanently_delete_ee_cpts( $post_id ) {
-		delete_post_meta( $post_id, '_wp_trash_meta_status' );
+	public function dont_permanently_delete_ee_cpts($post_id) {
+		delete_post_meta($post_id, '_wp_trash_meta_status');
 		delete_post_meta($post_id, '_wp_trash_meta_time');
 
 		//our cpts may have comments so let's take care of that too
@@ -868,14 +868,14 @@ 
 	 * @param  int    $revision_id ID of revision being restored
 	 * @return void
 	 */
-	public function restore_revision( $post_id, $revision_id ) {
-		$this->_restore_cpt_item( $post_id, $revision_id );
+	public function restore_revision($post_id, $revision_id) {
+		$this->_restore_cpt_item($post_id, $revision_id);
 
 		//global action
-		do_action( 'AHEE_EE_Admin_Page_CPT__restore_revision', $post_id, $revision_id);
+		do_action('AHEE_EE_Admin_Page_CPT__restore_revision', $post_id, $revision_id);
 
 		//class specific action so you can limit hooking into a specific page.
-		do_action( 'AHEE_EE_Admin_Page_CPT_' . get_class($this) . '__restore_revision', $post_id, $revision_id );
+		do_action('AHEE_EE_Admin_Page_CPT_'.get_class($this).'__restore_revision', $post_id, $revision_id);
 	}
 
 
@@ -886,7 +886,7 @@ 
 	 * @param  int $revision_id ID of revision for item
 	 * @return void
 	 */
-	abstract protected function _restore_cpt_item( $post_id, $revision_id );
+	abstract protected function _restore_cpt_item($post_id, $revision_id);
 
 
 
@@ -905,9 +905,9 @@ 
 	 */
 	public function modify_current_screen() {
 		//ONLY do this if the current page_route IS a cpt route
-		if ( !$this->_cpt_route ) return;
+		if ( ! $this->_cpt_route) return;
 		//routing things REALLY early b/c this is a cpt admin page
-		set_current_screen( $this->_cpt_routes[$this->_req_action]);
+		set_current_screen($this->_cpt_routes[$this->_req_action]);
 		$this->_current_screen = get_current_screen();
 		$this->_current_screen->base = 'event-espresso';
 		$this->_add_help_tabs(); //we make sure we add any help tabs back in!
@@ -928,8 +928,8 @@ 
 	 * @param string $title The new title (or existing if there is no editor_title defined)
 	 * @return string
 	 */
-	public function add_custom_editor_default_title( $title ) {
-		return isset( $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] ) ? $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] : $title;
+	public function add_custom_editor_default_title($title) {
+		return isset($this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]]) ? $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] : $title;
 	}
 
 
@@ -942,11 +942,11 @@ 
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink.
 	 * @return string
 	 */
-	public function add_shortlink_button_to_editor( $shortlink, $id, $context, $allow_slugs ) {
-		if ( !empty( $id ) && '' != get_option('permalink_structure') ) {
-			$post = get_post( $id );
-			if ( isset($post->post_type) && $this->page_slug == $post->post_type )
-			$shortlink = home_url('?p=' . $post->ID);
+	public function add_shortlink_button_to_editor($shortlink, $id, $context, $allow_slugs) {
+		if ( ! empty($id) && '' != get_option('permalink_structure')) {
+			$post = get_post($id);
+			if (isset($post->post_type) && $this->page_slug == $post->post_type)
+			$shortlink = home_url('?p='.$post->ID);
 		}
 		return $shortlink;
 	}
@@ -959,10 +959,10 @@ 
 	 * @return void
 	 */
 	public function route_admin_request() {
-		if ( $this->_cpt_route ) return;
+		if ($this->_cpt_route) return;
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -975,12 +975,12 @@ 
 	 * @return string html
 	 */
 	public function cpt_post_form_hidden_input() {
-		echo '<input type="hidden" name="ee_cpt_item_redirect_url" value="' . $this->_admin_base_url . '" />';
+		echo '<input type="hidden" name="ee_cpt_item_redirect_url" value="'.$this->_admin_base_url.'" />';
 
 		//we're also going to add the route value and the current page so we can direct autosave parsing correctly
 		echo '<div id="ee-cpt-hidden-inputs">';
-		echo '<input type="hidden" id="current_route" name="current_route" value="' . $this->_current_view . '" />';
-		echo '<input type="hidden" id="current_page" name="current_page" value="' . $this->page_slug . '" />';
+		echo '<input type="hidden" id="current_route" name="current_route" value="'.$this->_current_view.'" />';
+		echo '<input type="hidden" id="current_page" name="current_page" value="'.$this->page_slug.'" />';
 		echo '</div>';
 	}
 
@@ -993,12 +993,12 @@ 
 	 * @param  int    $status   Status for http header
 	 * @return string           new (or original) url to redirect to.
 	 */
-	public function revision_redirect( $location, $status ) {
+	public function revision_redirect($location, $status) {
 		//get revision
 		$rev_id = isset($this->_req_data['revision']) ? $this->_req_data['revision'] : NULL;
 
 		//can't do anything without revision so let's get out if not present
-		if ( empty( $rev_id ) )
+		if (empty($rev_id))
 			return $location;
 
 		//get rev_post_data
@@ -1012,8 +1012,8 @@ 
 				'message' => 5
 			);
 
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $admin_url );
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $admin_url);
 	}
 
 
@@ -1026,16 +1026,16 @@ 
 	 * @param  string $context optional, defaults to display.  How to write the '&'
 	 * @return string          the link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		$post = get_post( $id );
-		if ( !isset( $this->_req_data['action'] ) || !isset( $this->_cpt_routes[$this->_req_data['action']] ) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] )
+	public function modify_edit_post_link($link, $id, $context) {
+		$post = get_post($id);
+		if ( ! isset($this->_req_data['action']) || ! isset($this->_cpt_routes[$this->_req_data['action']]) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']])
 			return $link;
 		$query_args = array(
 			'action' => isset($this->_cpt_edit_routes[$post->post_type]) ? $this->_cpt_edit_routes[$post->post_type] : 'edit',
 			'post' => $id
 			);
 
-		return self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+		return self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 	}
 
 
@@ -1047,12 +1047,12 @@ 
 	 * @param  bool   $force_delete whether this is forcing a hard delete instead of trash
 	 * @return string               new delete link
 	 */
-	public function modify_delete_post_link( $delete_link, $post_id, $force_delete ) {
+	public function modify_delete_post_link($delete_link, $post_id, $force_delete) {
 		$post = get_post($post_id);
-		if ( !isset( $this->_req_data['action'] ) || ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] ) )
+		if ( ! isset($this->_req_data['action']) || (isset($this->_cpt_routes[$this->_req_data['action']]) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']]))
 			return $delete_link;
 
-		return add_query_arg( array('current_route' => 'trash' ), $delete_link );
+		return add_query_arg(array('current_route' => 'trash'), $delete_link);
 	}
 
 
@@ -1063,16 +1063,16 @@ 
 	 * @param  string $status   status
 	 * @return string           url to redirect to
 	 */
-	public function cpt_trash_post_location_redirect( $location, $status ) {
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] !== 'trash' && empty( $this->_req_data['post'] ) )
+	public function cpt_trash_post_location_redirect($location, $status) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] !== 'trash' && empty($this->_req_data['post']))
 			return $location;
 
-		$post = get_post( $this->_req_data['post'] );
-		$query_args = array( 'action' => 'default' );
+		$post = get_post($this->_req_data['post']);
+		$query_args = array('action' => 'default');
 		$this->_cpt_object = get_post_type_object($post->post_type);
-		EE_Error::add_success( sprintf( __('%s trashed.', 'event_espresso'), $this->_cpt_object->labels->singular_name) );
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+		EE_Error::add_success(sprintf(__('%s trashed.', 'event_espresso'), $this->_cpt_object->labels->singular_name));
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 	}
 
 
@@ -1087,7 +1087,7 @@ 
 	 * @param  string $post_id  This is the 'ID' value of the wp_posts table
 	 * @return string           the new location to redirect to
 	 */
-	public function cpt_post_location_redirect( $location, $post_id ) {
+	public function cpt_post_location_redirect($location, $post_id) {
 		//we DO have a match so let's setup the url
 
 		//we have to get the post to determine our route
@@ -1095,14 +1095,14 @@ 
 		$edit_route = $this->_cpt_edit_routes[$post->post_type];
 
 		//shared query_args
-		$query_args = array( 'action' => $edit_route, 'post' => $post_id );
+		$query_args = array('action' => $edit_route, 'post' => $post_id);
 		$admin_url = $this->_admin_base_url;
 //		$append = '';
 
-		if ( isset( $this->_req_data['save'] ) || isset( $this->_req_data['publish'] ) ) {
-			$status = get_post_status( $post_id );
-			if ( isset( $this->_req_data['publish'] ) ) {
-				switch ( $status ) {
+		if (isset($this->_req_data['save']) || isset($this->_req_data['publish'])) {
+			$status = get_post_status($post_id);
+			if (isset($this->_req_data['publish'])) {
+				switch ($status) {
 					case 'pending':
 						$message = 8;
 						break;
@@ -1115,13 +1115,13 @@ 
 			} else {
 					$message = 'draft' == $status ? 10 : 1;
 			}
-		} else if ( isset( $this->_req_data['addmeta']) && $this->_req_data['addmeta'] ) {
+		} else if (isset($this->_req_data['addmeta']) && $this->_req_data['addmeta']) {
 			$message = 2;
 //			$append = '#postcustom';
-		} else if ( isset( $this->_req_data['deletemeta']) && $this->_req_data['deletemeta'] ) {
+		} else if (isset($this->_req_data['deletemeta']) && $this->_req_data['deletemeta']) {
 			$message = 3;
 //			$append = '#postcustom';
-		} elseif ( $this->_req_data['action'] == 'post-quickpress-save-cont' ) {
+		} elseif ($this->_req_data['action'] == 'post-quickpress-save-cont') {
 			$message = 7;
 		} else {
 			$message = 4;
@@ -1129,12 +1129,12 @@ 
 
 		//change the message if the post type is not viewable on the frontend
 		$this->_cpt_object = get_post_type_object($post->post_type);
-		$message = $message === 1 && !$this->_cpt_object->publicly_queryable ? 4 : $message;
+		$message = $message === 1 && ! $this->_cpt_object->publicly_queryable ? 4 : $message;
 
-		$query_args = array_merge( array( 'message' => $message ), $query_args );
+		$query_args = array_merge(array('message' => $message), $query_args);
 
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $admin_url );
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $admin_url);
 	}
 
 
@@ -1166,10 +1166,10 @@ 
 	 * @param  array $messages the original messages array
 	 * @return array           the new messages array
 	 */
-	public function post_update_messages( $messages ) {
+	public function post_update_messages($messages) {
 		global $post;
-		$id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-		$id = empty( $id ) && is_object( $post ) ? $post->ID : NULL;
+		$id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+		$id = empty($id) && is_object($post) ? $post->ID : NULL;
 
 //		$post_type = $post ? $post->post_type : false;
 
@@ -1182,9 +1182,9 @@ 
 			0 => '', //Unused. Messages start at index 1.
 
 			1 => sprintf(
-				__( '%1$s updated. %2$sView %1$s%3$s', 'event_espresso'),
+				__('%1$s updated. %2$sView %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a href="' . esc_url( get_permalink( $id )) . '">',
+				'<a href="'.esc_url(get_permalink($id)).'">',
 				'</a>'
 			),
 
@@ -1192,38 +1192,38 @@ 
 
 			3 => __('Custom field deleted.'),
 
-			4 => sprintf( __( '%1$s updated.', 'event_espresso'), $this->_cpt_object->labels->singular_name ),
+			4 => sprintf(__('%1$s updated.', 'event_espresso'), $this->_cpt_object->labels->singular_name),
 
-			5 => isset( $_GET['revision'] ) ? sprintf( __('%s restored to revision from %s', 'event_espresso'), $this->_cpt_object->labels->singular_name, wp_post_revision_title( (int) $_GET['revision'], FALSE ) ) : FALSE,
+			5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'event_espresso'), $this->_cpt_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], FALSE)) : FALSE,
 
 			6 => sprintf(
-					__( '%1$s published. %2$sView %1$s%3$s', 'event_espresso'),
+					__('%1$s published. %2$sView %1$s%3$s', 'event_espresso'),
 					$this->_cpt_object->labels->singular_name,
-					'<a href="' . esc_url( get_permalink( $id )) . '">',
+					'<a href="'.esc_url(get_permalink($id)).'">',
 					'</a>'
 				),
 
-			7 => sprintf( __( '%1$s saved.', 'event_espresso'), $this->_cpt_object->labels->singular_name ),
+			7 => sprintf(__('%1$s saved.', 'event_espresso'), $this->_cpt_object->labels->singular_name),
 
 			8 => sprintf(
 				__('%1$s submitted. %2$sPreview %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $id ))) . '">',
+				'<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($id))).'">',
 				'</a>'
 			),
 
 			9 => sprintf(
-				__( '%1$s scheduled for: %2$s. %3$s">Preview %1$s%3$s', 'event_espresso'),
+				__('%1$s scheduled for: %2$s. %3$s">Preview %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<strong>' . date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date )) . '</strong>',
-				'<a target="_blank" href="' . esc_url( get_permalink( $id )),
+				'<strong>'.date_i18n(__('M j, Y @ G:i'), strtotime($post->post_date)).'</strong>',
+				'<a target="_blank" href="'.esc_url(get_permalink($id)),
 				'</a>'
 			),
 
 			10 => sprintf(
 				__('%1$s draft updated. %2$s">Preview page%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $id ))) ,
+				'<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($id))),
 				'</a>'
 			)
 		);
@@ -1250,24 +1250,24 @@ 
 		$post_type_object = $this->_cpt_object;
 		$title = $post_type_object->labels->add_new_item;
 		$editing = TRUE;
-		wp_enqueue_script( 'autosave' );
-		$post = $post = get_default_post_to_edit( $this->_cpt_routes[$this->_req_action], TRUE );
+		wp_enqueue_script('autosave');
+		$post = $post = get_default_post_to_edit($this->_cpt_routes[$this->_req_action], TRUE);
 		$post_ID = $post->ID;
 		$is_IE = $is_IE;
 
-		add_action( 'admin_print_styles', array( $this, 'add_new_admin_page_global' ) );
+		add_action('admin_print_styles', array($this, 'add_new_admin_page_global'));
 
 		//modify the default editor title field with default title.
-		add_filter('enter_title_here', array( $this, 'add_custom_editor_default_title' ), 10 );
+		add_filter('enter_title_here', array($this, 'add_custom_editor_default_title'), 10);
 
-		include_once WP_ADMIN_PATH . 'edit-form-advanced.php';
+		include_once WP_ADMIN_PATH.'edit-form-advanced.php';
 	}
 
 
 
 
 	public function add_new_admin_page_global() {
-		$admin_page = !empty( $this->_req_data['post'] ) ? 'post-php' : 'post-new-php';
+		$admin_page = ! empty($this->_req_data['post']) ? 'post-php' : 'post-new-php';
 		?>
 		<script type="text/javascript">
 			adminpage = '<?php echo $admin_page; ?>';
@@ -1289,16 +1289,16 @@ 
 	 */
 	protected function _edit_cpt_item() {
 		global $post, $title, $is_IE, $post_type, $post_type_object;
-		$post_id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-		$post = !empty( $post_id ) ? get_post( $post_id, OBJECT, 'edit' ) : NULL;
+		$post_id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+		$post = ! empty($post_id) ? get_post($post_id, OBJECT, 'edit') : NULL;
 
-		if ( empty ( $post ) ) {
-			wp_die( __('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?') );
+		if (empty ($post)) {
+			wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 		}
 
-		if ( ! empty( $_GET['get-post-lock'] ) ) {
-			wp_set_post_lock( $post_id );
-			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+		if ( ! empty($_GET['get-post-lock'])) {
+			wp_set_post_lock($post_id);
+			wp_redirect(get_edit_post_link($post_id, 'url'));
 			exit();
 		}
 
@@ -1310,32 +1310,32 @@ 
 		$post_type_object = $this->_cpt_object;
 		$is_IE = $is_IE;
 
-		if ( ! wp_check_post_lock( $post->ID ) ) {
-			$active_post_lock = wp_set_post_lock( $post->ID );
+		if ( ! wp_check_post_lock($post->ID)) {
+			$active_post_lock = wp_set_post_lock($post->ID);
 			//wp_enqueue_script('autosave');
 		}
 
 		$title = $this->_cpt_object->labels->edit_item;
 
-		add_action('admin_footer', '_admin_notice_post_locked' );
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-		if ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && !isset( $this->_labels['hide_add_button_on_cpt_route'][$this->_req_data['action']] ) ) {
-			$create_new_action = apply_filters( 'FHEE__EE_Admin_Page_CPT___edit_cpt_item__create_new_action', 'create_new', $this );
+		if (isset($this->_cpt_routes[$this->_req_data['action']]) && ! isset($this->_labels['hide_add_button_on_cpt_route'][$this->_req_data['action']])) {
+			$create_new_action = apply_filters('FHEE__EE_Admin_Page_CPT___edit_cpt_item__create_new_action', 'create_new', $this);
 
-			$post_new_file = EE_Admin_Page::add_query_args_and_nonce( array('action' => $create_new_action, 'page' => $this->page_slug), 'admin.php' );
+			$post_new_file = EE_Admin_Page::add_query_args_and_nonce(array('action' => $create_new_action, 'page' => $this->page_slug), 'admin.php');
 		}
 
-		if ( post_type_supports($this->_cpt_routes[$this->_req_action], 'comments') ) {
+		if (post_type_supports($this->_cpt_routes[$this->_req_action], 'comments')) {
 			wp_enqueue_script('admin-comments');
 			enqueue_comment_hotkeys_js();
 		}
 
-		add_action( 'admin_print_styles', array( $this, 'add_new_admin_page_global' ) );
+		add_action('admin_print_styles', array($this, 'add_new_admin_page_global'));
 
 		//modify the default editor title field with default title.
-		add_filter('enter_title_here', array( $this, 'add_custom_editor_default_title' ), 10 );
+		add_filter('enter_title_here', array($this, 'add_custom_editor_default_title'), 10);
 
-		include_once WP_ADMIN_PATH . 'edit-form-advanced.php';
+		include_once WP_ADMIN_PATH.'edit-form-advanced.php';
 
 	}
 

Indentation +20 added lines, -20 removed lines

@@ -1,23 +1,23 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * EE_Admin_Page_CPT class
- *
- * This class is for child classes that utilize core WP CPT views for add/edit pages.  All you have to do is extend this class instead of the usual EE_Admin_Page class for your child.
- *
- * Please not the following caveats:
- *
- * 1. When using add_meta_box() - it must use $this->wp_page_slug as the screen_id for the page NOT $this->_current_screen->id.  This is b/c there is a bug with how WP renders its custom post type pages that doesn't accept the default current_screen for metaboxes.
- *
- * 2. the same is true for any help_tabs or screen_options you want to add to custom post type views.
- *
- * 3. it is EXPECTED that $this->page_slug will be IDENTICAL to what slug/id was used when doing register_post_type().  So for instance, if you registered a "books" post type then $this->page_slug = 'espresso_books'  would NOT be valid.  So the correct id for the new post type would be "espresso_books".  Remember, you can still use something totally different for front-end rewrite slugs in your configuration array for the register post type.
- *
- * @package		Event Espresso
- * @subpackage 	includes/core/admin/EE_Admin_Page.core.php
- * @abstract
- * @author		Darren Ethier
- *
- */
+	 * EE_Admin_Page_CPT class
+	 *
+	 * This class is for child classes that utilize core WP CPT views for add/edit pages.  All you have to do is extend this class instead of the usual EE_Admin_Page class for your child.
+	 *
+	 * Please not the following caveats:
+	 *
+	 * 1. When using add_meta_box() - it must use $this->wp_page_slug as the screen_id for the page NOT $this->_current_screen->id.  This is b/c there is a bug with how WP renders its custom post type pages that doesn't accept the default current_screen for metaboxes.
+	 *
+	 * 2. the same is true for any help_tabs or screen_options you want to add to custom post type views.
+	 *
+	 * 3. it is EXPECTED that $this->page_slug will be IDENTICAL to what slug/id was used when doing register_post_type().  So for instance, if you registered a "books" post type then $this->page_slug = 'espresso_books'  would NOT be valid.  So the correct id for the new post type would be "espresso_books".  Remember, you can still use something totally different for front-end rewrite slugs in your configuration array for the register post type.
+	 *
+	 * @package		Event Espresso
+	 * @subpackage 	includes/core/admin/EE_Admin_Page.core.php
+	 * @abstract
+	 * @author		Darren Ethier
+	 *
+	 */
 abstract class EE_Admin_Page_CPT extends EE_Admin_Page {
 
 
@@ -78,8 +78,8 @@ 
 
 
 	/**
-	* @var EE_CPT_Base
-	*/
+	 * @var EE_CPT_Base
+	 */
 	protected $_cpt_model_obj = FALSE;
 
 

core/db_models/EEM_Venue.model.php

Spacing +19 added lines, -19 removed lines

@@ -21,16 +21,16 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Venue extends EEM_CPT_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Venue','event_espresso');
-		$this->plural_item = __('Venues','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Venue', 'event_espresso');
+		$this->plural_item = __('Venues', 'event_espresso');
 		$this->_tables = array(
 			'Venue_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Venue_Meta'=>new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID')
@@ -39,32 +39,32 @@ 
 			'Venue_CPT'=>array(
 				'VNU_ID'=>new EE_Primary_Key_Int_Field('ID', __("Venue ID", "event_espresso")),
 				'VNU_name'=>new EE_Plain_Text_Field('post_title', __("Venue Name", "event_espresso"), false, ''),
-				'VNU_desc'=>new EE_Post_Content_Field('post_content', __("Venue Description", "event_espresso"), false,''),
-				'VNU_identifier'=>new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false,''),
-				'VNU_created'=>new EE_Datetime_Field('post_date', __("Date Venue Created", "event_espresso"), FALSE,time()),
-				'VNU_short_desc'=>new EE_Plain_Text_Field('post_excerpt', __("Short Description of Venue", "event_espresso"), true,''),
-				'VNU_modified'=>new EE_Datetime_Field('post_modified', __("Venue Modified Date", "event_espresso"), FALSE,time()),
-				'VNU_wp_user'=>new EE_WP_User_Field('post_author', __("Venue Creator ID", "event_espresso"), false ),
-				'parent'=>new EE_Integer_Field('post_parent', __("Venue Parent ID", "event_espresso"), false,0),
+				'VNU_desc'=>new EE_Post_Content_Field('post_content', __("Venue Description", "event_espresso"), false, ''),
+				'VNU_identifier'=>new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false, ''),
+				'VNU_created'=>new EE_Datetime_Field('post_date', __("Date Venue Created", "event_espresso"), FALSE, time()),
+				'VNU_short_desc'=>new EE_Plain_Text_Field('post_excerpt', __("Short Description of Venue", "event_espresso"), true, ''),
+				'VNU_modified'=>new EE_Datetime_Field('post_modified', __("Venue Modified Date", "event_espresso"), FALSE, time()),
+				'VNU_wp_user'=>new EE_WP_User_Field('post_author', __("Venue Creator ID", "event_espresso"), false),
+				'parent'=>new EE_Integer_Field('post_parent', __("Venue Parent ID", "event_espresso"), false, 0),
 				'VNU_order'=>new EE_Integer_Field('menu_order', __("Venue order", "event_espresso"), false, 1),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_venues'),// EE_Plain_Text_Field('post_type', __("Venue post type", "event_espresso"), false, 'espresso_venues'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_venues'), // EE_Plain_Text_Field('post_type', __("Venue post type", "event_espresso"), false, 'espresso_venues'),
 				),
 			'Venue_Meta'=>array(
 				'VNUM_ID'=>new EE_DB_Only_Int_Field('VNUM_ID', __("ID of Venue Meta Row", "event_espresso"), false),
 				'VNU_ID_fk'=>new EE_DB_Only_Int_Field('VNU_ID', __("Foreign Key to Venue Post ", "event_espresso"), false),
 				'VNU_address'=>new EE_Plain_Text_Field('VNU_address', __("Venue Address line 1", "event_espresso"), true, ''),
-				'VNU_address2'=>new EE_Plain_Text_Field('VNU_address2', __("Venue Address line 2", "event_espresso"), true,''),
+				'VNU_address2'=>new EE_Plain_Text_Field('VNU_address2', __("Venue Address line 2", "event_espresso"), true, ''),
 				'VNU_city'=>new EE_Plain_Text_Field('VNU_city', __("Venue City", "event_espresso"), true, ''),
 				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __("State ID", "event_espresso"), true, null, 'State'),
 				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __("Country Code", "event_espresso"), true, null, 'Country'),
 				'VNU_zip'=>new EE_Plain_Text_Field('VNU_zip', __("Venue Zip/Postal Code", "event_espresso"), true),
 				'VNU_phone'=>new EE_Plain_Text_Field('VNU_phone', __("Venue Phone", "event_espresso"), true),
-				'VNU_capacity'=>new EE_Infinite_Integer_Field('VNU_capacity', __("Venue Capacity", "event_espresso"), true,EE_INF),
+				'VNU_capacity'=>new EE_Infinite_Integer_Field('VNU_capacity', __("Venue Capacity", "event_espresso"), true, EE_INF),
 				'VNU_url'=>new EE_Plain_Text_Field('VNU_url', __('Venue Website', 'event_espresso'), true),
 				'VNU_virtual_phone'=>new EE_Plain_Text_Field('VNU_virtual_phone', __('Call in Number', 'event_espresso'), true),
-				'VNU_virtual_url'=>new EE_Plain_Text_Field('VNU_virtual_url', __('Virtual URL', 'event_espresso'), true ),
-				'VNU_google_map_link'=>new EE_Plain_Text_Field('VNU_google_map_link', __('Google Map Link', 'event_espresso'), true ),
-				'VNU_enable_for_gmap'=>new EE_Boolean_Field('VNU_enable_for_gmap', __('Show Google Map?', 'event_espresso'), false, false )
+				'VNU_virtual_url'=>new EE_Plain_Text_Field('VNU_virtual_url', __('Virtual URL', 'event_espresso'), true),
+				'VNU_google_map_link'=>new EE_Plain_Text_Field('VNU_google_map_link', __('Google Map Link', 'event_espresso'), true),
+				'VNU_enable_for_gmap'=>new EE_Boolean_Field('VNU_enable_for_gmap', __('Show Google Map?', 'event_espresso'), false, false)
 
 			));
 		$this->_model_relations = array(
@@ -76,8 +76,8 @@ 
 		);
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_venues', 'VNUM_ID');
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
 	}
 
 }

core/db_models/fields/EE_Infinite_Integer_Field.php

Spacing +12 added lines, -12 removed lines

@@ -7,32 +7,32 @@ 
  * other than explicitly setting it to EE_INF.
  * Makes use of constant EE_INF_IN_DB set in espresso.php, and EE_INF, which is a PHP constant definedin the ether
  */
-class EE_Infinite_Integer_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Infinite_Integer_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
-		if($value_of_field_on_model_object === EE_INF){
+		if ($value_of_field_on_model_object === EE_INF) {
 			return EE_INF_IN_DB;
-		}else{
+		} else {
 			return intval($value_of_field_on_model_object);
 		}
 	}
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
+		if ($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
 				$value_inputted_for_field_on_model_object === EE_INF ||
 				$value_inputted_for_field_on_model_object === "EE_INF"
-				){
+				) {
 			return EE_INF;
-		}else{
+		} else {
 			return intval($value_inputted_for_field_on_model_object);
 		}
 	}
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
 		$intval = intval($value_inputted_for_field_on_model_object);
-		if($intval == EE_INF_IN_DB){
+		if ($intval == EE_INF_IN_DB) {
 			return EE_INF;
-		}else{
+		} else {
 			return $intval;
 		}
 	}
@@ -45,9 +45,9 @@ 
 	 * @param string $schema input, symbol, text; or any string you want to show if the value equals EE_INF
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = null ) {
-		if( $value_on_field_to_be_outputted === EE_INF ){
-			switch($schema){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
+		if ($value_on_field_to_be_outputted === EE_INF) {
+			switch ($schema) {
 				case 'input':
 					return '';
 				case 'symbol':

core/helpers/EEH_Autoloader.helper.php

Spacing +42 added lines, -42 removed lines

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

core/helpers/EEH_URL.helper.php

Spacing +55 added lines, -55 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -21,28 +21,28 @@ 
 	 * @param bool  $exclude_nonce  If true then the nonce will be excluded from the generated url.
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) {
-		if ( empty( $url ) ) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists and add nonce
-		if ( ! $exclude_nonce ) {
-			if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) {
-				$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) );
+		if ( ! $exclude_nonce) {
+			if (isset($args['action']) && ! empty($args['action'])) {
+				$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 			} else {
-				$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) );
+				$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 			}
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = ! empty( $_REQUEST['action'] ) ? array_merge( $args, array( 'return' => $_REQUEST['action'] ) ) : $args;
+		$args = ! empty($_REQUEST['action']) ? array_merge($args, array('return' => $_REQUEST['action'])) : $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -55,17 +55,17 @@ 
 	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
-	public static function remote_file_exists( $url, $args = array() ){
-		$results = wp_remote_request($url,array_merge( array(
+	public static function remote_file_exists($url, $args = array()) {
+		$results = wp_remote_request($url, array_merge(array(
 			'method'=>'GET',
 			'redirection'=>1
-		), $args ) );
-		if( ! $results instanceof WP_Error &&
+		), $args));
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -81,29 +81,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -116,29 +116,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -149,7 +149,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -164,9 +164,9 @@ 
 	 * @param   string $prefix Use this to prefix the string with something.
 	 * @return string
 	 */
-	public static function generate_unique_token( $prefix = '' ) {
-		$token =  md5( uniqid() . mt_rand() );
-		return $prefix ? $prefix . '_' . $token : $token;
+	public static function generate_unique_token($prefix = '') {
+		$token = md5(uniqid().mt_rand());
+		return $prefix ? $prefix.'_'.$token : $token;
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx
@@ -192,19 +192,19 @@ 
 	 * @param string $server_variable
 	 * @return string
 	 */
-	public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){
+	public static function filter_input_server_url($server_variable = 'REQUEST_URI') {
 		$URL = '';
 		$server_variables = array(
 			'REQUEST_URI' => 1,
 			'HTTP_HOST' => 1,
 			'PHP_SELF' => 1,
 		);
-		$server_variable = strtoupper( $server_variable );
+		$server_variable = strtoupper($server_variable);
 		// whitelist INPUT_SERVER var
-		if ( isset( $server_variables[ $server_variable ] ) ) {
-			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
-			if ( empty( $URL ) ) {
-				$URL = esc_url( $_SERVER[ $server_variable ] );
+		if (isset($server_variables[$server_variable])) {
+			$URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+			if (empty($URL)) {
+				$URL = esc_url($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;

core/libraries/form_sections/inputs/EE_CVV_Input.input.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_CVV_Input extends EE_Text_Input{
+class EE_CVV_Input extends EE_Text_Input {
 
 	/**
 	 * @param array $input_settings {
@@ -17,12 +17,12 @@ 
 	 */
 	public function __construct($input_settings = array()) {
 		$this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
-		$this->_add_validation_strategy( new EE_Int_Validation_Strategy(isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
+		$this->_add_validation_strategy(new EE_Int_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		parent::__construct($input_settings);
-		if( 
-				! isset( $input_settings[ 'include_whats_this_link' ] ) ||
-				( isset( $input_settings[ 'include_whats_this_link' ] ) &&
-				 $input_settings[ 'include_whats_this_link' ] == true ) ) {
+		if ( 
+				! isset($input_settings['include_whats_this_link']) ||
+				(isset($input_settings['include_whats_this_link']) &&
+				 $input_settings['include_whats_this_link'] == true) ) {
 				$this->_html_label_text = sprintf( 
 						_x( 
 								'%1$s %2$s(What\'s this?)%3$s', 

core/libraries/payment_methods/EE_Gateway.lib.php

Spacing +31 added lines, -31 removed lines

@@ -30,7 +30,7 @@ 
  * needed helpers and models (see all the methods starting with "set_", eg seg_line_item_helper which should be passed an object
  * which implements EEHI_Line_Item_Helper; etc).
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -108,7 +108,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -120,10 +120,10 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ] );
-		unset( $properties[ '_pay_log' ] );
+		unset($properties['_pay_model']);
+		unset($properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -131,7 +131,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -139,7 +139,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -165,8 +165,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->$property_name = $value;
 		}
@@ -175,14 +175,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -190,7 +190,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -198,7 +198,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -206,7 +206,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -215,23 +215,23 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
 	 */
-	public function format_currency($amount){
-		return number_format( $amount, 2, '.', '' );
+	public function format_currency($amount) {
+		return number_format($amount, 2, '.', '');
 //		return $this->_template->format_currency($amount, true);
 	}
 
@@ -240,7 +240,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -252,14 +252,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -270,9 +270,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -290,7 +290,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}