eventespresso / event-espresso-core

core/EE_PUE.core.php

Indentation +420 added lines, -420 removed lines

@@ -17,247 +17,247 @@ 
 {
 
 
-    /**
-     *    class constructor
-     *
-     * @access public
-     */
-    public function __construct()
-    {
+	/**
+	 *    class constructor
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
 //		throw new EE_Error('error');
 
-        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 (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
-            $this->_uxip_hooks();
-        }
-
-
-        $ueip_optin        = EE_Registry::instance()->CFG->core->ee_ueip_optin;
-        $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;
-
-        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';
-        }
-
-        //let's prepare extra stats
-        $extra_stats = array();
-
-        //only collect extra stats if the plugin user has opted in and transient is expired.
-        if (! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
-            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),
-                        '.'
-                    ) . '_'
-                    : '';
-
-
-                //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 (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;
-                }
-
-                //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;
-                }
-                $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;
-                }
-
-                //datetime stuff
-                $dtt_count = get_option('uxip_ee_all_dtts_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;
-                }
-
-                //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;
-                }
-
-                $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;
-                }
-
-                $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;
-                }
-
-                $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);
-            }
-        }
-
-
-        // 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');
-
-            $api_key         = isset(EE_Registry::instance()->NET_CFG->core->site_license_key)
-                ? EE_Registry::instance()->NET_CFG->core->site_license_key
-                : '';
-            //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.
-            $host_server_url = 'https://eventespresso.com';
-
-            //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.
-            //For example:
-            //$plugin_slug['premium']['p'] = 'some-premium-slug';
-            //$plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
-            //The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
-            // so doing something like:
-            //$plugin_slug['premium']['p'] = 'some-premium-slug';
-            //$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'),
-            );
-
-
-            //$options needs to be an array with the included keys as listed.
-            $options = array(
-                //	'optionName' => '', //(optional) - used as the reference for saving update information in the
-                // clients options table.  Will be automatically set if left blank.
-                'apikey'                => $api_key,
-                //(required), you will need to obtain the apikey that the client gets from your site and
-                // then saves in their sites options table (see 'getting an api-key' below)
-                'lang_domain'           => 'event_espresso',
-                //(optional) - put here whatever reference you are using for the localization of your plugin (if it's
-                // localized).  That way strings in this file will be included in the translation for your plugin.
-                'checkPeriod'           => '24',
-                //(optional) - use this parameter to indicate how often you want the client's install to ping your
-                // server for update checks.  The integer indicates hours.  If you don't include this parameter it will
-                // default to 12 hours.
-                'option_key'            => 'site_license_key',
-                //this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
-                // updating your information message whenever this option_key is modified.
-                'options_page_slug'     => 'espresso_general_settings',
-                'plugin_basename'       => EE_PLUGIN_BASENAME,
-                'use_wp_update'         => true,
-                //if TRUE then you want FREE versions of the plugin to be updated from WP
-                'extra_stats'           => $extra_stats,
-                'turn_on_notices_saved' => true,
-            );
-            //initiate the class and start the plugin update engine!
-            new PluginUpdateEngineChecker($host_server_url, $plugin_slug, $options);
-        }
-    }
-
-
-    /**
-     * The purpose of this function is to display information about Event Espresso data collection
-     * and a optin selection for extra data collecting by users.
-     *
-     * @param bool $extra
-     * @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"' : '')
-                 . '>'
-                 . esc_html__('User eXperience Improvement Program (UXIP)', 'event_espresso')
-                 . EEH_Template::get_help_tab_link('organization_logo_info')
-                 . '</h2>';
-            printf(
-                esc_html__(
-                    '%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="https://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">',
-                '</a>',
-                '<br><br>',
-                '<a href="https://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 .= '#UXIP_settings';
-            printf(
-                esc_html__(
-                    '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="https://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">',
-                '</a>',
-                '<a href="' . $settings_url . '" target="_blank">',
-                '</a>'
-            );
-        }
-    }
-
-
-    public 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';
-        ?>
+		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 (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			$this->_uxip_hooks();
+		}
+
+
+		$ueip_optin        = EE_Registry::instance()->CFG->core->ee_ueip_optin;
+		$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;
+
+		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';
+		}
+
+		//let's prepare extra stats
+		$extra_stats = array();
+
+		//only collect extra stats if the plugin user has opted in and transient is expired.
+		if (! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
+			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),
+						'.'
+					) . '_'
+					: '';
+
+
+				//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 (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;
+				}
+
+				//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;
+				}
+				$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;
+				}
+
+				//datetime stuff
+				$dtt_count = get_option('uxip_ee_all_dtts_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;
+				}
+
+				//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;
+				}
+
+				$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;
+				}
+
+				$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;
+				}
+
+				$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);
+			}
+		}
+
+
+		// 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');
+
+			$api_key         = isset(EE_Registry::instance()->NET_CFG->core->site_license_key)
+				? EE_Registry::instance()->NET_CFG->core->site_license_key
+				: '';
+			//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.
+			$host_server_url = 'https://eventespresso.com';
+
+			//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.
+			//For example:
+			//$plugin_slug['premium']['p'] = 'some-premium-slug';
+			//$plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
+			//The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
+			// so doing something like:
+			//$plugin_slug['premium']['p'] = 'some-premium-slug';
+			//$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'),
+			);
+
+
+			//$options needs to be an array with the included keys as listed.
+			$options = array(
+				//	'optionName' => '', //(optional) - used as the reference for saving update information in the
+				// clients options table.  Will be automatically set if left blank.
+				'apikey'                => $api_key,
+				//(required), you will need to obtain the apikey that the client gets from your site and
+				// then saves in their sites options table (see 'getting an api-key' below)
+				'lang_domain'           => 'event_espresso',
+				//(optional) - put here whatever reference you are using for the localization of your plugin (if it's
+				// localized).  That way strings in this file will be included in the translation for your plugin.
+				'checkPeriod'           => '24',
+				//(optional) - use this parameter to indicate how often you want the client's install to ping your
+				// server for update checks.  The integer indicates hours.  If you don't include this parameter it will
+				// default to 12 hours.
+				'option_key'            => 'site_license_key',
+				//this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
+				// updating your information message whenever this option_key is modified.
+				'options_page_slug'     => 'espresso_general_settings',
+				'plugin_basename'       => EE_PLUGIN_BASENAME,
+				'use_wp_update'         => true,
+				//if TRUE then you want FREE versions of the plugin to be updated from WP
+				'extra_stats'           => $extra_stats,
+				'turn_on_notices_saved' => true,
+			);
+			//initiate the class and start the plugin update engine!
+			new PluginUpdateEngineChecker($host_server_url, $plugin_slug, $options);
+		}
+	}
+
+
+	/**
+	 * The purpose of this function is to display information about Event Espresso data collection
+	 * and a optin selection for extra data collecting by users.
+	 *
+	 * @param bool $extra
+	 * @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"' : '')
+				 . '>'
+				 . esc_html__('User eXperience Improvement Program (UXIP)', 'event_espresso')
+				 . EEH_Template::get_help_tab_link('organization_logo_info')
+				 . '</h2>';
+			printf(
+				esc_html__(
+					'%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="https://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">',
+				'</a>',
+				'<br><br>',
+				'<a href="https://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 .= '#UXIP_settings';
+			printf(
+				esc_html__(
+					'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="https://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">',
+				'</a>',
+				'<a href="' . $settings_url . '" target="_blank">',
+				'</a>'
+			);
+		}
+	}
+
+
+	public 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';
+		?>
         <div class="updated data-collect-optin" id="espresso-data-collect-optin-container">
             <div id="data-collect-optin-options-container">
                 <span class="dashicons dashicons-admin-site"></span>
@@ -270,186 +270,186 @@ 
             </div>
         </div>
         <?php
-    }
-
-
-    /**
-     * enqueue scripts/styles needed for data collection optin
-     *
-     * @return void
-     */
-    public 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_enqueue_script('ee-data-optin-js');
-        wp_enqueue_style('ee-data-optin-css');
-    }
-
-
-    /**
-     * This just handles the setting of the selected option for data optin via ajax
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function espresso_data_optin_ajax_handler()
-    {
-
-        //verify nonce
-        if (isset($_POST['nonce']) && ! wp_verify_nonce($_POST['nonce'], 'ee-data-optin')) {
-            exit();
-        }
-
-        //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);
-        exit();
-    }
-
-
-    /**
-     * This is a handy helper method for retrieving whether there is an update available for the given plugin.
-     *
-     * @param  string $basename Use the equivalent result from plugin_basename() for this param as WP uses that to
-     *                          identify plugins. Defaults to core update
-     * @return boolean           True if update available, false if not.
-     */
-    public static function is_update_available($basename = '')
-    {
-
-        $basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
-
-        $update = false;
-
-        // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = DS . dirname($basename);
-
-        $plugins = get_plugins($folder);
-        $current = get_site_transient('update_plugins');
-
-        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)) {
-            $update = true;
-        }
-
-        return $update;
-    }
-
-
-    /**
-     * UXIP TRACKING *******
-     */
-
-
-    /**
-     * This method contains all the hooks into EE for gathering stats that will be reported with the PUE uxip system
-     *
-     * @public
-     * @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'));
-        }
-    }
-
-
-    public function track_active_theme()
-    {
-        //we only check this once a month.
-        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);
-        }
-    }
-
-
-    public function track_event_info()
-    {
-        //we only check this once every couple weeks.
-        if (false === ($transient = get_transient('ee4_event_info_check'))) {
-            //first let's get the number for ALL events
-            /** @var EEM_Event $EVT */
-            $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) {
-                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);
-            }
-
-            //datetimes!
-            $dtt_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);
-            }
-
-            //allticketcount
-            $all_tkt_count = $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);
-            }
-
-            //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);
-            }
-
-            //tktsold
-            $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);
-        }
-    }
+	}
+
+
+	/**
+	 * enqueue scripts/styles needed for data collection optin
+	 *
+	 * @return void
+	 */
+	public 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_enqueue_script('ee-data-optin-js');
+		wp_enqueue_style('ee-data-optin-css');
+	}
+
+
+	/**
+	 * This just handles the setting of the selected option for data optin via ajax
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function espresso_data_optin_ajax_handler()
+	{
+
+		//verify nonce
+		if (isset($_POST['nonce']) && ! wp_verify_nonce($_POST['nonce'], 'ee-data-optin')) {
+			exit();
+		}
+
+		//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);
+		exit();
+	}
+
+
+	/**
+	 * This is a handy helper method for retrieving whether there is an update available for the given plugin.
+	 *
+	 * @param  string $basename Use the equivalent result from plugin_basename() for this param as WP uses that to
+	 *                          identify plugins. Defaults to core update
+	 * @return boolean           True if update available, false if not.
+	 */
+	public static function is_update_available($basename = '')
+	{
+
+		$basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
+
+		$update = false;
+
+		// should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
+		$folder = DS . dirname($basename);
+
+		$plugins = get_plugins($folder);
+		$current = get_site_transient('update_plugins');
+
+		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)) {
+			$update = true;
+		}
+
+		return $update;
+	}
+
+
+	/**
+	 * UXIP TRACKING *******
+	 */
+
+
+	/**
+	 * This method contains all the hooks into EE for gathering stats that will be reported with the PUE uxip system
+	 *
+	 * @public
+	 * @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'));
+		}
+	}
+
+
+	public function track_active_theme()
+	{
+		//we only check this once a month.
+		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);
+		}
+	}
+
+
+	public function track_event_info()
+	{
+		//we only check this once every couple weeks.
+		if (false === ($transient = get_transient('ee4_event_info_check'))) {
+			//first let's get the number for ALL events
+			/** @var EEM_Event $EVT */
+			$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) {
+				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);
+			}
+
+			//datetimes!
+			$dtt_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);
+			}
+
+			//allticketcount
+			$all_tkt_count = $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);
+			}
+
+			//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);
+			}
+
+			//tktsold
+			$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);
+		}
+	}
 
 }

