eventespresso / event-espresso-core

core/CPTs/EE_CPT_Attendee_Strategy.core.php

Spacing +4 added lines, -4 removed lines

@@ -39,9 +39,9 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Attendee_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
 	}
 
@@ -55,7 +55,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    void
 	 */
-	public function the_posts( $posts, WP_Query $wp_query) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		//$EVT = EE_Registry::instance()->load_model( 'Event' );
 //		EEH_Debug_Tools::printr( $EVT, '$EVT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		$EVT_IDs = array();

Braces +3 added lines, -1 removed lines

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

core/EE_Addon.core.php

Braces +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else{
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
 			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );

Spacing +83 added lines, -83 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -95,7 +95,7 @@ 
 	 *    class constructor
 	 */
 	public function __construct() {
-		add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $this, 'admin_init' ) );
+		add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($this, 'admin_init'));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	/**
 	 * @param mixed $version
 	 */
-	public function set_version( $version = NULL ) {
+	public function set_version($version = NULL) {
 		$this->_version = $version;
 	}
 
@@ -121,7 +121,7 @@ 
 	/**
 	 * @param mixed $min_core_version
 	 */
-	public function set_min_core_version( $min_core_version = NULL ) {
+	public function set_min_core_version($min_core_version = NULL) {
 		$this->_min_core_version = $min_core_version;
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $addon_name
 	 * @return boolean
 	 */
-	public function set_name( $addon_name ) {
+	public function set_name($addon_name) {
 		return $this->_addon_name = $addon_name;
 	}
 
@@ -170,7 +170,7 @@ 
 	/**
 	 * @param string $plugin_basename
 	 */
-	public function set_plugin_basename( $plugin_basename ) {
+	public function set_plugin_basename($plugin_basename) {
 
 		$this->_plugin_basename = $plugin_basename;
 	}
@@ -190,7 +190,7 @@ 
 	/**
 	 * @param string $plugin_slug
 	 */
-	public function set_plugin_slug( $plugin_slug ) {
+	public function set_plugin_slug($plugin_slug) {
 
 		$this->_plugin_slug = $plugin_slug;
 	}
@@ -210,7 +210,7 @@ 
 	/**
 	 * @param string $plugin_action_slug
 	 */
-	public function set_plugin_action_slug( $plugin_action_slug ) {
+	public function set_plugin_action_slug($plugin_action_slug) {
 
 		$this->_plugin_action_slug = $plugin_action_slug;
 	}
@@ -230,9 +230,9 @@ 
 	/**
 	 * @param array $plugins_page_row
 	 */
-	public function set_plugins_page_row( $plugins_page_row = array() ) {
+	public function set_plugins_page_row($plugins_page_row = array()) {
 		// sigh.... check for example content that I stupidly merged to master and remove it if found
-		if ( ! is_array( $plugins_page_row ) && strpos( $plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>' ) !== false ) {
+		if ( ! is_array($plugins_page_row) && strpos($plugins_page_row, '<h3>Promotions Addon Upsell Info</h3>') !== false) {
 			$plugins_page_row = '';
 		}
 		$this->_plugins_page_row = $plugins_page_row;
@@ -250,7 +250,7 @@ 
 		do_action("AHEE__{$classname}__new_install");
 		do_action('AHEE__EE_Addon__new_install', $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -265,18 +265,18 @@ 
 		do_action("AHEE__{$classname}__reactivation");
 		do_action('AHEE__EE_Addon__reactivation', $this);
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
 
-	public function deactivation(){
+	public function deactivation() {
 		$classname = get_class($this);
 //		echo "Deactivating $classname";die;
 		do_action("AHEE__{$classname}__deactivation");
 		do_action('AHEE__EE_Addon__deactivation', $this);
 		//check if the site no longer needs to be in maintenance mode
-		EE_Register_Addon::deregister( $this->name() );
+		EE_Register_Addon::deregister($this->name());
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 	}
 
@@ -292,16 +292,16 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
-		if( $verify_schema === '' ) {
+	public function initialize_db_if_no_migrations_required($verify_schema = true) {
+		if ($verify_schema === '') {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
 			//(ie, no 2nd or 3rd arguments), instead of calling the registered callbacks with no arguments, it
 			//calls them with an argument of an empty string (ie ""), which evaluates to false
 			//so we need to treat the empty string as if nothing had been passed, and should instead use the default
 			$verify_schema = true;
 		}
-		if ( EE_Maintenance_Mode::instance()->level() !== EE_Maintenance_Mode::level_2_complete_maintenance ) {
-			if( $verify_schema ) {
+		if (EE_Maintenance_Mode::instance()->level() !== EE_Maintenance_Mode::level_2_complete_maintenance) {
+			if ($verify_schema) {
 				$this->initialize_db();
 			}
 			$this->initialize_default_data();
@@ -319,15 +319,15 @@ 
 			 * other data needs to be verified)
 			 */
 			EEH_Activation::initialize_db_content();
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+			update_option('ee_flush_rewrite_rules', TRUE);
 			//in case there are lots of addons being activated at once, let's force garbage collection
 			//to help avoid memory limit errors
 			//EEH_Debug_Tools::instance()->measure_memory( 'db content initialized for ' . get_class( $this), true );
 			gc_collect_cycles();
-		}else{
+		} else {
 			//ask the data migration manager to init this addon's data
 			//when migrations are finished because we can't do it now
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() );
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name());
 		}
 	}
 
@@ -341,15 +341,15 @@ 
 	 */
 	public function initialize_db() {
 		//find the migration script that sets the database to be compatible with the code
-		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() );
-		if( $current_dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name );
-			$current_data_migration_script->set_migrating( FALSE );
+		$current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name());
+		if ($current_dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name);
+			$current_data_migration_script->set_migrating(FALSE);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if ( $current_data_migration_script->get_errors() ) {
-				foreach( $current_data_migration_script->get_errors() as $error ) {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				foreach ($current_data_migration_script->get_errors() as $error) {
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
@@ -381,7 +381,7 @@ 
 		 * default data)
 		 * @param EE_Addon $addon the addon that called this
 		 */
-		do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this );
+		do_action('AHEE__EE_Addon__initialize_default_data__begin', $this);
 		//override to insert default data. It is safe to use the models here
 		//because the site should not be in maintenance mode
 	}
@@ -401,7 +401,7 @@ 
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
 		add_action(
-		    'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' )
+		    'AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')
         );
 	}
 
@@ -415,7 +415,7 @@ 
 		do_action("AHEE__{$classname}__downgrade");
 		do_action('AHEE__EE_Addon__downgrade', $this);
 		//it's possible there's old default data that needs to be double-checked
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) );
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -426,7 +426,7 @@ 
 	 * plugin activation only. In the future, we'll want to do it on plugin updates too
 	 * @return bool
 	 */
-	public function set_db_update_option_name(){
+	public function set_db_update_option_name() {
 		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016');
 		//let's just handle this on the next request, ok? right now we're just not really ready
 		return $this->set_activation_indicator_option();
@@ -454,7 +454,7 @@ 
 	 */
 	public function set_activation_indicator_option() {
 		// let's just handle this on the next request, ok? right now we're just not really ready
-		return update_option( $this->get_activation_indicator_option_name(), TRUE );
+		return update_option($this->get_activation_indicator_option_name(), TRUE);
 	}
 
 
@@ -462,8 +462,8 @@ 
 	 * Gets the name of the wp option which is used to temporarily indicate that this addon was activated
 	 * @return string
 	 */
-	public function get_activation_indicator_option_name(){
-		return 'ee_activation_' . $this->name();
+	public function get_activation_indicator_option_name() {
+		return 'ee_activation_'.$this->name();
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * Used by EE_System to set the request type of this addon. Should not be used by addon developers
 	 * @param int $req_type
 	 */
-	public function set_req_type( $req_type ) {
+	public function set_req_type($req_type) {
 		$this->_req_type = $req_type;
 	}
 
@@ -484,7 +484,7 @@ 
 	 * of addons
 	 */
 	public function detect_req_type() {
-		if( ! $this->_req_type ){
+		if ( ! $this->_req_type) {
 			$this->detect_activation_or_upgrade();
 		}
 		return $this->_req_type;
@@ -497,36 +497,36 @@ 
 	 * Should only be called once per request
 	 * @return void
 	 */
-	public function detect_activation_or_upgrade(){
+	public function detect_activation_or_upgrade() {
 		$activation_history_for_addon = $this->get_activation_history();
 //		d($activation_history_for_addon);
 		$request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version());
 		$this->set_req_type($request_type);
 		$classname = get_class($this);
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" );
-				do_action( 'AHEE__EE_Addon__detect_activations_or_upgrades__new_activation', $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation");
+				do_action('AHEE__EE_Addon__detect_activations_or_upgrades__new_activation', $this);
 				$this->new_install();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" );
-				do_action( 'AHEE__EE_Addon__detect_activations_or_upgrades__reactivation', $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation");
+				do_action('AHEE__EE_Addon__detect_activations_or_upgrades__reactivation', $this);
 				$this->reactivation();
-				$this->update_list_of_installed_versions( $activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" );
-				do_action( 'AHEE__EE_Addon__detect_activations_or_upgrades__upgrade', $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade");
+				do_action('AHEE__EE_Addon__detect_activations_or_upgrades__upgrade', $this);
 				$this->upgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" );
-				do_action( 'AHEE__EE_Addon__detect_activations_or_upgrades__downgrade', $this );
+				do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade");
+				do_action('AHEE__EE_Addon__detect_activations_or_upgrades__downgrade', $this);
 				$this->downgrade();
-				$this->update_list_of_installed_versions($activation_history_for_addon );
+				$this->update_list_of_installed_versions($activation_history_for_addon);
 				break;
 			case EE_System::req_type_normal:
 			default:
@@ -534,7 +534,7 @@ 
 				break;
 		}
 
-		do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" );
+		do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete");
 	}
 
 	/**
@@ -543,17 +543,17 @@ 
 	 * @param string $current_version_to_add
 	 * @return boolean success
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->get_activation_history();
 		}
-		if( $current_version_to_add === NULL){
+		if ($current_version_to_add === NULL) {
 			$current_version_to_add = $this->version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// resave
 //		echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history);
-		return update_option( $this->get_activation_history_option_name(), $version_history );
+		return update_option($this->get_activation_history_option_name(), $version_history);
 	}
 
 	/**
@@ -561,8 +561,8 @@ 
 	 * of this addon
 	 * @return string
 	 */
-	public function get_activation_history_option_name(){
-		return self::ee_addon_version_history_option_prefix . $this->name();
+	public function get_activation_history_option_name() {
+		return self::ee_addon_version_history_option_prefix.$this->name();
 	}
 
 
@@ -571,7 +571,7 @@ 
 	 * Gets the wp option which stores the activation history for this addon
 	 * @return array
 	 */
-	public function get_activation_history(){
+	public function get_activation_history() {
 		return get_option($this->get_activation_history_option_name(), NULL);
 	}
 
@@ -580,8 +580,8 @@ 
 	/**
 	 * @param string $config_section
 	 */
-	public function set_config_section( $config_section = '' ) {
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'addons';
+	public function set_config_section($config_section = '') {
+		$this->_config_section = ! empty($config_section) ? $config_section : 'addons';
 	}
 	/**
 	 *	filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc.
@@ -594,14 +594,14 @@ 
 	 * Sets the filepath to the main plugin file
 	 * @param string $filepath
 	 */
-	public function set_main_plugin_file( $filepath ) {
+	public function set_main_plugin_file($filepath) {
 		$this->_main_plugin_file = $filepath;
 	}
 	/**
 	 * gets the filepath to teh main file
 	 * @return string
 	 */
-	public function get_main_plugin_file(){
+	public function get_main_plugin_file() {
 		return $this->_main_plugin_file;
 	}
 
@@ -611,15 +611,15 @@ 
 	 * @return string
 	 */
 	public function get_main_plugin_file_basename() {
-		return plugin_basename( $this->get_main_plugin_file() );
+		return plugin_basename($this->get_main_plugin_file());
 	}
 
 	/**
 	 * Gets the folder name which contains the main plugin file
 	 * @return string
 	 */
-	public function get_main_plugin_file_dirname(){
-		return dirname( $this->get_main_plugin_file() );
+	public function get_main_plugin_file_dirname() {
+		return dirname($this->get_main_plugin_file());
 	}
 
 
@@ -628,11 +628,11 @@ 
      *
      * @return void
 	 */
-	public function admin_init(){
+	public function admin_init() {
 		// is admin and not in M-Mode ?
-		if ( is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2 );
-			add_filter( 'after_plugin_row_' . $this->_plugin_basename, array( $this, 'after_plugin_row' ), 10, 3 );
+		if (is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 2);
+			add_filter('after_plugin_row_'.$this->_plugin_basename, array($this, 'after_plugin_row'), 10, 3);
 		}
 	}
 
@@ -647,10 +647,10 @@ 
 	 * @param $file
 	 * @return array
 	 */
-	public function plugin_action_links( $links, $file ) {
-		if ( $file === $this->plugin_basename() && $this->plugin_action_slug() !== '' ) {
+	public function plugin_action_links($links, $file) {
+		if ($file === $this->plugin_basename() && $this->plugin_action_slug() !== '') {
 			// before other links
-			array_unshift( $links, '<a href="admin.php?page=' . $this->plugin_action_slug() . '">' . __( 'Settings' ) . '</a>' );
+			array_unshift($links, '<a href="admin.php?page='.$this->plugin_action_slug().'">'.__('Settings').'</a>');
 		}
 		return $links;
 	}
@@ -668,17 +668,17 @@ 
 	 * @param $status
 	 * @return void
 	 */
-	public function after_plugin_row( $plugin_file, $plugin_data, $status ) {
+	public function after_plugin_row($plugin_file, $plugin_data, $status) {
 
 		$after_plugin_row = '';
-		if ( $plugin_file === $this->plugin_basename() && $this->get_plugins_page_row() !== '' ) {
+		if ($plugin_file === $this->plugin_basename() && $this->get_plugins_page_row() !== '') {
 			$class = $status ? 'active' : 'inactive';
 			$plugins_page_row = $this->get_plugins_page_row();
-			$link_text = isset( $plugins_page_row[ 'link_text' ] ) ? $plugins_page_row[ 'link_text' ] : '';
-			$link_url = isset( $plugins_page_row[ 'link_url' ] ) ? $plugins_page_row[ 'link_url' ] : '';
-			$description = isset( $plugins_page_row[ 'description' ] ) ? $plugins_page_row[ 'description' ] : $plugins_page_row;
-			if ( ! empty( $link_text ) && ! empty( $link_url ) && ! empty( $description )) {
-				$after_plugin_row .= '<tr id="' . sanitize_title( $plugin_file ) . '-ee-addon" class="' . $class . '">';
+			$link_text = isset($plugins_page_row['link_text']) ? $plugins_page_row['link_text'] : '';
+			$link_url = isset($plugins_page_row['link_url']) ? $plugins_page_row['link_url'] : '';
+			$description = isset($plugins_page_row['description']) ? $plugins_page_row['description'] : $plugins_page_row;
+			if ( ! empty($link_text) && ! empty($link_url) && ! empty($description)) {
+				$after_plugin_row .= '<tr id="'.sanitize_title($plugin_file).'-ee-addon" class="'.$class.'">';
 				$after_plugin_row .= '<th class="check-column" scope="row"></th>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-title-td plugin-title column-primary">';
 				$after_plugin_row .= '<style>
@@ -720,7 +720,7 @@ 
 </style>';
 				$after_plugin_row .= '
 <p class="ee-addon-upsell-info-dv">
-	<a class="ee-button" href="' . $link_url . '">' . $link_text . ' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
+	<a class="ee-button" href="' . $link_url.'">'.$link_text.' &nbsp;<span class="dashicons dashicons-arrow-right-alt2" style="margin:0;"></span></a>
 </p>';
 				$after_plugin_row .= '</td>';
 				$after_plugin_row .= '<td class="ee-addon-upsell-info-desc-td column-description desc">';

Indentation +34 added lines, -34 removed lines

@@ -282,16 +282,16 @@ 
 
 
 
-    /**
-     * Takes care of double-checking that we're not in maintenance mode, and then
-     * initializing this addon's necessary initial data. This is called by default on new activations
-     * and reactivations
-     *
-     * @param boolean $verify_schema whether to verify the database's schema for this addon, or just its data.
-     *                               This is a resource-intensive job so we prefer to only do it when necessary
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Takes care of double-checking that we're not in maintenance mode, and then
+	 * initializing this addon's necessary initial data. This is called by default on new activations
+	 * and reactivations
+	 *
+	 * @param boolean $verify_schema whether to verify the database's schema for this addon, or just its data.
+	 *                               This is a resource-intensive job so we prefer to only do it when necessary
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function initialize_db_if_no_migrations_required( $verify_schema = true ) {
 		if( $verify_schema === '' ) {
 			//wp core bug imo: if no args are passed to `do_action('some_hook_name')` besides the hook's name
@@ -307,11 +307,11 @@ 
 			$this->initialize_default_data();
 			//@todo: this will probably need to be adjusted in 4.4 as the array changed formats I believe
 			EE_Data_Migration_Manager::instance()->update_current_database_state_to(
-			    array(
-			        'slug' => $this->name(),
-                    'version' => $this->version()
-                )
-            );
+				array(
+					'slug' => $this->name(),
+					'version' => $this->version()
+				)
+			);
 			/* make sure core's data is a-ok
 			 * (at the time of writing, we especially want to verify all the caps are present
 			 * because payment method type capabilities are added dynamically, and it's
@@ -355,11 +355,11 @@ 
 		}
 		//if not DMS was found that should be ok. This addon just doesn't require any database changes
 		EE_Data_Migration_Manager::instance()->update_current_database_state_to(
-		    array(
-		        'slug' => $this->name(),
-                'version' => $this->version()
-            )
-        );
+			array(
+				'slug' => $this->name(),
+				'version' => $this->version()
+			)
+		);
 	}
 
 
@@ -401,8 +401,8 @@ 
 		EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
 		//also it's possible there is new default data that needs to be added
 		add_action(
-		    'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' )
-        );
+			'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' )
+		);
 	}
 
 
@@ -624,9 +624,9 @@ 
 
 
 	/**
-     * sets hooks used in the admin
-     *
-     * @return void
+	 * sets hooks used in the admin
+	 *
+	 * @return void
 	 */
 	public function admin_init(){
 		// is admin and not in M-Mode ?
@@ -737,16 +737,16 @@ 
 
 
 
-    /**
-     * a safe space for addons to add additional logic like setting hooks
-     * that will run immediately after addon registration
-     * making this a great place for code that needs to be "omnipresent"
-     *
-     * @since 4.9.26
-     */
+	/**
+	 * a safe space for addons to add additional logic like setting hooks
+	 * that will run immediately after addon registration
+	 * making this a great place for code that needs to be "omnipresent"
+	 *
+	 * @since 4.9.26
+	 */
 	public function after_registration()
-    {
-        // cricket chirp... cricket chirp...
+	{
+		// cricket chirp... cricket chirp...
 	}
 
 

Doc Comments +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 	/**
 	 * Sets addon_name
 	 * @param string $addon_name
-	 * @return boolean
+	 * @return string
 	 */
 	public function set_name( $addon_name ) {
 		return $this->_addon_name = $addon_name;

core/EE_Base_Class_Repository.core.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Base_Class_Repository
@@ -39,8 +39,8 @@ 
 	 * @param array $arguments	arrays of arguments that will be passed to the object's save method
 	 * @return bool | int
 	 */
-	public function save( $arguments = array() ) {
-		return $this->persist( 'save', $arguments );
+	public function save($arguments = array()) {
+		return $this->persist('save', $arguments);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return bool | int
 	 */
 	public function save_all() {
-		return $this->persist_all( 'save' );
+		return $this->persist_all('save');
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @return bool
 	 */
 	public function delete() {
-		$success = $this->_call_user_func_array_on_current( 'delete' );
-		$this->remove( $this->current() );
+		$success = $this->_call_user_func_array_on_current('delete');
+		$this->remove($this->current());
 		return $success;
 	}
 
@@ -86,16 +86,16 @@ 
 	public function delete_all() {
 		$success = true;
 		$this->rewind();
-		while ( $this->valid() ) {
+		while ($this->valid()) {
 			// any db error will result in false being returned
-			$success = $this->_call_user_func_array_on_current( 'delete' ) !== false ? $success : false;
+			$success = $this->_call_user_func_array_on_current('delete') !== false ? $success : false;
 			// can't remove current object because valid() requires it
 			// so just capture current object temporarily
 			$object = $this->current();
 			// advance the pointer
 			$this->next();
 			// THEN remove the object from the repository
-			$this->remove( $object );
+			$this->remove($object);
 		}
 		return $success;
 	}
@@ -113,8 +113,8 @@ 
 	 * @param string $previous_value
 	 * @return bool | int
 	 */
-	public function update_extra_meta( $meta_key, $meta_value, $previous_value = null ) {
-		return $this->_call_user_func_array_on_current( 'update_extra_meta', array( $meta_key, $meta_value, $previous_value ) );
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = null) {
+		return $this->_call_user_func_array_on_current('update_extra_meta', array($meta_key, $meta_value, $previous_value));
 	}
 
 

core/EE_Data_Mapper.core.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 	 */	
 	public  function &instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Data_Mapper )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Data_Mapper)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -71,10 +71,10 @@ 
 	 *		@ return void
 	 */
 	final function __destruct() {}
-	final function __call($a,$b) {}
-	public static function __callStatic($a,$b) {}
+	final function __call($a, $b) {}
+	public static function __callStatic($a, $b) {}
 	final function __get($a) {}
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 	final function __isset($a) {}
 	final function __unset($a) {}
 	final function __sleep() {

Indentation +5 added lines, -5 removed lines

@@ -28,9 +28,9 @@ 
 
 
    /**
-     * instance of the EE_Data_Mapper Object
-     * @private _instance
-     */
+    * instance of the EE_Data_Mapper Object
+    * @private _instance
+    */
 	private static $_instance = NULL;
 
 
@@ -82,8 +82,8 @@ 
 	}
 	final function __wakeup() {}
 	final function __toString() {
-	    return '';
-    }
+		return '';
+	}
 	final function __invoke() {}
 	final static function __set_state() {}
 	final function __clone() {}

core/EE_Load_Textdomain.core.php

Braces +9 added lines, -5 removed lines

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

Spacing +11 added lines, -11 removed lines

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

core/EE_Log.core.php

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');
+}
 /**
  *
  * Class EE_Log

Spacing +56 added lines, -56 removed lines

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

core/EE_Object_Repository.core.php

Spacing +15 added lines, -15 removed lines

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

core/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_Init.core.php

Spacing +56 added lines, -56 removed lines

@@ -88,16 +88,16 @@ 
 		$this->_set_init_properties();
 
 		//global styles/scripts across all wp admin pages
-		add_action('admin_enqueue_scripts', array($this, 'load_wp_global_scripts_styles'), 5 );
+		add_action('admin_enqueue_scripts', array($this, 'load_wp_global_scripts_styles'), 5);
 
 		//load initial stuff.
 		$this->_set_file_and_folder_name();
 
 		$this->_set_menu_map();
 
-		if ( empty( $this->_menu_map ) || is_array( $this->_menu_map ) )
+		if (empty($this->_menu_map) || is_array($this->_menu_map))
 			 {
-			 	EE_Error::doing_it_wrong( get_class( $this ) . '::$_menu_map', sprintf( __('The EE4 addon with the class %s is setting up the _menu_map property incorrectly for this version of EE core.  Please see Admin_Page_Init class examples in core for the new way of setting this property up.', 'event_espresso' ), get_class( $this ) ), '4.4.0' );
+			 	EE_Error::doing_it_wrong(get_class($this).'::$_menu_map', sprintf(__('The EE4 addon with the class %s is setting up the _menu_map property incorrectly for this version of EE core.  Please see Admin_Page_Init class examples in core for the new way of setting this property up.', 'event_espresso'), get_class($this)), '4.4.0');
 			 	return;
 			 }
 
@@ -159,7 +159,7 @@ 
 	public function load_wp_global_scripts_styles() {
 		/** STYLES **/
 		//register
-		wp_register_style('espresso_menu', EE_ADMIN_URL . 'assets/admin-menu-styles.css');
+		wp_register_style('espresso_menu', EE_ADMIN_URL.'assets/admin-menu-styles.css');
 
 
 
@@ -201,8 +201,8 @@ 
 
 
 	protected function _set_capability() {
-		$capability = empty($this->capability) ?  $this->_menu_map->capability : $this->capability;
-		$this->capability = apply_filters( 'FHEE_' . $this->_menu_map->menu_slug . '_capability', $capability );
+		$capability = empty($this->capability) ? $this->_menu_map->capability : $this->capability;
+		$this->capability = apply_filters('FHEE_'.$this->_menu_map->menu_slug.'_capability', $capability);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	public function initialize_admin_page() {
 		//let's check user access first
 		$this->_check_user_access();
-		if ( !is_object( $this->_loaded_page_object) ) return;
+		if ( ! is_object($this->_loaded_page_object)) return;
 		$this->_loaded_page_object->route_admin_request();
 		return;
 	}
@@ -232,25 +232,25 @@ 
 
 
 	public function set_page_dependencies($wp_page_slug) {
-		if ( !$this->_load_page ) return;
+		if ( ! $this->_load_page) return;
 
-		if ( !is_object($this->_loaded_page_object) ) {
+		if ( ! is_object($this->_loaded_page_object)) {
 			$msg[] = __('We can\'t load the page because we\'re missing a valid page object that tells us what to load', 'event_espresso');
-			$msg[] = $msg[0] . "\r\n" . sprintf(
+			$msg[] = $msg[0]."\r\n".sprintf(
 				__('The custom slug you have set for this page is %s. This means we\'re looking for the class %s_Admin_Page (found in %s_Admin_Page.core.php) within your %s directory', 'event_espresso'),
 				 $this->_file_name,
 				 $this->_file_name,
-				 $this->_folder_path . $this->_file_name,
+				 $this->_folder_path.$this->_file_name,
 				 $this->_menu_map->menu_slug
 			);
-			throw new EE_Error( implode( '||', $msg) );
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$this->_loaded_page_object->set_wp_page_slug($wp_page_slug);
-		$page_hook = 'load-' . $wp_page_slug;
+		$page_hook = 'load-'.$wp_page_slug;
 		//hook into page load hook so all page specific stuff get's loaded.
-		if ( !empty($wp_page_slug) )
-			add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies') );
+		if ( ! empty($wp_page_slug))
+			add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies'));
 	}
 
 
@@ -261,7 +261,7 @@ 
 	 */
 	public function do_initial_loads() {
 		//no loading or initializing if menu map is setup incorrectly.
-		if ( empty( $this->_menu_map ) || is_array( $this->_menu_map ) ) {
+		if (empty($this->_menu_map) || is_array($this->_menu_map)) {
 			return;
 		}
 		$this->_initialize_admin_page();
@@ -278,19 +278,19 @@ 
 		$bt = debug_backtrace();
 		//for more reliable determination of folder name
 		//we're using this to get the actual folder name of the CALLING class (i.e. the child class that extends this).  Why?  Because $this->menu_slug may be different than the folder name (to avoid conflicts with other plugins)
-		$class = get_class( $this );
-		foreach ( $bt as $index => $values ) {
-			if ( isset( $values['class'] ) && $values['class'] == $class ) {
+		$class = get_class($this);
+		foreach ($bt as $index => $values) {
+			if (isset($values['class']) && $values['class'] == $class) {
 				$file_index = $index - 1;
-				$this->_folder_name = basename(dirname($bt[$file_index]['file']) );
-				if ( !empty( $this->_folder_name ) ) break;
+				$this->_folder_name = basename(dirname($bt[$file_index]['file']));
+				if ( ! empty($this->_folder_name)) break;
 			}
 		}
 
-		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . DS;
+		$this->_folder_path = EE_ADMIN_PAGES.$this->_folder_name.DS;
 
-		$this->_file_name = preg_replace( '/^ee/' , 'EE', $this->_folder_name );
-		$this->_file_name = ucwords( str_replace('_', ' ', $this->_file_name) );
+		$this->_file_name = preg_replace('/^ee/', 'EE', $this->_folder_name);
+		$this->_file_name = ucwords(str_replace('_', ' ', $this->_file_name));
 		$this->_file_name = str_replace(' ', '_', $this->_file_name);
 	}
 
@@ -302,19 +302,19 @@ 
 	 * @param bool $extend This indicates whether we're checking the extend directory for any register_hooks files/classes
 	 * @return array
 	 */
-	public function register_hooks( $extend = FALSE ) {
+	public function register_hooks($extend = FALSE) {
 
 		//get a list of files in the directory that have the "Hook" in their name an
 
 		//if this is an extended check (i.e. caf is active) then we will scan the caffeinated/extend directory first and any hook files that are found will be have their reference added to the $_files_hook array property.  Then, we make sure that when we loop through the core decaf directories to find hook files that we skip over any hooks files that have already been set by caf.
-		if ( $extend ) {
-			$hook_files_glob_path = apply_filters( 'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path__extend', EE_CORE_CAF_ADMIN_EXTEND . $this->_folder_name . DS . '*' . $this->_file_name . '_Hooks_Extend.class.php' );
-			$this->_hook_paths = $this->_register_hook_files( $hook_files_glob_path, $extend );
+		if ($extend) {
+			$hook_files_glob_path = apply_filters('FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path__extend', EE_CORE_CAF_ADMIN_EXTEND.$this->_folder_name.DS.'*'.$this->_file_name.'_Hooks_Extend.class.php');
+			$this->_hook_paths = $this->_register_hook_files($hook_files_glob_path, $extend);
 		}
 
 		//loop through decaf folders
-		$hook_files_glob_path = apply_filters( 'FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path', $this->_folder_path . '*' . $this->_file_name . '_Hooks.class.php' );
-		$this->_hook_paths = array_merge( $this->_register_hook_files( $hook_files_glob_path ), $this->_hook_paths );  //making sure any extended hook paths are later in the array than the core hook paths!
+		$hook_files_glob_path = apply_filters('FHEE__EE_Admin_Page_Init__register_hooks__hook_files_glob_path', $this->_folder_path.'*'.$this->_file_name.'_Hooks.class.php');
+		$this->_hook_paths = array_merge($this->_register_hook_files($hook_files_glob_path), $this->_hook_paths); //making sure any extended hook paths are later in the array than the core hook paths!
 
 		return $this->_hook_paths;
 
@@ -322,27 +322,27 @@ 
 
 
 
-	protected function _register_hook_files( $hook_files_glob_path, $extend = FALSE ) {
+	protected function _register_hook_files($hook_files_glob_path, $extend = FALSE) {
 		$hook_paths = array();
-		if ( $hook_files = glob( $hook_files_glob_path ) ) {
-			if ( empty( $hook_files ) ) {
+		if ($hook_files = glob($hook_files_glob_path)) {
+			if (empty($hook_files)) {
 				return array();
 			}
-			foreach ( $hook_files as $file ) {
+			foreach ($hook_files as $file) {
 				//lets get the linked admin.
-				$hook_file = $extend ? str_replace( EE_CORE_CAF_ADMIN_EXTEND . $this->_folder_name . DS, '', $file ) : str_replace($this->_folder_path, '', $file );
-				$replace = $extend ? '_' . $this->_file_name . '_Hooks_Extend.class.php' : '_' . $this->_file_name . '_Hooks.class.php';
-				$rel_admin = str_replace( $replace, '', $hook_file);
+				$hook_file = $extend ? str_replace(EE_CORE_CAF_ADMIN_EXTEND.$this->_folder_name.DS, '', $file) : str_replace($this->_folder_path, '', $file);
+				$replace = $extend ? '_'.$this->_file_name.'_Hooks_Extend.class.php' : '_'.$this->_file_name.'_Hooks.class.php';
+				$rel_admin = str_replace($replace, '', $hook_file);
 				$rel_admin = strtolower($rel_admin);
 				$hook_paths[] = $file;
 
 				//make sure we haven't already got a hook setup for this page path
-				if ( in_array( $rel_admin, $this->_files_hooked ) )
+				if (in_array($rel_admin, $this->_files_hooked))
 					continue;
 
 				$this->hook_file = $hook_file;
-				$rel_admin_hook = 'FHEE_do_other_page_hooks_' . $rel_admin;
-				$filter = add_filter( $rel_admin_hook, array($this, 'load_admin_hook') );
+				$rel_admin_hook = 'FHEE_do_other_page_hooks_'.$rel_admin;
+				$filter = add_filter($rel_admin_hook, array($this, 'load_admin_hook'));
 				$this->_files_hooked[] = $rel_admin;
 			}
 		}
@@ -367,7 +367,7 @@ 
 	protected function _initialize_admin_page() {
 
 		//JUST CHECK WE'RE ON RIGHT PAGE.
-		if ( (!isset( $_REQUEST['page'] ) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing )
+		if (( ! isset($_REQUEST['page']) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing)
 			return; //not on the right page so let's get out.
 		$this->_load_page = TRUE;
 
@@ -375,30 +375,30 @@ 
 //		spl_autoload_register(array( $this, 'set_autoloaders') );
 
 		//we don't need to do a page_request check here because it's only called via WP menu system.
-		$admin_page = $this->_file_name . '_Admin_Page';
-		$hook_suffix = $this->_menu_map->menu_slug . '_' . $admin_page;
+		$admin_page = $this->_file_name.'_Admin_Page';
+		$hook_suffix = $this->_menu_map->menu_slug.'_'.$admin_page;
 		$admin_page = apply_filters("FHEE__EE_Admin_Page_Init___initialize_admin_page__admin_page__{$hook_suffix}", $admin_page);
 
 		// define requested admin page class name then load the file and instantiate
-		$path_to_file = str_replace( array( '\\', '/' ), DS, $this->_folder_path . $admin_page . '.core.php' );
-		$path_to_file=apply_filters("FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__{$hook_suffix}",$path_to_file );//so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
+		$path_to_file = str_replace(array('\\', '/'), DS, $this->_folder_path.$admin_page.'.core.php');
+		$path_to_file = apply_filters("FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__{$hook_suffix}", $path_to_file); //so if the file would be in EE_ADMIN/attendees/Attendee_Admin_Page.core.php, the filter would be FHEE__EE_Admin_Page_Init___initialize_admin_page__path_to_file__attendees_Attendee_Admin_Page
 
-		if ( is_readable( $path_to_file )) {
+		if (is_readable($path_to_file)) {
 			// This is a place where EE plugins can hook in to make sure their own files are required in the appropriate place
-			do_action( 'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization' );
-			do_action( 'AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_' . $this->_menu_map->menu_slug );
-			require_once( $path_to_file );
-			$a = new ReflectionClass( $admin_page );
-			$this->_loaded_page_object = $a->newInstance( $this->_routing );
+			do_action('AHEE__EE_Admin_Page___initialize_admin_page__before_initialization');
+			do_action('AHEE__EE_Admin_Page___initialize_admin_page__before_initialization_'.$this->_menu_map->menu_slug);
+			require_once($path_to_file);
+			$a = new ReflectionClass($admin_page);
+			$this->_loaded_page_object = $a->newInstance($this->_routing);
 		}
-		do_action( 'AHEE__EE_Admin_Page___initialize_admin_page__after_initialization' );
-		do_action( 'AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_' . $this->_menu_map->menu_slug );
+		do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization');
+		do_action('AHEE__EE_Admin_Page___initialize_admin_page__after_initialization_'.$this->_menu_map->menu_slug);
 	}
 
 
 
 	public function get_admin_page_name() {
-		return $this->_file_name . '_Admin_Page';
+		return $this->_file_name.'_Admin_Page';
 	}
 
 
@@ -431,8 +431,8 @@ 
 	 * @return bool|die true if pass (or admin) wp_die if fail
 	 */
 	private function _check_user_access() {
-		if ( ! EE_Registry::instance()->CAP->current_user_can( $this->_menu_map->capability, $this->_menu_map->menu_slug ) ) {
-			wp_die( __('You don\'t have access to this page.'), '', array( 'back_link' => true ) );
+		if ( ! EE_Registry::instance()->CAP->current_user_can($this->_menu_map->capability, $this->_menu_map->menu_slug)) {
+			wp_die(__('You don\'t have access to this page.'), '', array('back_link' => true));
 		}
 		return true;
 	}

Braces +22 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -220,7 +222,9 @@ 
 	public function initialize_admin_page() {
 		//let's check user access first
 		$this->_check_user_access();
-		if ( !is_object( $this->_loaded_page_object) ) return;
+		if ( !is_object( $this->_loaded_page_object) ) {
+			return;
+		}
 		$this->_loaded_page_object->route_admin_request();
 		return;
 	}
@@ -232,7 +236,9 @@ 
 
 
 	public function set_page_dependencies($wp_page_slug) {
-		if ( !$this->_load_page ) return;
+		if ( !$this->_load_page ) {
+			return;
+		}
 
 		if ( !is_object($this->_loaded_page_object) ) {
 			$msg[] = __('We can\'t load the page because we\'re missing a valid page object that tells us what to load', 'event_espresso');
@@ -249,8 +255,9 @@ 
 		$this->_loaded_page_object->set_wp_page_slug($wp_page_slug);
 		$page_hook = 'load-' . $wp_page_slug;
 		//hook into page load hook so all page specific stuff get's loaded.
-		if ( !empty($wp_page_slug) )
-			add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies') );
+		if ( !empty($wp_page_slug) ) {
+					add_action($page_hook, array($this->_loaded_page_object, 'load_page_dependencies') );
+		}
 	}
 
 
@@ -283,7 +290,9 @@ 
 			if ( isset( $values['class'] ) && $values['class'] == $class ) {
 				$file_index = $index - 1;
 				$this->_folder_name = basename(dirname($bt[$file_index]['file']) );
-				if ( !empty( $this->_folder_name ) ) break;
+				if ( !empty( $this->_folder_name ) ) {
+					break;
+				}
 			}
 		}
 
@@ -337,8 +346,9 @@ 
 				$hook_paths[] = $file;
 
 				//make sure we haven't already got a hook setup for this page path
-				if ( in_array( $rel_admin, $this->_files_hooked ) )
-					continue;
+				if ( in_array( $rel_admin, $this->_files_hooked ) ) {
+									continue;
+				}
 
 				$this->hook_file = $hook_file;
 				$rel_admin_hook = 'FHEE_do_other_page_hooks_' . $rel_admin;
@@ -367,8 +377,10 @@ 
 	protected function _initialize_admin_page() {
 
 		//JUST CHECK WE'RE ON RIGHT PAGE.
-		if ( (!isset( $_REQUEST['page'] ) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing )
-			return; //not on the right page so let's get out.
+		if ( (!isset( $_REQUEST['page'] ) || $_REQUEST['page'] != $this->_menu_map->menu_slug) && $this->_routing ) {
+					return;
+		}
+		//not on the right page so let's get out.
 		$this->_load_page = TRUE;
 
 		//let's set page specific autoloaders.  Note that this just sets autoloaders for THIS set of admin pages.

Doc Comments +3 added lines, -1 removed lines

@@ -214,7 +214,6 @@ 
 	 *
 	 * @access  public
 	 * @uses   _initialize_admin_page()
-	 * @param  string $dir_name directory name for specific admin_page being loaded.
 	 * @return void
 	 */
 	public function initialize_admin_page() {
@@ -231,6 +230,9 @@ 
 
 
 
+	/**
+	 * @param string $wp_page_slug
+	 */
 	public function set_page_dependencies($wp_page_slug) {
 		if ( !$this->_load_page ) return;