eventespresso / event-espresso-core

core/services/request/middleware/RecommendedVersions.php

Spacing +5 added lines, -5 removed lines

@@ -32,18 +32,18 @@ 
         $this->request = $request;
         $this->response = $response;
         // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
+        if ( ! $this->minimumWordPressVersionRequired()) {
             $this->request->unSetRequestParam('activate', true);
             add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
             $this->response->terminateRequest();
             $this->response->deactivatePlugin();
         }
         // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
+        if ( ! $this->minimumPhpVersionRecommended()) {
             $this->displayMinimumRecommendedPhpVersionNotice();
         }
         // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
+        if ( ! $this->upcomingRequiredPhpVersion()) {
             $this->displayUpcomingRequiredVersion();
         }
         $this->response = $this->processRequestStack($this->request, $this->response);
@@ -142,7 +142,7 @@ 
     {
         if ($this->request->isAdmin()) {
             new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+                'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
                 sprintf(
                     esc_html__(
                         'Event Espresso recommends PHP version %1$s or greater for optimal performance. 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.',
@@ -180,7 +180,7 @@ 
             && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
             && current_user_can('update_plugins')
         ) {
-            add_action('admin_notices', function () {
+            add_action('admin_notices', function() {
                 echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
                      . sprintf(
                          esc_html__(

Indentation +173 added lines, -173 removed lines

@@ -19,183 +19,183 @@
 class RecommendedVersions extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidDataTypeException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
-            $this->request->unSetRequestParam('activate', true);
-            add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
-            $this->response->terminateRequest();
-            $this->response->deactivatePlugin();
-        }
-        // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
-            $this->displayMinimumRecommendedPhpVersionNotice();
-        }
-        // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
-            $this->displayUpcomingRequiredVersion();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
-     * against) so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            // first account for wp_version being pre-release
-            // (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
-            strpos($wp_version, '-') > 0
-                ? substr($wp_version, 0, strpos($wp_version, '-'))
-                : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumWordPressVersionRequired()
-    {
-        return RecommendedVersions::compareWordPressVersion();
-    }
-
-
-    /**
-     * @param string $min_version
-     * @return boolean
-     */
-    private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumPhpVersionRecommended()
-    {
-        return $this->checkPhpVersion();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function minimumWpVersionError()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// check required WP version
+		if (! $this->minimumWordPressVersionRequired()) {
+			$this->request->unSetRequestParam('activate', true);
+			add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
+			$this->response->terminateRequest();
+			$this->response->deactivatePlugin();
+		}
+		// check recommended PHP version
+		if (! $this->minimumPhpVersionRecommended()) {
+			$this->displayMinimumRecommendedPhpVersionNotice();
+		}
+		// upcoming required version
+		if (! $this->upcomingRequiredPhpVersion()) {
+			$this->displayUpcomingRequiredVersion();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
+	 * against) so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			// first account for wp_version being pre-release
+			// (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
+			strpos($wp_version, '-') > 0
+				? substr($wp_version, 0, strpos($wp_version, '-'))
+				: $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumWordPressVersionRequired()
+	{
+		return RecommendedVersions::compareWordPressVersion();
+	}
+
+
+	/**
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumPhpVersionRecommended()
+	{
+		return $this->checkPhpVersion();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function minimumWpVersionError()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                    __(
-                        'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_WP_VER_REQUIRED,
-                    $wp_version,
-                    '<br/>',
-                    '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+					__(
+						'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_WP_VER_REQUIRED,
+					$wp_version,
+					'<br/>',
+					'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function displayMinimumRecommendedPhpVersionNotice()
-    {
-        if ($this->request->isAdmin()) {
-            new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-                sprintf(
-                    esc_html__(
-                        'Event Espresso recommends PHP version %1$s or greater for optimal performance. 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_RECOMMENDED,
-                    PHP_VERSION,
-                    '<br/>',
-                    '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns whether the provided php version number is less than the current version of php installed on the server.
-     *
-     * @param string $version_required
-     * @return bool
-     */
-    private function upcomingRequiredPhpVersion($version_required = '5.5')
-    {
-        return true;
-        // return $this->checkPhpVersion($version_required);
-    }
-
-
-    /**
-     *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
-     */
-    private function displayUpcomingRequiredVersion()
-    {
-        if (
-            $this->request->isAdmin()
-            && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
-            && current_user_can('update_plugins')
-        ) {
-            add_action('admin_notices', function () {
-                echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
-                     . sprintf(
-                         esc_html__(
-                             'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
-                             'event_espresso'
-                         ),
-                         '<strong>',
-                         '</strong>',
-                         PHP_VERSION,
-                         '<a href="https://wordpress.org/support/upgrade-php/">',
-                         '</a>'
-                     )
-                     . '</p></div>';
-            });
-        }
-    }
+	}
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function displayMinimumRecommendedPhpVersionNotice()
+	{
+		if ($this->request->isAdmin()) {
+			new PersistentAdminNotice(
+				'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+				sprintf(
+					esc_html__(
+						'Event Espresso recommends PHP version %1$s or greater for optimal performance. 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_RECOMMENDED,
+					PHP_VERSION,
+					'<br/>',
+					'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns whether the provided php version number is less than the current version of php installed on the server.
+	 *
+	 * @param string $version_required
+	 * @return bool
+	 */
+	private function upcomingRequiredPhpVersion($version_required = '5.5')
+	{
+		return true;
+		// return $this->checkPhpVersion($version_required);
+	}
+
+
+	/**
+	 *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
+	 */
+	private function displayUpcomingRequiredVersion()
+	{
+		if (
+			$this->request->isAdmin()
+			&& apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
+			&& current_user_can('update_plugins')
+		) {
+			add_action('admin_notices', function () {
+				echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
+					 . sprintf(
+						 esc_html__(
+							 'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
+							 'event_espresso'
+						 ),
+						 '<strong>',
+						 '</strong>',
+						 PHP_VERSION,
+						 '<a href="https://wordpress.org/support/upgrade-php/">',
+						 '</a>'
+					 )
+					 . '</p></div>';
+			});
+		}
+	}
 }

modules/single_page_checkout/reg_steps/attendee_information/privacy_consent.template.php

Spacing +1 added lines, -1 removed lines

@@ -3,4 +3,4 @@
  * @var EE_Checkbox_Multi_Input $input
  */
 ?>
-<div class="ee-privacy-consent-assertion"><?php echo $input->get_html_for_input();?></div>
+<div class="ee-privacy-consent-assertion"><?php echo $input->get_html_for_input(); ?></div>

core/libraries/form_sections/strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php

Indentation +52 added lines, -52 removed lines

@@ -14,62 +14,62 @@
 class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = sprintf(
-                __('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
-                '<br />',
-                $this->get_list_of_allowed_tags()
-            );
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = sprintf(
+				__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
+				'<br />',
+				$this->get_list_of_allowed_tags()
+			);
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
-    /**
-     * get_list_of_allowed_tags
-     *
-     * generates and returns a string that lists the top-level HTML tags that are allowable for this input
-     *
-     * @return string
-     */
-    public function get_list_of_allowed_tags()
-    {
-        $tags_we_allow = $this->getAllowedTags();
-        ksort($tags_we_allow);
-        return implode(', ', array_keys($tags_we_allow));
-    }
+	/**
+	 * get_list_of_allowed_tags
+	 *
+	 * generates and returns a string that lists the top-level HTML tags that are allowable for this input
+	 *
+	 * @return string
+	 */
+	public function get_list_of_allowed_tags()
+	{
+		$tags_we_allow = $this->getAllowedTags();
+		ksort($tags_we_allow);
+		return implode(', ', array_keys($tags_we_allow));
+	}
 
 
-    /**
-     * Returns an array whose keys are allowed tags and values are an array of allowed attributes
-     *
-     * @return array
-     */
-    protected function getAllowedTags()
-    {
-        global $allowedposttags;
-        return array_merge_recursive(
-            $allowedposttags,
-            EEH_HTML::get_simple_tags()
-        );
-    }
+	/**
+	 * Returns an array whose keys are allowed tags and values are an array of allowed attributes
+	 *
+	 * @return array
+	 */
+	protected function getAllowedTags()
+	{
+		global $allowedposttags;
+		return array_merge_recursive(
+			$allowedposttags,
+			EEH_HTML::get_simple_tags()
+		);
+	}
 
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        parent::validate($normalized_value);
-        $normalized_value_sans_tags = wp_kses("$normalized_value", $this->getAllowedTags());
-        if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $this->getAllowedTags());
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = sprintf(
                 __('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
                 '<br />',

core/EE_Cron_Tasks.core.php

Spacing +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
      */
     public static function instance()
     {
-        if (! self::$_instance instanceof EE_Cron_Tasks) {
+        if ( ! self::$_instance instanceof EE_Cron_Tasks) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -71,7 +71,7 @@ 
              */
             add_action(
                 'AHEE__EE_System__load_core_configuration__complete',
-                function () {
+                function() {
                     EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request = true;
                     EE_Registry::instance()->NET_CFG->update_config(true, false);
                     add_option('ee_disabled_wp_cron_check', 1, '', false);
@@ -123,16 +123,16 @@ 
             'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
         );
         $crons = (array) get_option('cron');
-        if (! is_array($crons)) {
+        if ( ! is_array($crons)) {
             return;
         }
         foreach ($crons as $timestamp => $cron) {
             /** @var array[] $cron */
             foreach ($ee_crons as $ee_cron) {
-                if (isset($cron[ $ee_cron ]) && is_array($cron[ $ee_cron ])) {
+                if (isset($cron[$ee_cron]) && is_array($cron[$ee_cron])) {
                     do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
-                    foreach ($cron[ $ee_cron ] as $ee_cron_details) {
-                        if (! empty($ee_cron_details['args'])) {
+                    foreach ($cron[$ee_cron] as $ee_cron_details) {
+                        if ( ! empty($ee_cron_details['args'])) {
                             do_action(
                                 'AHEE_log',
                                 __CLASS__,
@@ -159,7 +159,7 @@ 
      */
     public static function reschedule_cron_for_transactions_if_maintenance_mode($cron_task, array $TXN_IDs)
     {
-        if (! method_exists('EE_Cron_Tasks', $cron_task)) {
+        if ( ! method_exists('EE_Cron_Tasks', $cron_task)) {
             throw new DomainException(
                 sprintf(
                     __('"%1$s" is not valid method on EE_Cron_Tasks.', 'event_espresso'),
@@ -168,7 +168,7 @@ 
             );
         }
         // reschedule the cron if we can't hit the db right now
-        if (! EE_Maintenance_Mode::instance()->models_can_query()) {
+        if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
             foreach ($TXN_IDs as $TXN_ID => $additional_vars) {
                 // ensure $additional_vars is an array
                 $additional_vars = is_array($additional_vars) ? $additional_vars : array($additional_vars);
@@ -249,7 +249,7 @@ 
     {
         do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
         if (absint($TXN_ID)) {
-            self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+            self::$_update_transactions_with_payment[$TXN_ID] = $PAY_ID;
             add_action(
                 'shutdown',
                 array('EE_Cron_Tasks', 'update_transaction_with_payment'),
@@ -295,7 +295,7 @@ 
         EE_Registry::instance()->load_model('Transaction');
         foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
             // reschedule the cron if we can't hit the db right now
-            if (! EE_Maintenance_Mode::instance()->models_can_query()) {
+            if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
                 // reset cron job for updating the TXN
                 EE_Cron_Tasks::schedule_update_transaction_with_payment(
                     time() + EE_Cron_Tasks::reschedule_timeout,
@@ -311,7 +311,7 @@ 
                 // now try to update the TXN with any payments
                 $payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
             }
-            unset(self::$_update_transactions_with_payment[ $TXN_ID ]);
+            unset(self::$_update_transactions_with_payment[$TXN_ID]);
         }
     }
 
@@ -372,7 +372,7 @@ 
     public static function expired_transaction_check($TXN_ID = 0)
     {
         if (absint($TXN_ID)) {
-            self::$_expired_transactions[ $TXN_ID ] = $TXN_ID;
+            self::$_expired_transactions[$TXN_ID] = $TXN_ID;
             add_action(
                 'shutdown',
                 array('EE_Cron_Tasks', 'process_expired_transactions'),
@@ -486,7 +486,7 @@ 
                         break;
                 }
             }
-            unset(self::$_expired_transactions[ $TXN_ID ]);
+            unset(self::$_expired_transactions[$TXN_ID]);
         }
     }
 
@@ -533,7 +533,7 @@ 
             $reg_config = LoaderFactory::getLoader()->load('EE_Registration_Config');
             $time_diff_for_comparison = apply_filters(
                 'FHEE__EE_Cron_Tasks__clean_out_old_gateway_logs__time_diff_for_comparison',
-                '-' . $reg_config->gateway_log_lifespan
+                '-'.$reg_config->gateway_log_lifespan
             );
             EEM_Change_Log::instance()->delete_gateway_logs_older_than(new DateTime($time_diff_for_comparison));
         }

Indentation +600 added lines, -600 removed lines

@@ -15,607 +15,607 @@
 class EE_Cron_Tasks extends EE_Base
 {
 
-    /**
-     * WordPress doesn't allow duplicate crons within 10 minutes of the original,
-     * so we'll set our retry time for just over 10 minutes to avoid that
-     */
-    const reschedule_timeout = 605;
-
-
-    /**
-     * @var EE_Cron_Tasks
-     */
-    private static $_instance;
-
-
-    /**
-     * @return EE_Cron_Tasks
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function instance()
-    {
-        if (! self::$_instance instanceof EE_Cron_Tasks) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * @access private
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function __construct()
-    {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__);
-        // verify that WP Cron is enabled
-        if (
-            defined('DISABLE_WP_CRON')
-            && DISABLE_WP_CRON
-            && is_admin()
-            && ! get_option('ee_disabled_wp_cron_check')
-        ) {
-            /**
-             * This needs to be delayed until after the config is loaded because EE_Cron_Tasks is constructed before
-             * config is loaded.
-             * This is intentionally using a anonymous function so that its not easily de-registered.  Client code
-             * wanting to not have this functionality can just register its own action at a priority after this one to
-             * reverse any changes.
-             */
-            add_action(
-                'AHEE__EE_System__load_core_configuration__complete',
-                function () {
-                    EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request = true;
-                    EE_Registry::instance()->NET_CFG->update_config(true, false);
-                    add_option('ee_disabled_wp_cron_check', 1, '', false);
-                }
-            );
-        }
-        // UPDATE TRANSACTION WITH PAYMENT
-        add_action(
-            'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-            array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
-            10,
-            2
-        );
-        // ABANDONED / EXPIRED TRANSACTION CHECK
-        add_action(
-            'AHEE__EE_Cron_Tasks__expired_transaction_check',
-            array('EE_Cron_Tasks', 'expired_transaction_check'),
-            10,
-            1
-        );
-        // CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
-        add_action(
-            'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-            array('EE_Cron_Tasks', 'clean_out_junk_transactions')
-        );
-        // logging
-        add_action(
-            'AHEE__EE_System__load_core_configuration__complete',
-            array('EE_Cron_Tasks', 'log_scheduled_ee_crons')
-        );
-        EE_Registry::instance()->load_lib('Messages_Scheduler');
-        // clean out old gateway logs
-        add_action(
-            'AHEE_EE_Cron_Tasks__clean_out_old_gateway_logs',
-            array('EE_Cron_Tasks', 'clean_out_old_gateway_logs')
-        );
-    }
-
-
-    /**
-     * @access protected
-     * @return void
-     */
-    public static function log_scheduled_ee_crons()
-    {
-        $ee_crons = array(
-            'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
-            'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-            'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-        );
-        $crons = (array) get_option('cron');
-        if (! is_array($crons)) {
-            return;
-        }
-        foreach ($crons as $timestamp => $cron) {
-            /** @var array[] $cron */
-            foreach ($ee_crons as $ee_cron) {
-                if (isset($cron[ $ee_cron ]) && is_array($cron[ $ee_cron ])) {
-                    do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
-                    foreach ($cron[ $ee_cron ] as $ee_cron_details) {
-                        if (! empty($ee_cron_details['args'])) {
-                            do_action(
-                                'AHEE_log',
-                                __CLASS__,
-                                __FUNCTION__,
-                                print_r($ee_cron_details['args'], true),
-                                "{$ee_cron} args"
-                            );
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * reschedule_cron_for_transactions_if_maintenance_mode
-     * if Maintenance Mode is active, this will reschedule a cron to run again in 10 minutes
-     *
-     * @param string $cron_task
-     * @param array  $TXN_IDs
-     * @return bool
-     * @throws DomainException
-     */
-    public static function reschedule_cron_for_transactions_if_maintenance_mode($cron_task, array $TXN_IDs)
-    {
-        if (! method_exists('EE_Cron_Tasks', $cron_task)) {
-            throw new DomainException(
-                sprintf(
-                    __('"%1$s" is not valid method on EE_Cron_Tasks.', 'event_espresso'),
-                    $cron_task
-                )
-            );
-        }
-        // reschedule the cron if we can't hit the db right now
-        if (! EE_Maintenance_Mode::instance()->models_can_query()) {
-            foreach ($TXN_IDs as $TXN_ID => $additional_vars) {
-                // ensure $additional_vars is an array
-                $additional_vars = is_array($additional_vars) ? $additional_vars : array($additional_vars);
-                // reset cron job for the TXN
-                call_user_func_array(
-                    array('EE_Cron_Tasks', $cron_task),
-                    array_merge(
-                        array(
-                            time() + (10 * MINUTE_IN_SECONDS),
-                            $TXN_ID,
-                        ),
-                        $additional_vars
-                    )
-                );
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-
-
-    /****************  UPDATE TRANSACTION WITH PAYMENT ****************/
-
-
-    /**
-     * array of TXN IDs and the payment
-     *
-     * @var array
-     */
-    protected static $_update_transactions_with_payment = array();
-
-
-    /**
-     * schedule_update_transaction_with_payment
-     * sets a wp_schedule_single_event() for updating any TXNs that may
-     * require updating due to recently received payments
-     *
-     * @param int $timestamp
-     * @param int $TXN_ID
-     * @param int $PAY_ID
-     */
-    public static function schedule_update_transaction_with_payment(
-        $timestamp,
-        $TXN_ID,
-        $PAY_ID
-    ) {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__);
-        // validate $TXN_ID and $timestamp
-        $TXN_ID = absint($TXN_ID);
-        $timestamp = absint($timestamp);
-        if ($TXN_ID && $timestamp) {
-            wp_schedule_single_event(
-                $timestamp,
-                'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-                array($TXN_ID, $PAY_ID)
-            );
-        }
-    }
-
-
-    /**
-     * setup_update_for_transaction_with_payment
-     * this is the callback for the action hook:
-     * 'AHEE__EE_Cron_Tasks__update_transaction_with_payment'
-     * which is setup by EE_Cron_Tasks::schedule_update_transaction_with_payment().
-     * The passed TXN_ID and associated payment gets added to an array, and then
-     * the EE_Cron_Tasks::update_transaction_with_payment() function is hooked into
-     * 'shutdown' which will actually handle the processing of any
-     * transactions requiring updating, because doing so now would be too early
-     * and the required resources may not be available
-     *
-     * @param int $TXN_ID
-     * @param int $PAY_ID
-     */
-    public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $PAY_ID = 0)
-    {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
-        if (absint($TXN_ID)) {
-            self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
-            add_action(
-                'shutdown',
-                array('EE_Cron_Tasks', 'update_transaction_with_payment'),
-                5
-            );
-        }
-    }
-
-
-    /**
-     * update_transaction_with_payment
-     * loops through the self::$_abandoned_transactions array
-     * and attempts to finalize any TXNs that have not been completed
-     * but have had their sessions expired, most likely due to a user not
-     * returning from an off-site payment gateway
-     *
-     * @throws EE_Error
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public static function update_transaction_with_payment()
-    {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__);
-        if (
+	/**
+	 * WordPress doesn't allow duplicate crons within 10 minutes of the original,
+	 * so we'll set our retry time for just over 10 minutes to avoid that
+	 */
+	const reschedule_timeout = 605;
+
+
+	/**
+	 * @var EE_Cron_Tasks
+	 */
+	private static $_instance;
+
+
+	/**
+	 * @return EE_Cron_Tasks
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function instance()
+	{
+		if (! self::$_instance instanceof EE_Cron_Tasks) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * @access private
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function __construct()
+	{
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
+		// verify that WP Cron is enabled
+		if (
+			defined('DISABLE_WP_CRON')
+			&& DISABLE_WP_CRON
+			&& is_admin()
+			&& ! get_option('ee_disabled_wp_cron_check')
+		) {
+			/**
+			 * This needs to be delayed until after the config is loaded because EE_Cron_Tasks is constructed before
+			 * config is loaded.
+			 * This is intentionally using a anonymous function so that its not easily de-registered.  Client code
+			 * wanting to not have this functionality can just register its own action at a priority after this one to
+			 * reverse any changes.
+			 */
+			add_action(
+				'AHEE__EE_System__load_core_configuration__complete',
+				function () {
+					EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request = true;
+					EE_Registry::instance()->NET_CFG->update_config(true, false);
+					add_option('ee_disabled_wp_cron_check', 1, '', false);
+				}
+			);
+		}
+		// UPDATE TRANSACTION WITH PAYMENT
+		add_action(
+			'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
+			array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
+			10,
+			2
+		);
+		// ABANDONED / EXPIRED TRANSACTION CHECK
+		add_action(
+			'AHEE__EE_Cron_Tasks__expired_transaction_check',
+			array('EE_Cron_Tasks', 'expired_transaction_check'),
+			10,
+			1
+		);
+		// CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
+		add_action(
+			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
+			array('EE_Cron_Tasks', 'clean_out_junk_transactions')
+		);
+		// logging
+		add_action(
+			'AHEE__EE_System__load_core_configuration__complete',
+			array('EE_Cron_Tasks', 'log_scheduled_ee_crons')
+		);
+		EE_Registry::instance()->load_lib('Messages_Scheduler');
+		// clean out old gateway logs
+		add_action(
+			'AHEE_EE_Cron_Tasks__clean_out_old_gateway_logs',
+			array('EE_Cron_Tasks', 'clean_out_old_gateway_logs')
+		);
+	}
+
+
+	/**
+	 * @access protected
+	 * @return void
+	 */
+	public static function log_scheduled_ee_crons()
+	{
+		$ee_crons = array(
+			'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
+			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
+			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
+		);
+		$crons = (array) get_option('cron');
+		if (! is_array($crons)) {
+			return;
+		}
+		foreach ($crons as $timestamp => $cron) {
+			/** @var array[] $cron */
+			foreach ($ee_crons as $ee_cron) {
+				if (isset($cron[ $ee_cron ]) && is_array($cron[ $ee_cron ])) {
+					do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
+					foreach ($cron[ $ee_cron ] as $ee_cron_details) {
+						if (! empty($ee_cron_details['args'])) {
+							do_action(
+								'AHEE_log',
+								__CLASS__,
+								__FUNCTION__,
+								print_r($ee_cron_details['args'], true),
+								"{$ee_cron} args"
+							);
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * reschedule_cron_for_transactions_if_maintenance_mode
+	 * if Maintenance Mode is active, this will reschedule a cron to run again in 10 minutes
+	 *
+	 * @param string $cron_task
+	 * @param array  $TXN_IDs
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public static function reschedule_cron_for_transactions_if_maintenance_mode($cron_task, array $TXN_IDs)
+	{
+		if (! method_exists('EE_Cron_Tasks', $cron_task)) {
+			throw new DomainException(
+				sprintf(
+					__('"%1$s" is not valid method on EE_Cron_Tasks.', 'event_espresso'),
+					$cron_task
+				)
+			);
+		}
+		// reschedule the cron if we can't hit the db right now
+		if (! EE_Maintenance_Mode::instance()->models_can_query()) {
+			foreach ($TXN_IDs as $TXN_ID => $additional_vars) {
+				// ensure $additional_vars is an array
+				$additional_vars = is_array($additional_vars) ? $additional_vars : array($additional_vars);
+				// reset cron job for the TXN
+				call_user_func_array(
+					array('EE_Cron_Tasks', $cron_task),
+					array_merge(
+						array(
+							time() + (10 * MINUTE_IN_SECONDS),
+							$TXN_ID,
+						),
+						$additional_vars
+					)
+				);
+			}
+			return true;
+		}
+		return false;
+	}
+
+
+
+
+	/****************  UPDATE TRANSACTION WITH PAYMENT ****************/
+
+
+	/**
+	 * array of TXN IDs and the payment
+	 *
+	 * @var array
+	 */
+	protected static $_update_transactions_with_payment = array();
+
+
+	/**
+	 * schedule_update_transaction_with_payment
+	 * sets a wp_schedule_single_event() for updating any TXNs that may
+	 * require updating due to recently received payments
+	 *
+	 * @param int $timestamp
+	 * @param int $TXN_ID
+	 * @param int $PAY_ID
+	 */
+	public static function schedule_update_transaction_with_payment(
+		$timestamp,
+		$TXN_ID,
+		$PAY_ID
+	) {
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
+		// validate $TXN_ID and $timestamp
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
+			wp_schedule_single_event(
+				$timestamp,
+				'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
+				array($TXN_ID, $PAY_ID)
+			);
+		}
+	}
+
+
+	/**
+	 * setup_update_for_transaction_with_payment
+	 * this is the callback for the action hook:
+	 * 'AHEE__EE_Cron_Tasks__update_transaction_with_payment'
+	 * which is setup by EE_Cron_Tasks::schedule_update_transaction_with_payment().
+	 * The passed TXN_ID and associated payment gets added to an array, and then
+	 * the EE_Cron_Tasks::update_transaction_with_payment() function is hooked into
+	 * 'shutdown' which will actually handle the processing of any
+	 * transactions requiring updating, because doing so now would be too early
+	 * and the required resources may not be available
+	 *
+	 * @param int $TXN_ID
+	 * @param int $PAY_ID
+	 */
+	public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $PAY_ID = 0)
+	{
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+			add_action(
+				'shutdown',
+				array('EE_Cron_Tasks', 'update_transaction_with_payment'),
+				5
+			);
+		}
+	}
+
+
+	/**
+	 * update_transaction_with_payment
+	 * loops through the self::$_abandoned_transactions array
+	 * and attempts to finalize any TXNs that have not been completed
+	 * but have had their sessions expired, most likely due to a user not
+	 * returning from an off-site payment gateway
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public static function update_transaction_with_payment()
+	{
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
+		if (
 // are there any TXNs that need cleaning up ?
-            empty(self::$_update_transactions_with_payment)
-            // reschedule the cron if we can't hit the db right now
-            || EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
-                'schedule_update_transaction_with_payment',
-                self::$_update_transactions_with_payment
-            )
-        ) {
-            return;
-        }
-        /** @type EE_Payment_Processor $payment_processor */
-        $payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
-        // set revisit flag for payment processor
-        $payment_processor->set_revisit();
-        // load EEM_Transaction
-        EE_Registry::instance()->load_model('Transaction');
-        foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
-            // reschedule the cron if we can't hit the db right now
-            if (! EE_Maintenance_Mode::instance()->models_can_query()) {
-                // reset cron job for updating the TXN
-                EE_Cron_Tasks::schedule_update_transaction_with_payment(
-                    time() + EE_Cron_Tasks::reschedule_timeout,
-                    $TXN_ID,
-                    $PAY_ID
-                );
-                continue;
-            }
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
-            $payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
-            // verify transaction
-            if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
-                // now try to update the TXN with any payments
-                $payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
-            }
-            unset(self::$_update_transactions_with_payment[ $TXN_ID ]);
-        }
-    }
-
-
-
-    /************  END OF UPDATE TRANSACTION WITH PAYMENT  ************/
-
-
-    /*****************  EXPIRED TRANSACTION CHECK *****************/
-
-
-    /**
-     * array of TXN IDs
-     *
-     * @var array
-     */
-    protected static $_expired_transactions = array();
-
-
-    /**
-     * schedule_expired_transaction_check
-     * sets a wp_schedule_single_event() for following up on TXNs after their session has expired
-     *
-     * @param int $timestamp
-     * @param int $TXN_ID
-     */
-    public static function schedule_expired_transaction_check(
-        $timestamp,
-        $TXN_ID
-    ) {
-        // validate $TXN_ID and $timestamp
-        $TXN_ID = absint($TXN_ID);
-        $timestamp = absint($timestamp);
-        if ($TXN_ID && $timestamp) {
-            wp_schedule_single_event(
-                $timestamp,
-                'AHEE__EE_Cron_Tasks__expired_transaction_check',
-                array($TXN_ID)
-            );
-        }
-    }
-
-
-    /**
-     * expired_transaction_check
-     * this is the callback for the action hook:
-     * 'AHEE__EE_Cron_Tasks__transaction_session_expiration_check'
-     * which is utilized by wp_schedule_single_event()
-     * in \EED_Single_Page_Checkout::_initialize_transaction().
-     * The passed TXN_ID gets added to an array, and then the
-     * process_expired_transactions() function is hooked into
-     * 'AHEE__EE_System__core_loaded_and_ready' which will actually handle the
-     * processing of any failed transactions, because doing so now would be
-     * too early and the required resources may not be available
-     *
-     * @param int $TXN_ID
-     */
-    public static function expired_transaction_check($TXN_ID = 0)
-    {
-        if (absint($TXN_ID)) {
-            self::$_expired_transactions[ $TXN_ID ] = $TXN_ID;
-            add_action(
-                'shutdown',
-                array('EE_Cron_Tasks', 'process_expired_transactions'),
-                5
-            );
-        }
-    }
-
-
-    /**
-     * process_expired_transactions
-     * loops through the self::$_expired_transactions array and processes any failed TXNs
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws DomainException
-     * @throws RuntimeException
-     */
-    public static function process_expired_transactions()
-    {
-        if (
+			empty(self::$_update_transactions_with_payment)
+			// reschedule the cron if we can't hit the db right now
+			|| EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
+				'schedule_update_transaction_with_payment',
+				self::$_update_transactions_with_payment
+			)
+		) {
+			return;
+		}
+		/** @type EE_Payment_Processor $payment_processor */
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		// set revisit flag for payment processor
+		$payment_processor->set_revisit();
+		// load EEM_Transaction
+		EE_Registry::instance()->load_model('Transaction');
+		foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
+			// reschedule the cron if we can't hit the db right now
+			if (! EE_Maintenance_Mode::instance()->models_can_query()) {
+				// reset cron job for updating the TXN
+				EE_Cron_Tasks::schedule_update_transaction_with_payment(
+					time() + EE_Cron_Tasks::reschedule_timeout,
+					$TXN_ID,
+					$PAY_ID
+				);
+				continue;
+			}
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+			$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
+			// verify transaction
+			if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
+				// now try to update the TXN with any payments
+				$payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
+			}
+			unset(self::$_update_transactions_with_payment[ $TXN_ID ]);
+		}
+	}
+
+
+
+	/************  END OF UPDATE TRANSACTION WITH PAYMENT  ************/
+
+
+	/*****************  EXPIRED TRANSACTION CHECK *****************/
+
+
+	/**
+	 * array of TXN IDs
+	 *
+	 * @var array
+	 */
+	protected static $_expired_transactions = array();
+
+
+	/**
+	 * schedule_expired_transaction_check
+	 * sets a wp_schedule_single_event() for following up on TXNs after their session has expired
+	 *
+	 * @param int $timestamp
+	 * @param int $TXN_ID
+	 */
+	public static function schedule_expired_transaction_check(
+		$timestamp,
+		$TXN_ID
+	) {
+		// validate $TXN_ID and $timestamp
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
+			wp_schedule_single_event(
+				$timestamp,
+				'AHEE__EE_Cron_Tasks__expired_transaction_check',
+				array($TXN_ID)
+			);
+		}
+	}
+
+
+	/**
+	 * expired_transaction_check
+	 * this is the callback for the action hook:
+	 * 'AHEE__EE_Cron_Tasks__transaction_session_expiration_check'
+	 * which is utilized by wp_schedule_single_event()
+	 * in \EED_Single_Page_Checkout::_initialize_transaction().
+	 * The passed TXN_ID gets added to an array, and then the
+	 * process_expired_transactions() function is hooked into
+	 * 'AHEE__EE_System__core_loaded_and_ready' which will actually handle the
+	 * processing of any failed transactions, because doing so now would be
+	 * too early and the required resources may not be available
+	 *
+	 * @param int $TXN_ID
+	 */
+	public static function expired_transaction_check($TXN_ID = 0)
+	{
+		if (absint($TXN_ID)) {
+			self::$_expired_transactions[ $TXN_ID ] = $TXN_ID;
+			add_action(
+				'shutdown',
+				array('EE_Cron_Tasks', 'process_expired_transactions'),
+				5
+			);
+		}
+	}
+
+
+	/**
+	 * process_expired_transactions
+	 * loops through the self::$_expired_transactions array and processes any failed TXNs
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws DomainException
+	 * @throws RuntimeException
+	 */
+	public static function process_expired_transactions()
+	{
+		if (
 // are there any TXNs that need cleaning up ?
-            empty(self::$_expired_transactions)
-            // reschedule the cron if we can't hit the db right now
-            || EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
-                'schedule_expired_transaction_check',
-                self::$_expired_transactions
-            )
-        ) {
-            return;
-        }
-        /** @type EE_Transaction_Processor $transaction_processor */
-        $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
-        // set revisit flag for txn processor
-        $transaction_processor->set_revisit();
-        // load EEM_Transaction
-        EE_Registry::instance()->load_model('Transaction');
-        foreach (self::$_expired_transactions as $TXN_ID) {
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
-            // verify transaction and whether it is failed or not
-            if ($transaction instanceof EE_Transaction) {
-                switch ($transaction->status_ID()) {
-                    // Completed TXNs
-                    case EEM_Transaction::complete_status_code:
-                        // Don't update the transaction/registrations if the Primary Registration is Not Approved.
-                        $primary_registration = $transaction->primary_registration();
-                        if (
-                            $primary_registration instanceof EE_Registration
-                            && $primary_registration->status_ID() !== EEM_Registration::status_id_not_approved
-                        ) {
-                            /** @type EE_Transaction_Processor $transaction_processor */
-                            $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
-                            $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
-                                $transaction,
-                                $transaction->last_payment()
-                            );
-                            do_action(
-                                'AHEE__EE_Cron_Tasks__process_expired_transactions__completed_transaction',
-                                $transaction
-                            );
-                        }
-                        break;
-                    // Overpaid TXNs
-                    case EEM_Transaction::overpaid_status_code:
-                        do_action(
-                            'AHEE__EE_Cron_Tasks__process_expired_transactions__overpaid_transaction',
-                            $transaction
-                        );
-                        break;
-                    // Incomplete TXNs
-                    case EEM_Transaction::incomplete_status_code:
-                        do_action(
-                            'AHEE__EE_Cron_Tasks__process_expired_transactions__incomplete_transaction',
-                            $transaction
-                        );
-                        // todo : move business logic into EE_Transaction_Processor for finalizing abandoned transactions
-                        break;
-                    // Abandoned TXNs
-                    case EEM_Transaction::abandoned_status_code:
-                        // run hook before updating transaction, primarily so
-                        // EED_Ticket_Sales_Monitor::process_abandoned_transactions() can release reserved tickets
-                        do_action(
-                            'AHEE__EE_Cron_Tasks__process_expired_transactions__abandoned_transaction',
-                            $transaction
-                        );
-                        // don't finalize the TXN if it has already been completed
-                        if ($transaction->all_reg_steps_completed() !== true) {
-                            /** @type EE_Payment_Processor $payment_processor */
-                            $payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
-                            // let's simulate an IPN here which will trigger any notifications that need to go out
-                            $payment_processor->update_txn_based_on_payment(
-                                $transaction,
-                                $transaction->last_payment(),
-                                true,
-                                true
-                            );
-                        }
-                        break;
-                    // Failed TXNs
-                    case EEM_Transaction::failed_status_code:
-                        do_action(
-                            'AHEE__EE_Cron_Tasks__process_expired_transactions__failed_transaction',
-                            $transaction
-                        );
-                        // todo :
-                        // perform garbage collection here and remove clean_out_junk_transactions()
-                        // $registrations = $transaction->registrations();
-                        // if (! empty($registrations)) {
-                        //     foreach ($registrations as $registration) {
-                        //         if ($registration instanceof EE_Registration) {
-                        //             $delete_registration = true;
-                        //             if ($registration->attendee() instanceof EE_Attendee) {
-                        //                 $delete_registration = false;
-                        //             }
-                        //             if ($delete_registration) {
-                        //                 $registration->delete_permanently();
-                        //                 $registration->delete_related_permanently();
-                        //             }
-                        //         }
-                        //     }
-                        // }
-                        break;
-                }
-            }
-            unset(self::$_expired_transactions[ $TXN_ID ]);
-        }
-    }
-
-
-
-    /*************  END OF EXPIRED TRANSACTION CHECK  *************/
-
-
-    /************* START CLEAN UP BOT TRANSACTIONS **********************/
-
-
-    /**
-     * callback for 'AHEE__EE_Cron_Tasks__clean_up_junk_transactions'
-     * which is setup during activation to run on an hourly cron
-     *
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public static function clean_out_junk_transactions()
-    {
-        if (EE_Maintenance_Mode::instance()->models_can_query()) {
-            EED_Ticket_Sales_Monitor::reset_reservation_counts();
-            EEM_Transaction::instance('')->delete_junk_transactions();
-            EEM_Registration::instance('')->delete_registrations_with_no_transaction();
-            EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();
-        }
-    }
-
-
-    /**
-     * Deletes old gateway logs. After about a week we usually don't need them for debugging. But folks can filter that.
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public static function clean_out_old_gateway_logs()
-    {
-        if (EE_Maintenance_Mode::instance()->models_can_query()) {
-            $reg_config = LoaderFactory::getLoader()->load('EE_Registration_Config');
-            $time_diff_for_comparison = apply_filters(
-                'FHEE__EE_Cron_Tasks__clean_out_old_gateway_logs__time_diff_for_comparison',
-                '-' . $reg_config->gateway_log_lifespan
-            );
-            EEM_Change_Log::instance()->delete_gateway_logs_older_than(new DateTime($time_diff_for_comparison));
-        }
-    }
-
-
-    /*****************  FINALIZE ABANDONED TRANSACTIONS *****************/
-
-
-    /**
-     * @var array
-     */
-    protected static $_abandoned_transactions = array();
-
-
-    /**
-     * @deprecated
-     * @param int $timestamp
-     * @param int $TXN_ID
-     */
-    public static function schedule_finalize_abandoned_transactions_check($timestamp, $TXN_ID)
-    {
-        EE_Cron_Tasks::schedule_expired_transaction_check($timestamp, $TXN_ID);
-    }
-
-
-    /**
-     * @deprecated
-     * @param int $TXN_ID
-     */
-    public static function check_for_abandoned_transactions($TXN_ID = 0)
-    {
-        EE_Cron_Tasks::expired_transaction_check($TXN_ID);
-    }
-
-
-    /**
-     * @deprecated
-     * @throws EE_Error
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public static function finalize_abandoned_transactions()
-    {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__);
-        if (
+			empty(self::$_expired_transactions)
+			// reschedule the cron if we can't hit the db right now
+			|| EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
+				'schedule_expired_transaction_check',
+				self::$_expired_transactions
+			)
+		) {
+			return;
+		}
+		/** @type EE_Transaction_Processor $transaction_processor */
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		// set revisit flag for txn processor
+		$transaction_processor->set_revisit();
+		// load EEM_Transaction
+		EE_Registry::instance()->load_model('Transaction');
+		foreach (self::$_expired_transactions as $TXN_ID) {
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+			// verify transaction and whether it is failed or not
+			if ($transaction instanceof EE_Transaction) {
+				switch ($transaction->status_ID()) {
+					// Completed TXNs
+					case EEM_Transaction::complete_status_code:
+						// Don't update the transaction/registrations if the Primary Registration is Not Approved.
+						$primary_registration = $transaction->primary_registration();
+						if (
+							$primary_registration instanceof EE_Registration
+							&& $primary_registration->status_ID() !== EEM_Registration::status_id_not_approved
+						) {
+							/** @type EE_Transaction_Processor $transaction_processor */
+							$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+							$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
+								$transaction,
+								$transaction->last_payment()
+							);
+							do_action(
+								'AHEE__EE_Cron_Tasks__process_expired_transactions__completed_transaction',
+								$transaction
+							);
+						}
+						break;
+					// Overpaid TXNs
+					case EEM_Transaction::overpaid_status_code:
+						do_action(
+							'AHEE__EE_Cron_Tasks__process_expired_transactions__overpaid_transaction',
+							$transaction
+						);
+						break;
+					// Incomplete TXNs
+					case EEM_Transaction::incomplete_status_code:
+						do_action(
+							'AHEE__EE_Cron_Tasks__process_expired_transactions__incomplete_transaction',
+							$transaction
+						);
+						// todo : move business logic into EE_Transaction_Processor for finalizing abandoned transactions
+						break;
+					// Abandoned TXNs
+					case EEM_Transaction::abandoned_status_code:
+						// run hook before updating transaction, primarily so
+						// EED_Ticket_Sales_Monitor::process_abandoned_transactions() can release reserved tickets
+						do_action(
+							'AHEE__EE_Cron_Tasks__process_expired_transactions__abandoned_transaction',
+							$transaction
+						);
+						// don't finalize the TXN if it has already been completed
+						if ($transaction->all_reg_steps_completed() !== true) {
+							/** @type EE_Payment_Processor $payment_processor */
+							$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+							// let's simulate an IPN here which will trigger any notifications that need to go out
+							$payment_processor->update_txn_based_on_payment(
+								$transaction,
+								$transaction->last_payment(),
+								true,
+								true
+							);
+						}
+						break;
+					// Failed TXNs
+					case EEM_Transaction::failed_status_code:
+						do_action(
+							'AHEE__EE_Cron_Tasks__process_expired_transactions__failed_transaction',
+							$transaction
+						);
+						// todo :
+						// perform garbage collection here and remove clean_out_junk_transactions()
+						// $registrations = $transaction->registrations();
+						// if (! empty($registrations)) {
+						//     foreach ($registrations as $registration) {
+						//         if ($registration instanceof EE_Registration) {
+						//             $delete_registration = true;
+						//             if ($registration->attendee() instanceof EE_Attendee) {
+						//                 $delete_registration = false;
+						//             }
+						//             if ($delete_registration) {
+						//                 $registration->delete_permanently();
+						//                 $registration->delete_related_permanently();
+						//             }
+						//         }
+						//     }
+						// }
+						break;
+				}
+			}
+			unset(self::$_expired_transactions[ $TXN_ID ]);
+		}
+	}
+
+
+
+	/*************  END OF EXPIRED TRANSACTION CHECK  *************/
+
+
+	/************* START CLEAN UP BOT TRANSACTIONS **********************/
+
+
+	/**
+	 * callback for 'AHEE__EE_Cron_Tasks__clean_up_junk_transactions'
+	 * which is setup during activation to run on an hourly cron
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public static function clean_out_junk_transactions()
+	{
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
+			EED_Ticket_Sales_Monitor::reset_reservation_counts();
+			EEM_Transaction::instance('')->delete_junk_transactions();
+			EEM_Registration::instance('')->delete_registrations_with_no_transaction();
+			EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();
+		}
+	}
+
+
+	/**
+	 * Deletes old gateway logs. After about a week we usually don't need them for debugging. But folks can filter that.
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public static function clean_out_old_gateway_logs()
+	{
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
+			$reg_config = LoaderFactory::getLoader()->load('EE_Registration_Config');
+			$time_diff_for_comparison = apply_filters(
+				'FHEE__EE_Cron_Tasks__clean_out_old_gateway_logs__time_diff_for_comparison',
+				'-' . $reg_config->gateway_log_lifespan
+			);
+			EEM_Change_Log::instance()->delete_gateway_logs_older_than(new DateTime($time_diff_for_comparison));
+		}
+	}
+
+
+	/*****************  FINALIZE ABANDONED TRANSACTIONS *****************/
+
+
+	/**
+	 * @var array
+	 */
+	protected static $_abandoned_transactions = array();
+
+
+	/**
+	 * @deprecated
+	 * @param int $timestamp
+	 * @param int $TXN_ID
+	 */
+	public static function schedule_finalize_abandoned_transactions_check($timestamp, $TXN_ID)
+	{
+		EE_Cron_Tasks::schedule_expired_transaction_check($timestamp, $TXN_ID);
+	}
+
+
+	/**
+	 * @deprecated
+	 * @param int $TXN_ID
+	 */
+	public static function check_for_abandoned_transactions($TXN_ID = 0)
+	{
+		EE_Cron_Tasks::expired_transaction_check($TXN_ID);
+	}
+
+
+	/**
+	 * @deprecated
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public static function finalize_abandoned_transactions()
+	{
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
+		if (
 // are there any TXNs that need cleaning up ?
-            empty(self::$_abandoned_transactions)
-            // reschedule the cron if we can't hit the db right now
-            || EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
-                'schedule_expired_transaction_check',
-                self::$_abandoned_transactions
-            )
-        ) {
-            return;
-        }
-        // combine our arrays of transaction IDs
-        self::$_expired_transactions = self::$_abandoned_transactions + self::$_expired_transactions;
-        // and deal with abandoned transactions here now...
-        EE_Cron_Tasks::process_expired_transactions();
-    }
-
-
-    /*************  END OF FINALIZE ABANDONED TRANSACTIONS  *************/
+			empty(self::$_abandoned_transactions)
+			// reschedule the cron if we can't hit the db right now
+			|| EE_Cron_Tasks::reschedule_cron_for_transactions_if_maintenance_mode(
+				'schedule_expired_transaction_check',
+				self::$_abandoned_transactions
+			)
+		) {
+			return;
+		}
+		// combine our arrays of transaction IDs
+		self::$_expired_transactions = self::$_abandoned_transactions + self::$_expired_transactions;
+		// and deal with abandoned transactions here now...
+		EE_Cron_Tasks::process_expired_transactions();
+	}
+
+
+	/*************  END OF FINALIZE ABANDONED TRANSACTIONS  *************/
 }

core/services/assets/AssetCollection.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
             /** @var Asset $asset */
             $asset = $this->current();
             if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }
@@ -96,7 +96,7 @@ 
             /** @var JavascriptAsset $asset */
             $asset = $this->current();
             if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }

Indentation +188 added lines, -188 removed lines

@@ -21,192 +21,192 @@
 {
 
 
-    /**
-     * AssetCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\values\assets\Asset');
-    }
-
-
-    /**
-     * @return StylesheetAsset[]
-     * @since 4.9.62.p
-     */
-    public function getStylesheetAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_JS);
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFiles()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
-    }
-
-
-    /**
-     * @param $type
-     * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
-     * @since 4.9.62.p
-     */
-    protected function getAssetsOfType($type)
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var Asset $asset */
-            $asset = $this->current();
-            if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssetsWithData()
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var JavascriptAsset $asset */
-            $asset = $this->current();
-            if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Javascript Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasJavascriptAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Stylesheet Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasStylesheetAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-    /**
-     * returns the object from the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return JavascriptAsset|StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                /** @var JavascriptAsset|StylesheetAsset $object */
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * returns the Stylesheet Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getStylesheetAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * returns the Javascript Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return JavascriptAsset
-     * @since 4.9.63.p
-     */
-    public function getJavascriptAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_JS);
-    }
+	/**
+	 * AssetCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\values\assets\Asset');
+	}
+
+
+	/**
+	 * @return StylesheetAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getStylesheetAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFiles()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
+	}
+
+
+	/**
+	 * @param $type
+	 * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	protected function getAssetsOfType($type)
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var Asset $asset */
+			$asset = $this->current();
+			if ($asset->type() === $type) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssetsWithData()
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var JavascriptAsset $asset */
+			$asset = $this->current();
+			if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Javascript Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasJavascriptAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Stylesheet Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasStylesheetAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+	/**
+	 * returns the object from the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return JavascriptAsset|StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				/** @var JavascriptAsset|StylesheetAsset $object */
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * returns the Stylesheet Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getStylesheetAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * returns the Javascript Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return JavascriptAsset
+	 * @since 4.9.63.p
+	 */
+	public function getJavascriptAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_JS);
+	}
 }

core/domain/services/admin/privacy/forms/PrivacySettingsFormHandler.php

Indentation +100 added lines, -100 removed lines

@@ -28,112 +28,112 @@
 class PrivacySettingsFormHandler extends FormHandler
 {
 
-    /**
-     * @var EE_Config
-     */
-    protected $config;
+	/**
+	 * @var EE_Config
+	 */
+	protected $config;
 
 
-    /**
-     * PrivacySettingsFormHandler constructor.
-     *
-     * @param EE_Registry $registry
-     * @param EE_Config   $config
-     */
-    public function __construct(EE_Registry $registry, EE_Config $config)
-    {
-        $this->config = $config;
-        parent::__construct(
-            esc_html__('Privacy Settings', 'event_espresso'),
-            esc_html__('Privacy Settings', 'event_espresso'),
-            'privacy-settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * PrivacySettingsFormHandler constructor.
+	 *
+	 * @param EE_Registry $registry
+	 * @param EE_Config   $config
+	 */
+	public function __construct(EE_Registry $registry, EE_Config $config)
+	{
+		$this->config = $config;
+		parent::__construct(
+			esc_html__('Privacy Settings', 'event_espresso'),
+			esc_html__('Privacy Settings', 'event_espresso'),
+			'privacy-settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function generate()
-    {
-        // this form makes use of the session for passing around invalid form submission data, so make sure its enabled
-        add_filter('FHEE__EE_Session___save_session_to_db__abort_session_save', '__return_false');
-        /**
-         * @var $reg_config EE_Registration_Config
-         */
-        $reg_config = $this->config->registration;
-        return new EE_Form_Section_Proper(
-            array(
-                'name'        => 'privacy_consent_settings',
-                'subsections' => array(
-                    'privacy_consent_form_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(esc_html__('Privacy Policy Consent Settings', 'event_espresso'))
-                    ),
-                    'enable'                   => new EE_Select_Reveal_Input(
-                        array(
-                            'enable-privacy-consent' => esc_html__('Enabled', 'event_espresso'),
-                            'disable'                => esc_html__('Disabled', 'event_espresso'),
-                        ),
-                        array(
-                            'default'         => $reg_config->isConsentCheckboxEnabled()
-                                ? 'enable-privacy-consent'
-                                : 'disable',
-                            'html_label_text' => esc_html__('Privacy Consent Checkbox', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'When enabled, a checkbox appears in the registration form requiring users to consent to your site\'s privacy policy.',
-                                'event_espresso'
-                            ),
-                        )
-                    ),
-                    'enable-privacy-consent'   => new EE_Form_Section_Proper(
-                        array(
-                            'subsections' => array(
-                                'consent_assertion' => new EE_Text_Area_Input(
-                                    array(
-                                        'default'               => $reg_config->getConsentCheckboxLabelText(),
-                                        'html_label_text'       => esc_html__('Consent Text', 'event_espresso'),
-                                        'html_help_text'        => esc_html__(
-                                            'Text describing what the registrant is consenting to by submitting their personal data in the registration form. To reset to default value, remove all this text and save.',
-                                            'event_espresso'
-                                        ),
-                                        'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
-                                    )
-                                ),
-                            ),
-                        )
-                    ),
-                ),
-            )
-        );
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function generate()
+	{
+		// this form makes use of the session for passing around invalid form submission data, so make sure its enabled
+		add_filter('FHEE__EE_Session___save_session_to_db__abort_session_save', '__return_false');
+		/**
+		 * @var $reg_config EE_Registration_Config
+		 */
+		$reg_config = $this->config->registration;
+		return new EE_Form_Section_Proper(
+			array(
+				'name'        => 'privacy_consent_settings',
+				'subsections' => array(
+					'privacy_consent_form_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(esc_html__('Privacy Policy Consent Settings', 'event_espresso'))
+					),
+					'enable'                   => new EE_Select_Reveal_Input(
+						array(
+							'enable-privacy-consent' => esc_html__('Enabled', 'event_espresso'),
+							'disable'                => esc_html__('Disabled', 'event_espresso'),
+						),
+						array(
+							'default'         => $reg_config->isConsentCheckboxEnabled()
+								? 'enable-privacy-consent'
+								: 'disable',
+							'html_label_text' => esc_html__('Privacy Consent Checkbox', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'When enabled, a checkbox appears in the registration form requiring users to consent to your site\'s privacy policy.',
+								'event_espresso'
+							),
+						)
+					),
+					'enable-privacy-consent'   => new EE_Form_Section_Proper(
+						array(
+							'subsections' => array(
+								'consent_assertion' => new EE_Text_Area_Input(
+									array(
+										'default'               => $reg_config->getConsentCheckboxLabelText(),
+										'html_label_text'       => esc_html__('Consent Text', 'event_espresso'),
+										'html_help_text'        => esc_html__(
+											'Text describing what the registrant is consenting to by submitting their personal data in the registration form. To reset to default value, remove all this text and save.',
+											'event_espresso'
+										),
+										'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
+									)
+								),
+							),
+						)
+					),
+				),
+			)
+		);
+	}
 
 
-    /**
-     * After validating the form data, update the registration config
-     *
-     * @param array $submitted_form_data
-     * @return bool
-     */
-    public function process($submitted_form_data = array())
-    {
-        try {
-            $valid_data = parent::process($submitted_form_data);
-            $reg_config = $this->config->registration;
-            $reg_config->setConsentCheckboxEnabled($valid_data['enable'] === 'enable-privacy-consent');
-            $reg_config->setConsentCheckboxLabelText(
-                $valid_data['enable-privacy-consent']['consent_assertion']
-            );
-            return $this->config->update_espresso_config(false, false);
-        } catch (InvalidFormSubmissionException $e) {
-            // the form was invalid, it should be re-displayed with errors
-            return false;
-        }
-    }
+	/**
+	 * After validating the form data, update the registration config
+	 *
+	 * @param array $submitted_form_data
+	 * @return bool
+	 */
+	public function process($submitted_form_data = array())
+	{
+		try {
+			$valid_data = parent::process($submitted_form_data);
+			$reg_config = $this->config->registration;
+			$reg_config->setConsentCheckboxEnabled($valid_data['enable'] === 'enable-privacy-consent');
+			$reg_config->setConsentCheckboxLabelText(
+				$valid_data['enable-privacy-consent']['consent_assertion']
+			);
+			return $this->config->update_espresso_config(false, false);
+		} catch (InvalidFormSubmissionException $e) {
+			// the form was invalid, it should be re-displayed with errors
+			return false;
+		}
+	}
 }
 // End of file PrivacySettingsFormHandler.php
 // Location: EventEspresso\core\domain\services\admin\privacy\forms/PrivacySettingsFormHandler.php

admin_pages/general_settings/OrganizationSettings.php

Spacing +5 added lines, -5 removed lines

@@ -447,8 +447,8 @@ 
         $this->organization_config->instagram = isset($form_data['organization_instagram'])
             ? esc_url_raw($form_data['organization_instagram'])
             : $this->organization_config->instagram;
-        $this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
-            ? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
+        $this->core_config->ee_ueip_optin = isset($form_data[EE_Core_Config::OPTION_NAME_UXIP][0])
+            ? filter_var($form_data[EE_Core_Config::OPTION_NAME_UXIP][0], FILTER_VALIDATE_BOOLEAN)
             : false;
         $this->core_config->ee_ueip_has_notified = true;
 
@@ -479,10 +479,10 @@ 
         if (empty($this->network_core_config->site_license_key)) {
             return false;
         }
-        $ver_option_key = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
+        $ver_option_key = 'puvererr_'.basename(EE_PLUGIN_BASENAME);
         $verify_fail = get_option($ver_option_key, false);
         return $verify_fail === false
-                  || (! empty($this->network_core_config->site_license_key)
+                  || ( ! empty($this->network_core_config->site_license_key)
                         && $verify_fail === false
                   );
     }
@@ -528,6 +528,6 @@ 
     private function getValidationIndicator()
     {
         $verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
-        return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
+        return '<span class="dashicons dashicons-admin-network '.$verified_class.' ee-icon-size-20"></span>';
     }
 }

Indentation +506 added lines, -506 removed lines

@@ -44,531 +44,531 @@
 class OrganizationSettings extends FormHandler
 {
 
-    /**
-     * @var EE_Organization_Config
-     */
-    protected $organization_config;
+	/**
+	 * @var EE_Organization_Config
+	 */
+	protected $organization_config;
 
-    /**
-     * @var EE_Core_Config
-     */
-    protected $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	protected $core_config;
 
 
-    /**
-     * @var EE_Network_Core_Config
-     */
-    protected $network_core_config;
+	/**
+	 * @var EE_Network_Core_Config
+	 */
+	protected $network_core_config;
 
-    /**
-     * @var CountrySubRegionDao $countrySubRegionDao
-     */
-    protected $countrySubRegionDao;
+	/**
+	 * @var CountrySubRegionDao $countrySubRegionDao
+	 */
+	protected $countrySubRegionDao;
 
-    /**
-     * Form constructor.
-     *
-     * @param EE_Registry             $registry
-     * @param EE_Organization_Config  $organization_config
-     * @param EE_Core_Config          $core_config
-     * @param EE_Network_Core_Config $network_core_config
-     * @param CountrySubRegionDao $countrySubRegionDao
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        EE_Registry $registry,
-        EE_Organization_Config $organization_config,
-        EE_Core_Config $core_config,
-        EE_Network_Core_Config $network_core_config,
-        CountrySubRegionDao $countrySubRegionDao
-    ) {
-        $this->organization_config = $organization_config;
-        $this->core_config = $core_config;
-        $this->network_core_config = $network_core_config;
-        $this->countrySubRegionDao = $countrySubRegionDao;
-        parent::__construct(
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            'organization_settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * Form constructor.
+	 *
+	 * @param EE_Registry             $registry
+	 * @param EE_Organization_Config  $organization_config
+	 * @param EE_Core_Config          $core_config
+	 * @param EE_Network_Core_Config $network_core_config
+	 * @param CountrySubRegionDao $countrySubRegionDao
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		EE_Registry $registry,
+		EE_Organization_Config $organization_config,
+		EE_Core_Config $core_config,
+		EE_Network_Core_Config $network_core_config,
+		CountrySubRegionDao $countrySubRegionDao
+	) {
+		$this->organization_config = $organization_config;
+		$this->core_config = $core_config;
+		$this->network_core_config = $network_core_config;
+		$this->countrySubRegionDao = $countrySubRegionDao;
+		parent::__construct(
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			'organization_settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function generate()
-    {
-        $has_sub_regions = EEM_State::instance()->count(
-            array(array('Country.CNT_ISO' => $this->organization_config->CNT_ISO))
-        );
-        $form = new EE_Form_Section_Proper(
-            array(
-                'name'            => 'organization_settings',
-                'html_id'         => 'organization_settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => array(
-                    'contact_information_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Contact Information', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
-                            '',
-                            'contact-information-hdr'
-                        )
-                    ),
-                    'organization_name'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_name',
-                            'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'Displayed on all emails and invoices.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('name'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_address_1'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_address_1',
-                            'html_label_text' => esc_html__('Street Address', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('address_1'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_address_2'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_address_2',
-                            'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('address_2'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_city'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_city',
-                            'html_label_text' => esc_html__('City', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('city'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_country'      => new EE_Country_Select_Input(
-                        null,
-                        array(
-                            EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
-                            'html_name'       => 'organization_country',
-                            'html_label_text' => esc_html__('Country', 'event_espresso'),
-                            'default'         => $this->organization_config->CNT_ISO,
-                            'required'        => false,
-                            'html_help_text'  => sprintf(
-                                esc_html__(
-                                    '%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
-                                    'event_espresso'
-                                ),
-                                '<span class="reminder-spn">',
-                                '</span>'
-                            ),
-                        )
-                    ),
-                    'organization_state' => new EE_State_Select_Input(
-                        null,
-                        array(
-                            'html_name'       => 'organization_state',
-                            'html_label_text' => esc_html__('State/Province', 'event_espresso'),
-                            'default'         => $this->organization_config->STA_ID,
-                            'required'        => false,
-                            'html_help_text' => empty($this->organization_config->STA_ID) || ! $has_sub_regions
-                                ? sprintf(
-                                    esc_html__(
-                                        'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
-                                        'event_espresso'
-                                    ),
-                                    '<span class="reminder-spn">',
-                                    '</span>',
-                                    '<br />'
-                                )
-                                : '',
-                        )
-                    ),
-                    'organization_zip'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_zip',
-                            'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('zip'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_email'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_email',
-                            'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
-                            'html_help_text'  => sprintf(
-                                esc_html__(
-                                    'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
-                                    'event_espresso'
-                                ),
-                                '<code>[CO_FORMATTED_EMAIL]</code>',
-                                '<code>[CO_EMAIL]</code>'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('email'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_phone'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_phone',
-                            'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'The phone number for your organization.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('phone'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_vat'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_vat',
-                            'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'The VAT/Tax Number may be displayed on invoices and receipts.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('vat'),
-                            'required'        => false,
-                        )
-                    ),
-                    'company_logo_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Company Logo', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
-                            '',
-                            'company-logo-hdr'
-                        )
-                    ),
-                    'organization_logo_url'      => new EE_Admin_File_Uploader_Input(
-                        array(
-                            'html_name' => 'organization_logo_url',
-                            'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('logo_url'),
-                            'required'        => false,
-                        )
-                    ),
-                    'social_links_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Social Links', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
-                            . EEH_HTML::br()
-                            . EEH_HTML::p(
-                                esc_html__(
-                                    'Enter any links to social accounts for your organization here',
-                                    'event_espresso'
-                                ),
-                                '',
-                                'description'
-                            ),
-                            '',
-                            'social-links-hdr'
-                        )
-                    ),
-                    'organization_facebook'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_facebook',
-                            'html_label_text' => esc_html__('Facebook', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
-                            'default'         => $this->organization_config->get_pretty('facebook'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_twitter'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_twitter',
-                            'html_label_text' => esc_html__('Twitter', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
-                            'default'         => $this->organization_config->get_pretty('twitter'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_linkedin'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_linkedin',
-                            'html_label_text' => esc_html__('LinkedIn', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
-                            'default'         => $this->organization_config->get_pretty('linkedin'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_pinterest'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_pinterest',
-                            'html_label_text' => esc_html__('Pinterest', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
-                            'default'         => $this->organization_config->get_pretty('pinterest'),
-                            'required'        => false,
-                        )
-                    ),
-                    'organization_instagram'      => new EE_Text_Input(
-                        array(
-                            'html_name' => 'organization_instagram',
-                            'html_label_text' => esc_html__('Instagram', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="instagram.com/handle"',
-                            'default'         => $this->organization_config->get_pretty('instagram'),
-                            'required'        => false,
-                        )
-                    ),
-                ),
-            )
-        );
-        if (is_main_site()) {
-            $form->add_subsections(
-                array(
-                    'site_license_key_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Your Event Espresso License Key', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('site_license_key_info'),
-                                'help_tour_activation'
-                            ),
-                            '',
-                            'site-license-key-hdr'
-                        )
-                    ),
-                    'site_license_key' => $this->getSiteLicenseKeyField()
-                )
-            );
-            $form->add_subsections(
-                array(
-                    'uxip_optin_hdr' => new EE_Form_Section_HTML(
-                        $this->uxipOptinText()
-                    ),
-                    'ueip_optin' => new EE_Checkbox_Multi_Input(
-                        array(
-                            true => __('Yes! I want to help improve Event Espresso!', 'event_espresso')
-                        ),
-                        array(
-                            'html_name' => EE_Core_Config::OPTION_NAME_UXIP,
-                            'html_label_text' => esc_html__(
-                                'UXIP Opt In?',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->core_config->ee_ueip_optin)
-                                ? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
-                                : false,
-                            'required'        => false,
-                        )
-                    ),
-                ),
-                'organization_instagram',
-                false
-            );
-        }
-        return $form;
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function generate()
+	{
+		$has_sub_regions = EEM_State::instance()->count(
+			array(array('Country.CNT_ISO' => $this->organization_config->CNT_ISO))
+		);
+		$form = new EE_Form_Section_Proper(
+			array(
+				'name'            => 'organization_settings',
+				'html_id'         => 'organization_settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => array(
+					'contact_information_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Contact Information', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
+							'',
+							'contact-information-hdr'
+						)
+					),
+					'organization_name'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_name',
+							'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'Displayed on all emails and invoices.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('name'),
+							'required'        => false,
+						)
+					),
+					'organization_address_1'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_address_1',
+							'html_label_text' => esc_html__('Street Address', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('address_1'),
+							'required'        => false,
+						)
+					),
+					'organization_address_2'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_address_2',
+							'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('address_2'),
+							'required'        => false,
+						)
+					),
+					'organization_city'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_city',
+							'html_label_text' => esc_html__('City', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('city'),
+							'required'        => false,
+						)
+					),
+					'organization_country'      => new EE_Country_Select_Input(
+						null,
+						array(
+							EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
+							'html_name'       => 'organization_country',
+							'html_label_text' => esc_html__('Country', 'event_espresso'),
+							'default'         => $this->organization_config->CNT_ISO,
+							'required'        => false,
+							'html_help_text'  => sprintf(
+								esc_html__(
+									'%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
+									'event_espresso'
+								),
+								'<span class="reminder-spn">',
+								'</span>'
+							),
+						)
+					),
+					'organization_state' => new EE_State_Select_Input(
+						null,
+						array(
+							'html_name'       => 'organization_state',
+							'html_label_text' => esc_html__('State/Province', 'event_espresso'),
+							'default'         => $this->organization_config->STA_ID,
+							'required'        => false,
+							'html_help_text' => empty($this->organization_config->STA_ID) || ! $has_sub_regions
+								? sprintf(
+									esc_html__(
+										'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
+										'event_espresso'
+									),
+									'<span class="reminder-spn">',
+									'</span>',
+									'<br />'
+								)
+								: '',
+						)
+					),
+					'organization_zip'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_zip',
+							'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('zip'),
+							'required'        => false,
+						)
+					),
+					'organization_email'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_email',
+							'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
+							'html_help_text'  => sprintf(
+								esc_html__(
+									'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
+									'event_espresso'
+								),
+								'<code>[CO_FORMATTED_EMAIL]</code>',
+								'<code>[CO_EMAIL]</code>'
+							),
+							'default'         => $this->organization_config->get_pretty('email'),
+							'required'        => false,
+						)
+					),
+					'organization_phone'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_phone',
+							'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'The phone number for your organization.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('phone'),
+							'required'        => false,
+						)
+					),
+					'organization_vat'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_vat',
+							'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'The VAT/Tax Number may be displayed on invoices and receipts.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('vat'),
+							'required'        => false,
+						)
+					),
+					'company_logo_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Company Logo', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
+							'',
+							'company-logo-hdr'
+						)
+					),
+					'organization_logo_url'      => new EE_Admin_File_Uploader_Input(
+						array(
+							'html_name' => 'organization_logo_url',
+							'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('logo_url'),
+							'required'        => false,
+						)
+					),
+					'social_links_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Social Links', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
+							. EEH_HTML::br()
+							. EEH_HTML::p(
+								esc_html__(
+									'Enter any links to social accounts for your organization here',
+									'event_espresso'
+								),
+								'',
+								'description'
+							),
+							'',
+							'social-links-hdr'
+						)
+					),
+					'organization_facebook'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_facebook',
+							'html_label_text' => esc_html__('Facebook', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
+							'default'         => $this->organization_config->get_pretty('facebook'),
+							'required'        => false,
+						)
+					),
+					'organization_twitter'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_twitter',
+							'html_label_text' => esc_html__('Twitter', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
+							'default'         => $this->organization_config->get_pretty('twitter'),
+							'required'        => false,
+						)
+					),
+					'organization_linkedin'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_linkedin',
+							'html_label_text' => esc_html__('LinkedIn', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
+							'default'         => $this->organization_config->get_pretty('linkedin'),
+							'required'        => false,
+						)
+					),
+					'organization_pinterest'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_pinterest',
+							'html_label_text' => esc_html__('Pinterest', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
+							'default'         => $this->organization_config->get_pretty('pinterest'),
+							'required'        => false,
+						)
+					),
+					'organization_instagram'      => new EE_Text_Input(
+						array(
+							'html_name' => 'organization_instagram',
+							'html_label_text' => esc_html__('Instagram', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="instagram.com/handle"',
+							'default'         => $this->organization_config->get_pretty('instagram'),
+							'required'        => false,
+						)
+					),
+				),
+			)
+		);
+		if (is_main_site()) {
+			$form->add_subsections(
+				array(
+					'site_license_key_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Your Event Espresso License Key', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('site_license_key_info'),
+								'help_tour_activation'
+							),
+							'',
+							'site-license-key-hdr'
+						)
+					),
+					'site_license_key' => $this->getSiteLicenseKeyField()
+				)
+			);
+			$form->add_subsections(
+				array(
+					'uxip_optin_hdr' => new EE_Form_Section_HTML(
+						$this->uxipOptinText()
+					),
+					'ueip_optin' => new EE_Checkbox_Multi_Input(
+						array(
+							true => __('Yes! I want to help improve Event Espresso!', 'event_espresso')
+						),
+						array(
+							'html_name' => EE_Core_Config::OPTION_NAME_UXIP,
+							'html_label_text' => esc_html__(
+								'UXIP Opt In?',
+								'event_espresso'
+							),
+							'default'         => isset($this->core_config->ee_ueip_optin)
+								? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
+								: false,
+							'required'        => false,
+						)
+					),
+				),
+				'organization_instagram',
+				false
+			);
+		}
+		return $form;
+	}
 
 
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws LogicException
-     */
-    public function display()
-    {
-        $this->form()->enqueue_js();
-        return parent::display();
-    }
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws LogicException
+	 */
+	public function display()
+	{
+		$this->form()->enqueue_js();
+		return parent::display();
+	}
 
 
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $form_data
-     * @return bool
-     * @throws InvalidFormSubmissionException
-     * @throws EE_Error
-     * @throws LogicException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function process($form_data = array())
-    {
-        // process form
-        $valid_data = (array) parent::process($form_data);
-        if (empty($valid_data)) {
-            return false;
-        }
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $form_data
+	 * @return bool
+	 * @throws InvalidFormSubmissionException
+	 * @throws EE_Error
+	 * @throws LogicException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function process($form_data = array())
+	{
+		// process form
+		$valid_data = (array) parent::process($form_data);
+		if (empty($valid_data)) {
+			return false;
+		}
 
-        if (is_main_site()) {
-            $this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
-                ? sanitize_text_field($form_data['ee_site_license_key'])
-                : $this->network_core_config->site_license_key;
-        }
-        $this->organization_config->name = isset($form_data['organization_name'])
-            ? sanitize_text_field($form_data['organization_name'])
-            : $this->organization_config->name;
-        $this->organization_config->address_1 = isset($form_data['organization_address_1'])
-            ? sanitize_text_field($form_data['organization_address_1'])
-            : $this->organization_config->address_1;
-        $this->organization_config->address_2 = isset($form_data['organization_address_2'])
-            ? sanitize_text_field($form_data['organization_address_2'])
-            : $this->organization_config->address_2;
-        $this->organization_config->city = isset($form_data['organization_city'])
-            ? sanitize_text_field($form_data['organization_city'])
-            : $this->organization_config->city;
-        $this->organization_config->STA_ID = isset($form_data['organization_state'])
-            ? absint($form_data['organization_state'])
-            : $this->organization_config->STA_ID;
-        $this->organization_config->CNT_ISO = isset($form_data['organization_country'])
-            ? sanitize_text_field($form_data['organization_country'])
-            : $this->organization_config->CNT_ISO;
-        $this->organization_config->zip = isset($form_data['organization_zip'])
-            ? sanitize_text_field($form_data['organization_zip'])
-            : $this->organization_config->zip;
-        $this->organization_config->email = isset($form_data['organization_email'])
-            ? sanitize_email($form_data['organization_email'])
-            : $this->organization_config->email;
-        $this->organization_config->vat = isset($form_data['organization_vat'])
-            ? sanitize_text_field($form_data['organization_vat'])
-            : $this->organization_config->vat;
-        $this->organization_config->phone = isset($form_data['organization_phone'])
-            ? sanitize_text_field($form_data['organization_phone'])
-            : $this->organization_config->phone;
-        $this->organization_config->logo_url = isset($form_data['organization_logo_url'])
-            ? esc_url_raw($form_data['organization_logo_url'])
-            : $this->organization_config->logo_url;
-        $this->organization_config->facebook = isset($form_data['organization_facebook'])
-            ? esc_url_raw($form_data['organization_facebook'])
-            : $this->organization_config->facebook;
-        $this->organization_config->twitter = isset($form_data['organization_twitter'])
-            ? esc_url_raw($form_data['organization_twitter'])
-            : $this->organization_config->twitter;
-        $this->organization_config->linkedin = isset($form_data['organization_linkedin'])
-            ? esc_url_raw($form_data['organization_linkedin'])
-            : $this->organization_config->linkedin;
-        $this->organization_config->pinterest = isset($form_data['organization_pinterest'])
-            ? esc_url_raw($form_data['organization_pinterest'])
-            : $this->organization_config->pinterest;
-        $this->organization_config->google = isset($form_data['organization_google'])
-            ? esc_url_raw($form_data['organization_google'])
-            : $this->organization_config->google;
-        $this->organization_config->instagram = isset($form_data['organization_instagram'])
-            ? esc_url_raw($form_data['organization_instagram'])
-            : $this->organization_config->instagram;
-        $this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
-            ? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
-            : false;
-        $this->core_config->ee_ueip_has_notified = true;
+		if (is_main_site()) {
+			$this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
+				? sanitize_text_field($form_data['ee_site_license_key'])
+				: $this->network_core_config->site_license_key;
+		}
+		$this->organization_config->name = isset($form_data['organization_name'])
+			? sanitize_text_field($form_data['organization_name'])
+			: $this->organization_config->name;
+		$this->organization_config->address_1 = isset($form_data['organization_address_1'])
+			? sanitize_text_field($form_data['organization_address_1'])
+			: $this->organization_config->address_1;
+		$this->organization_config->address_2 = isset($form_data['organization_address_2'])
+			? sanitize_text_field($form_data['organization_address_2'])
+			: $this->organization_config->address_2;
+		$this->organization_config->city = isset($form_data['organization_city'])
+			? sanitize_text_field($form_data['organization_city'])
+			: $this->organization_config->city;
+		$this->organization_config->STA_ID = isset($form_data['organization_state'])
+			? absint($form_data['organization_state'])
+			: $this->organization_config->STA_ID;
+		$this->organization_config->CNT_ISO = isset($form_data['organization_country'])
+			? sanitize_text_field($form_data['organization_country'])
+			: $this->organization_config->CNT_ISO;
+		$this->organization_config->zip = isset($form_data['organization_zip'])
+			? sanitize_text_field($form_data['organization_zip'])
+			: $this->organization_config->zip;
+		$this->organization_config->email = isset($form_data['organization_email'])
+			? sanitize_email($form_data['organization_email'])
+			: $this->organization_config->email;
+		$this->organization_config->vat = isset($form_data['organization_vat'])
+			? sanitize_text_field($form_data['organization_vat'])
+			: $this->organization_config->vat;
+		$this->organization_config->phone = isset($form_data['organization_phone'])
+			? sanitize_text_field($form_data['organization_phone'])
+			: $this->organization_config->phone;
+		$this->organization_config->logo_url = isset($form_data['organization_logo_url'])
+			? esc_url_raw($form_data['organization_logo_url'])
+			: $this->organization_config->logo_url;
+		$this->organization_config->facebook = isset($form_data['organization_facebook'])
+			? esc_url_raw($form_data['organization_facebook'])
+			: $this->organization_config->facebook;
+		$this->organization_config->twitter = isset($form_data['organization_twitter'])
+			? esc_url_raw($form_data['organization_twitter'])
+			: $this->organization_config->twitter;
+		$this->organization_config->linkedin = isset($form_data['organization_linkedin'])
+			? esc_url_raw($form_data['organization_linkedin'])
+			: $this->organization_config->linkedin;
+		$this->organization_config->pinterest = isset($form_data['organization_pinterest'])
+			? esc_url_raw($form_data['organization_pinterest'])
+			: $this->organization_config->pinterest;
+		$this->organization_config->google = isset($form_data['organization_google'])
+			? esc_url_raw($form_data['organization_google'])
+			: $this->organization_config->google;
+		$this->organization_config->instagram = isset($form_data['organization_instagram'])
+			? esc_url_raw($form_data['organization_instagram'])
+			: $this->organization_config->instagram;
+		$this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
+			? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
+			: false;
+		$this->core_config->ee_ueip_has_notified = true;
 
-        $this->registry->CFG->currency = new EE_Currency_Config(
-            $this->organization_config->CNT_ISO
-        );
-        /** @var EE_Country $country */
-        $country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
-        if ($country instanceof EE_Country) {
-            $country->set('CNT_active', 1);
-            $country->save();
-            $this->countrySubRegionDao->saveCountrySubRegions($country);
-        }
-        return true;
-    }
+		$this->registry->CFG->currency = new EE_Currency_Config(
+			$this->organization_config->CNT_ISO
+		);
+		/** @var EE_Country $country */
+		$country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
+		if ($country instanceof EE_Country) {
+			$country->set('CNT_active', 1);
+			$country->save();
+			$this->countrySubRegionDao->saveCountrySubRegions($country);
+		}
+		return true;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function uxipOptinText()
-    {
-        ob_start();
-        Stats::optinText(false);
-        return ob_get_clean();
-    }
+	/**
+	 * @return string
+	 */
+	private function uxipOptinText()
+	{
+		ob_start();
+		Stats::optinText(false);
+		return ob_get_clean();
+	}
 
 
-    /**
-     * Return whether the site license key has been verified or not.
-     * @return bool
-     */
-    private function licenseKeyVerified()
-    {
-        if (empty($this->network_core_config->site_license_key)) {
-            return false;
-        }
-        $ver_option_key = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
-        $verify_fail = get_option($ver_option_key, false);
-        return $verify_fail === false
-                  || (! empty($this->network_core_config->site_license_key)
-                        && $verify_fail === false
-                  );
-    }
+	/**
+	 * Return whether the site license key has been verified or not.
+	 * @return bool
+	 */
+	private function licenseKeyVerified()
+	{
+		if (empty($this->network_core_config->site_license_key)) {
+			return false;
+		}
+		$ver_option_key = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
+		$verify_fail = get_option($ver_option_key, false);
+		return $verify_fail === false
+				  || (! empty($this->network_core_config->site_license_key)
+						&& $verify_fail === false
+				  );
+	}
 
 
-    /**
-     * @return EE_Text_Input
-     */
-    private function getSiteLicenseKeyField()
-    {
-        $text_input = new EE_Text_Input(
-            array(
-                'html_name' => 'ee_site_license_key',
-                'html_id' => 'site_license_key',
-                'html_label_text' => esc_html__('Support License Key', 'event_espresso'),
-                /** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
-                'html_help_text'  => sprintf(
-                    esc_html__(
-                        'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ),
-                /** phpcs:enable */
-                'default'         => isset($this->network_core_config->site_license_key)
-                    ? $this->network_core_config->site_license_key
-                    : '',
-                'required'        => false,
-                'form_html_filter' => new VsprintfFilter(
-                    '%2$s %1$s',
-                    array($this->getValidationIndicator())
-                )
-            )
-        );
-        return $text_input;
-    }
+	/**
+	 * @return EE_Text_Input
+	 */
+	private function getSiteLicenseKeyField()
+	{
+		$text_input = new EE_Text_Input(
+			array(
+				'html_name' => 'ee_site_license_key',
+				'html_id' => 'site_license_key',
+				'html_label_text' => esc_html__('Support License Key', 'event_espresso'),
+				/** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
+				'html_help_text'  => sprintf(
+					esc_html__(
+						'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				),
+				/** phpcs:enable */
+				'default'         => isset($this->network_core_config->site_license_key)
+					? $this->network_core_config->site_license_key
+					: '',
+				'required'        => false,
+				'form_html_filter' => new VsprintfFilter(
+					'%2$s %1$s',
+					array($this->getValidationIndicator())
+				)
+			)
+		);
+		return $text_input;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getValidationIndicator()
-    {
-        $verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
-        return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
-    }
+	/**
+	 * @return string
+	 */
+	private function getValidationIndicator()
+	{
+		$verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
+		return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
+	}
 }

public/Espresso_Arabica_2014/content-espresso_events-header.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
 ?>
 <header class="event-header">
 	<?php echo "<{$tag}  id=\"event-details-{$tag}-{$post->ID}\" class=\"entry-title\">"; ?>
-		<a class="ee-event-header-lnk" href="<?php the_permalink(); ?>"<?php echo \EED_Events_Archive::link_target();?>>
+		<a class="ee-event-header-lnk" href="<?php the_permalink(); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
             <?php the_title(); ?>
         </a>
 	<?php echo "</{$tag}>"; ?>
-	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
+	<?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?>
 </header>

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

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
 
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => $input->html_label_id()
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => $input->html_label_id()
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -62,7 +62,7 @@ 
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();