Spacing +35 added lines, -35 removed lines

@@ -29,7 +29,7 @@ 
         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')) {
+        if ( ! defined('MONTH_IN_SECONDS')) {
             define('MONTH_IN_SECONDS', WEEK_IN_SECONDS * 4);
         }
 
@@ -58,7 +58,7 @@ 
         $extra_stats = array();
 
         //only collect extra stats if the plugin user has opted in and transient is expired.
-        if (! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
+        if ( ! empty($espresso_data_optin) && $espresso_data_optin == 'yes') {
             if (false === ($transient = get_transient('ee_extra_data'))
                 && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
             ) {
@@ -68,15 +68,15 @@ 
                     ? 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;
                     }
                 }
 
@@ -86,50 +86,50 @@ 
 
                 //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
@@ -142,10 +142,10 @@ 
 
 
         // 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)
+            $api_key = isset(EE_Registry::instance()->NET_CFG->core->site_license_key)
                 ? EE_Registry::instance()->NET_CFG->core->site_license_key
                 : '';
             //this needs to be the host server where plugin update engine is installed. Note, if you leave this blank
@@ -208,9 +208,9 @@ 
      */
     public static function espresso_data_collection_optin_text($extra = true)
     {
-        if (! $extra) {
+        if ( ! $extra) {
             echo '<h2 class="ee-admin-settings-hdr" '
-                 . (! $extra ? 'id="UXIP_settings"' : '')
+                 . ( ! $extra ? 'id="UXIP_settings"' : '')
                  . '>'
                  . esc_html__('User eXperience Improvement Program (UXIP)', 'event_espresso')
                  . EEH_Template::get_help_tab_link('organization_logo_info')
@@ -241,7 +241,7 @@ 
                 ),
                 '<a href="https://eventespresso.com/about/user-experience-improvement-program-uxip/" target="_blank">',
                 '</a>',
-                '<a href="' . $settings_url . '" target="_blank">',
+                '<a href="'.$settings_url.'" target="_blank">',
                 '</a>'
             );
         }
@@ -282,14 +282,14 @@ 
     {
         wp_register_script(
             'ee-data-optin-js',
-            EE_GLOBAL_ASSETS_URL . 'scripts/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',
+            EE_GLOBAL_ASSETS_URL.'css/ee-data-optin.css',
             array(),
             EVENT_ESPRESSO_VERSION
         );
@@ -337,19 +337,19 @@ 
         $update = false;
 
         // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = DS . dirname($basename);
+        $folder = DS.dirname($basename);
 
         $plugins = get_plugins($folder);
         $current = get_site_transient('update_plugins');
 
-        foreach ((array)$plugins as $plugin_file => $plugin_data) {
+        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;
         }
 

espresso.php

Indentation +192 added lines, -192 removed lines

@@ -38,217 +38,217 @@
  * @since       4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.50.rc.003');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.50.rc.003');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
-        /**
-         *    espresso_load_error_handling
-         *    this function loads EE's class for handling exceptions and errors
-         */
-        function espresso_load_error_handling()
-        {
-            static $error_handling_loaded = false;
-            if ($error_handling_loaded) {
-                return;
-            }
-            // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
-                \EEH_Debug_Tools::instance();
-            }
-            // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once EE_CORE . 'EE_Error.core.php';
-            } else {
-                wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-            }
-            $error_handling_loaded = true;
-        }
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		/**
+		 *    espresso_load_error_handling
+		 *    this function loads EE's class for handling exceptions and errors
+		 */
+		function espresso_load_error_handling()
+		{
+			static $error_handling_loaded = false;
+			if ($error_handling_loaded) {
+				return;
+			}
+			// load debugging tools
+			if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+				require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+				\EEH_Debug_Tools::instance();
+			}
+			// load error handling
+			if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+				require_once EE_CORE . 'EE_Error.core.php';
+			} else {
+				wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+			}
+			$error_handling_loaded = true;
+		}
 
