eventespresso / event-espresso-core

core/libraries/messages/defaults/default/html_receipt_ticket_list.template.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
         <div class="ticket-time-and-place-details">
             <div class="ticket-time-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'clock-16x16.png'); ?>">
+                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'clock-16x16.png'); ?>">
                     <?php esc_html_e('Date/Time:', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-dates">[DATETIME_LIST]</ul>
             </div>
             <div class="ticket-place-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'location-pin-16x16.png'); ?>">
+                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'location-pin-16x16.png'); ?>">
                     <?php esc_html_e('Venue', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-venues">
@@ -45,7 +45,7 @@ 
         </div>
         <div class="ticket-registrations-area">
             <h4 class="sub-section-title">
-                <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'users-16x16.png'); ?>">
+                <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'users-16x16.png'); ?>">
                 <?php esc_html_e("Registration Details", "event_espresso"); ?>
                 <span class="small-text link">
                     ( <a class="print_button noPrint" href="[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]">

core/libraries/messages/defaults/default/html_receipt_event_list.template.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 ?>
 <h3 class="section-title event-name">
-    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'calendar_year-24x24.png'); ?>">
+    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'calendar_year-24x24.png'); ?>">
     <?php esc_html_e("Event Name:", "event_espresso") ?>
     <span class="plain-text">[EVENT_NAME]</span>
     <span class="small-text link">

core/libraries/messages/defaults/default/html_receipt_attendee_list.template.php

Spacing +2 added lines, -2 removed lines

@@ -8,11 +8,11 @@
 <li class="ticket-registration">
     <table class="registration-details">
         <tr class="odd">
-            <th><?php	_e('Attendee', 'event_espresso');?></th>
+            <th><?php	_e('Attendee', 'event_espresso'); ?></th>
             <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
         </tr>
         <tr>
-            <th><?php esc_html_e("Registration Code:", "event_espresso");?></th>
+            <th><?php esc_html_e("Registration Code:", "event_espresso"); ?></th>
             <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
         </tr>
     </table>

core/EE_Maintenance_Mode.core.php

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EE_Maintenance_Mode) {
+        if ( ! self::$_instance instanceof EE_Maintenance_Mode) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -184,7 +184,7 @@ 
      */
     public static function disable_frontend_for_maintenance()
     {
-        return (! is_admin() && EE_Maintenance_Mode::instance()->level());
+        return ( ! is_admin() && EE_Maintenance_Mode::instance()->level());
     }
 
 
@@ -199,14 +199,14 @@ 
         ) {
             wp_register_style(
                 'espresso_default',
-                EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+                EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
                 ['dashicons'],
                 EVENT_ESPRESSO_VERSION
             );
             wp_enqueue_style('espresso_default');
             wp_register_script(
                 'espresso_core',
-                EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+                EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js',
                 ['jquery'],
                 EVENT_ESPRESSO_VERSION,
                 true
@@ -226,7 +226,7 @@ 
     public static function template_include()
     {
         // shut 'er down for maintenance ? then don't use any of our templates for our endpoints
-        return get_template_directory() . '/index.php';
+        return get_template_directory().'/index.php';
     }
 
 
@@ -278,10 +278,10 @@ 
                 ),
                 '<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="',
                 '"><span class="dashicons dashicons-no"></span></a><p>',
-                ' &raquo; <a href="' . add_query_arg(
+                ' &raquo; <a href="'.add_query_arg(
                     ['page' => 'espresso_maintenance_settings'],
                     admin_url('admin.php')
-                ) . '">',
+                ).'">',
                 '</a></p></div>'
             );
         }

Indentation +334 added lines, -334 removed lines

@@ -15,340 +15,340 @@
  */
 class EE_Maintenance_Mode implements ResettableInterface
 {
-    /**
-     * constants available to client code for interpreting the values of EE_Maintenance_Mode::level().
-     * level_0_not_in_maintenance means the site is NOT in maintenance mode (so everything's normal)
-     */
-    const level_0_not_in_maintenance = 0;
-
-    /**
-     * level_1_frontend_only_maintenance means that the site's frontend EE code should be completely disabled
-     * but the admin backend should be running as normal. Maybe an admin can view the frontend though
-     */
-    const level_1_frontend_only_maintenance = 1;
-
-    /**
-     * level_2_complete_maintenance means the frontend AND EE backend code are disabled. The only system running
-     * is the maintenance mode stuff, which will require users to update all addons, and then finish running all
-     * migration scripts before taking the site out of maintenance mode
-     */
-    const level_2_complete_maintenance = 2;
-
-    /**
-     * the name of the option which stores the current level of maintenance mode
-     */
-    const option_name_maintenance_mode = 'ee_maintenance_mode';
-
-
-    /**
-     * @var EE_Maintenance_Mode $_instance
-     */
-    private static $_instance;
-
-    /**
-     * @var EE_Registry $EE
-     */
-    protected $EE;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @return EE_Maintenance_Mode
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated
-        if (! self::$_instance instanceof EE_Maintenance_Mode) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * Resets maintenance mode (mostly just re-checks whether we should be in maintenance mode)
-     *
-     * @return EE_Maintenance_Mode
-     * @throws EE_Error
-     */
-    public static function reset()
-    {
-        self::instance()->set_maintenance_mode_if_db_old();
-        return self::instance();
-    }
-
-
-    /**
-     *private constructor to prevent direct creation
-     */
-    private function __construct()
-    {
-        // if M-Mode level 2 is engaged, we still need basic assets loaded
-        add_action('wp_enqueue_scripts', [$this, 'load_assets_required_for_m_mode']);
-        // shut 'er down for maintenance ?
-        add_filter('the_content', [$this, 'the_content'], 2);
-        // add powered by EE msg
-        add_action('shutdown', [$this, 'display_maintenance_mode_notice'], 10);
-    }
-
-
-    /**
-     * retrieves the maintenance mode option value from the db
-     *
-     * @return int
-     */
-    public function real_level()
-    {
-        return (int) get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance);
-    }
-
-
-    /**
-     * Returns whether the models reportedly are able to run queries or not
-     * (ie, if the system thinks their tables are present and up-to-date).
-     *
-     * @return boolean
-     */
-    public function models_can_query()
-    {
-        return $this->real_level() !== EE_Maintenance_Mode::level_2_complete_maintenance;
-    }
-
-
-    /**
-     * Determines whether we're in maintenance mode and what level. However, while the site
-     * is in level 1 maintenance, and an admin visits the frontend, this function makes it appear
-     * to them as if teh site isn't in maintenance mode.
-     * EE_Maintenance_Mode::level_0_not_in_maintenance => not in maintenance mode (in normal mode)
-     * EE_Maintenance_Mode::level_1_frontend_only_maintenance=> frontend-only maintenance mode
-     * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode
-     *
-     * @return int
-     */
-    public function level()
-    {
-        $maintenance_mode_level = $this->real_level();
-        // if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend
-        if (
-            $maintenance_mode_level === EE_Maintenance_Mode::level_1_frontend_only_maintenance// we're in level 1
-            && ((defined('DOING_AJAX') && DOING_AJAX) || ! is_admin()) // on non-ajax frontend requests
-            && current_user_can('administrator') // when the user is an admin
-        ) {
-            $maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
-        }
-        return $maintenance_mode_level;
-    }
-
-
-    /**
-     * Determines if we need to put EE in maintenance mode because the database needs updating
-     *
-     * @return boolean true if DB is old and maintenance mode was triggered; false otherwise
-     * @throws EE_Error
-     */
-    public function set_maintenance_mode_if_db_old()
-    {
-        LoaderFactory::getLoader()->getShared('Data_Migration_Manager');
-        if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
-            update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
-            return true;
-        }
-        if ($this->level() === self::level_2_complete_maintenance) {
-            // we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
-            // then we shouldn't be in mm2. (Maybe an addon got deactivated?)
-            update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance);
-            return false;
-        }
-        return false;
-    }
-
-
-    /**
-     * Updates the maintenance level on the site
-     *
-     * @param int $level
-     * @return void
-     */
-    public function set_maintenance_level($level)
-    {
-        do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level);
-        update_option(self::option_name_maintenance_mode, (int) $level);
-    }
-
-
-    /**
-     * returns TRUE if M-Mode is engaged and the current request is not for the admin
-     *
-     * @return bool
-     */
-    public static function disable_frontend_for_maintenance()
-    {
-        return (! is_admin() && EE_Maintenance_Mode::instance()->level());
-    }
-
-
-    /**
-     * @return void
-     */
-    public function load_assets_required_for_m_mode()
-    {
-        if (
-            $this->real_level() === EE_Maintenance_Mode::level_2_complete_maintenance
-            && ! wp_script_is('espresso_core')
-        ) {
-            wp_register_style(
-                'espresso_default',
-                EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                ['dashicons'],
-                EVENT_ESPRESSO_VERSION
-            );
-            wp_enqueue_style('espresso_default');
-            wp_register_script(
-                'espresso_core',
-                EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-                ['jquery'],
-                EVENT_ESPRESSO_VERSION,
-                true
-            );
-            wp_enqueue_script('espresso_core');
-        }
-    }
-
-
-    /**
-     * replacement EE CPT template that displays message notifying site visitors
-     * that EE has been temporarily placed into maintenance mode
-     * does NOT get called on non-EE-CPT requests
-     *
-     * @return    string
-     */
-    public static function template_include()
-    {
-        // shut 'er down for maintenance ? then don't use any of our templates for our endpoints
-        return get_template_directory() . '/index.php';
-    }
-
-
-    /**
-     * displays message notifying site visitors that EE has been temporarily
-     * placed into maintenance mode when post_type != EE CPT
-     *
-     * @param string $the_content
-     * @return string
-     */
-    public function the_content($the_content)
-    {
-        // check if M-mode is engaged and for EE shortcode
-        if ($this->level() && strpos($the_content, '[ESPRESSO_') !== false) {
-            // this can eventually be moved to a template, or edited via admin. But for now...
-            $the_content = sprintf(
-                esc_html__(
-                    '%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s',
-                    'event_espresso'
-                ),
-                '<h3>',
-                '</h3><p>',
-                '</p>'
-            );
-        }
-        return $the_content;
-    }
-
-
-    /**
-     * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
-     */
-    public function display_maintenance_mode_notice()
-    {
-        /** @var CurrentPage $current_page */
-        $current_page = LoaderFactory::getLoader()->getShared(CurrentPage::class);
-        // check if M-mode is engaged and for EE shortcode
-        if (
-            ! (defined('DOING_AJAX') && DOING_AJAX)
-            && $this->real_level()
-            && ! is_admin()
-            && current_user_can('administrator')
-            && $current_page->isEspressoPage()
-        ) {
-            printf(
-                esc_html__(
-                    '%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s',
-                    'event_espresso'
-                ),
-                '<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="',
-                '"><span class="dashicons dashicons-no"></span></a><p>',
-                ' &raquo; <a href="' . add_query_arg(
-                    ['page' => 'espresso_maintenance_settings'],
-                    admin_url('admin.php')
-                ) . '">',
-                '</a></p></div>'
-            );
-        }
-    }
-    // espresso-notices important-notice ee-attention
-
-
-    /**
-     * override magic methods
-     */
-    final public function __destruct()
-    {
-    }
-
-
-    final public function __call($a, $b)
-    {
-    }
-
-
-    final public function __get($a)
-    {
-    }
-
-
-    final public function __set($a, $b)
-    {
-    }
-
-
-    final public function __isset($a)
-    {
-    }
-
-
-    final public function __unset($a)
-    {
-    }
-
-
-    final public function __sleep()
-    {
-        return [];
-    }
-
-
-    final public function __wakeup()
-    {
-    }
-
-
-    final public function __invoke()
-    {
-    }
-
-
-    final public static function __set_state($a = null)
-    {
-        return EE_Maintenance_Mode::instance();
-    }
-
-
-    final public function __clone()
-    {
-    }
+	/**
+	 * constants available to client code for interpreting the values of EE_Maintenance_Mode::level().
+	 * level_0_not_in_maintenance means the site is NOT in maintenance mode (so everything's normal)
+	 */
+	const level_0_not_in_maintenance = 0;
+
+	/**
+	 * level_1_frontend_only_maintenance means that the site's frontend EE code should be completely disabled
+	 * but the admin backend should be running as normal. Maybe an admin can view the frontend though
+	 */
+	const level_1_frontend_only_maintenance = 1;
+
+	/**
+	 * level_2_complete_maintenance means the frontend AND EE backend code are disabled. The only system running
+	 * is the maintenance mode stuff, which will require users to update all addons, and then finish running all
+	 * migration scripts before taking the site out of maintenance mode
+	 */
+	const level_2_complete_maintenance = 2;
+
+	/**
+	 * the name of the option which stores the current level of maintenance mode
+	 */
+	const option_name_maintenance_mode = 'ee_maintenance_mode';
+
+
+	/**
+	 * @var EE_Maintenance_Mode $_instance
+	 */
+	private static $_instance;
+
+	/**
+	 * @var EE_Registry $EE
+	 */
+	protected $EE;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @return EE_Maintenance_Mode
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated
+		if (! self::$_instance instanceof EE_Maintenance_Mode) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * Resets maintenance mode (mostly just re-checks whether we should be in maintenance mode)
+	 *
+	 * @return EE_Maintenance_Mode
+	 * @throws EE_Error
+	 */
+	public static function reset()
+	{
+		self::instance()->set_maintenance_mode_if_db_old();
+		return self::instance();
+	}
+
+
+	/**
+	 *private constructor to prevent direct creation
+	 */
+	private function __construct()
+	{
+		// if M-Mode level 2 is engaged, we still need basic assets loaded
+		add_action('wp_enqueue_scripts', [$this, 'load_assets_required_for_m_mode']);
+		// shut 'er down for maintenance ?
+		add_filter('the_content', [$this, 'the_content'], 2);
+		// add powered by EE msg
+		add_action('shutdown', [$this, 'display_maintenance_mode_notice'], 10);
+	}
+
+
+	/**
+	 * retrieves the maintenance mode option value from the db
+	 *
+	 * @return int
+	 */
+	public function real_level()
+	{
+		return (int) get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance);
+	}
+
+
+	/**
+	 * Returns whether the models reportedly are able to run queries or not
+	 * (ie, if the system thinks their tables are present and up-to-date).
+	 *
+	 * @return boolean
+	 */
+	public function models_can_query()
+	{
+		return $this->real_level() !== EE_Maintenance_Mode::level_2_complete_maintenance;
+	}
+
+
+	/**
+	 * Determines whether we're in maintenance mode and what level. However, while the site
+	 * is in level 1 maintenance, and an admin visits the frontend, this function makes it appear
+	 * to them as if teh site isn't in maintenance mode.
+	 * EE_Maintenance_Mode::level_0_not_in_maintenance => not in maintenance mode (in normal mode)
+	 * EE_Maintenance_Mode::level_1_frontend_only_maintenance=> frontend-only maintenance mode
+	 * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode
+	 *
+	 * @return int
+	 */
+	public function level()
+	{
+		$maintenance_mode_level = $this->real_level();
+		// if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend
+		if (
+			$maintenance_mode_level === EE_Maintenance_Mode::level_1_frontend_only_maintenance// we're in level 1
+			&& ((defined('DOING_AJAX') && DOING_AJAX) || ! is_admin()) // on non-ajax frontend requests
+			&& current_user_can('administrator') // when the user is an admin
+		) {
+			$maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
+		}
+		return $maintenance_mode_level;
+	}
+
+
+	/**
+	 * Determines if we need to put EE in maintenance mode because the database needs updating
+	 *
+	 * @return boolean true if DB is old and maintenance mode was triggered; false otherwise
+	 * @throws EE_Error
+	 */
+	public function set_maintenance_mode_if_db_old()
+	{
+		LoaderFactory::getLoader()->getShared('Data_Migration_Manager');
+		if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
+			update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
+			return true;
+		}
+		if ($this->level() === self::level_2_complete_maintenance) {
+			// we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
+			// then we shouldn't be in mm2. (Maybe an addon got deactivated?)
+			update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance);
+			return false;
+		}
+		return false;
+	}
+
+
+	/**
+	 * Updates the maintenance level on the site
+	 *
+	 * @param int $level
+	 * @return void
+	 */
+	public function set_maintenance_level($level)
+	{
+		do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level);
+		update_option(self::option_name_maintenance_mode, (int) $level);
+	}
+
+
+	/**
+	 * returns TRUE if M-Mode is engaged and the current request is not for the admin
+	 *
+	 * @return bool
+	 */
+	public static function disable_frontend_for_maintenance()
+	{
+		return (! is_admin() && EE_Maintenance_Mode::instance()->level());
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function load_assets_required_for_m_mode()
+	{
+		if (
+			$this->real_level() === EE_Maintenance_Mode::level_2_complete_maintenance
+			&& ! wp_script_is('espresso_core')
+		) {
+			wp_register_style(
+				'espresso_default',
+				EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+				['dashicons'],
+				EVENT_ESPRESSO_VERSION
+			);
+			wp_enqueue_style('espresso_default');
+			wp_register_script(
+				'espresso_core',
+				EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+				['jquery'],
+				EVENT_ESPRESSO_VERSION,
+				true
+			);
+			wp_enqueue_script('espresso_core');
+		}
+	}
+
+
+	/**
+	 * replacement EE CPT template that displays message notifying site visitors
+	 * that EE has been temporarily placed into maintenance mode
+	 * does NOT get called on non-EE-CPT requests
+	 *
+	 * @return    string
+	 */
+	public static function template_include()
+	{
+		// shut 'er down for maintenance ? then don't use any of our templates for our endpoints
+		return get_template_directory() . '/index.php';
+	}
+
+
+	/**
+	 * displays message notifying site visitors that EE has been temporarily
+	 * placed into maintenance mode when post_type != EE CPT
+	 *
+	 * @param string $the_content
+	 * @return string
+	 */
+	public function the_content($the_content)
+	{
+		// check if M-mode is engaged and for EE shortcode
+		if ($this->level() && strpos($the_content, '[ESPRESSO_') !== false) {
+			// this can eventually be moved to a template, or edited via admin. But for now...
+			$the_content = sprintf(
+				esc_html__(
+					'%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s',
+					'event_espresso'
+				),
+				'<h3>',
+				'</h3><p>',
+				'</p>'
+			);
+		}
+		return $the_content;
+	}
+
+
+	/**
+	 * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
+	 */
+	public function display_maintenance_mode_notice()
+	{
+		/** @var CurrentPage $current_page */
+		$current_page = LoaderFactory::getLoader()->getShared(CurrentPage::class);
+		// check if M-mode is engaged and for EE shortcode
+		if (
+			! (defined('DOING_AJAX') && DOING_AJAX)
+			&& $this->real_level()
+			&& ! is_admin()
+			&& current_user_can('administrator')
+			&& $current_page->isEspressoPage()
+		) {
+			printf(
+				esc_html__(
+					'%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s',
+					'event_espresso'
+				),
+				'<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="',
+				'"><span class="dashicons dashicons-no"></span></a><p>',
+				' &raquo; <a href="' . add_query_arg(
+					['page' => 'espresso_maintenance_settings'],
+					admin_url('admin.php')
+				) . '">',
+				'</a></p></div>'
+			);
+		}
+	}
+	// espresso-notices important-notice ee-attention
+
+
+	/**
+	 * override magic methods
+	 */
+	final public function __destruct()
+	{
+	}
+
+
+	final public function __call($a, $b)
+	{
+	}
+
+
+	final public function __get($a)
+	{
+	}
+
+
+	final public function __set($a, $b)
+	{
+	}
+
+
+	final public function __isset($a)
+	{
+	}
+
+
+	final public function __unset($a)
+	{
+	}
+
+
+	final public function __sleep()
+	{
+		return [];
+	}
+
+
+	final public function __wakeup()
+	{
+	}
+
+
+	final public function __invoke()
+	{
+	}
+
+
+	final public static function __set_state($a = null)
+	{
+		return EE_Maintenance_Mode::instance();
+	}
+
+
+	final public function __clone()
+	{
+	}
 
 
-    final public static function __callStatic($a, $b)
-    {
-    }
+	final public static function __callStatic($a, $b)
+	{
+	}
 }

