eventespresso / event-espresso-core

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 +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
 
 
 	/**
-	 * @param mixed $min_core_version
+	 * @param string $min_core_version
 	 */
 	public function set_min_core_version( $min_core_version = NULL ) {
 		$this->_min_core_version = $min_core_version;
@@ -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_Module_Request_Router.core.php

Indentation +1 added lines, -1 removed lines

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

Spacing +49 added lines, -49 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -243,7 +243,7 @@
 	 *    get_view
 	 *
 	 * @access    public
-	 * @param $current_route
+	 * @param string $current_route
 	 * @return    string
 	 */
 	public function get_view( $current_route ) {

Braces +3 added lines, -1 removed lines

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

core/EE_Object_Repository.core.php

Spacing +15 added lines, -15 removed lines

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

core/EE_PUE.core.php

Indentation +1 added lines, -1 removed lines

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

Spacing +88 added lines, -88 removed lines

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

Braces +69 added lines, -43 removed lines

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

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
  *