-        /**
-         *    espresso_load_required
-         *    given a class name and path, this function will load that file or throw an exception
-         *
-         * @param    string $classname
-         * @param    string $full_path_to_file
-         * @throws    EE_Error
-         */
-        function espresso_load_required($classname, $full_path_to_file)
-        {
-            if (is_readable($full_path_to_file)) {
-                require_once $full_path_to_file;
-            } else {
-                throw new \EE_Error (
-                    sprintf(
-                        esc_html__(
-                            'The %s class file could not be located or is not readable due to file permissions.',
-                            'event_espresso'
-                        ),
-                        $classname
-                    )
-                );
-            }
-        }
+		/**
+		 *    espresso_load_required
+		 *    given a class name and path, this function will load that file or throw an exception
+		 *
+		 * @param    string $classname
+		 * @param    string $full_path_to_file
+		 * @throws    EE_Error
+		 */
+		function espresso_load_required($classname, $full_path_to_file)
+		{
+			if (is_readable($full_path_to_file)) {
+				require_once $full_path_to_file;
+			} else {
+				throw new \EE_Error (
+					sprintf(
+						esc_html__(
+							'The %s class file could not be located or is not readable due to file permissions.',
+							'event_espresso'
+						),
+						$classname
+					)
+				);
+			}
+		}
 