core/db_models/EEM_System_Status.model.php

Spacing +16 added lines, -16 removed lines

@@ -97,9 +97,9 @@ 
         $active_plugins = array_map('strtolower', $active_plugins);
         $plugin_info = array();
         foreach ($active_plugins as $plugin) {
-                $plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
+                $plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-                $plugin_info[ $plugin ] = $plugin_data;
+                $plugin_info[$plugin] = $plugin_data;
         }
         return $plugin_info;
     }
@@ -124,7 +124,7 @@ 
             );
             $wp_memory_to_display .= '</mark>';
         } else {
-            $wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
+            $wp_memory_to_display = '<mark class="yes">'.size_format($wp_memory_int).'</mark>';
         }
         return array(
             'name' => get_bloginfo('name', 'display'),
@@ -163,7 +163,7 @@ 
         $options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
         $presentable_migration_scripts = array();
         foreach ($options as $option_array) {
-            $presentable_migration_scripts[ str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name']) ] = maybe_unserialize($option_array['option_value']);
+            $presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name'])] = maybe_unserialize($option_array['option_value']);
         }
         return $presentable_migration_scripts;
 //      return get_option(EE_Data_Migration_Manager::data_migrations_option_name);//EE_Data_Migration_Manager::instance()->get_data_migrations_ran();
@@ -189,18 +189,18 @@ 
 
         $pi = preg_replace(
             array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-            '#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
+            '#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
             "#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
             '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
             . '<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
             '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
             '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
             "# +#", '#<tr>#', '#</tr>#'),
-            array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
-            '<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
-            "\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
+            array('$1', '', '', '', '</$1>'."\n", '<', ' ', ' ', ' ', '', ' ',
+            '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
+            "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
             '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-            '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+            '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n".
             '<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
             ob_get_clean()
         );
@@ -220,7 +220,7 @@ 
             foreach ($askapache as $m) {
                 $m2 = isset($m[2]) ? $m[2] : null;
             }
-              $pi[ $n ][ $m[1] ] = (!isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
+              $pi[$n][$m[1]] = ( ! isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
         }
 
         return $pi;
@@ -237,7 +237,7 @@ 
         if ($response instanceof WP_Error) {
             $error_string = '';
             foreach ($response->errors as $short_name => $description_array) {
-                $error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
+                $error_string .= "<b>$short_name</b>: ".implode(", ", $description_array);
             }
             return $error_string;
         }
@@ -249,8 +249,8 @@ 
      */
     public function get_wp_maintenance_mode()
     {
-        $opened = file_exists(ABSPATH . '.maintenance');
-        return $opened ? sprintf(esc_html__('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>', '</strong>') : esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
+        $opened = file_exists(ABSPATH.'.maintenance');
+        return $opened ? sprintf(esc_html__('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>', '</strong>') : esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso');
     }
     /**
      * Whether or not logging is enabled
@@ -258,8 +258,8 @@ 
      */
     public function get_logging_enabled()
     {
-            $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
-            return $opened ? esc_html__('Log Directory is writable', 'event_espresso') : sprintf(esc_html__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>') ;
+            $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR.'/logs/espresso_log.txt', 'a');
+            return $opened ? esc_html__('Log Directory is writable', 'event_espresso') : sprintf(esc_html__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
     }
     /**
      *  Whether curl ro fsock works
@@ -276,7 +276,7 @@ 
         } elseif ($curl_works) {
             $status = esc_html__('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
         } else {
-            $status = esc_html__('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso') . '</mark>';
+            $status = esc_html__('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso').'</mark>';
         }
         return $status;
     }

Indentation +283 added lines, -283 removed lines

@@ -5,79 +5,79 @@ 
  */
 class EEM_System_Status
 {
-    // private instance of the EEM_System_Status object
-    protected static $_instance = null;
+	// private instance of the EEM_System_Status object
+	protected static $_instance = null;
 
 
 
-    /**
-     *      This function is a singleton method used to instantiate the EEM_Attendee object
-     *
-     *      @access public
-     *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
-     *      @return EEM_System_Status
-     */
-    public static function instance()
-    {
+	/**
+	 *      This function is a singleton method used to instantiate the EEM_Attendee object
+	 *
+	 *      @access public
+	 *      @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
+	 *      @return EEM_System_Status
+	 */
+	public static function instance()
+	{
 
-        // check if instance of EEM_System_Status already exists
-        if (self::$_instance === null) {
-            // instantiate EEM_System_Status
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-    private function __construct()
-    {
-    }
-    /**
-     *
-     * @return array where each key is a function name on this class, and each value is SOMETHING--
-     * it might be a value, an array, or an object
-     */
-    public function get_system_stati()
-    {
-        return apply_filters(
-            'FHEE__EEM_System_Status__get_system_stati',
-            array(
-                'ee_version' => $this->get_ee_version(),
-                'ee_activation_history' => $this->get_ee_activation_history(),
-                'ee_config' => $this->get_ee_config(),
-                'ee_migration_history' => $this->get_ee_migration_history(),
-                'active_plugins' => $this->get_active_plugins(),
-                'wp_settings' => $this->get_wp_settings(),
-                'wp_maintenance_mode' => $this->get_wp_maintenance_mode(),
-                'https_enabled' => $this->get_https_enabled(),
-                'logging_enabled' => $this->get_logging_enabled(),
-                'remote_posting' => $this->get_remote_posting(),
-                'php_version' => $this->php_version(),
-                'php.ini_settings' => $this->get_php_ini_all(),
-                'php_info' => $this->get_php_info(),
-            ),
-            $this
-        );
-    }
-    /**
-     *
-     * @return string
-     */
-    public function get_ee_version()
-    {
-        return espresso_version();
-    }
-    /**
-     *
-     * @return string
-     */
-    public function php_version()
-    {
-        return phpversion();
-    }
-    /**
-     *
-     * @return array, where each key is a plugin name (lower-cased), values are sub-arrays.
-     * Sub-arrays like described in wp function get_plugin_data. Ie,     *
-     *  'Name' => 'Plugin Name',
+		// check if instance of EEM_System_Status already exists
+		if (self::$_instance === null) {
+			// instantiate EEM_System_Status
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+	private function __construct()
+	{
+	}
+	/**
+	 *
+	 * @return array where each key is a function name on this class, and each value is SOMETHING--
+	 * it might be a value, an array, or an object
+	 */
+	public function get_system_stati()
+	{
+		return apply_filters(
+			'FHEE__EEM_System_Status__get_system_stati',
+			array(
+				'ee_version' => $this->get_ee_version(),
+				'ee_activation_history' => $this->get_ee_activation_history(),
+				'ee_config' => $this->get_ee_config(),
+				'ee_migration_history' => $this->get_ee_migration_history(),
+				'active_plugins' => $this->get_active_plugins(),
+				'wp_settings' => $this->get_wp_settings(),
+				'wp_maintenance_mode' => $this->get_wp_maintenance_mode(),
+				'https_enabled' => $this->get_https_enabled(),
+				'logging_enabled' => $this->get_logging_enabled(),
+				'remote_posting' => $this->get_remote_posting(),
+				'php_version' => $this->php_version(),
+				'php.ini_settings' => $this->get_php_ini_all(),
+				'php_info' => $this->get_php_info(),
+			),
+			$this
+		);
+	}
+	/**
+	 *
+	 * @return string
+	 */
+	public function get_ee_version()
+	{
+		return espresso_version();
+	}
+	/**
+	 *
+	 * @return string
+	 */
+	public function php_version()
+	{
+		return phpversion();
+	}
+	/**
+	 *
+	 * @return array, where each key is a plugin name (lower-cased), values are sub-arrays.
+	 * Sub-arrays like described in wp function get_plugin_data. Ie,     *
+	 *  'Name' => 'Plugin Name',
         'PluginURI' => 'Plugin URI',
         'Version' => 'Version',
         'Description' => 'Description',
@@ -86,231 +86,231 @@ 
         'TextDomain' => 'Text Domain',
         'DomainPath' => 'Domain Path',
         'Network' => 'Network',
-     */
-    public function get_active_plugins()
-    {
-        $active_plugins = (array) get_option('active_plugins', array());
-        if (is_multisite()) {
-            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
-        }
-        $active_plugins = array_map('strtolower', $active_plugins);
-        $plugin_info = array();
-        foreach ($active_plugins as $plugin) {
-                $plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
+	 */
+	public function get_active_plugins()
+	{
+		$active_plugins = (array) get_option('active_plugins', array());
+		if (is_multisite()) {
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
+		}
+		$active_plugins = array_map('strtolower', $active_plugins);
+		$plugin_info = array();
+		foreach ($active_plugins as $plugin) {
+				$plugin_data = @get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin);
 
-                $plugin_info[ $plugin ] = $plugin_data;
-        }
-        return $plugin_info;
-    }
+				$plugin_info[ $plugin ] = $plugin_data;
+		}
+		return $plugin_info;
+	}
 
-    /**
-     *
-     * @return array with keys 'home_url' and 'site_url'
-     */
-    public function get_wp_settings()
-    {
-        $wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
-        if ($wp_memory_int < 67108864) {
-            $wp_memory_to_display = '<mark class="error">';
-            $wp_memory_to_display .= sprintf(
-                esc_html__(
-                    '%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s',
-                    'event_espresso'
-                ),
-                WP_MEMORY_LIMIT,
-                '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">',
-                '</a>"'
-            );
-            $wp_memory_to_display .= '</mark>';
-        } else {
-            $wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
-        }
-        return array(
-            'name' => get_bloginfo('name', 'display'),
-            'is_multisite' => is_multisite(),
-            'version' =>  get_bloginfo('version', 'display'),
-            'home_url' => home_url(),
-            'site_url' => site_url(),
-            'WP_DEBUG' => WP_DEBUG,
-            'permalink_structure' => get_option('permalink_structure'),
-            'theme' => wp_get_theme(),
-            'gmt_offset' => get_option('gmt_offset'),
-            'timezone_string' => get_option('timezone_string'),
-            'admin_email' =>  get_bloginfo('admin_email', 'display'),
-            'language' => get_bloginfo('language', 'display'),
-            'wp_max_upload_size' => size_format(wp_max_upload_size()),
-            'wp_memory' => $wp_memory_to_display
-            );
-    }
+	/**
+	 *
+	 * @return array with keys 'home_url' and 'site_url'
+	 */
+	public function get_wp_settings()
+	{
+		$wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
+		if ($wp_memory_int < 67108864) {
+			$wp_memory_to_display = '<mark class="error">';
+			$wp_memory_to_display .= sprintf(
+				esc_html__(
+					'%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s',
+					'event_espresso'
+				),
+				WP_MEMORY_LIMIT,
+				'<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">',
+				'</a>"'
+			);
+			$wp_memory_to_display .= '</mark>';
+		} else {
+			$wp_memory_to_display = '<mark class="yes">' . size_format($wp_memory_int) . '</mark>';
+		}
+		return array(
+			'name' => get_bloginfo('name', 'display'),
+			'is_multisite' => is_multisite(),
+			'version' =>  get_bloginfo('version', 'display'),
+			'home_url' => home_url(),
+			'site_url' => site_url(),
+			'WP_DEBUG' => WP_DEBUG,
+			'permalink_structure' => get_option('permalink_structure'),
+			'theme' => wp_get_theme(),
+			'gmt_offset' => get_option('gmt_offset'),
+			'timezone_string' => get_option('timezone_string'),
+			'admin_email' =>  get_bloginfo('admin_email', 'display'),
+			'language' => get_bloginfo('language', 'display'),
+			'wp_max_upload_size' => size_format(wp_max_upload_size()),
+			'wp_memory' => $wp_memory_to_display
+			);
+	}
 
-    /**
-     * Gets an array of information about the history of ee versions installed
-     * @return array
-     */
-    public function get_ee_activation_history()
-    {
-        return get_option('espresso_db_update');
-    }
+	/**
+	 * Gets an array of information about the history of ee versions installed
+	 * @return array
+	 */
+	public function get_ee_activation_history()
+	{
+		return get_option('espresso_db_update');
+	}
 
 
-    /**
-     * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that version was installed
-     * @return EE_Data_Migration_Script_Base[]
-     */
-    public function get_ee_migration_history()
-    {
-        $options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
-        $presentable_migration_scripts = array();
-        foreach ($options as $option_array) {
-            $presentable_migration_scripts[ str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name']) ] = maybe_unserialize($option_array['option_value']);
-        }
-        return $presentable_migration_scripts;
+	/**
+	 * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that version was installed
+	 * @return EE_Data_Migration_Script_Base[]
+	 */
+	public function get_ee_migration_history()
+	{
+		$options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
+		$presentable_migration_scripts = array();
+		foreach ($options as $option_array) {
+			$presentable_migration_scripts[ str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name']) ] = maybe_unserialize($option_array['option_value']);
+		}
+		return $presentable_migration_scripts;
 //      return get_option(EE_Data_Migration_Manager::data_migrations_option_name);//EE_Data_Migration_Manager::instance()->get_data_migrations_ran();
-    }
+	}
 
-    /**
-     *
-     * @return array like EE_Config class
-     */
-    public function get_ee_config()
-    {
-        return EE_Config::instance();
-    }
+	/**
+	 *
+	 * @return array like EE_Config class
+	 */
+	public function get_ee_config()
+	{
+		return EE_Config::instance();
+	}
 
-    /**
-     * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
-     * @return array like the output of phpinfo(), but in an array
-     */
-    public function get_php_info()
-    {
-        ob_start();
-        phpinfo(-1);
+	/**
+	 * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
+	 * @return array like the output of phpinfo(), but in an array
+	 */
+	public function get_php_info()
+	{
+		ob_start();
+		phpinfo(-1);
 
-        $pi = preg_replace(
-            array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-            '#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
-            "#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
-            '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
-            . '<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
-            '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
-            '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
-            "# +#", '#<tr>#', '#</tr>#'),
-            array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
-            '<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
-            "\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
-            '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-            '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
-            '<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
-            ob_get_clean()
-        );
+		$pi = preg_replace(
+			array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
+			'#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
+			"#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
+			'#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
+			. '<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
+			'#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
+			'#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
+			"# +#", '#<tr>#', '#</tr>#'),
+			array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
+			'<h2>PHP Configuration</h2>' . "\n" . '<tr><td>PHP Version</td><td>$2</td></tr>' .
+			"\n" . '<tr><td>PHP Egg</td><td>$1</td></tr>',
+			'<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
+			'<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+			'<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
+			ob_get_clean()
+		);
 
-        $sections = explode('<h2>', strip_tags((string) $pi, '<h2><th><td>'));
-        unset($sections[0]);
+		$sections = explode('<h2>', strip_tags((string) $pi, '<h2><th><td>'));
+		unset($sections[0]);
 
-        $pi = array();
-        foreach ($sections as $section) {
-            $n = substr($section, 0, strpos($section, '</h2>'));
-            preg_match_all(
-                '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
-                $section,
-                $askapache,
-                PREG_SET_ORDER
-            );
-            foreach ($askapache as $m) {
-                $m2 = isset($m[2]) ? $m[2] : null;
-            }
-              $pi[ $n ][ $m[1] ] = (!isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
-        }
+		$pi = array();
+		foreach ($sections as $section) {
+			$n = substr($section, 0, strpos($section, '</h2>'));
+			preg_match_all(
+				'#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
+				$section,
+				$askapache,
+				PREG_SET_ORDER
+			);
+			foreach ($askapache as $m) {
+				$m2 = isset($m[2]) ? $m[2] : null;
+			}
+			  $pi[ $n ][ $m[1] ] = (!isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
+		}
 
-        return $pi;
-    }
+		return $pi;
+	}
 
-    /**
-     * Checks if site responds ot HTTPS
-     * @return boolean
-     */
-    public function get_https_enabled()
-    {
-        $home = str_replace("http://", "https://", home_url());
-        $response = wp_remote_get($home);
-        if ($response instanceof WP_Error) {
-            $error_string = '';
-            foreach ($response->errors as $short_name => $description_array) {
-                $error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
-            }
-            return $error_string;
-        }
-        return "ok!";
-    }
-    /**
-     * Whether or not a .maintenance file is detected
-     * @return string descripting wp_maintenance_mode status
-     */
-    public function get_wp_maintenance_mode()
-    {
-        $opened = file_exists(ABSPATH . '.maintenance');
-        return $opened ? sprintf(esc_html__('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>', '</strong>') : esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
-    }
-    /**
-     * Whether or not logging is enabled
-     * @return string descripting logging's status
-     */
-    public function get_logging_enabled()
-    {
-            $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
-            return $opened ? esc_html__('Log Directory is writable', 'event_espresso') : sprintf(esc_html__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>') ;
-    }
-    /**
-     *  Whether curl ro fsock works
-     * @return string describing posting's status
-     */
-    public function get_remote_posting()
-    {
-        $fsock_works = function_exists('fsockopen');
-        $curl_works = function_exists('curl_init');
-        if ($fsock_works && $curl_works) {
-            $status = esc_html__('Your server has fsockopen and cURL enabled.', 'event_espresso');
-        } elseif ($fsock_works) {
-            $status = esc_html__('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
-        } elseif ($curl_works) {
-            $status = esc_html__('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-        } else {
-            $status = esc_html__('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso') . '</mark>';
-        }
-        return $status;
-    }
-    /**
-     * Gets all the php.ini settings
-     * @return array
-     */
-    public function get_php_ini_all()
-    {
-        return ini_get_all();
-    }
-    /**
-     * Transforms the php.ini notation for numbers (like '2M') to an integer.
-     *
-     * @param type $size
-     * @return int
-     */
-    public function let_to_num($size)
-    {
-        $l      = substr($size, -1);
-        $ret    = substr($size, 0, -1);
-        // phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
-        switch (strtoupper($l)) {
-            case 'P':
-                $ret *= 1024;
-            case 'T':
-                $ret *= 1024;
-            case 'G':
-                $ret *= 1024;
-            case 'M':
-                $ret *= 1024;
-            case 'K':
-                $ret *= 1024;
-        }
-        // phpcs:enable
-        return $ret;
-    }
+	/**
+	 * Checks if site responds ot HTTPS
+	 * @return boolean
+	 */
+	public function get_https_enabled()
+	{
+		$home = str_replace("http://", "https://", home_url());
+		$response = wp_remote_get($home);
+		if ($response instanceof WP_Error) {
+			$error_string = '';
+			foreach ($response->errors as $short_name => $description_array) {
+				$error_string .= "<b>$short_name</b>: " . implode(", ", $description_array);
+			}
+			return $error_string;
+		}
+		return "ok!";
+	}
+	/**
+	 * Whether or not a .maintenance file is detected
+	 * @return string descripting wp_maintenance_mode status
+	 */
+	public function get_wp_maintenance_mode()
+	{
+		$opened = file_exists(ABSPATH . '.maintenance');
+		return $opened ? sprintf(esc_html__('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>', '</strong>') : esc_html__('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
+	}
+	/**
+	 * Whether or not logging is enabled
+	 * @return string descripting logging's status
+	 */
+	public function get_logging_enabled()
+	{
+			$opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a');
+			return $opened ? esc_html__('Log Directory is writable', 'event_espresso') : sprintf(esc_html__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>') ;
+	}
+	/**
+	 *  Whether curl ro fsock works
+	 * @return string describing posting's status
+	 */
+	public function get_remote_posting()
+	{
+		$fsock_works = function_exists('fsockopen');
+		$curl_works = function_exists('curl_init');
+		if ($fsock_works && $curl_works) {
+			$status = esc_html__('Your server has fsockopen and cURL enabled.', 'event_espresso');
+		} elseif ($fsock_works) {
+			$status = esc_html__('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
+		} elseif ($curl_works) {
+			$status = esc_html__('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
+		} else {
+			$status = esc_html__('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso') . '</mark>';
+		}
+		return $status;
+	}
+	/**
+	 * Gets all the php.ini settings
+	 * @return array
+	 */
+	public function get_php_ini_all()
+	{
+		return ini_get_all();
+	}
+	/**
+	 * Transforms the php.ini notation for numbers (like '2M') to an integer.
+	 *
+	 * @param type $size
+	 * @return int
+	 */
+	public function let_to_num($size)
+	{
+		$l      = substr($size, -1);
+		$ret    = substr($size, 0, -1);
+		// phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
+		switch (strtoupper($l)) {
+			case 'P':
+				$ret *= 1024;
+			case 'T':
+				$ret *= 1024;
+			case 'G':
+				$ret *= 1024;
+			case 'M':
+				$ret *= 1024;
+			case 'K':
+				$ret *= 1024;
+		}
+		// phpcs:enable
+		return $ret;
+	}
 }

modules/thank_you_page/templates/thank-you-page-registration-details.template.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     $event_name    = '';
     $wait_list     = false;
     foreach ($registrations as $registration) {
-        if (! $registration instanceof EE_Registration) {
+        if ( ! $registration instanceof EE_Registration) {
             continue;
         }
         if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
@@ -55,7 +55,7 @@ 
             <tbody>
             <?php
         }
-        if ($is_primary || (! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
+        if ($is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
             <tr>
                 <td width="40%">
                     <?php

Indentation +62 added lines, -62 removed lines

@@ -14,24 +14,24 @@ 
 
 <div class="ee-registration-details-dv">
     <?php
-    $registrations = $transaction->registrations();
-    $registrations = is_array($registrations) ? $registrations : [];
-    $reg_count     = count($registrations);
-    $reg_cntr      = 0;
-    $event_name    = '';
-    $wait_list     = false;
-    foreach ($registrations as $registration) {
-        if (! $registration instanceof EE_Registration) {
-            continue;
-        }
-        if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
+	$registrations = $transaction->registrations();
+	$registrations = is_array($registrations) ? $registrations : [];
+	$reg_count     = count($registrations);
+	$reg_cntr      = 0;
+	$event_name    = '';
+	$wait_list     = false;
+	foreach ($registrations as $registration) {
+		if (! $registration instanceof EE_Registration) {
+			continue;
+		}
+		if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
             </tbody>
             </table>
             <?php
-        }
-        $reg_cntr++;
-        if ($event_name != $registration->event_name()) {
-            ?>
+		}
+		$reg_cntr++;
+		if ($event_name != $registration->event_name()) {
+			?>
             <h5>
                 <span class="smaller-text grey-text">
                     <?php esc_html_e('for', 'event_espresso'); ?> :
@@ -54,23 +54,23 @@ 
             </thead>
             <tbody>
             <?php
-        }
-        if ($is_primary || (! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
+		}
+		if ($is_primary || (! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
             <tr>
                 <td width="40%">
                     <?php
-                    if ($registration->attendee() instanceof EE_Attendee) {
-                        echo esc_html($registration->attendee()->full_name(true));
-                    }
-                    ?>
+					if ($registration->attendee() instanceof EE_Attendee) {
+						echo esc_html($registration->attendee()->full_name(true));
+					}
+					?>
                     <p class="tiny-text" style="margin: .75em 0 0;">
                         <?php if ($registration->count_question_groups()) { ?>
                             <a class="ee-icon-only-lnk"
                                href="<?php echo esc_url_raw($registration->edit_attendee_information_url()); ?>"
                                title="<?php esc_attr_e(
-                                   'Click here to edit Attendee Information',
-                                   'event_espresso'
-                               ); ?>"
+								   'Click here to edit Attendee Information',
+								   'event_espresso'
+							   ); ?>"
                             >
                                 <span class="dashicons dashicons-groups"></span>
                                 <?php esc_html_e('edit info', 'event_espresso'); ?>
@@ -78,15 +78,15 @@ 
                         <?php } ?>
                         <a class="ee-resend-reg-confirmation-email ee-icon-only-lnk"
                            href="<?php echo esc_url_raw(
-                               add_query_arg(
-                                   ['token' => $registration->reg_url_link(), 'resend_reg_confirmation' => 'true'],
-                                   EE_Registry::instance()->CFG->core->thank_you_page_url()
-                               )
-                           ); ?>"
+							   add_query_arg(
+								   ['token' => $registration->reg_url_link(), 'resend_reg_confirmation' => 'true'],
+								   EE_Registry::instance()->CFG->core->thank_you_page_url()
+							   )
+						   ); ?>"
                            title="<?php esc_attr_e(
-                               'Click here to resend the Registration Confirmation email',
-                               'event_espresso'
-                           ); ?>"
+							   'Click here to resend the Registration Confirmation email',
+							   'event_espresso'
+						   ); ?>"
                            rel="<?php echo esc_attr($registration->reg_url_link()); ?>"
                         >
                             <span class="dashicons dashicons-email-alt"></span>
@@ -100,27 +100,27 @@ 
                 <td width="35%" class="jst-left">
                     <?php $registration->e_pretty_status(true) ?>
                     <?php
-                    if ($registration->status_ID() === EEM_Registration::status_id_wait_list) {
-                        $wait_list = true;
-                    }
-                    ?>
+					if ($registration->status_ID() === EEM_Registration::status_id_wait_list) {
+						$wait_list = true;
+					}
+					?>
                 </td>
             </tr>
             <?php do_action(
-                'AHEE__thank_you_page_registration_details_template__after_registration_table_row',
-                $registration
-            ); ?>
+				'AHEE__thank_you_page_registration_details_template__after_registration_table_row',
+				$registration
+			); ?>
             <?php
-            $event_name = $registration->event_name();
-        }
-        if ($reg_cntr >= $reg_count) {
-            ?>
+			$event_name = $registration->event_name();
+		}
+		if ($reg_cntr >= $reg_count) {
+			?>
             </tbody>
             </table>
             <?php
-        }
-    }
-    ?>
+		}
+	}
+	?>
     <?php if ($is_primary && $SPCO_attendee_information_url) { ?>
         <p class="small-text jst-rght">
             <a href='<?php echo esc_url_raw($SPCO_attendee_information_url) ?>'>
@@ -129,22 +129,22 @@ 
         </p>
     <?php } ?>
     <?php
-    if ($wait_list) {
-        echo apply_filters(
-            'AFEE__thank_you_page_registration_details_template__wait_list_notice',
-            sprintf(
-                esc_html__(
-                    '%1$sre: Wait List Registrations%2$sPlease note that the total cost listed below in the Transaction Details is for ALL registrations, including those that are on the wait list, even though they can not be currently paid for. If any spaces become available however, you may be notified by the Event admin and have the opportunity to secure the remaining tickets by making a payment for them.%3$s',
-                    'event_espresso'
-                ),
-                '<h6 class="" style="margin-bottom:.25em;"><span class="dashicons dashicons-clipboard ee-icon-size-16 purple-text"></span>',
-                '</h6 ><p class="ee-wait-list-notice">',
-                '</p ><br />'
-            )
-        );
-    }
-    do_action('AHEE__thank_you_page_registration_details_template__after_registration_details');
-    ?>
+	if ($wait_list) {
+		echo apply_filters(
+			'AFEE__thank_you_page_registration_details_template__wait_list_notice',
+			sprintf(
+				esc_html__(
+					'%1$sre: Wait List Registrations%2$sPlease note that the total cost listed below in the Transaction Details is for ALL registrations, including those that are on the wait list, even though they can not be currently paid for. If any spaces become available however, you may be notified by the Event admin and have the opportunity to secure the remaining tickets by making a payment for them.%3$s',
+					'event_espresso'
+				),
+				'<h6 class="" style="margin-bottom:.25em;"><span class="dashicons dashicons-clipboard ee-icon-size-16 purple-text"></span>',
+				'</h6 ><p class="ee-wait-list-notice">',
+				'</p ><br />'
+			)
+		);
+	}
+	do_action('AHEE__thank_you_page_registration_details_template__after_registration_details');
+	?>
 
 </div>
 <!-- end of .registration-details -->

modules/thank_you_page/EED_Thank_You_Page.module.php

Spacing +25 added lines, -25 removed lines

@@ -129,8 +129,8 @@ 
      */
     public static function set_definitions()
     {
-        define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
+        define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
+        define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)).'templates/');
     }
 
 
@@ -147,7 +147,7 @@ 
             return $this->_current_txn;
         }
         $TXN_model = EE_Registry::instance()->load_model('Transaction');
-        if (! $TXN_model instanceof EEM_Transaction) {
+        if ( ! $TXN_model instanceof EEM_Transaction) {
             EE_Error::add_error(
                 esc_html__('The transaction model could not be established.', 'event_espresso'),
                 __FILE__,
@@ -185,7 +185,7 @@ 
      */
     public function get_txn_payments($since = 0)
     {
-        if (! $this->get_txn()) {
+        if ( ! $this->get_txn()) {
             return [];
         }
         $args = array('order_by' => array('PAY_timestamp' => 'ASC'));
@@ -327,7 +327,7 @@ 
     {
         wp_register_script(
             'thank_you_page',
-            THANK_YOU_ASSETS_URL . 'thank_you_page.js',
+            THANK_YOU_ASSETS_URL.'thank_you_page.js',
             array('espresso_core', 'heartbeat'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -347,9 +347,9 @@ 
     public function init()
     {
         $this->_get_reg_url_link();
-        if (! $this->get_txn()) {
+        if ( ! $this->get_txn()) {
             echo EEH_HTML::div(
-                EEH_HTML::h4(esc_html__('We\'re sorry...', 'event_espresso')) .
+                EEH_HTML::h4(esc_html__('We\'re sorry...', 'event_espresso')).
                 sprintf(
                     esc_html__(
                         'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
@@ -440,12 +440,12 @@ 
     public function thank_you_page_results()
     {
         $this->init();
-        if (! $this->_current_txn instanceof EE_Transaction) {
+        if ( ! $this->_current_txn instanceof EE_Transaction) {
             return EE_Error::get_notices();
         }
         // link to receipt
         $template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url();
-        if (! empty($template_args['TXN_receipt_url'])) {
+        if ( ! empty($template_args['TXN_receipt_url'])) {
             $template_args['order_conf_desc'] = esc_html__(
                 '%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
                 'event_espresso'
@@ -463,7 +463,7 @@ 
             add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
         }
         return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
             $template_args
         );
     }
@@ -513,7 +513,7 @@ 
             '$SPCO_attendee_information_url'
         );
         echo EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
             $template_args
         );
     }
@@ -585,7 +585,7 @@ 
      */
     public function get_ajax_content()
     {
-        if (! $this->get_txn()) {
+        if ( ! $this->get_txn()) {
             return;
         }
         // first determine which event(s) require pre-approval or not
@@ -596,9 +596,9 @@ 
                 $event = $registration->event();
                 if ($event instanceof EE_Event) {
                     if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
-                        $events_requiring_pre_approval[ $event->ID() ] = $event;
+                        $events_requiring_pre_approval[$event->ID()] = $event;
                     } else {
-                        $events[ $event->ID() ] = $event;
+                        $events[$event->ID()] = $event;
                     }
                 }
             }
@@ -616,7 +616,7 @@ 
      */
     public function display_details_for_events($events = array())
     {
-        if (! empty($events)) {
+        if ( ! empty($events)) {
             ?>
             <div id="espresso-thank-you-page-ajax-content-dv">
                 <div id="espresso-thank-you-page-ajax-transaction-dv"></div>
@@ -629,7 +629,7 @@ 
                                 'event_espresso'
                             ); ?></span>
                     </div>
-                    <?php if (! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
+                    <?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
                         <p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
                             <?php echo apply_filters(
                                 'EED_Thank_You_Page__get_ajax_content__waiting_for_IPN_msg',
@@ -662,7 +662,7 @@ 
      */
     public function display_details_for_events_requiring_pre_approval($events = array())
     {
-        if (! empty($events)) {
+        if ( ! empty($events)) {
             ?>
             <div id="espresso-thank-you-page-not-approved-message-dv">
                 <h4 class="orange-text"><?php esc_html_e('Important Notice:', 'event_espresso'); ?></h4>
@@ -719,7 +719,7 @@ 
             '$SPCO_payment_options_url'
         );
         return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php',
             $template_args
         );
     }
@@ -735,7 +735,7 @@ 
     public function get_payment_row_html(EE_Payment $payment = null)
     {
         $html = '';
-        if (! $payment instanceof EE_Payment) {
+        if ( ! $payment instanceof EE_Payment) {
             return '';
         }
         if (
@@ -749,25 +749,25 @@ 
             $payment->set_status(EEM_Payment::status_id_pending);
         }
         $payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-            ? '<br /><span class="small-text">' . esc_html($payment->gateway_response()) . '</span>'
+            ? '<br /><span class="small-text">'.esc_html($payment->gateway_response()).'</span>'
             : '';
         $html .= '
             <tr>
                 <td>
-                    ' . esc_html($payment->timestamp()) . '
+                    ' . esc_html($payment->timestamp()).'
                 </td>
                 <td>
                     ' . (
             $payment->payment_method() instanceof EE_Payment_Method
                 ? esc_html($payment->payment_method()->name())
                 : esc_html__('Unknown', 'event_espresso')
-            ) . '
+            ).'
                 </td>
                 <td class="jst-rght">
-                    ' . EEH_Template::format_currency($payment->amount()) . '
+                    ' . EEH_Template::format_currency($payment->amount()).'
                 </td>
                 <td class="jst-rght" style="line-height:1;">
-                    ' . $payment->pretty_status(true) . $payment_declined_msg . '
+                    ' . $payment->pretty_status(true).$payment_declined_msg.'
                 </td>
             </tr>';
         do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
@@ -825,7 +825,7 @@ 
             '$SPCO_payment_options_url'
         );
         return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
             $template_args
         );
     }

Indentation +789 added lines, -789 removed lines

@@ -10,613 +10,613 @@ 
  */
 class EED_Thank_You_Page extends EED_Module
 {
-    /**
-     * time in seconds to wait for the IPN to arrive before telling the registrant to bugger off ( 1200s = 20 minutes )
-     */
-    const IPN_wait_time = 1200;
-
-    /**
-     * The transaction specified by the reg_url_link passed from the Request, or from the Session
-     *
-     * @var EE_Transaction $_current_txn
-     */
-    private $_current_txn;
-
-    /**
-     * @var EE_Registration $_primary_registrant
-     */
-    private $_primary_registrant;
-
-    /**
-     * The reg_url_link passed from the Request, or from the Session
-     *
-     * @var string $_reg_url_link
-     */
-    private $_reg_url_link;
-
-    /**
-     * whether the incoming reg_url_link is for the primary registrant or not
-     *
-     * @var boolean $_is_primary
-     */
-    private $_is_primary;
-
-    /**
-     * The URL for revisiting the SPCO attendee information step
-     *
-     * @var string $_SPCO_attendee_information_url
-     */
-    private $_SPCO_attendee_information_url;
-
-    /**
-     * The URL for revisiting the SPCO payment options step
-     *
-     * @var string $_SPCO_payment_options_url
-     */
-    private $_SPCO_payment_options_url;
-
-    /**
-     * whether to display the Payment Options link
-     *
-     * @var boolean $_show_try_pay_again_link
-     */
-    private $_show_try_pay_again_link = false;
-
-    /**
-     * whether payments are allowed at this time
-     *
-     * @var boolean $_payments_closed
-     */
-    private $_payments_closed = false;
-
-    /**
-     * whether the selected payment method is Bank, Check , Invoice, etc
-     *
-     * @var boolean $_is_offline_payment_method
-     */
-    private $_is_offline_payment_method = true;
-
-
-    /**
-     * @return EED_Module|EED_Thank_You_Page
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks()
-    {
-        add_action('wp_loaded', array('EED_Thank_You_Page', 'set_definitions'), 2);
-    }
-
-
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'wp_ajax_espresso_resend_reg_confirmation_email',
-            array('EED_Thank_You_Page', 'resend_reg_confirmation_email'),
-            10,
-            2
-        );
-        add_action(
-            'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
-            array('EED_Thank_You_Page', 'resend_reg_confirmation_email'),
-            10,
-            2
-        );
-    }
-
-
-    /**
-     * set_definitions
-     *
-     * @return void
-     */
-    public static function set_definitions()
-    {
-        define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
-    }
-
-
-    /**
-     * get_txn
-     *
-     * @return EE_Transaction
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_txn()
-    {
-        if ($this->_current_txn instanceof EE_Transaction) {
-            return $this->_current_txn;
-        }
-        $TXN_model = EE_Registry::instance()->load_model('Transaction');
-        if (! $TXN_model instanceof EEM_Transaction) {
-            EE_Error::add_error(
-                esc_html__('The transaction model could not be established.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return null;
-        }
-        // get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
-        $this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
-        // verify TXN
-        if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
-            EE_Error::add_error(
-                esc_html__(
-                    'No transaction information could be retrieved or the transaction data is not of the correct type.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return null;
-        }
-        return $this->_current_txn;
-    }
-
-
-    /**
-     * get_txn_payments
-     *
-     * @param int $since
-     * @return EE_Payment[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_txn_payments($since = 0)
-    {
-        if (! $this->get_txn()) {
-            return [];
-        }
-        $args = array('order_by' => array('PAY_timestamp' => 'ASC'));
-        if ($since > 0) {
-            $args[0] = array('PAY_timestamp' => array('>', $since));
-        }
-        // get array of payments with most recent first
-        return $this->_current_txn->payments($args);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isOfflinePaymentMethod()
-    {
-        return $this->_is_offline_payment_method;
-    }
-
-
-
-
-    /**
-     * get_reg_url_link
-     *
-     * @return void
-     */
-    private function _get_reg_url_link()
-    {
-        if ($this->_reg_url_link) {
-            return;
-        }
-        // check for reg_url_link
-        $reg_url_link = self::getRequest()->getRequestParam('e_reg_url_link');
-        // only do thank you page stuff if we have a REG_url_link in the url
-        if (WP_DEBUG && ! $reg_url_link) {
-            EE_Error::add_error(
-                esc_html__(
-                    'No transaction information could be retrieved because the registration URL link is missing or invalid.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        $this->set_reg_url_link($reg_url_link);
-    }
-
-
-    /**
-     * set_reg_url_link
-     *
-     * @param string $reg_url_link
-     */
-    public function set_reg_url_link($reg_url_link = null)
-    {
-        $this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
-    }
-
-
-    /**
-     * run - initial module setup
-     * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
-     *
-     * @param WP $WP
-     * @return void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * load_resources
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function load_resources()
-    {
-        $this->_get_reg_url_link();
-        // resend_reg_confirmation_email ?
-        if (self::getRequest()->requestParamIsSet('resend')) {
-            EED_Thank_You_Page::resend_reg_confirmation_email();
-        }
-        EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        $this->_translate_strings();
-        // load assets
-        add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
-    }
-
-
-    /**
-     * load_js
-     *
-     * @return void
-     */
-    protected function _translate_strings()
-    {
-        EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->_reg_url_link;
-        EE_Registry::$i18n_js_strings['initial_access'] = time();
-        EE_Registry::$i18n_js_strings['IPN_wait_time'] = EED_Thank_You_Page::IPN_wait_time;
-        EE_Registry::$i18n_js_strings['TXN_complete'] = EEM_Transaction::complete_status_code;
-        EE_Registry::$i18n_js_strings['TXN_incomplete'] = EEM_Transaction::incomplete_status_code;
-        EE_Registry::$i18n_js_strings['checking_for_new_payments'] = __(
-            'checking for new payments...',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['loading_payment_info'] = __(
-            'loading payment information...',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['server_error'] = __(
-            'An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['slow_IPN'] = apply_filters(
-            'EED_Thank_You_Page__load_js__slow_IPN',
-            sprintf(
-                __(
-                    '%sThe Payment Notification appears to be taking longer than usual to arrive. Maybe check back later or just wait for your payment and registration confirmation results to be sent to you via email. We apologize for any inconvenience this may have caused.%s',
-                    'event_espresso'
-                ),
-                '<div id="espresso-thank-you-page-slow-IPN-dv" class="ee-attention jst-left">',
-                '</div>'
-            )
-        );
-    }
-
-
-    /**
-     * load_js
-     *
-     * @return void
-     */
-    public function load_js()
-    {
-        wp_register_script(
-            'thank_you_page',
-            THANK_YOU_ASSETS_URL . 'thank_you_page.js',
-            array('espresso_core', 'heartbeat'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('thank_you_page');
-        wp_enqueue_style('espresso_default');
-    }
-
-
-    /**
-     * init
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function init()
-    {
-        $this->_get_reg_url_link();
-        if (! $this->get_txn()) {
-            echo EEH_HTML::div(
-                EEH_HTML::h4(esc_html__('We\'re sorry...', 'event_espresso')) .
-                sprintf(
-                    esc_html__(
-                        'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
-                        'event_espresso'
-                    ),
-                    '<br/>'
-                ),
-                '',
-                'ee-attention'
-            );
-            return;
-        }
-        // if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
-        if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
-            $this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
-            $this->_current_txn->save();
-        }
-        $this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
-            ? $this->_current_txn->primary_registration()
-            : null;
-        $this->_is_primary = $this->_primary_registrant->reg_url_link() === $this->_reg_url_link;
-        $show_try_pay_again_link_default = apply_filters(
-            'AFEE__EED_Thank_You_Page__init__show_try_pay_again_link_default',
-            true
-        );
-        $this->_show_try_pay_again_link = $show_try_pay_again_link_default;
-        // txn status ?
-        if ($this->_current_txn->is_completed()) {
-            $this->_show_try_pay_again_link = $show_try_pay_again_link_default;
-        } elseif (
-            $this->_current_txn->is_incomplete()
-            && ($this->_primary_registrant->is_approved()
-                || $this->_primary_registrant->is_pending_payment())
-        ) {
-            $this->_show_try_pay_again_link = true;
-        } elseif ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
-            // its pending
-            $this->_show_try_pay_again_link = isset(
-                EE_Registry::instance()->CFG->registration->show_pending_payment_options
-            )
-                                              && EE_Registry::instance()->CFG
-                                                  ->registration->show_pending_payment_options
-                ? true
-                : $show_try_pay_again_link_default;
-        }
-        $this->_payments_closed = ! $this->_current_txn->payment_method() instanceof EE_Payment_Method;
-        $this->_is_offline_payment_method = false;
-        if (
+	/**
+	 * time in seconds to wait for the IPN to arrive before telling the registrant to bugger off ( 1200s = 20 minutes )
+	 */
+	const IPN_wait_time = 1200;
+
+	/**
+	 * The transaction specified by the reg_url_link passed from the Request, or from the Session
+	 *
+	 * @var EE_Transaction $_current_txn
+	 */
+	private $_current_txn;
+
+	/**
+	 * @var EE_Registration $_primary_registrant
+	 */
+	private $_primary_registrant;
+
+	/**
+	 * The reg_url_link passed from the Request, or from the Session
+	 *
+	 * @var string $_reg_url_link
+	 */
+	private $_reg_url_link;
+
+	/**
+	 * whether the incoming reg_url_link is for the primary registrant or not
+	 *
+	 * @var boolean $_is_primary
+	 */
+	private $_is_primary;
+
+	/**
+	 * The URL for revisiting the SPCO attendee information step
+	 *
+	 * @var string $_SPCO_attendee_information_url
+	 */
+	private $_SPCO_attendee_information_url;
+
+	/**
+	 * The URL for revisiting the SPCO payment options step
+	 *
+	 * @var string $_SPCO_payment_options_url
+	 */
+	private $_SPCO_payment_options_url;
+
+	/**
+	 * whether to display the Payment Options link
+	 *
+	 * @var boolean $_show_try_pay_again_link
+	 */
+	private $_show_try_pay_again_link = false;
+
+	/**
+	 * whether payments are allowed at this time
+	 *
+	 * @var boolean $_payments_closed
+	 */
+	private $_payments_closed = false;
+
+	/**
+	 * whether the selected payment method is Bank, Check , Invoice, etc
+	 *
+	 * @var boolean $_is_offline_payment_method
+	 */
+	private $_is_offline_payment_method = true;
+
+
+	/**
+	 * @return EED_Module|EED_Thank_You_Page
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks()
+	{
+		add_action('wp_loaded', array('EED_Thank_You_Page', 'set_definitions'), 2);
+	}
+
+
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'wp_ajax_espresso_resend_reg_confirmation_email',
+			array('EED_Thank_You_Page', 'resend_reg_confirmation_email'),
+			10,
+			2
+		);
+		add_action(
+			'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
+			array('EED_Thank_You_Page', 'resend_reg_confirmation_email'),
+			10,
+			2
+		);
+	}
+
+
+	/**
+	 * set_definitions
+	 *
+	 * @return void
+	 */
+	public static function set_definitions()
+	{
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
+	}
+
+
+	/**
+	 * get_txn
+	 *
+	 * @return EE_Transaction
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_txn()
+	{
+		if ($this->_current_txn instanceof EE_Transaction) {
+			return $this->_current_txn;
+		}
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
+		if (! $TXN_model instanceof EEM_Transaction) {
+			EE_Error::add_error(
+				esc_html__('The transaction model could not be established.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return null;
+		}
+		// get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
+		// verify TXN
+		if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
+			EE_Error::add_error(
+				esc_html__(
+					'No transaction information could be retrieved or the transaction data is not of the correct type.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return null;
+		}
+		return $this->_current_txn;
+	}
+
+
+	/**
+	 * get_txn_payments
+	 *
+	 * @param int $since
+	 * @return EE_Payment[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_txn_payments($since = 0)
+	{
+		if (! $this->get_txn()) {
+			return [];
+		}
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
+		if ($since > 0) {
+			$args[0] = array('PAY_timestamp' => array('>', $since));
+		}
+		// get array of payments with most recent first
+		return $this->_current_txn->payments($args);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isOfflinePaymentMethod()
+	{
+		return $this->_is_offline_payment_method;
+	}
+
+
+
+
+	/**
+	 * get_reg_url_link
+	 *
+	 * @return void
+	 */
+	private function _get_reg_url_link()
+	{
+		if ($this->_reg_url_link) {
+			return;
+		}
+		// check for reg_url_link
+		$reg_url_link = self::getRequest()->getRequestParam('e_reg_url_link');
+		// only do thank you page stuff if we have a REG_url_link in the url
+		if (WP_DEBUG && ! $reg_url_link) {
+			EE_Error::add_error(
+				esc_html__(
+					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		$this->set_reg_url_link($reg_url_link);
+	}
+
+
+	/**
+	 * set_reg_url_link
+	 *
+	 * @param string $reg_url_link
+	 */
+	public function set_reg_url_link($reg_url_link = null)
+	{
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
+	}
+
+
+	/**
+	 * run - initial module setup
+	 * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
+	 *
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * load_resources
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function load_resources()
+	{
+		$this->_get_reg_url_link();
+		// resend_reg_confirmation_email ?
+		if (self::getRequest()->requestParamIsSet('resend')) {
+			EED_Thank_You_Page::resend_reg_confirmation_email();
+		}
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		$this->_translate_strings();
+		// load assets
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+	}
+
+
+	/**
+	 * load_js
+	 *
+	 * @return void
+	 */
+	protected function _translate_strings()
+	{
+		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->_reg_url_link;
+		EE_Registry::$i18n_js_strings['initial_access'] = time();
+		EE_Registry::$i18n_js_strings['IPN_wait_time'] = EED_Thank_You_Page::IPN_wait_time;
+		EE_Registry::$i18n_js_strings['TXN_complete'] = EEM_Transaction::complete_status_code;
+		EE_Registry::$i18n_js_strings['TXN_incomplete'] = EEM_Transaction::incomplete_status_code;
+		EE_Registry::$i18n_js_strings['checking_for_new_payments'] = __(
+			'checking for new payments...',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['loading_payment_info'] = __(
+			'loading payment information...',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['server_error'] = __(
+			'An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['slow_IPN'] = apply_filters(
+			'EED_Thank_You_Page__load_js__slow_IPN',
+			sprintf(
+				__(
+					'%sThe Payment Notification appears to be taking longer than usual to arrive. Maybe check back later or just wait for your payment and registration confirmation results to be sent to you via email. We apologize for any inconvenience this may have caused.%s',
+					'event_espresso'
+				),
+				'<div id="espresso-thank-you-page-slow-IPN-dv" class="ee-attention jst-left">',
+				'</div>'
+			)
+		);
+	}
+
+
+	/**
+	 * load_js
+	 *
+	 * @return void
+	 */
+	public function load_js()
+	{
+		wp_register_script(
+			'thank_you_page',
+			THANK_YOU_ASSETS_URL . 'thank_you_page.js',
+			array('espresso_core', 'heartbeat'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('thank_you_page');
+		wp_enqueue_style('espresso_default');
+	}
+
+
+	/**
+	 * init
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function init()
+	{
+		$this->_get_reg_url_link();
+		if (! $this->get_txn()) {
+			echo EEH_HTML::div(
+				EEH_HTML::h4(esc_html__('We\'re sorry...', 'event_espresso')) .
+				sprintf(
+					esc_html__(
+						'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
+						'event_espresso'
+					),
+					'<br/>'
+				),
+				'',
+				'ee-attention'
+			);
+			return;
+		}
+		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
+		if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
+			$this->_current_txn->save();
+		}
+		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
+			? $this->_current_txn->primary_registration()
+			: null;
+		$this->_is_primary = $this->_primary_registrant->reg_url_link() === $this->_reg_url_link;
+		$show_try_pay_again_link_default = apply_filters(
+			'AFEE__EED_Thank_You_Page__init__show_try_pay_again_link_default',
+			true
+		);
+		$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
+		// txn status ?
+		if ($this->_current_txn->is_completed()) {
+			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
+		} elseif (
+			$this->_current_txn->is_incomplete()
+			&& ($this->_primary_registrant->is_approved()
+				|| $this->_primary_registrant->is_pending_payment())
+		) {
+			$this->_show_try_pay_again_link = true;
+		} elseif ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
+			// its pending
+			$this->_show_try_pay_again_link = isset(
+				EE_Registry::instance()->CFG->registration->show_pending_payment_options
+			)
+											  && EE_Registry::instance()->CFG
+												  ->registration->show_pending_payment_options
+				? true
+				: $show_try_pay_again_link_default;
+		}
+		$this->_payments_closed = ! $this->_current_txn->payment_method() instanceof EE_Payment_Method;
+		$this->_is_offline_payment_method = false;
+		if (
 // if payment method is unknown
-            ! $this->_current_txn->payment_method() instanceof EE_Payment_Method
-            || (
-                // or is an offline payment method
-                $this->_current_txn->payment_method() instanceof EE_Payment_Method
-                && $this->_current_txn->payment_method()->is_off_line()
-            )
-        ) {
-            $this->_is_offline_payment_method = true;
-        }
-        // link to SPCO
-        $revisit_spco_url = add_query_arg(
-            array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
-            EE_Registry::instance()->CFG->core->reg_page_url()
-        );
-        // link to SPCO payment_options
-        $this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
-            ? $this->_primary_registrant->payment_overview_url()
-            : add_query_arg(
-                array('step' => 'payment_options'),
-                $revisit_spco_url
-            );
-        // link to SPCO attendee_information
-        $this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
-            ? $this->_primary_registrant->edit_attendee_information_url()
-            : false;
-        do_action('AHEE__EED_Thank_You_Page__init_end', $this->_current_txn);
-        // set no cache headers and constants
-        EE_System::do_not_cache();
-    }
-
-
-    /**
-     * display_thank_you_page_results
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function thank_you_page_results()
-    {
-        $this->init();
-        if (! $this->_current_txn instanceof EE_Transaction) {
-            return EE_Error::get_notices();
-        }
-        // link to receipt
-        $template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url();
-        if (! empty($template_args['TXN_receipt_url'])) {
-            $template_args['order_conf_desc'] = esc_html__(
-                '%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
-                'event_espresso'
-            );
-        } else {
-            $template_args['order_conf_desc'] = esc_html__(
-                '%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation.',
-                'event_espresso'
-            );
-        }
-        $template_args['transaction'] = $this->_current_txn;
-        $template_args['revisit'] = self::getRequest()->getRequestParam('revisit', false, 'bool');
-        add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
-        if ($this->_is_primary && ! $this->_current_txn->is_free()) {
-            add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
-        }
-        return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
-            $template_args
-        );
-    }
-
-
-    /**
-     * _update_server_wait_time
-     *
-     * @param array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _update_server_wait_time($thank_you_page_data = array())
-    {
-        $response['espresso_thank_you_page'] = array(
-            'still_waiting' => isset($thank_you_page_data['initial_access'])
-                ? time() - $thank_you_page_data['initial_access']
-                : 0,
-            'txn_status'    => $this->_current_txn->status_ID(),
-        );
-        return $response;
-    }
-
-
-    /**
-     * get_registration_details
-     *
-     * @throws EE_Error
-     */
-    public function get_registration_details()
-    {
-        // prepare variables for displaying
-        $template_args = array();
-        $template_args['transaction'] = $this->_current_txn;
-        $template_args['reg_url_link'] = $this->_reg_url_link;
-        $template_args['is_primary'] = $this->_is_primary;
-        $template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
-        $template_args['resend_reg_confirmation_url'] = add_query_arg(
-            array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
-            EE_Registry::instance()->CFG->core->thank_you_page_url()
-        );
-        // verify template arguments
-        EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
-        EEH_Template_Validator::verify_isnt_null(
-            $template_args['SPCO_attendee_information_url'],
-            '$SPCO_attendee_information_url'
-        );
-        echo EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
-            $template_args
-        );
-    }
-
-
-    /**
-     * resend_reg_confirmation_email
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function resend_reg_confirmation_email()
-    {
-        $reg_url_link = self::getRequest()->getRequestParam('token');
-        // was a REG_ID passed ?
-        if ($reg_url_link) {
-            $registration = EEM_Registration::instance()->get_one(
-                array(array('REG_url_link' => $reg_url_link))
-            );
-            if ($registration instanceof EE_Registration) {
-                // resend email
-                EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
-            } else {
-                EE_Error::add_error(
-                    esc_html__(
-                        'The Registration Confirmation email could not be sent because a valid Registration could not be retrieved from the database.',
-                        'event_espresso'
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-        } else {
-            EE_Error::add_error(
-                esc_html__(
-                    'The Registration Confirmation email could not be sent because a registration token is missing or invalid.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        // request sent via AJAX ?
-        if (EE_FRONT_AJAX) {
-            echo wp_json_encode(EE_Error::get_notices(false));
-            die();
-            // or was JS disabled ?
-        } else {
-            // save errors so that they get picked up on the next request
-            EE_Error::get_notices(true, true);
-            wp_safe_redirect(
-                add_query_arg(
-                    array('e_reg_url_link' => $reg_url_link),
-                    EE_Registry::instance()->CFG->core->thank_you_page_url()
-                )
-            );
-        }
-    }
-
-
-    /**
-     * get_ajax_content
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_ajax_content()
-    {
-        if (! $this->get_txn()) {
-            return;
-        }
-        // first determine which event(s) require pre-approval or not
-        $events = array();
-        $events_requiring_pre_approval = array();
-        foreach ($this->_current_txn->registrations() as $registration) {
-            if ($registration instanceof EE_Registration) {
-                $event = $registration->event();
-                if ($event instanceof EE_Event) {
-                    if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
-                        $events_requiring_pre_approval[ $event->ID() ] = $event;
-                    } else {
-                        $events[ $event->ID() ] = $event;
-                    }
-                }
-            }
-        }
-        $this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
-        $this->display_details_for_events($events);
-    }
-
-
-    /**
-     * display_details_for_events
-     *
-     * @param EE_Event[] $events
-     * @return void
-     */
-    public function display_details_for_events($events = array())
-    {
-        if (! empty($events)) {
-            ?>
+			! $this->_current_txn->payment_method() instanceof EE_Payment_Method
+			|| (
+				// or is an offline payment method
+				$this->_current_txn->payment_method() instanceof EE_Payment_Method
+				&& $this->_current_txn->payment_method()->is_off_line()
+			)
+		) {
+			$this->_is_offline_payment_method = true;
+		}
+		// link to SPCO
+		$revisit_spco_url = add_query_arg(
+			array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
+			EE_Registry::instance()->CFG->core->reg_page_url()
+		);
+		// link to SPCO payment_options
+		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
+			? $this->_primary_registrant->payment_overview_url()
+			: add_query_arg(
+				array('step' => 'payment_options'),
+				$revisit_spco_url
+			);
+		// link to SPCO attendee_information
+		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
+			? $this->_primary_registrant->edit_attendee_information_url()
+			: false;
+		do_action('AHEE__EED_Thank_You_Page__init_end', $this->_current_txn);
+		// set no cache headers and constants
+		EE_System::do_not_cache();
+	}
+
+
+	/**
+	 * display_thank_you_page_results
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function thank_you_page_results()
+	{
+		$this->init();
+		if (! $this->_current_txn instanceof EE_Transaction) {
+			return EE_Error::get_notices();
+		}
+		// link to receipt
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url();
+		if (! empty($template_args['TXN_receipt_url'])) {
+			$template_args['order_conf_desc'] = esc_html__(
+				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
+				'event_espresso'
+			);
+		} else {
+			$template_args['order_conf_desc'] = esc_html__(
+				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation.',
+				'event_espresso'
+			);
+		}
+		$template_args['transaction'] = $this->_current_txn;
+		$template_args['revisit'] = self::getRequest()->getRequestParam('revisit', false, 'bool');
+		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
+		if ($this->_is_primary && ! $this->_current_txn->is_free()) {
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
+		}
+		return EEH_Template::locate_template(
+			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+			$template_args
+		);
+	}
+
+
+	/**
+	 * _update_server_wait_time
+	 *
+	 * @param array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _update_server_wait_time($thank_you_page_data = array())
+	{
+		$response['espresso_thank_you_page'] = array(
+			'still_waiting' => isset($thank_you_page_data['initial_access'])
+				? time() - $thank_you_page_data['initial_access']
+				: 0,
+			'txn_status'    => $this->_current_txn->status_ID(),
+		);
+		return $response;
+	}
+
+
+	/**
+	 * get_registration_details
+	 *
+	 * @throws EE_Error
+	 */
+	public function get_registration_details()
+	{
+		// prepare variables for displaying
+		$template_args = array();
+		$template_args['transaction'] = $this->_current_txn;
+		$template_args['reg_url_link'] = $this->_reg_url_link;
+		$template_args['is_primary'] = $this->_is_primary;
+		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
+		$template_args['resend_reg_confirmation_url'] = add_query_arg(
+			array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
+			EE_Registry::instance()->CFG->core->thank_you_page_url()
+		);
+		// verify template arguments
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null(
+			$template_args['SPCO_attendee_information_url'],
+			'$SPCO_attendee_information_url'
+		);
+		echo EEH_Template::locate_template(
+			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+			$template_args
+		);
+	}
+
+
+	/**
+	 * resend_reg_confirmation_email
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function resend_reg_confirmation_email()
+	{
+		$reg_url_link = self::getRequest()->getRequestParam('token');
+		// was a REG_ID passed ?
+		if ($reg_url_link) {
+			$registration = EEM_Registration::instance()->get_one(
+				array(array('REG_url_link' => $reg_url_link))
+			);
+			if ($registration instanceof EE_Registration) {
+				// resend email
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
+			} else {
+				EE_Error::add_error(
+					esc_html__(
+						'The Registration Confirmation email could not be sent because a valid Registration could not be retrieved from the database.',
+						'event_espresso'
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+		} else {
+			EE_Error::add_error(
+				esc_html__(
+					'The Registration Confirmation email could not be sent because a registration token is missing or invalid.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		// request sent via AJAX ?
+		if (EE_FRONT_AJAX) {
+			echo wp_json_encode(EE_Error::get_notices(false));
+			die();
+			// or was JS disabled ?
+		} else {
+			// save errors so that they get picked up on the next request
+			EE_Error::get_notices(true, true);
+			wp_safe_redirect(
+				add_query_arg(
+					array('e_reg_url_link' => $reg_url_link),
+					EE_Registry::instance()->CFG->core->thank_you_page_url()
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * get_ajax_content
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_ajax_content()
+	{
+		if (! $this->get_txn()) {
+			return;
+		}
+		// first determine which event(s) require pre-approval or not
+		$events = array();
+		$events_requiring_pre_approval = array();
+		foreach ($this->_current_txn->registrations() as $registration) {
+			if ($registration instanceof EE_Registration) {
+				$event = $registration->event();
+				if ($event instanceof EE_Event) {
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
+						$events_requiring_pre_approval[ $event->ID() ] = $event;
+					} else {
+						$events[ $event->ID() ] = $event;
+					}
+				}
+			}
+		}
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
+		$this->display_details_for_events($events);
+	}
+
+
+	/**
+	 * display_details_for_events
+	 *
+	 * @param EE_Event[] $events
+	 * @return void
+	 */
+	public function display_details_for_events($events = array())
+	{
+		if (! empty($events)) {
+			?>
             <div id="espresso-thank-you-page-ajax-content-dv">
                 <div id="espresso-thank-you-page-ajax-transaction-dv"></div>
                 <div id="espresso-thank-you-page-ajax-payment-dv"></div>
@@ -624,19 +624,19 @@ 
                     <div id="ee-ajax-loading-dv" class="float-left lt-blue-text">
                         <span class="dashicons dashicons-upload"></span><span id="ee-ajax-loading-msg-spn">
                             <?php esc_html_e(
-                                'loading transaction and payment information...',
-                                'event_espresso'
-                            ); ?></span>
+								'loading transaction and payment information...',
+								'event_espresso'
+							); ?></span>
                     </div>
                     <?php if (! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
                         <p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
                             <?php echo apply_filters(
-                                'EED_Thank_You_Page__get_ajax_content__waiting_for_IPN_msg',
-                                esc_html__(
-                                    'Some payment gateways can take 15 minutes or more to return their payment notification, so please be patient if you require payment confirmation as soon as possible. Please note that as soon as everything is finalized, we will send your full payment and registration confirmation results to you via email.',
-                                    'event_espresso'
-                                )
-                            ); ?>
+								'EED_Thank_You_Page__get_ajax_content__waiting_for_IPN_msg',
+								esc_html__(
+									'Some payment gateways can take 15 minutes or more to return their payment notification, so please be patient if you require payment confirmation as soon as possible. Please note that as soon as everything is finalized, we will send your full payment and registration confirmation results to you via email.',
+									'event_espresso'
+								)
+							); ?>
                             <br/>
                             <span class="jst-rght ee-block small-text lt-grey-text">
                                 <?php esc_html_e('current wait time ', 'event_espresso'); ?>
@@ -647,120 +647,120 @@ 
                 <div class="clear"></div>
             </div>
             <?php
-        }
-    }
-
-
-    /**
-     * display_details_for_events_requiring_pre_approval
-     *
-     * @param EE_Event[] $events
-     * @return void
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    public function display_details_for_events_requiring_pre_approval($events = array())
-    {
-        if (! empty($events)) {
-            ?>
+		}
+	}
+
+
+	/**
+	 * display_details_for_events_requiring_pre_approval
+	 *
+	 * @param EE_Event[] $events
+	 * @return void
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	public function display_details_for_events_requiring_pre_approval($events = array())
+	{
+		if (! empty($events)) {
+			?>
             <div id="espresso-thank-you-page-not-approved-message-dv">
                 <h4 class="orange-text"><?php esc_html_e('Important Notice:', 'event_espresso'); ?></h4>
                 <p id="events-requiring-pre-approval-pg" class="small-text">
                     <?php echo apply_filters(
-                        'AHEE__EED_Thank_You_Page__get_ajax_content__not_approved_message',
-                        esc_html__(
-                            'The following Event(s) you have registered for do not require payment at this time and will not be billed for during this transaction. Billing will only occur after all attendees have been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.',
-                            'event_espresso'
-                        )
-                    ); ?>
+						'AHEE__EED_Thank_You_Page__get_ajax_content__not_approved_message',
+						esc_html__(
+							'The following Event(s) you have registered for do not require payment at this time and will not be billed for during this transaction. Billing will only occur after all attendees have been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.',
+							'event_espresso'
+						)
+					); ?>
                 </p>
                 <ul class="events-requiring-pre-approval-ul">
                     <?php
-                    foreach ($events as $event) {
-                        if ($event instanceof EE_Event) {
-                            echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
-                            esc_html($event->name()),
-                            '</li>';
-                        }
-                    } ?>
+					foreach ($events as $event) {
+						if ($event instanceof EE_Event) {
+							echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
+							esc_html($event->name()),
+							'</li>';
+						}
+					} ?>
                 </ul>
                 <div class="clear"></div>
             </div>
             <?php
-        }
-    }
-
-
-    /**
-     * get_transaction_details
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function get_transaction_details()
-    {
-        // prepare variables for displaying
-        $template_args = array();
-        $template_args['transaction'] = $this->_current_txn;
-        $template_args['reg_url_link'] = $this->_reg_url_link;
-        $template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
-        // link to SPCO payment_options
-        $template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
-        $template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
-        // verify template arguments
-        EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
-        EEH_Template_Validator::verify_isnt_null(
-            $template_args['show_try_pay_again_link'],
-            '$show_try_pay_again_link'
-        );
-        EEH_Template_Validator::verify_isnt_null(
-            $template_args['SPCO_payment_options_url'],
-            '$SPCO_payment_options_url'
-        );
-        return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
-            $template_args
-        );
-    }
-
-
-    /**
-     * get_payment_row_html
-     *
-     * @param EE_Payment $payment
-     * @return string
-     * @throws EE_Error
-     */
-    public function get_payment_row_html(EE_Payment $payment = null)
-    {
-        $html = '';
-        if (! $payment instanceof EE_Payment) {
-            return '';
-        }
-        if (
-            $payment->payment_method() instanceof EE_Payment_Method
-            && $payment->status() === EEM_Payment::status_id_failed
-            && $payment->payment_method()->is_off_site()
-        ) {
-            // considering the registrant has made it to the Thank You page,
-            // any failed payments may actually be pending and the IPN is just slow
-            // so let's
-            $payment->set_status(EEM_Payment::status_id_pending);
-        }
-        $payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-            ? '<br /><span class="small-text">' . esc_html($payment->gateway_response()) . '</span>'
-            : '';
-        $html .= '
+		}
+	}
+
+
+	/**
+	 * get_transaction_details
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function get_transaction_details()
+	{
+		// prepare variables for displaying
+		$template_args = array();
+		$template_args['transaction'] = $this->_current_txn;
+		$template_args['reg_url_link'] = $this->_reg_url_link;
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
+		// link to SPCO payment_options
+		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
+		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
+		// verify template arguments
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null(
+			$template_args['show_try_pay_again_link'],
+			'$show_try_pay_again_link'
+		);
+		EEH_Template_Validator::verify_isnt_null(
+			$template_args['SPCO_payment_options_url'],
+			'$SPCO_payment_options_url'
+		);
+		return EEH_Template::locate_template(
+			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
+			$template_args
+		);
+	}
+
+
+	/**
+	 * get_payment_row_html
+	 *
+	 * @param EE_Payment $payment
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function get_payment_row_html(EE_Payment $payment = null)
+	{
+		$html = '';
+		if (! $payment instanceof EE_Payment) {
+			return '';
+		}
+		if (
+			$payment->payment_method() instanceof EE_Payment_Method
+			&& $payment->status() === EEM_Payment::status_id_failed
+			&& $payment->payment_method()->is_off_site()
+		) {
+			// considering the registrant has made it to the Thank You page,
+			// any failed payments may actually be pending and the IPN is just slow
+			// so let's
+			$payment->set_status(EEM_Payment::status_id_pending);
+		}
+		$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
+			? '<br /><span class="small-text">' . esc_html($payment->gateway_response()) . '</span>'
+			: '';
+		$html .= '
             <tr>
                 <td>
                     ' . esc_html($payment->timestamp()) . '
                 </td>
                 <td>
                     ' . (
-            $payment->payment_method() instanceof EE_Payment_Method
-                ? esc_html($payment->payment_method()->name())
-                : esc_html__('Unknown', 'event_espresso')
-            ) . '
+			$payment->payment_method() instanceof EE_Payment_Method
+				? esc_html($payment->payment_method()->name())
+				: esc_html__('Unknown', 'event_espresso')
+			) . '
                 </td>
                 <td class="jst-rght">
                     ' . EEH_Template::format_currency($payment->amount()) . '
@@ -769,81 +769,81 @@ 
                     ' . $payment->pretty_status(true) . $payment_declined_msg . '
                 </td>
             </tr>';
-        do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
-        return $html;
-    }
-
-
-    /**
-     * get_payment_details
-     *
-     * @param EE_Payment[] $payments
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_payment_details($payments = array())
-    {
-        // prepare variables for displaying
-        $template_args = array();
-        $template_args['transaction'] = $this->_current_txn;
-        $template_args['reg_url_link'] = $this->_reg_url_link;
-        $template_args['payments'] = array();
-        foreach ($payments as $payment) {
-            $template_args['payments'][] = $this->get_payment_row_html($payment);
-        }
-        // create a hacky payment object, but dont save it
-        $payment = EE_Payment::new_instance(
-            array(
-                'TXN_ID'        => $this->_current_txn->ID(),
-                'STS_ID'        => EEM_Payment::status_id_pending,
-                'PAY_timestamp' => time(),
-                'PAY_amount'    => $this->_current_txn->total(),
-                'PMD_ID'        => $this->_current_txn->payment_method_ID(),
-            )
-        );
-        $payment_method = $this->_current_txn->payment_method();
-        if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
-            $template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
-        } else {
-            $template_args['gateway_content'] = '';
-        }
-        // link to SPCO payment_options
-        $template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
-        $template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
-        // verify template arguments
-        EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
-        EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
-        EEH_Template_Validator::verify_isnt_null(
-            $template_args['show_try_pay_again_link'],
-            '$show_try_pay_again_link'
-        );
-        EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
-        EEH_Template_Validator::verify_isnt_null(
-            $template_args['SPCO_payment_options_url'],
-            '$SPCO_payment_options_url'
-        );
-        return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
-            $template_args
-        );
-    }
-
-
-    /**
-     * get_payment_details
-     *
-     * @param array $payments
-     * @return string
-     * @throws EE_Error
-     */
-    public function get_new_payments($payments = array())
-    {
-        $payments_html = '';
-        // prepare variables for displaying
-        foreach ($payments as $payment) {
-            $payments_html .= $this->get_payment_row_html($payment);
-        }
-        return $payments_html;
-    }
+		do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
+		return $html;
+	}
+
+
+	/**
+	 * get_payment_details
+	 *
+	 * @param EE_Payment[] $payments
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_payment_details($payments = array())
+	{
+		// prepare variables for displaying
+		$template_args = array();
+		$template_args['transaction'] = $this->_current_txn;
+		$template_args['reg_url_link'] = $this->_reg_url_link;
+		$template_args['payments'] = array();
+		foreach ($payments as $payment) {
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
+		}
+		// create a hacky payment object, but dont save it
+		$payment = EE_Payment::new_instance(
+			array(
+				'TXN_ID'        => $this->_current_txn->ID(),
+				'STS_ID'        => EEM_Payment::status_id_pending,
+				'PAY_timestamp' => time(),
+				'PAY_amount'    => $this->_current_txn->total(),
+				'PMD_ID'        => $this->_current_txn->payment_method_ID(),
+			)
+		);
+		$payment_method = $this->_current_txn->payment_method();
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
+		} else {
+			$template_args['gateway_content'] = '';
+		}
+		// link to SPCO payment_options
+		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
+		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
+		// verify template arguments
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
+		EEH_Template_Validator::verify_isnt_null(
+			$template_args['show_try_pay_again_link'],
+			'$show_try_pay_again_link'
+		);
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
+		EEH_Template_Validator::verify_isnt_null(
+			$template_args['SPCO_payment_options_url'],
+			'$SPCO_payment_options_url'
+		);
+		return EEH_Template::locate_template(
+			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+			$template_args
+		);
+	}
+
+
+	/**
+	 * get_payment_details
+	 *
+	 * @param array $payments
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function get_new_payments($payments = array())
+	{
+		$payments_html = '';
+		// prepare variables for displaying
+		foreach ($payments as $payment) {
+			$payments_html .= $this->get_payment_row_html($payment);
+		}
+		return $payments_html;
+	}
 }

modules/single_page_checkout/templates/registration_page_wrapper.template.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 
 <div id="ee-single-page-checkout-dv" class="">
     <?php
-    if (! $empty_cart) {
+    if ( ! $empty_cart) {
         if (apply_filters('FHEE__registration_page_wrapper_template__display_time_limit', false)) { ?>
             <p id="spco-registration-time-limit-pg" class="spco-steps-pg ee-attention important-notice"
                style="display: none;">
@@ -31,7 +31,7 @@ 
                 <span id="spco-registration-expiration-spn" class="" style="display:none;"></span>
             </p>
         <?php }
-        if (! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
+        if ( ! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
             ?>
             <h2 id="spco-steps-big-hdr" class="spco-steps-big-hdr">
                 <?php esc_html_e(' Steps', 'event_espresso'); ?>
@@ -77,7 +77,7 @@ 
         foreach ($reg_steps as $reg_step) {
             if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
                 $slug = $reg_step->slug();
-                do_action('AHEE__' . $slug . '__reg_step_start', $reg_step);
+                do_action('AHEE__'.$slug.'__reg_step_start', $reg_step);
                 // todo: deprecate hook AHEE__registration_page_attendee_information__start
                 ?>
                 <div id="spco-<?php echo esc_attr($slug); ?>-dv"

Indentation +43 added lines, -43 removed lines

@@ -16,38 +16,38 @@ 
 
 <div id="ee-single-page-checkout-dv" class="">
     <?php
-    if (! $empty_cart) {
-        if (apply_filters('FHEE__registration_page_wrapper_template__display_time_limit', false)) { ?>
+	if (! $empty_cart) {
+		if (apply_filters('FHEE__registration_page_wrapper_template__display_time_limit', false)) { ?>
             <p id="spco-registration-time-limit-pg" class="spco-steps-pg ee-attention important-notice"
                style="display: none;">
                 <?php echo sprintf(
-                    apply_filters(
-                        'FHEE__registration_page_wrapper_template___time_limit',
-                        esc_html__('You have %1$s to complete your registration.', 'event_espresso')
-                    ),
-                    '<span id="spco-registration-time-limit-spn" class="spco-registration-time-limit-spn">'
-                    . $registration_time_limit
-                    . '</span>'
-                );
-                ?>
+					apply_filters(
+						'FHEE__registration_page_wrapper_template___time_limit',
+						esc_html__('You have %1$s to complete your registration.', 'event_espresso')
+					),
+					'<span id="spco-registration-time-limit-spn" class="spco-registration-time-limit-spn">'
+					. $registration_time_limit
+					. '</span>'
+				);
+				?>
                 <span id="spco-registration-expiration-spn" class="" style="display:none;"></span>
             </p>
         <?php }
-        if (! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
-            ?>
+		if (! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
+			?>
             <h2 id="spco-steps-big-hdr" class="spco-steps-big-hdr">
                 <?php esc_html_e(' Steps', 'event_espresso'); ?>
             </h2>
 
             <div id="spco-steps-display-dv">
                 <?php
-                $step_nmbr = 1;
-                $total_steps = count($reg_steps) - 1;
-                foreach ($reg_steps as $reg_step) {
-                    if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
-                        $slug = $reg_step->slug();
-                        $step_display_dv_class = $reg_step->is_current_step() ? 'active-step' : 'inactive-step';
-                        ?>
+				$step_nmbr = 1;
+				$total_steps = count($reg_steps) - 1;
+				foreach ($reg_steps as $reg_step) {
+					if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
+						$slug = $reg_step->slug();
+						$step_display_dv_class = $reg_step->is_current_step() ? 'active-step' : 'inactive-step';
+						?>
                         <div id="spco-step-<?php echo esc_attr($slug); ?>-display-dv"
                              class="spco-step-display-dv <?php echo esc_attr($step_display_dv_class); ?> steps-<?php echo esc_attr($total_steps); ?>"
                         >
@@ -60,28 +60,28 @@ 
                         </div>
 
                         <?php
-                        if ($step_nmbr < $total_steps) { ?>
+						if ($step_nmbr < $total_steps) { ?>
                             <div class="spco-step-arrow-dv">&raquo;</div>
                             <?php
-                        }
-                        $step_nmbr++;
-                    }
-                }
-                ?>
+						}
+						$step_nmbr++;
+					}
+				}
+				?>
                 <div class="clear-float"></div>
             </div>
 
             <?php
-        }
+		}
 
-        do_action('AHEE__SPCO__before_registration_steps');
-        $step_nmbr = 1;
-        foreach ($reg_steps as $reg_step) {
-            if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
-                $slug = $reg_step->slug();
-                do_action('AHEE__' . $slug . '__reg_step_start', $reg_step);
-                // todo: deprecate hook AHEE__registration_page_attendee_information__start
-                ?>
+		do_action('AHEE__SPCO__before_registration_steps');
+		$step_nmbr = 1;
+		foreach ($reg_steps as $reg_step) {
+			if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
+				$slug = $reg_step->slug();
+				do_action('AHEE__' . $slug . '__reg_step_start', $reg_step);
+				// todo: deprecate hook AHEE__registration_page_attendee_information__start
+				?>
                 <div id="spco-<?php echo esc_attr($slug); ?>-dv"
                      class="spco-step-dv <?php echo esc_attr($reg_step->div_class()); ?>"
                 >
@@ -89,20 +89,20 @@ 
                     <?php do_action('AHEE__SPCO_after_reg_step_form', $slug, $next_step); ?>
                 </div>
                 <?php $step_nmbr++;
-            }
-        }
-        do_action('AHEE__SPCO__after_registration_steps');
-    } else {
-        ?>
+			}
+		}
+		do_action('AHEE__SPCO__after_registration_steps');
+	} else {
+		?>
         <h3 id="spco-empty-cart-hdr" class="spco-step-title-hdr">
             <?php esc_html_e('Nothing in your Event Queue', 'event_espresso'); ?>
         </h3>
         <p><?php echo wp_kses($empty_msg, AllowedTags::getWithFormTags()); ?></p>
         <?php echo wp_kses($cookies_not_set_msg, AllowedTags::getWithFormTags()); ?>
         <?php
-    }
-    do_action('AHEE__SPCO__reg_form_footer');
-    ?>
+	}
+	do_action('AHEE__SPCO__reg_form_footer');
+	?>
 
 </div>
 

modules/single_page_checkout/reg_steps/payment_options/no_payment_required.template.php

Indentation +28 added lines, -28 removed lines

@@ -3,36 +3,36 @@
 /** @type array $registrations_for_free_events */
 
 if (is_array($registrations_for_free_events) && ! empty($registrations_for_free_events)) {
-    echo apply_filters(
-        'FHEE__registration_page_payment_options__no_payment_required_hdr',
-        sprintf(
-            esc_html__('%1$sNo Payment Required%2$s', 'event_espresso'),
-            '<h6>',
-            '</h6>'
-        )
-    );
-    foreach ($registrations_for_free_events as $registration_for_free_event) {
-        if (
-            $registration_for_free_event instanceof EE_Registration
-            && $registration_for_free_event->ticket()->is_free()
-        ) {
-            if ($registration_for_free_event->event() instanceof EE_Event) {
-                ?>
+	echo apply_filters(
+		'FHEE__registration_page_payment_options__no_payment_required_hdr',
+		sprintf(
+			esc_html__('%1$sNo Payment Required%2$s', 'event_espresso'),
+			'<h6>',
+			'</h6>'
+		)
+	);
+	foreach ($registrations_for_free_events as $registration_for_free_event) {
+		if (
+			$registration_for_free_event instanceof EE_Registration
+			&& $registration_for_free_event->ticket()->is_free()
+		) {
+			if ($registration_for_free_event->event() instanceof EE_Event) {
+				?>
                 <p>
                     <?php echo apply_filters(
-                        'FHEE__registration_page_payment_options__no_payment_required_pg',
-                        sprintf(
-                            esc_html__(
-                                '"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.',
-                                'event_espresso'
-                            ),
-                            $registration_for_free_event->ticket()->name(),
-                            $registration_for_free_event->event()->name()
-                        )
-                    ); ?>
+						'FHEE__registration_page_payment_options__no_payment_required_pg',
+						sprintf(
+							esc_html__(
+								'"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.',
+								'event_espresso'
+							),
+							$registration_for_free_event->ticket()->name(),
+							$registration_for_free_event->event()->name()
+						)
+					); ?>
                 </p>
                 <?php
-            }
-        }
-    }
+			}
+		}
+	}
 }