eventespresso / event-espresso-core

core/admin/EE_Admin_Page_CPT_Init.core.php

Spacing +4 added lines, -4 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/admin/EE_Admin_Page_Loader.core.php

Braces +14 added lines, -9 removed lines

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

Spacing +121 added lines, -121 removed lines

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

core/admin/EE_Help_Tour_final_stop.class.php

Spacing +2 added lines, -2 removed lines

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

Braces +2 added lines, -1 removed lines

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

core/admin/templates/about_admin_wrapper.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <div class="wrap espresso-admin about-wrap">
 
 	<h1><?php  echo $admin_page_title; ?></h1>
-	<div class="about-text"><?php echo !empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
-	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf( esc_attr__( '%s Logo', 'event_espresso' ), 'Event Espresso' ); ?>"/><br /><?php printf( __('Version %s', 'event_espresso' ),  EVENT_ESPRESSO_VERSION ); ?></div>
+	<div class="about-text"><?php echo ! empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
+	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf(esc_attr__('%s Logo', 'event_espresso'), 'Event Espresso'); ?>"/><br /><?php printf(__('Version %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); ?></div>
 
 	<?php echo $nav_tabs; ?>
 
 
 <?php
-	do_action( 'AHEE__admin_wrapper__template__before_about_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
 	echo $about_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_about_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
 ?>
 
 </div>

core/admin/templates/admin_details_metabox_column_wrapper.template.php

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
 
 		<?php
 		//let's loop through the columns
-		 for ( $i = 1; $i <= $num_columns; $i++ ) {
-		 	$metaref = ( $i === 1 ) ? 'normal' : 'side';
-		 	$metaref = ( $i > 2 ) ? 'column'.$i : $metaref;
+		 for ($i = 1; $i <= $num_columns; $i++) {
+		 	$metaref = ($i === 1) ? 'normal' : 'side';
+		 	$metaref = ($i > 2) ? 'column'.$i : $metaref;
 		 ?>
 
 			<div id='postbox-container-<?php echo $i; ?>' class='postbox-container'>
-				<?php do_meta_boxes( $current_page, $metaref, NULL ); ?>
+				<?php do_meta_boxes($current_page, $metaref, NULL); ?>
 			</div>
 		<?php }// end column loop ?>
 	</div> <!-- post-body -->

core/admin/templates/admin_details_publish_metabox.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( $publish_box_extra_content ) : ?>
+<?php if ($publish_box_extra_content) : ?>
 <div id="minor-publishing">
 <?php echo $publish_box_extra_content; ?>
 </div>
@@ -13,7 +13,7 @@ 
 	
 	<div id="espresso_major_buttons_wrapper">
 	
-		<?php if ( $publish_delete_link ) : ?>
+		<?php if ($publish_delete_link) : ?>
 		<div id="delete-action">
 			<?php echo $publish_delete_link; ?>
 		</div>

core/admin/templates/admin_details_wrapper.template.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 			<!-- admin-page-header -->
 		<div id="post-body" class="metabox-holder columns-2">
 			
-		<?php if ( ! empty( $post_body_content )) : ?>
+		<?php if ( ! empty($post_body_content)) : ?>
 			<div id="post-body-content">
 				<?php echo $post_body_content; ?>
 			</div>
@@ -13,13 +13,13 @@ 
 		<?php endif; ?>
 			
 			<div id="postbox-container-1" class="postbox-container">
-				<?php do_meta_boxes( $current_page, 'side', NULL ); ?>
+				<?php do_meta_boxes($current_page, 'side', NULL); ?>
 			</div>
 			<!-- postbox-container-1 -->
 			
 			<div id="postbox-container-2" class="postbox-container">
-				<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
-				<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
+				<?php do_meta_boxes($current_page, 'normal', NULL); ?>
+				<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
 			</div>
 			<!-- postbox-container-2 -->
 			

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 			
 			
 			<div id="postbox-container-2" class="postbox-container">
-				<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
-				<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
+				<?php do_meta_boxes($current_page, 'normal', NULL); ?>
+				<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
 			</div>
 			<!-- postbox-container-2 -->
 			

core/admin/templates/admin_general_metabox_contents_espresso_links.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <div class="padding">
 	   	<ul class="infolinks">
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso') . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">' . __('Usage Guide').'</a>'; ?>
+	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso').'</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'.__('Usage Guide').'</a>'; ?>
 	   		</li>
 	   		<li>
 		   		<a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -30,7 +30,7 @@ 
 	   			</a>
 	   		</li>
 	   		<li>
-	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso'). '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">' .__('Add-ons', 'event_espresso').'</a>'; ?><br />
+	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso').'</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'.__('Add-ons', 'event_espresso').'</a>'; ?><br />
 	   			<br />
 	   			<ol>
 	   				<li>