-        /**
-         * @since 4.9.27
-         * @throws \EE_Error
-         * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-         * @throws \EventEspresso\core\exceptions\InvalidEntityException
-         * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
-         * @throws \EventEspresso\core\exceptions\InvalidClassException
-         * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
-         * @throws \OutOfBoundsException
-         */
-        function bootstrap_espresso()
-        {
-            require_once __DIR__ . '/core/espresso_definitions.php';
-            try {
-                espresso_load_error_handling();
-                espresso_load_required(
-                    'EEH_Base',
-                    EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_Array',
-                    EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
-                );
-                // instantiate and configure PSR4 autoloader
-                espresso_load_required(
-                    'Psr4Autoloader',
-                    EE_CORE . 'Psr4Autoloader.php'
-                );
-                espresso_load_required(
-                    'EE_Psr4AutoloaderInit',
-                    EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
-                );
-                $AutoloaderInit = new EE_Psr4AutoloaderInit();
-                $AutoloaderInit->initializeAutoloader();
-                espresso_load_required(
-                    'EE_Request',
-                    EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
-                );
-                espresso_load_required(
-                    'EE_Response',
-                    EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
-                );
-                espresso_load_required(
-                    'EE_Bootstrap',
-                    EE_CORE . 'EE_Bootstrap.core.php'
-                );
-                // bootstrap EE and the request stack
-                new EE_Bootstrap(
-                    new EE_Request($_GET, $_POST, $_COOKIE),
-                    new EE_Response()
-                );
-            } catch (Exception $e) {
-                require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
-                new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
-            }
-        }
-        bootstrap_espresso();
-    }
+		/**
+		 * @since 4.9.27
+		 * @throws \EE_Error
+		 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+		 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+		 * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
+		 * @throws \EventEspresso\core\exceptions\InvalidClassException
+		 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
+		 * @throws \OutOfBoundsException
+		 */
+		function bootstrap_espresso()
+		{
+			require_once __DIR__ . '/core/espresso_definitions.php';
+			try {
+				espresso_load_error_handling();
+				espresso_load_required(
+					'EEH_Base',
+					EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
+				);
+				espresso_load_required(
+					'EEH_Array',
+					EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
+				);
+				// instantiate and configure PSR4 autoloader
+				espresso_load_required(
+					'Psr4Autoloader',
+					EE_CORE . 'Psr4Autoloader.php'
+				);
+				espresso_load_required(
+					'EE_Psr4AutoloaderInit',
+					EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+				);
+				$AutoloaderInit = new EE_Psr4AutoloaderInit();
+				$AutoloaderInit->initializeAutoloader();
+				espresso_load_required(
+					'EE_Request',
+					EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
+				);
+				espresso_load_required(
+					'EE_Response',
+					EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
+				);
+				espresso_load_required(
+					'EE_Bootstrap',
+					EE_CORE . 'EE_Bootstrap.core.php'
+				);
+				// bootstrap EE and the request stack
+				new EE_Bootstrap(
+					new EE_Request($_GET, $_POST, $_COOKIE),
+					new EE_Response()
+				);
+			} catch (Exception $e) {
+				require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
+				new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
+			}
+		}
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/libraries/form_sections/strategies/display/EE_Submit_Input_Display_Strategy.strategy.php

Indentation +22 added lines, -22 removed lines

@@ -11,8 +11,8 @@ 
  */
 class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base{
 
-    const HTML_TAG_BUTTON = 'button';
-    const HTML_TAG_INPUT = 'input';
+	const HTML_TAG_BUTTON = 'button';
+	const HTML_TAG_INPUT = 'input';
 
 
 	/**
@@ -20,19 +20,19 @@ 
 	 * @return string of html to display the input
 	 */
 	public function display(){
-	    $button_text = $this->_input->html_label_text();
-        $button_text = ! empty($button_text)
-            ? $button_text
-            : $this->_input->raw_value_in_form();
-        $tag = apply_filters(
-          'FHEE__EE_Submit_Input_Display_Strategy__display__submit_input_html_tag',
-          EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON
-        );
-        // verify result is one of the two valid options
-        $tag = $tag === EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON
-               || $tag === EE_Submit_Input_Display_Strategy::HTML_TAG_INPUT
-            ? $tag
-            : EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON;
+		$button_text = $this->_input->html_label_text();
+		$button_text = ! empty($button_text)
+			? $button_text
+			: $this->_input->raw_value_in_form();
+		$tag = apply_filters(
+		  'FHEE__EE_Submit_Input_Display_Strategy__display__submit_input_html_tag',
+		  EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON
+		);
+		// verify result is one of the two valid options
+		$tag = $tag === EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON
+			   || $tag === EE_Submit_Input_Display_Strategy::HTML_TAG_INPUT
+			? $tag
+			: EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON;
 		$html = '<' . $tag . ' type="submit" ';
 		$html .= 'name="' . $this->_input->html_name() . '" ';
 		$html .= 'value="' . $this->_input->raw_value_in_form() . '" ';
@@ -41,13 +41,13 @@ 
 		$html .= 'style="' . $this->_input->html_style() . '" ';
 		$html .= $this->_input->other_html_attributes();
 		if($tag === EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON) {
-            $html .= '>';
-            $html .= $button_text;
-            $html .= '</button>';
-        } else {
-            $html .= '/>';
-        }
-        return $html;
+			$html .= '>';
+			$html .= $button_text;
+			$html .= '</button>';
+		} else {
+			$html .= '/>';
+		}
+		return $html;
 	}
 
 }

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
  * @package       Event Espresso
  * @author        Mike Nelson
  */
-class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base {
 
     const HTML_TAG_BUTTON = 'button';
     const HTML_TAG_INPUT = 'input';
@@ -19,7 +19,7 @@ 
 	 *
 	 * @return string of html to display the input
 	 */
-	public function display(){
+	public function display() {
 	    $button_text = $this->_input->html_label_text();
         $button_text = ! empty($button_text)
             ? $button_text
@@ -33,14 +33,14 @@ 
                || $tag === EE_Submit_Input_Display_Strategy::HTML_TAG_INPUT
             ? $tag
             : EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON;
-		$html = '<' . $tag . ' type="submit" ';
-		$html .= 'name="' . $this->_input->html_name() . '" ';
-		$html .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-		$html .= 'id="' . $this->_input->html_id() . '-submit" ';
-		$html .= 'class="' . $this->_input->html_class() . ' ' . $this->_input->button_css_attributes() . '" ';
-		$html .= 'style="' . $this->_input->html_style() . '" ';
+		$html = '<'.$tag.' type="submit" ';
+		$html .= 'name="'.$this->_input->html_name().'" ';
+		$html .= 'value="'.$this->_input->raw_value_in_form().'" ';
+		$html .= 'id="'.$this->_input->html_id().'-submit" ';
+		$html .= 'class="'.$this->_input->html_class().' '.$this->_input->button_css_attributes().'" ';
+		$html .= 'style="'.$this->_input->html_style().'" ';
 		$html .= $this->_input->other_html_attributes();
-		if($tag === EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON) {
+		if ($tag === EE_Submit_Input_Display_Strategy::HTML_TAG_BUTTON) {
             $html .= '>';
             $html .= $button_text;
             $html .= '</button>';