eventespresso / event-espresso-core

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_details.template.php

Spacing +8 added lines, -8 removed lines

@@ -1,36 +1,36 @@
 <div id="admin-primary-mbox-reg-details-dv" class="admin-primary-mbox-dv">
 
-	<?php do_action( 'AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID ); ?>
+	<?php do_action('AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID); ?>
 	<?php echo $resend_registration_button; ?>
 	<?php echo $view_transaction_button; ?>
 	<br/>
 
-	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h3>
+	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h3>
 
 	<?php echo $line_item_table; ?>
 
 	<a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-registration-session-info-dv" class="hidden">
 
 		<a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h3>
+		<h3 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h3>
 
 		<table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $reg_details as $key => $reg_detail ) : ?>
+			<?php foreach ($reg_details as $key => $reg_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $reg_detail['value'];?>
+						<?php echo $reg_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $reg_details?>

admin_pages/maintenance/Maintenance_Admin_Page_Init.core.php

Indentation +84 added lines, -84 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -29,91 +29,91 @@ 
 {
 
 
-    public function __construct()
-    {
-        //define some page related constants
-        define('EE_MAINTENANCE_LABEL', __('Maintenance', 'event_espresso'));
-        define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
-        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
-        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance' . DS);
-        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates' . DS);
-        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
-        //check that if we're in maintenance mode that we tell the admin that
-        add_action('admin_notices', array($this, 'check_maintenance_mode'));
-        parent::__construct();
-    }
-
-
-
-    protected function _set_init_properties()
-    {
-        $this->label = EE_MAINTENANCE_LABEL;
-    }
-
-
-
-    protected function _set_menu_map()
-    {
-        $menu_map = $this->_menu_map();
-        $this->_menu_map = EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance
-            ? new EE_Admin_Page_Main_Menu($menu_map) : new EE_Admin_Page_Sub_Menu($menu_map);
-    }
-
-
-
-    protected function _menu_map()
-    {
-        $map = array(
-            'menu_group'              => 'extras',
-            'menu_order'              => 30,
-            'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-            'parent_slug'             => 'espresso_events',
-            'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
-            'menu_label'              => EE_MAINTENANCE_LABEL,
-            'capability'              => 'manage_options',
-            'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
-            'admin_init_page'         => $this,
-        );
-        if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-            $map['menu_group'] = 'main';
-            $map['subtitle'] = EE_MAINTENANCE_LABEL;
-            $map['menu_label'] = __('Event Espresso', 'event_espresso');
-        }
-        return $map;
-    }
-
-
-
-    /**
-     * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
-     * maintenance mode
-     */
-    public function check_maintenance_mode()
-    {
-        $notice = '';
-        $maintenance_page_url = '';
-        if (EE_Maintenance_Mode::instance()->level()) {
-            $maintenance_page_url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_MAINTENANCE_ADMIN_URL);
-            switch (EE_Maintenance_Mode::instance()->level()) {
-                case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
-                    $notice = '<div class="update-nag">
+	public function __construct()
+	{
+		//define some page related constants
+		define('EE_MAINTENANCE_LABEL', __('Maintenance', 'event_espresso'));
+		define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
+		define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
+		define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance' . DS);
+		define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates' . DS);
+		define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
+		//check that if we're in maintenance mode that we tell the admin that
+		add_action('admin_notices', array($this, 'check_maintenance_mode'));
+		parent::__construct();
+	}
+
+
+
+	protected function _set_init_properties()
+	{
+		$this->label = EE_MAINTENANCE_LABEL;
+	}
+
+
+
+	protected function _set_menu_map()
+	{
+		$menu_map = $this->_menu_map();
+		$this->_menu_map = EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance
+			? new EE_Admin_Page_Main_Menu($menu_map) : new EE_Admin_Page_Sub_Menu($menu_map);
+	}
+
+
+
+	protected function _menu_map()
+	{
+		$map = array(
+			'menu_group'              => 'extras',
+			'menu_order'              => 30,
+			'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+			'parent_slug'             => 'espresso_events',
+			'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
+			'menu_label'              => EE_MAINTENANCE_LABEL,
+			'capability'              => 'manage_options',
+			'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
+			'admin_init_page'         => $this,
+		);
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+			$map['menu_group'] = 'main';
+			$map['subtitle'] = EE_MAINTENANCE_LABEL;
+			$map['menu_label'] = __('Event Espresso', 'event_espresso');
+		}
+		return $map;
+	}
+
+
+
+	/**
+	 * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
+	 * maintenance mode
+	 */
+	public function check_maintenance_mode()
+	{
+		$notice = '';
+		$maintenance_page_url = '';
+		if (EE_Maintenance_Mode::instance()->level()) {
+			$maintenance_page_url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_MAINTENANCE_ADMIN_URL);
+			switch (EE_Maintenance_Mode::instance()->level()) {
+				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
+					$notice = '<div class="update-nag">
 						'
-                              . sprintf(__("Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
-                            "event_espresso"), "<a href='$maintenance_page_url'>", "</a>")
-                              .
-                              '</div>';
-                    break;
-                case EE_Maintenance_Mode::level_2_complete_maintenance:
-                    $notice = '<div class="error">
+							  . sprintf(__("Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
+							"event_espresso"), "<a href='$maintenance_page_url'>", "</a>")
+							  .
+							  '</div>';
+					break;
+				case EE_Maintenance_Mode::level_2_complete_maintenance:
+					$notice = '<div class="error">
 						<p>' . sprintf(__("As part of the process for updating Event Espresso, your database also
 needs to be updated. Event Espresso is in COMPLETE MAINTENANCE MODE (both WordPress admin pages and front-end event registration pages are disabled) until you run the database update script. %s Visit the Maintenance Page to get started,%s it only takes a moment.",
-                            "event_espresso"), "<a href='$maintenance_page_url'>", "</a>") .
-                              '</div>';
-                    break;
-            }
-        }
-        echo apply_filters('FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice', $notice,
-            $maintenance_page_url);
-    }
+							"event_espresso"), "<a href='$maintenance_page_url'>", "</a>") .
+							  '</div>';
+					break;
+			}
+		}
+		echo apply_filters('FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice', $notice,
+			$maintenance_page_url);
+	}
 
 } //end class Payments_Admin_Page_Init

Spacing +5 added lines, -5 removed lines

@@ -34,10 +34,10 @@ 
         //define some page related constants
         define('EE_MAINTENANCE_LABEL', __('Maintenance', 'event_espresso'));
         define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
-        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
-        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance' . DS);
-        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates' . DS);
-        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
+        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page='.EE_MAINTENANCE_PG_SLUG));
+        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES.'maintenance'.DS);
+        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN.'templates'.DS);
+        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL.'maintenance/assets/');
         //check that if we're in maintenance mode that we tell the admin that
         add_action('admin_notices', array($this, 'check_maintenance_mode'));
         parent::__construct();
@@ -107,7 +107,7 @@ 
                     $notice = '<div class="error">
 						<p>' . sprintf(__("As part of the process for updating Event Espresso, your database also
 needs to be updated. Event Espresso is in COMPLETE MAINTENANCE MODE (both WordPress admin pages and front-end event registration pages are disabled) until you run the database update script. %s Visit the Maintenance Page to get started,%s it only takes a moment.",
-                            "event_espresso"), "<a href='$maintenance_page_url'>", "</a>") .
+                            "event_espresso"), "<a href='$maintenance_page_url'>", "</a>").
                               '</div>';
                     break;
             }

modules/invalid_checkout_access/InvalidCheckoutAccess.php

Indentation +10 added lines, -10 removed lines

@@ -39,8 +39,8 @@ 
 		if (
 			! ( $checkout->uts || $checkout->reg_url_link )
 			&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-            && \EE_Config::instance()->registration->track_invalid_checkout_access()
-        ) {
+			&& \EE_Config::instance()->registration->track_invalid_checkout_access()
+		) {
 			/** @var \EE_Request $request */
 			$request = \EE_Registry::instance()->load_core( 'EE_Request' );
 			$ip_address = $request->ip_address();
@@ -60,14 +60,14 @@ 
 			}
 			$ee_bot_checkout[ $ip_address ][ $http_referer ]++;
 			update_option( InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout );
-            if (WP_DEBUG) {
-                \EE_Error::add_error(
-                    esc_html__('Direct access to the registration checkout page is not allowed.', 'event_espresso'),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
+			if (WP_DEBUG) {
+				\EE_Error::add_error(
+					esc_html__('Direct access to the registration checkout page is not allowed.', 'event_espresso'),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
 			return true;
 		}
 		return false;

Spacing +29 added lines, -29 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\modules\invalid_checkout_access;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,31 +35,31 @@ 
 	 * @param \EE_Checkout $checkout
 	 * @return bool true if access to registration checkout appears to be invalid
 	 */
-	public function checkoutAccessIsInvalid( \EE_Checkout $checkout ) {
+	public function checkoutAccessIsInvalid(\EE_Checkout $checkout) {
 		if (
-			! ( $checkout->uts || $checkout->reg_url_link )
-			&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+			! ($checkout->uts || $checkout->reg_url_link)
+			&& ! (defined('DOING_AJAX') && DOING_AJAX)
             && \EE_Config::instance()->registration->track_invalid_checkout_access()
         ) {
 			/** @var \EE_Request $request */
-			$request = \EE_Registry::instance()->load_core( 'EE_Request' );
+			$request = \EE_Registry::instance()->load_core('EE_Request');
 			$ip_address = $request->ip_address();
-			$ee_bot_checkout = get_option( InvalidCheckoutAccess::OPTION_KEY );
-			if ( $ee_bot_checkout === false ) {
+			$ee_bot_checkout = get_option(InvalidCheckoutAccess::OPTION_KEY);
+			if ($ee_bot_checkout === false) {
 				$ee_bot_checkout = array();
-				add_option( InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout, '', false );
+				add_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout, '', false);
 			}
-			if ( ! isset( $ee_bot_checkout[ $ip_address ] ) ) {
-				$ee_bot_checkout[ $ip_address ] = array();
+			if ( ! isset($ee_bot_checkout[$ip_address])) {
+				$ee_bot_checkout[$ip_address] = array();
 			}
-			$http_referer = isset( $_SERVER['HTTP_REFERER'] )
-				? esc_attr( $_SERVER['HTTP_REFERER'] )
+			$http_referer = isset($_SERVER['HTTP_REFERER'])
+				? esc_attr($_SERVER['HTTP_REFERER'])
 				: 0;
-			if ( ! isset( $ee_bot_checkout[ $ip_address ][ $http_referer ] ) ) {
-				$ee_bot_checkout[ $ip_address ][ $http_referer ] = 0;
+			if ( ! isset($ee_bot_checkout[$ip_address][$http_referer])) {
+				$ee_bot_checkout[$ip_address][$http_referer] = 0;
 			}
-			$ee_bot_checkout[ $ip_address ][ $http_referer ]++;
-			update_option( InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout );
+			$ee_bot_checkout[$ip_address][$http_referer]++;
+			update_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout);
             if (WP_DEBUG) {
                 \EE_Error::add_error(
                     esc_html__('Direct access to the registration checkout page is not allowed.', 'event_espresso'),
@@ -88,13 +88,13 @@ 
 				'layout_strategy' => new \EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
 					'invalid_checkout_access_hdr'   => new \EE_Form_Section_HTML(
-						\EEH_HTML::h2( esc_html__( 'Invalid Checkout Access', 'event_espresso' ) )
+						\EEH_HTML::h2(esc_html__('Invalid Checkout Access', 'event_espresso'))
 					),
 					'ee_bot_checkout_data'          => new \EE_Text_Area_Input(
 						array(
-							'html_label_text' => esc_html__( 'Invalid Checkout Data', 'event_espresso' ),
+							'html_label_text' => esc_html__('Invalid Checkout Data', 'event_espresso'),
 							'default'         => var_export(
-								get_option( InvalidCheckoutAccess::OPTION_KEY, array() ),
+								get_option(InvalidCheckoutAccess::OPTION_KEY, array()),
 								true
 							),
 							'required'        => false,
@@ -106,7 +106,7 @@ 
 					),
 					'track_invalid_checkout_access' => new \EE_Yes_No_Input(
 						array(
-							'html_label_text'         => __( 'Track Invalid Checkout Access?', 'event_espresso' ),
+							'html_label_text'         => __('Track Invalid Checkout Access?', 'event_espresso'),
 							'html_help_text'          => esc_html__(
 								'Controls whether or not invalid attempts to directly access the registration checkout page should be tracked. Setting this to "No" means that the above data will no longer be collected.',
 								'event_espresso'
@@ -119,7 +119,7 @@ 
 					),
 					'delete_invalid_checkout_data'  => new \EE_Yes_No_Input(
 						array(
-							'html_label_text'         => __( 'Reset Invalid Checkout Data', 'event_espresso' ),
+							'html_label_text'         => __('Reset Invalid Checkout Data', 'event_espresso'),
 							'html_help_text'          => esc_html__(
 								'Setting this to "Yes" will delete all existing invalid checkout access data.',
 								'event_espresso'
@@ -141,15 +141,15 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public function processForm( \EE_Registration_Config $EE_Registration_Config ) {
+	public function processForm(\EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$invalid_checkout_access_form = $this->getForm();
 			// if not displaying a form, then check for form submission
-			if ( $invalid_checkout_access_form->was_submitted() ) {
+			if ($invalid_checkout_access_form->was_submitted()) {
 				// capture form data
 				$invalid_checkout_access_form->receive_form_submission();
 				// validate form data
-				if ( $invalid_checkout_access_form->is_valid() ) {
+				if ($invalid_checkout_access_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $invalid_checkout_access_form->valid_data();
 					// ensure form inputs we want are set
@@ -163,8 +163,8 @@ 
 							$valid_data['track_invalid_checkout_access']
 						);
 						// if deleting, then update option with empty array
-						if ( filter_var( $valid_data['delete_invalid_checkout_data'], FILTER_VALIDATE_BOOLEAN ) ) {
-							update_option( InvalidCheckoutAccess::OPTION_KEY, array() );
+						if (filter_var($valid_data['delete_invalid_checkout_data'], FILTER_VALIDATE_BOOLEAN)) {
+							update_option(InvalidCheckoutAccess::OPTION_KEY, array());
 						}
 					} else {
 						\EE_Error::add_error(
@@ -178,7 +178,7 @@ 
 						);
 					}
 				} else {
-					if ( $invalid_checkout_access_form->submission_error_message() !== '' ) {
+					if ($invalid_checkout_access_form->submission_error_message() !== '') {
 						\EE_Error::add_error(
 							$invalid_checkout_access_form->submission_error_message(),
 							__FILE__,
@@ -188,7 +188,7 @@ 
 					}
 				}
 			}
-		} catch ( \EE_Error $e ) {
+		} catch (\EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

core/libraries/messages/data_class/EE_Messages_Preview_incoming_data.class.php

Indentation +553 added lines, -553 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -24,585 +24,585 @@ 
 class EE_Messages_Preview_incoming_data extends EE_Messages_incoming_data
 {
     
-    //some specific properties we need for this class
-    private $_events = array();
-    private $_attendees = array();
-    private $_registrations = array();
+	//some specific properties we need for this class
+	private $_events = array();
+	private $_attendees = array();
+	private $_registrations = array();
     
     
-    /**
-     * For the constructor of this special preview class.  We're either looking for an event id or empty data.  If we
-     * have an event id (or ids) then we'll use that as the source for the "dummy" data.  If the data is empty then
-     * we'll get the first three published events from the users database and use that as a source.
-     *
-     * @param array $data
-     */
-    public function __construct($data = array())
-    {
-        $this->_data = isset($data['event_ids']) ? $data['event_ids'] : array();
-        $this->_setup_attendees_events();
-        parent::__construct($data);
-    }
+	/**
+	 * For the constructor of this special preview class.  We're either looking for an event id or empty data.  If we
+	 * have an event id (or ids) then we'll use that as the source for the "dummy" data.  If the data is empty then
+	 * we'll get the first three published events from the users database and use that as a source.
+	 *
+	 * @param array $data
+	 */
+	public function __construct($data = array())
+	{
+		$this->_data = isset($data['event_ids']) ? $data['event_ids'] : array();
+		$this->_setup_attendees_events();
+		parent::__construct($data);
+	}
     
     
-    /**
-     * Returns database safe representation of the data later used to when instantiating this object.
-     *
-     * @param array $data The incoming data to be prepped.
-     *
-     * @return array   The prepped data for db
-     */
-    static public function convert_data_for_persistent_storage($data)
-    {
-        return $data;
-    }
+	/**
+	 * Returns database safe representation of the data later used to when instantiating this object.
+	 *
+	 * @param array $data The incoming data to be prepped.
+	 *
+	 * @return array   The prepped data for db
+	 */
+	static public function convert_data_for_persistent_storage($data)
+	{
+		return $data;
+	}
     
     
-    /**
-     * Data that has been stored in persistent storage that was prepped by _convert_data_for_persistent_storage
-     * can be sent into this method and converted back into the format used for instantiating with this data handler.
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    static public function convert_data_from_persistent_storage($data)
-    {
-        return $data;
-    }
+	/**
+	 * Data that has been stored in persistent storage that was prepped by _convert_data_for_persistent_storage
+	 * can be sent into this method and converted back into the format used for instantiating with this data handler.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	static public function convert_data_from_persistent_storage($data)
+	{
+		return $data;
+	}
     
     
-    /**
-     * This will just setup the _events property in the expected format.
-     *
-     * @throws \EE_Error
-     */
-    private function _setup_attendees_events()
-    {
-        
-        //setup some attendee objects
-        $attendees = $this->_get_some_attendees();
-        
-        //if empty $data we'll do a query to get some events from the server. otherwise we'll retrieve the event data for the given ids.
-        $events = $this->_get_some_events($this->_data);
-        
-        $answers_n_questions = $this->_get_some_q_and_as();
-        
-        if (count($events) < 1) {
-            throw new EE_Error(__('We can\'t generate a preview for you because there are no active events in your database',
-                'event_espresso'));
-        }
-        
-        
-        //now let's loop and set up the _events property.  At the same time we'll set up attendee properties.
-        
-        
-        //we'll actually use the generated line_item identifiers for our loop
-        $dtts = $tkts = array();
-        foreach ($events as $id => $event) {
-            if ( ! $event instanceof EE_Event) {
-                continue;
-            }
-            $this->_events[$id]['ID']       = $id;
-            $this->_events[$id]['name']     = $event->get('EVT_name');
-            $datetime                       = $event->get_first_related('Datetime');
-            $tickets                        = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket',
-                array('default_where_conditions' => 'none')) : array();
-            $this->_events[$id]['event']    = $event;
-            $this->_events[$id]['reg_objs'] = array();
-            $this->_events[$id]['tkt_objs'] = $tickets;
-            $this->_events[$id]['dtt_objs'] = array();
+	/**
+	 * This will just setup the _events property in the expected format.
+	 *
+	 * @throws \EE_Error
+	 */
+	private function _setup_attendees_events()
+	{
+        
+		//setup some attendee objects
+		$attendees = $this->_get_some_attendees();
+        
+		//if empty $data we'll do a query to get some events from the server. otherwise we'll retrieve the event data for the given ids.
+		$events = $this->_get_some_events($this->_data);
+        
+		$answers_n_questions = $this->_get_some_q_and_as();
+        
+		if (count($events) < 1) {
+			throw new EE_Error(__('We can\'t generate a preview for you because there are no active events in your database',
+				'event_espresso'));
+		}
+        
+        
+		//now let's loop and set up the _events property.  At the same time we'll set up attendee properties.
+        
+        
+		//we'll actually use the generated line_item identifiers for our loop
+		$dtts = $tkts = array();
+		foreach ($events as $id => $event) {
+			if ( ! $event instanceof EE_Event) {
+				continue;
+			}
+			$this->_events[$id]['ID']       = $id;
+			$this->_events[$id]['name']     = $event->get('EVT_name');
+			$datetime                       = $event->get_first_related('Datetime');
+			$tickets                        = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket',
+				array('default_where_conditions' => 'none')) : array();
+			$this->_events[$id]['event']    = $event;
+			$this->_events[$id]['reg_objs'] = array();
+			$this->_events[$id]['tkt_objs'] = $tickets;
+			$this->_events[$id]['dtt_objs'] = array();
             
-            $dttcache = array();
-            $tkts     = array();
-            foreach ($tickets as $ticket) {
-                if ( ! $ticket instanceof EE_Ticket) {
-                    continue;
-                }
-                $reldatetime                     = $ticket->datetimes();
-                $tkts[$ticket->ID()]             = array();
-                $tkts[$ticket->ID()]['ticket']   = $ticket;
-                $tkts[$ticket->ID()]['dtt_objs'] = $reldatetime;
-                $tkts[$ticket->ID()]['att_objs'] = $attendees;
-                $tkts[$ticket->ID()]['count']    = count($attendees);
-                $tkts[$ticket->ID()]['EE_Event'] = $event;
-                foreach ($reldatetime as $datetime) {
-                    if ($datetime instanceof EE_Datetime && ! isset($dtts[$datetime->ID()])) {
-                        $this->_events[$id]['dtt_objs'][$datetime->ID()] = $datetime;
-                        $dtts[$datetime->ID()]['datetime']               = $datetime;
-                        $dtts[$datetime->ID()]['tkt_objs'][]             = $ticket;
-                        $dtts[$datetime->ID()]['evt_objs'][]             = $event;
-                        $dttcache[$datetime->ID()]                       = $datetime;
-                    }
-                }
-            }
+			$dttcache = array();
+			$tkts     = array();
+			foreach ($tickets as $ticket) {
+				if ( ! $ticket instanceof EE_Ticket) {
+					continue;
+				}
+				$reldatetime                     = $ticket->datetimes();
+				$tkts[$ticket->ID()]             = array();
+				$tkts[$ticket->ID()]['ticket']   = $ticket;
+				$tkts[$ticket->ID()]['dtt_objs'] = $reldatetime;
+				$tkts[$ticket->ID()]['att_objs'] = $attendees;
+				$tkts[$ticket->ID()]['count']    = count($attendees);
+				$tkts[$ticket->ID()]['EE_Event'] = $event;
+				foreach ($reldatetime as $datetime) {
+					if ($datetime instanceof EE_Datetime && ! isset($dtts[$datetime->ID()])) {
+						$this->_events[$id]['dtt_objs'][$datetime->ID()] = $datetime;
+						$dtts[$datetime->ID()]['datetime']               = $datetime;
+						$dtts[$datetime->ID()]['tkt_objs'][]             = $ticket;
+						$dtts[$datetime->ID()]['evt_objs'][]             = $event;
+						$dttcache[$datetime->ID()]                       = $datetime;
+					}
+				}
+			}
             
-            $this->_events[$id]['total_attendees'] = count($attendees);
-            $this->_events[$id]['att_objs']        = $attendees;
+			$this->_events[$id]['total_attendees'] = count($attendees);
+			$this->_events[$id]['att_objs']        = $attendees;
             
-            //let's also setup the dummy attendees property!
-            foreach ($attendees as $att_key => $attendee) {
-                if ( ! $attendee instanceof EE_Attendee) {
-                    continue;
-                }
-                $this->_attendees[$att_key]['line_ref'][] = $id;  //so later it can be determined what events this attendee registered for!
-                $this->_attendees[$att_key]['evt_objs'][] = $event;
-                $this->_attendees[$att_key]['att_obj']    = $attendee;
-                //$this->_attendees[$att_key]['registration_id'] = 0;
-                $this->_attendees[$att_key]['attendee_email'] = $attendee->email();
-                $this->_attendees[$att_key]['tkt_objs']       = $tickets;
-                if ($att_key == 999999991) {
-                    $this->_attendees[$att_key]['ans_objs'][999]  = $answers_n_questions['answers'][999];
-                    $this->_attendees[$att_key]['ans_objs'][1002] = $answers_n_questions['answers'][1002];
-                    $this->_attendees[$att_key]['ans_objs'][1005] = $answers_n_questions['answers'][1005];
-                } elseif ($att_key == 999999992) {
-                    $this->_attendees[$att_key]['ans_objs'][1000] = $answers_n_questions['answers'][1000];
-                    $this->_attendees[$att_key]['ans_objs'][1003] = $answers_n_questions['answers'][1003];
-                    $this->_attendees[$att_key]['ans_objs'][1006] = $answers_n_questions['answers'][1006];
-                } elseif ($att_key == 999999993) {
-                    $this->_attendees[$att_key]['ans_objs'][1001] = $answers_n_questions['answers'][1001];
-                    $this->_attendees[$att_key]['ans_objs'][1004] = $answers_n_questions['answers'][1004];
-                    $this->_attendees[$att_key]['ans_objs'][1007] = $answers_n_questions['answers'][1007];
-                }
-            }
-        }
-        
-        $this->tickets            = $tkts;
-        $this->datetimes          = $dtts;
-        $this->answers            = $answers_n_questions['answers'];
-        $this->questions          = $answers_n_questions['questions'];
-        $this->total_ticket_count = count($tkts) * count($this->_attendees);
-        
-    }
+			//let's also setup the dummy attendees property!
+			foreach ($attendees as $att_key => $attendee) {
+				if ( ! $attendee instanceof EE_Attendee) {
+					continue;
+				}
+				$this->_attendees[$att_key]['line_ref'][] = $id;  //so later it can be determined what events this attendee registered for!
+				$this->_attendees[$att_key]['evt_objs'][] = $event;
+				$this->_attendees[$att_key]['att_obj']    = $attendee;
+				//$this->_attendees[$att_key]['registration_id'] = 0;
+				$this->_attendees[$att_key]['attendee_email'] = $attendee->email();
+				$this->_attendees[$att_key]['tkt_objs']       = $tickets;
+				if ($att_key == 999999991) {
+					$this->_attendees[$att_key]['ans_objs'][999]  = $answers_n_questions['answers'][999];
+					$this->_attendees[$att_key]['ans_objs'][1002] = $answers_n_questions['answers'][1002];
+					$this->_attendees[$att_key]['ans_objs'][1005] = $answers_n_questions['answers'][1005];
+				} elseif ($att_key == 999999992) {
+					$this->_attendees[$att_key]['ans_objs'][1000] = $answers_n_questions['answers'][1000];
+					$this->_attendees[$att_key]['ans_objs'][1003] = $answers_n_questions['answers'][1003];
+					$this->_attendees[$att_key]['ans_objs'][1006] = $answers_n_questions['answers'][1006];
+				} elseif ($att_key == 999999993) {
+					$this->_attendees[$att_key]['ans_objs'][1001] = $answers_n_questions['answers'][1001];
+					$this->_attendees[$att_key]['ans_objs'][1004] = $answers_n_questions['answers'][1004];
+					$this->_attendees[$att_key]['ans_objs'][1007] = $answers_n_questions['answers'][1007];
+				}
+			}
+		}
+        
+		$this->tickets            = $tkts;
+		$this->datetimes          = $dtts;
+		$this->answers            = $answers_n_questions['answers'];
+		$this->questions          = $answers_n_questions['questions'];
+		$this->total_ticket_count = count($tkts) * count($this->_attendees);
+        
+	}
     
     
-    /**
-     * This just returns an array of dummy attendee objects that we'll use to attach to events for our preview data
-     *
-     * @access private
-     * @return array an array of attendee objects
-     */
-    private function _get_some_attendees()
-    {
-        //let's just setup a dummy array of various attendee details
-        $dummy_attendees = array(
-            0 => array(
-                'Luke',
-                'Skywalker',
-                'farfaraway@galaxy.sp',
-                '804 Bantha Dr.',
-                'Complex 8',
-                'Mos Eisley',
-                32,
-                'US',
-                'f0r3e',
-                '222-333-4763',
-                false,
-                '999999991'
-            ),
-            1 => array(
-                'Princess',
-                'Leia',
-                'buns@fcn.al',
-                '1456 Valley Way Boulevard',
-                'Suite 9',
-                'Alderaan',
-                15,
-                'US',
-                'c1h2c',
-                '78-123-111-1111',
-                false,
-                '999999992'
-            ),
-            2 => array(
-                'Yoda',
-                'I Am',
-                'arrivenot@emailbad.fr',
-                '4th Tree',
-                '5th Knot',
-                'Marsh',
-                22,
-                'US',
-                'l18n',
-                '999-999-9999',
-                false,
-                '999999993'
-            ),
-        );
-        
-        //let's generate the attendee objects
-        $attendees = array();
-        $var_array = array(
-            'fname',
-            'lname',
-            'email',
-            'address',
-            'address2',
-            'city',
-            'staid',
-            'cntry',
-            'zip',
-            'phone',
-            'deleted',
-            'attid'
-        );
-        
-        //EE_Registry::instance()->load_class( 'Attendee', array(), FALSE, false, TRUE );
-        foreach ($dummy_attendees as $dummy) {
-            $att = array_combine($var_array, $dummy);
-            extract($att);
-            /** @var $fname string */
-            /** @var $lname string */
-            /** @var $address string */
-            /** @var $address2 string */
-            /** @var $city string */
-            /** @var $staid string */
-            /** @var $cntry string */
-            /** @var $zip string */
-            /** @var $email string */
-            /** @var $phone string */
-            /** @var $attid string */
-            $attendees[$attid] = EE_Attendee::new_instance(
-                array(
-                    'ATT_fname'    => $fname,
-                    'ATT_lname'    => $lname,
-                    'ATT_address'  => $address,
-                    'ATT_address2' => $address2,
-                    'ATT_city'     => $city,
-                    'STA_ID'       => $staid,
-                    'CNT_ISO'      => $cntry,
-                    'ATT_zip'      => $zip,
-                    'ATT_email'    => $email,
-                    'ATT_phone'    => $phone,
-                    'ATT_ID'       => $attid
-                )
-            );
-        }
-        
-        return $attendees;
-    }
+	/**
+	 * This just returns an array of dummy attendee objects that we'll use to attach to events for our preview data
+	 *
+	 * @access private
+	 * @return array an array of attendee objects
+	 */
+	private function _get_some_attendees()
+	{
+		//let's just setup a dummy array of various attendee details
+		$dummy_attendees = array(
+			0 => array(
+				'Luke',
+				'Skywalker',
+				'farfaraway@galaxy.sp',
+				'804 Bantha Dr.',
+				'Complex 8',
+				'Mos Eisley',
+				32,
+				'US',
+				'f0r3e',
+				'222-333-4763',
+				false,
+				'999999991'
+			),
+			1 => array(
+				'Princess',
+				'Leia',
+				'buns@fcn.al',
+				'1456 Valley Way Boulevard',
+				'Suite 9',
+				'Alderaan',
+				15,
+				'US',
+				'c1h2c',
+				'78-123-111-1111',
+				false,
+				'999999992'
+			),
+			2 => array(
+				'Yoda',
+				'I Am',
+				'arrivenot@emailbad.fr',
+				'4th Tree',
+				'5th Knot',
+				'Marsh',
+				22,
+				'US',
+				'l18n',
+				'999-999-9999',
+				false,
+				'999999993'
+			),
+		);
+        
+		//let's generate the attendee objects
+		$attendees = array();
+		$var_array = array(
+			'fname',
+			'lname',
+			'email',
+			'address',
+			'address2',
+			'city',
+			'staid',
+			'cntry',
+			'zip',
+			'phone',
+			'deleted',
+			'attid'
+		);
+        
+		//EE_Registry::instance()->load_class( 'Attendee', array(), FALSE, false, TRUE );
+		foreach ($dummy_attendees as $dummy) {
+			$att = array_combine($var_array, $dummy);
+			extract($att);
+			/** @var $fname string */
+			/** @var $lname string */
+			/** @var $address string */
+			/** @var $address2 string */
+			/** @var $city string */
+			/** @var $staid string */
+			/** @var $cntry string */
+			/** @var $zip string */
+			/** @var $email string */
+			/** @var $phone string */
+			/** @var $attid string */
+			$attendees[$attid] = EE_Attendee::new_instance(
+				array(
+					'ATT_fname'    => $fname,
+					'ATT_lname'    => $lname,
+					'ATT_address'  => $address,
+					'ATT_address2' => $address2,
+					'ATT_city'     => $city,
+					'STA_ID'       => $staid,
+					'CNT_ISO'      => $cntry,
+					'ATT_zip'      => $zip,
+					'ATT_email'    => $email,
+					'ATT_phone'    => $phone,
+					'ATT_ID'       => $attid
+				)
+			);
+		}
+        
+		return $attendees;
+	}
     
     
-    /**
-     * Return an array of dummy question objects indexed by answer id and dummy answer objects indexed by answer id.
-     * This will be used in our dummy data setup
-     * @return array
-     */
-    private function _get_some_q_and_as()
-    {
-        
-        
-        $quests_array = array(
-            0 => array(
-                555,
-                __('What is your favorite planet?', 'event_espresso'),
-                0
-            ),
-            1 => array(
-                556,
-                __('What is your favorite food?', 'event_espresso'),
-                0
-            ),
-            2 => array(
-                557,
-                __('How many lightyears have you travelled', 'event_espresso'),
-                0
-            )
-        );
-        
-        
-        $ans_array = array(
-            0 => array(
-                999,
-                555,
-                'Tattoine'
-            ),
-            1 => array(
-                1000,
-                555,
-                'Alderaan'
-            ),
-            2 => array(
-                1001,
-                555,
-                'Dantooine'
-            ),
-            3 => array(
-                1002,
-                556,
-                'Fish Fingers'
-            ),
-            4 => array(
-                1003,
-                556,
-                'Sushi'
-            ),
-            5 => array(
-                1004,
-                556,
-                'Water'
-            ),
-            6 => array(
-                1005,
-                557,
-                'A lot',
-            ),
-            7 => array(
-                1006,
-                557,
-                "That's none of your business."
-            ),
-            8 => array(
-                1007,
-                557,
-                "People less travel me then."
-            )
-        );
-        
-        $qst_columns = array('QST_ID', 'QST_display_text', 'QST_system');
-        $ans_columns = array('ANS_ID', 'QST_ID', 'ANS_value');
-        
-        //EE_Registry::instance()->load_class( 'Question', array(), FALSE, TRUE, TRUE );
-        //EE_Registry::instance()->load_class( 'Answer', array(), FALSE, TRUE, TRUE );
-        
-        $qsts = array();
-        //first the questions
-        foreach ($quests_array as $qst) {
-            $qstobj                  = array_combine($qst_columns, $qst);
-            $qsts[$qstobj['QST_ID']] = EE_Question::new_instance($qstobj);
-        }
-        
-        //now the answers (and we'll setup our arrays)
-        $q_n_as = array();
-        foreach ($ans_array as $ans) {
-            $ansobj                             = array_combine($ans_columns, $ans);
-            $ansobj                             = EE_Answer::new_instance($ansobj);
-            $q_n_as['answers'][$ansobj->ID()]   = $ansobj;
-            $q_n_as['questions'][$ansobj->ID()] = $qsts[$ansobj->get('QST_ID')];
-        }
-        
-        return $q_n_as;
-        
-    }
+	/**
+	 * Return an array of dummy question objects indexed by answer id and dummy answer objects indexed by answer id.
+	 * This will be used in our dummy data setup
+	 * @return array
+	 */
+	private function _get_some_q_and_as()
+	{
+        
+        
+		$quests_array = array(
+			0 => array(
+				555,
+				__('What is your favorite planet?', 'event_espresso'),
+				0
+			),
+			1 => array(
+				556,
+				__('What is your favorite food?', 'event_espresso'),
+				0
+			),
+			2 => array(
+				557,
+				__('How many lightyears have you travelled', 'event_espresso'),
+				0
+			)
+		);
+        
+        
+		$ans_array = array(
+			0 => array(
+				999,
+				555,
+				'Tattoine'
+			),
+			1 => array(
+				1000,
+				555,
+				'Alderaan'
+			),
+			2 => array(
+				1001,
+				555,
+				'Dantooine'
+			),
+			3 => array(
+				1002,
+				556,
+				'Fish Fingers'
+			),
+			4 => array(
+				1003,
+				556,
+				'Sushi'
+			),
+			5 => array(
+				1004,
+				556,
+				'Water'
+			),
+			6 => array(
+				1005,
+				557,
+				'A lot',
+			),
+			7 => array(
+				1006,
+				557,
+				"That's none of your business."
+			),
+			8 => array(
+				1007,
+				557,
+				"People less travel me then."
+			)
+		);
+        
+		$qst_columns = array('QST_ID', 'QST_display_text', 'QST_system');
+		$ans_columns = array('ANS_ID', 'QST_ID', 'ANS_value');
+        
+		//EE_Registry::instance()->load_class( 'Question', array(), FALSE, TRUE, TRUE );
+		//EE_Registry::instance()->load_class( 'Answer', array(), FALSE, TRUE, TRUE );
+        
+		$qsts = array();
+		//first the questions
+		foreach ($quests_array as $qst) {
+			$qstobj                  = array_combine($qst_columns, $qst);
+			$qsts[$qstobj['QST_ID']] = EE_Question::new_instance($qstobj);
+		}
+        
+		//now the answers (and we'll setup our arrays)
+		$q_n_as = array();
+		foreach ($ans_array as $ans) {
+			$ansobj                             = array_combine($ans_columns, $ans);
+			$ansobj                             = EE_Answer::new_instance($ansobj);
+			$q_n_as['answers'][$ansobj->ID()]   = $ansobj;
+			$q_n_as['questions'][$ansobj->ID()] = $qsts[$ansobj->get('QST_ID')];
+		}
+        
+		return $q_n_as;
+        
+	}
     
     
-    /**
-     * Return an array of event objects from the database
-     *
-     * If event ids are not included then we'll just retrieve the first published event from the database.
-     *
-     * @param  array $event_ids if set, this will be an array of event ids to obtain events for.
-     *
-     * @return array    An array of event objects from the db.
-     */
-    private function _get_some_events($event_ids = array())
-    {
-        
-        //HEY, if we have an evt_id then we want to make sure we use that for the preview (because a specific event template is being viewed);
-        $event_ids = isset($_REQUEST['evt_id']) && ! empty($_REQUEST['evt_id'])
-            ? array($_REQUEST['evt_id'])
-            : $event_ids;
-        
-        $limit = ! empty($event_ids)
-            ? null
-            : apply_filters('FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1');
-        
-        $where = ! empty($event_ids)
-            ? array(
-                'EVT_ID'                 => array('IN', $event_ids),
-                'Datetime.Ticket.TKT_ID' => array('>', 1)
-            )
-            : array('Datetime.Ticket.TKT_ID' => array('>', 1));
-        
-        $events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit));
-        
-        return $events;
-    }
+	/**
+	 * Return an array of event objects from the database
+	 *
+	 * If event ids are not included then we'll just retrieve the first published event from the database.
+	 *
+	 * @param  array $event_ids if set, this will be an array of event ids to obtain events for.
+	 *
+	 * @return array    An array of event objects from the db.
+	 */
+	private function _get_some_events($event_ids = array())
+	{
+        
+		//HEY, if we have an evt_id then we want to make sure we use that for the preview (because a specific event template is being viewed);
+		$event_ids = isset($_REQUEST['evt_id']) && ! empty($_REQUEST['evt_id'])
+			? array($_REQUEST['evt_id'])
+			: $event_ids;
+        
+		$limit = ! empty($event_ids)
+			? null
+			: apply_filters('FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1');
+        
+		$where = ! empty($event_ids)
+			? array(
+				'EVT_ID'                 => array('IN', $event_ids),
+				'Datetime.Ticket.TKT_ID' => array('>', 1)
+			)
+			: array('Datetime.Ticket.TKT_ID' => array('>', 1));
+        
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit));
+        
+		return $events;
+	}
     
     
-    protected function _setup_data()
-    {
-        
-        //need to figure out the running total for test purposes so... we're going to create a temp cart and add the tickets to it!
-        if (EE_Registry::instance()->SSN instanceof EE_Session) {
-            EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-            $session = EE_Registry::instance()->SSN;
-        } else {
-            $session = EE_Registry::instance()->load_core('Session');
-        }
-        $cart = EE_Cart::instance(null, $session);
-        
-        
-        //add tickets to cart
-        foreach ($this->tickets as $ticket) {
-            $cart->add_ticket_to_cart($ticket['ticket']);
-        }
-        
-        
-        //setup txn property
-        $this->txn = EE_Transaction::new_instance(
-            array(
-                'TXN_timestamp'    => time(), //unix timestamp
-                'TXN_total'        => 0, //txn_total
-                'TXN_paid'         => 0, //txn_paid
-                'STS_ID'           => EEM_Transaction::incomplete_status_code, //sts_id
-                'TXN_session_data' => null, //dump of txn session object (we're just going to leave blank here)
-                'TXN_hash_salt'    => null, //hash salt blank as well
-                'TXN_ID'           => 999999
-            )
-        );
-        
-        
-        //setup reg_objects
-        //note we're setting up a reg object for each attendee in each event but ALSO adding to the reg_object array.
-        $this->reg_objs = array();
-        $regid          = 9999990;
-        foreach ($this->_attendees as $key => $attendee) {
-            //note we need to setup reg_objects for each event this attendee belongs to
-            $regatt = $attendee['att_obj'] instanceof EE_Attendee ? $attendee['att_obj']->ID() : null;
-            $regtxn = $this->txn->ID();
-            $regcnt = 1;
-            foreach ($attendee['line_ref'] as $evtid) {
-                foreach ($this->_events[$evtid]['tkt_objs'] as $ticket) {
-                    if ( ! $ticket instanceof EE_Ticket) {
-                        continue;
-                    }
-                    $reg_array                                        = array(
-                        'EVT_ID'           => $evtid,
-                        'ATT_ID'           => $regatt,
-                        'TXN_ID'           => $regtxn,
-                        'TKT_ID'           => $ticket->ID(),
-                        'STS_ID'           => EEM_Registration::status_id_pending_payment,
-                        'REG_date'         => time(),
-                        'REG_final_price'  => $ticket->get('TKT_price'),
-                        'REG_session'      => 'dummy_session_id',
-                        'REG_code'         => $regid . '-dummy-generated-code',
-                        'REG_url_link'     => $regcnt . '-daafpapasdlfakasdfpqasdfasdf',
-                        'REG_count'        => $regcnt,
-                        'REG_group_size'   => $this->_events[$evtid]['total_attendees'],
-                        'REG_att_is_going' => true,
-                        'REG_ID'           => $regid
-                    );
-                    $REG_OBJ                                          = EE_Registration::new_instance($reg_array);
-                    $this->_attendees[$key]['reg_objs'][$regid]       = $REG_OBJ;
-                    $this->_events[$evtid]['reg_objs'][]              = $REG_OBJ;
-                    $this->reg_objs[]                                 = $REG_OBJ;
-                    $this->tickets[$ticket->ID()]['reg_objs'][$regid] = $REG_OBJ;
+	protected function _setup_data()
+	{
+        
+		//need to figure out the running total for test purposes so... we're going to create a temp cart and add the tickets to it!
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+			$session = EE_Registry::instance()->SSN;
+		} else {
+			$session = EE_Registry::instance()->load_core('Session');
+		}
+		$cart = EE_Cart::instance(null, $session);
+        
+        
+		//add tickets to cart
+		foreach ($this->tickets as $ticket) {
+			$cart->add_ticket_to_cart($ticket['ticket']);
+		}
+        
+        
+		//setup txn property
+		$this->txn = EE_Transaction::new_instance(
+			array(
+				'TXN_timestamp'    => time(), //unix timestamp
+				'TXN_total'        => 0, //txn_total
+				'TXN_paid'         => 0, //txn_paid
+				'STS_ID'           => EEM_Transaction::incomplete_status_code, //sts_id
+				'TXN_session_data' => null, //dump of txn session object (we're just going to leave blank here)
+				'TXN_hash_salt'    => null, //hash salt blank as well
+				'TXN_ID'           => 999999
+			)
+		);
+        
+        
+		//setup reg_objects
+		//note we're setting up a reg object for each attendee in each event but ALSO adding to the reg_object array.
+		$this->reg_objs = array();
+		$regid          = 9999990;
+		foreach ($this->_attendees as $key => $attendee) {
+			//note we need to setup reg_objects for each event this attendee belongs to
+			$regatt = $attendee['att_obj'] instanceof EE_Attendee ? $attendee['att_obj']->ID() : null;
+			$regtxn = $this->txn->ID();
+			$regcnt = 1;
+			foreach ($attendee['line_ref'] as $evtid) {
+				foreach ($this->_events[$evtid]['tkt_objs'] as $ticket) {
+					if ( ! $ticket instanceof EE_Ticket) {
+						continue;
+					}
+					$reg_array                                        = array(
+						'EVT_ID'           => $evtid,
+						'ATT_ID'           => $regatt,
+						'TXN_ID'           => $regtxn,
+						'TKT_ID'           => $ticket->ID(),
+						'STS_ID'           => EEM_Registration::status_id_pending_payment,
+						'REG_date'         => time(),
+						'REG_final_price'  => $ticket->get('TKT_price'),
+						'REG_session'      => 'dummy_session_id',
+						'REG_code'         => $regid . '-dummy-generated-code',
+						'REG_url_link'     => $regcnt . '-daafpapasdlfakasdfpqasdfasdf',
+						'REG_count'        => $regcnt,
+						'REG_group_size'   => $this->_events[$evtid]['total_attendees'],
+						'REG_att_is_going' => true,
+						'REG_ID'           => $regid
+					);
+					$REG_OBJ                                          = EE_Registration::new_instance($reg_array);
+					$this->_attendees[$key]['reg_objs'][$regid]       = $REG_OBJ;
+					$this->_events[$evtid]['reg_objs'][]              = $REG_OBJ;
+					$this->reg_objs[]                                 = $REG_OBJ;
+					$this->tickets[$ticket->ID()]['reg_objs'][$regid] = $REG_OBJ;
                     
-                    $regcnt++;
-                    $regid++;
-                }
-            }
-        }
-        
-        
-        //setup line items!
-        $line_item_total = EEH_Line_Item::create_total_line_item($this->txn);
-        
-        //add tickets
-        foreach ($this->tickets as $tktid => $item) {
-            $qty    = $item['count'];
-            $ticket = $item['ticket'];
-            EEH_Line_Item::add_ticket_purchase($line_item_total, $ticket, $qty);
-        }
-        
-        $shipping_line_item = EE_Line_Item::new_instance(array(
-            'LIN_name'       => __('Shipping Surcharge', 'event_espresso'),
-            'LIN_desc'       => __('Sent via Millenium Falcon', 'event_espresso'),
-            'LIN_unit_price' => 20,
-            'LIN_quantity'   => 1,
-            'LIN_is_taxable' => true,
-            'LIN_total'      => 20,
-            'LIN_type'       => EEM_Line_Item::type_line_item
-        ));
-        EEH_Line_Item::add_item($line_item_total, $shipping_line_item);
-        $this->additional_line_items = array($shipping_line_item);
-        
-        //now let's add taxes
-        EEH_Line_Item::apply_taxes($line_item_total);
-        
-        //now we should be able to get the items we need from this object
-        $event_line_items = EEH_Line_Item::get_pre_tax_subtotal($line_item_total)->children();
-        $line_items       = array();
-        foreach ($event_line_items as $line_id => $line_item) {
-            if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event') {
-                continue;
-            }
-            $ticket_line_items = EEH_Line_Item::get_ticket_line_items($line_item);
-            foreach ($ticket_line_items as $ticket_line_id => $ticket_line_item) {
-                if ( ! $ticket_line_item instanceof EE_Line_Item) {
-                    continue;
-                }
-                $this->tickets[$ticket_line_item->OBJ_ID()]['line_item']      = $ticket_line_item;
-                $this->tickets[$ticket_line_item->OBJ_ID()]['sub_line_items'] = $ticket_line_item->children();
-                $line_items[$ticket_line_item->ID()]['children']              = $ticket_line_item->children();
-                $line_items[$ticket_line_item->ID()]['EE_Ticket']             = $this->tickets[$ticket_line_item->OBJ_ID()]['ticket'];
-            }
-        }
-        
-        $this->line_items_with_children = $line_items;
-        $this->tax_line_items           = $line_item_total->tax_descendants();
-        
-        //add proper total to transaction object.
-        $grand_total                 = $line_item_total->recalculate_total_including_taxes();
-        $this->grand_total_line_item = $line_item_total;
-        $this->txn->set_total($grand_total);
-        
-        
-        //add additional details for each registration
-        foreach ($this->reg_objs as $reg) {
-            if ( ! $reg instanceof EE_Registration) {
-                continue;
-            }
-            $this->_registrations[$reg->ID()]['tkt_obj']  = $this->tickets[$reg->get('TKT_ID')]['ticket'];
-            $this->_registrations[$reg->ID()]['evt_obj']  = $this->_events[$reg->get('EVT_ID')]['event'];
-            $this->_registrations[$reg->ID()]['reg_obj']  = $reg;
-            $this->_registrations[$reg->ID()]['ans_objs'] = $this->_attendees[$reg->get('ATT_ID')]['ans_objs'];
-            $this->_registrations[$reg->ID()]['att_obj']  = $this->_attendees[$reg->get('ATT_ID')]['att_obj'];
-            $this->_registrations[$reg->ID()]['dtt_objs'] = $this->tickets[$reg->get('TKT_ID')]['dtt_objs'];
-        }
-        
-        
-        //events and attendees
-        $this->events        = $this->_events;
-        $this->attendees     = $this->_attendees;
-        $this->registrations = $this->_registrations;
-        
-        $attendees_to_shift = $this->_attendees;
-        
-        //setup primary attendee property
-        $this->primary_attendee_data = array(
-            'fname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
-                ? $this->_attendees[999999991]['att_obj']->fname()
-                : '',
+					$regcnt++;
+					$regid++;
+				}
+			}
+		}
+        
+        
+		//setup line items!
+		$line_item_total = EEH_Line_Item::create_total_line_item($this->txn);
+        
+		//add tickets
+		foreach ($this->tickets as $tktid => $item) {
+			$qty    = $item['count'];
+			$ticket = $item['ticket'];
+			EEH_Line_Item::add_ticket_purchase($line_item_total, $ticket, $qty);
+		}
+        
+		$shipping_line_item = EE_Line_Item::new_instance(array(
+			'LIN_name'       => __('Shipping Surcharge', 'event_espresso'),
+			'LIN_desc'       => __('Sent via Millenium Falcon', 'event_espresso'),
+			'LIN_unit_price' => 20,
+			'LIN_quantity'   => 1,
+			'LIN_is_taxable' => true,
+			'LIN_total'      => 20,
+			'LIN_type'       => EEM_Line_Item::type_line_item
+		));
+		EEH_Line_Item::add_item($line_item_total, $shipping_line_item);
+		$this->additional_line_items = array($shipping_line_item);
+        
+		//now let's add taxes
+		EEH_Line_Item::apply_taxes($line_item_total);
+        
+		//now we should be able to get the items we need from this object
+		$event_line_items = EEH_Line_Item::get_pre_tax_subtotal($line_item_total)->children();
+		$line_items       = array();
+		foreach ($event_line_items as $line_id => $line_item) {
+			if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event') {
+				continue;
+			}
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($line_item);
+			foreach ($ticket_line_items as $ticket_line_id => $ticket_line_item) {
+				if ( ! $ticket_line_item instanceof EE_Line_Item) {
+					continue;
+				}
+				$this->tickets[$ticket_line_item->OBJ_ID()]['line_item']      = $ticket_line_item;
+				$this->tickets[$ticket_line_item->OBJ_ID()]['sub_line_items'] = $ticket_line_item->children();
+				$line_items[$ticket_line_item->ID()]['children']              = $ticket_line_item->children();
+				$line_items[$ticket_line_item->ID()]['EE_Ticket']             = $this->tickets[$ticket_line_item->OBJ_ID()]['ticket'];
+			}
+		}
+        
+		$this->line_items_with_children = $line_items;
+		$this->tax_line_items           = $line_item_total->tax_descendants();
+        
+		//add proper total to transaction object.
+		$grand_total                 = $line_item_total->recalculate_total_including_taxes();
+		$this->grand_total_line_item = $line_item_total;
+		$this->txn->set_total($grand_total);
+        
+        
+		//add additional details for each registration
+		foreach ($this->reg_objs as $reg) {
+			if ( ! $reg instanceof EE_Registration) {
+				continue;
+			}
+			$this->_registrations[$reg->ID()]['tkt_obj']  = $this->tickets[$reg->get('TKT_ID')]['ticket'];
+			$this->_registrations[$reg->ID()]['evt_obj']  = $this->_events[$reg->get('EVT_ID')]['event'];
+			$this->_registrations[$reg->ID()]['reg_obj']  = $reg;
+			$this->_registrations[$reg->ID()]['ans_objs'] = $this->_attendees[$reg->get('ATT_ID')]['ans_objs'];
+			$this->_registrations[$reg->ID()]['att_obj']  = $this->_attendees[$reg->get('ATT_ID')]['att_obj'];
+			$this->_registrations[$reg->ID()]['dtt_objs'] = $this->tickets[$reg->get('TKT_ID')]['dtt_objs'];
+		}
+        
+        
+		//events and attendees
+		$this->events        = $this->_events;
+		$this->attendees     = $this->_attendees;
+		$this->registrations = $this->_registrations;
+        
+		$attendees_to_shift = $this->_attendees;
+        
+		//setup primary attendee property
+		$this->primary_attendee_data = array(
+			'fname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
+				? $this->_attendees[999999991]['att_obj']->fname()
+				: '',
             
-            'lname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
-                ? $this->_attendees[999999991]['att_obj']->lname()
-                : '',
+			'lname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
+				? $this->_attendees[999999991]['att_obj']->lname()
+				: '',
             
-            'email' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
-                ? $this->_attendees[999999991]['att_obj']->email()
-                : '',
+			'email' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
+				? $this->_attendees[999999991]['att_obj']->email()
+				: '',
             
-            'att_obj' => $this->_attendees[999999991]['att_obj'],
+			'att_obj' => $this->_attendees[999999991]['att_obj'],
             
-            'reg_obj' => array_shift($attendees_to_shift[999999991]['reg_objs'])
-        );
+			'reg_obj' => array_shift($attendees_to_shift[999999991]['reg_objs'])
+		);
         
-        //reg_info property
-        //note this isn't referenced by any shortcode parsers so we'll ignore for now.
-        $this->reg_info = array();
+		//reg_info property
+		//note this isn't referenced by any shortcode parsers so we'll ignore for now.
+		$this->reg_info = array();
         
-        //let's set a reg_obj for messengers expecting one.
-        $this->reg_obj = array_pop($this->_attendees[999999991]['reg_objs']);
+		//let's set a reg_obj for messengers expecting one.
+		$this->reg_obj = array_pop($this->_attendees[999999991]['reg_objs']);
         
         
-        //the below are just dummy items.
-        $this->user_id     = 1;
-        $this->ip_address  = '192.0.2.1';
-        $this->user_agent  = '';
-        $this->init_access = time();
-        $this->last_access = time();
-    }
+		//the below are just dummy items.
+		$this->user_id     = 1;
+		$this->ip_address  = '192.0.2.1';
+		$this->user_agent  = '';
+		$this->init_access = time();
+		$this->last_access = time();
+	}
     
 } //end EE_Messages_Preview_incoming_data class

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
                 if ( ! $attendee instanceof EE_Attendee) {
                     continue;
                 }
-                $this->_attendees[$att_key]['line_ref'][] = $id;  //so later it can be determined what events this attendee registered for!
+                $this->_attendees[$att_key]['line_ref'][] = $id; //so later it can be determined what events this attendee registered for!
                 $this->_attendees[$att_key]['evt_objs'][] = $event;
                 $this->_attendees[$att_key]['att_obj']    = $attendee;
                 //$this->_attendees[$att_key]['registration_id'] = 0;
@@ -467,7 +467,7 @@ 
                     if ( ! $ticket instanceof EE_Ticket) {
                         continue;
                     }
-                    $reg_array                                        = array(
+                    $reg_array = array(
                         'EVT_ID'           => $evtid,
                         'ATT_ID'           => $regatt,
                         'TXN_ID'           => $regtxn,
@@ -476,8 +476,8 @@ 
                         'REG_date'         => time(),
                         'REG_final_price'  => $ticket->get('TKT_price'),
                         'REG_session'      => 'dummy_session_id',
-                        'REG_code'         => $regid . '-dummy-generated-code',
-                        'REG_url_link'     => $regcnt . '-daafpapasdlfakasdfpqasdfasdf',
+                        'REG_code'         => $regid.'-dummy-generated-code',
+                        'REG_url_link'     => $regcnt.'-daafpapasdlfakasdfpqasdfasdf',
                         'REG_count'        => $regcnt,
                         'REG_group_size'   => $this->_events[$evtid]['total_attendees'],
                         'REG_att_is_going' => true,

caffeinated/core/libraries/shortcodes/EE_Question_List_Shortcodes.lib.php

Indentation +62 added lines, -62 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -36,80 +36,80 @@ 
 {
     
     
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
     
     
-    protected function _init_props()
-    {
-        $this->label       = __('Questions and Answers Shortcodes', 'event_espresso');
-        $this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
-        $this->_shortcodes = array(
-            '[QUESTION_LIST]' => __('This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
-                'event_espresso')
-        );
-    }
+	protected function _init_props()
+	{
+		$this->label       = __('Questions and Answers Shortcodes', 'event_espresso');
+		$this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
+		$this->_shortcodes = array(
+			'[QUESTION_LIST]' => __('This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
+				'event_espresso')
+		);
+	}
     
     
-    protected function _parser($shortcode)
-    {
+	protected function _parser($shortcode)
+	{
         
         
-        switch ($shortcode) {
-            case '[QUESTION_LIST]' :
-                return $this->_get_question_list();
-                break;
-        }
+		switch ($shortcode) {
+			case '[QUESTION_LIST]' :
+				return $this->_get_question_list();
+				break;
+		}
         
-        return '';
-    }
+		return '';
+	}
     
     
-    protected function _get_question_list()
-    {
-        $this->_validate_list_requirements();
+	protected function _get_question_list()
+	{
+		$this->_validate_list_requirements();
         
-        //for when [QUESTION_LIST] is used in the [attendee_list] field.
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_question_answer_list_for_attendee();
-        } //for when [QUESTION_LIST] is used in the main content field.
-        else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
-            return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
-        } else {
-            return '';
-        }
-    }
+		//for when [QUESTION_LIST] is used in the [attendee_list] field.
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_question_answer_list_for_attendee();
+		} //for when [QUESTION_LIST] is used in the main content field.
+		else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
+			return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
+		} else {
+			return '';
+		}
+	}
     
     
-    /**
-     * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
-     * answers for that attendee since that is what we really need (we can derive the questions from the answers);
-     * @return string parsed template.
-     */
-    private function _get_question_answer_list_for_attendee($reg_obj = null)
-    {
-        $valid_shortcodes = array('question');
-        $reg_obj          = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list']) ? $this->_data['template']['question_list'] : '';
-        $template         = empty($template) && isset($this->_extra_data['template']['question_list']) ? $this->_extra_data['template']['question_list'] : $template;
-        $ans_result       = '';
-        $answers          = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']) ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
-        $questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
-        foreach ($answers as $answer) {
-            //first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
-            $question = ! $question instanceof EE_Question ? $answer->question() : $question;
-            if ($question instanceof EE_Question and $question->admin_only()) {
-                continue;
-            }
-            $ans_result .= $this->_shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes,
-                $this->_extra_data);
-        }
+	/**
+	 * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
+	 * answers for that attendee since that is what we really need (we can derive the questions from the answers);
+	 * @return string parsed template.
+	 */
+	private function _get_question_answer_list_for_attendee($reg_obj = null)
+	{
+		$valid_shortcodes = array('question');
+		$reg_obj          = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list']) ? $this->_data['template']['question_list'] : '';
+		$template         = empty($template) && isset($this->_extra_data['template']['question_list']) ? $this->_extra_data['template']['question_list'] : $template;
+		$ans_result       = '';
+		$answers          = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']) ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
+		$questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
+		foreach ($answers as $answer) {
+			//first see if the question is in our $questions array.  If not then try to get from answer object
+			$question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+			$question = ! $question instanceof EE_Question ? $answer->question() : $question;
+			if ($question instanceof EE_Question and $question->admin_only()) {
+				continue;
+			}
+			$ans_result .= $this->_shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes,
+				$this->_extra_data);
+		}
         
-        return $ans_result;
-    }
+		return $ans_result;
+	}
     
     
 } //end EE_Question_List_Shortcodes class

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
         foreach ($answers as $answer) {
             //first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+            $question = isset($questions[$answer->ID()]) ? $questions[$answer->ID()] : null;
             $question = ! $question instanceof EE_Question ? $answer->question() : $question;
             if ($question instanceof EE_Question and $question->admin_only()) {
                 continue;

admin_pages/registrations/templates/reg_admin_details_side_meta_box_registrant.template.php

Indentation +8 added lines, -8 removed lines

@@ -26,13 +26,13 @@ 
 
 <p class="contact-details-buttons">
     <?php if (
-        $att_check instanceof EE_Attendee
-        && EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contact',
-            'view_or_edit_contact_button',
-            $att_check->ID()
-        )
-    ) : ?>
+		$att_check instanceof EE_Attendee
+		&& EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contact',
+			'view_or_edit_contact_button',
+			$att_check->ID()
+		)
+	) : ?>
     <a class="button button-small" href="<?php echo $att_edit_link; ?>"
        title="<?php echo esc_attr($att_edit_label); ?>">
         <span class="ee-icon ee-icon-user-edit"></span><?php echo $att_edit_label; ?>
@@ -40,7 +40,7 @@ 
     <?php if (! empty($create_link)) : ?>
         <a class="button button-small" href="<?php echo $create_link; ?>"
            title="<?php esc_attr_e('This registration shares the contact details for the primary registration in this group.  If you\'d like this registration to have its own details, you can do so by clicking this button',
-               'event_espresso'); ?>">
+			   'event_espresso'); ?>">
             <span class="ee-icon ee-icon-user-add-new"></span><?php echo $create_label; ?>
         </a>
     <?php endif; ?>

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left">
             <?php _e('Name', 'event_espresso'); ?>
-        </span><?php echo $fname . ' ' . $lname; ?>
+        </span><?php echo $fname.' '.$lname; ?>
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a
@@ -37,7 +37,7 @@ 
        title="<?php echo esc_attr($att_edit_label); ?>">
         <span class="ee-icon ee-icon-user-edit"></span><?php echo $att_edit_label; ?>
     </a>
-    <?php if (! empty($create_link)) : ?>
+    <?php if ( ! empty($create_link)) : ?>
         <a class="button button-small" href="<?php echo $create_link; ?>"
            title="<?php esc_attr_e('This registration shares the contact details for the primary registration in this group.  If you\'d like this registration to have its own details, you can do so by clicking this button',
                'event_espresso'); ?>">

admin_pages/registration_form/help_tours/Registration_Form_Question_Groups_Help_Tour.class.php

Indentation +114 added lines, -114 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -18,130 +18,130 @@ 
 class Registration_Form_Question_Groups_Help_Tour extends EE_Help_Tour
 {
     
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Question Groups Tour', 'event_espresso');
-        $this->_slug  = $this->_is_caf ? 'question-groups-caf-overview-joyride' : 'question-groups-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Question Groups Tour', 'event_espresso');
+		$this->_slug  = $this->_is_caf ? 'question-groups-caf-overview-joyride' : 'question-groups-overview-joyride';
+	}
     
     
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            )
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			)
+		);
         
-        if ($this->_is_caf) {
-            $this->_stops[20] = array(
-                'id'      => 'name',
-                'content' => $this->_name_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 25
-                )
-            );
-            $this->_stops[30] = array(
-                'id'      => 'description',
-                'content' => $this->_description_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[40] = array(
-                'id'      => 'show_group_name',
-                'content' => $this->_show_group_name_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[50] = array(
-                'id'      => 'show_group_desc',
-                'content' => $this->_show_group_description_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[60] = array(
-                'class'   => 'bulkactions',
-                'content' => $this->_bulk_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -80
-                )
-            );
-            $this->_stops[70] = array(
-                'id'      => 'add-new-question-group',
-                'content' => $this->_add_new_question_group_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            );
-        }
-    }
+		if ($this->_is_caf) {
+			$this->_stops[20] = array(
+				'id'      => 'name',
+				'content' => $this->_name_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 25
+				)
+			);
+			$this->_stops[30] = array(
+				'id'      => 'description',
+				'content' => $this->_description_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[40] = array(
+				'id'      => 'show_group_name',
+				'content' => $this->_show_group_name_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[50] = array(
+				'id'      => 'show_group_desc',
+				'content' => $this->_show_group_description_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[60] = array(
+				'class'   => 'bulkactions',
+				'content' => $this->_bulk_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -80
+				)
+			);
+			$this->_stops[70] = array(
+				'id'      => 'add-new-question-group',
+				'content' => $this->_add_new_question_group_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			);
+		}
+	}
     
     
-    protected function _start()
-    {
-        $content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
-        if ($this->_is_caf) {
-            $content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
-                    'event_espresso') . '</p>';
-        } else {
-            $content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
-                    'event_espresso') . '</p>';
-        }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
+		if ($this->_is_caf) {
+			$content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
+					'event_espresso') . '</p>';
+		} else {
+			$content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
+					'event_espresso') . '</p>';
+		}
         
-        return $content;
-    }
+		return $content;
+	}
     
-    protected function _name_stop()
-    {
-        return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
-            'event_espresso') . '</p>';
-    }
+	protected function _name_stop()
+	{
+		return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _description_stop()
-    {
-        return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
-    }
+	protected function _description_stop()
+	{
+		return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
+	}
     
-    protected function _show_group_name_stop()
-    {
-        return '<p>' . __('View if the name of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
-    }
+	protected function _show_group_name_stop()
+	{
+		return '<p>' . __('View if the name of the question group should be shown to customers.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _show_group_description_stop()
-    {
-        return '<p>' . __('View if the description of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
-    }
+	protected function _show_group_description_stop()
+	{
+		return '<p>' . __('View if the description of the question group should be shown to customers.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _bulk_actions_stop()
-    {
-        return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
-    }
+	protected function _bulk_actions_stop()
+	{
+		return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
+	}
     
-    protected function _search_stop()
-    {
-        return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
-            'event_espresso') . '</p>';
-    }
+	protected function _search_stop()
+	{
+		return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _add_new_question_group_stop()
-    {
-        return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
-    }
+	protected function _add_new_question_group_stop()
+	{
+		return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
+	}
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -94,13 +94,13 @@ 
     
     protected function _start()
     {
-        $content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Question Groups', 'event_espresso').'</h3>';
         if ($this->_is_caf) {
-            $content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
-                    'event_espresso') . '</p>';
+            $content .= '<p>'.__('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
+                    'event_espresso').'</p>';
         } else {
-            $content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
-                    'event_espresso') . '</p>';
+            $content .= '<p>'.__('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
+                    'event_espresso').'</p>';
         }
         
         return $content;
@@ -108,40 +108,40 @@ 
     
     protected function _name_stop()
     {
-        return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View available questions groups. You can reorder your questions by dragging and dropping them.',
+            'event_espresso').'</p>';
     }
     
     protected function _description_stop()
     {
-        return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the question group description.', 'event_espresso').'</p>';
     }
     
     protected function _show_group_name_stop()
     {
-        return '<p>' . __('View if the name of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View if the name of the question group should be shown to customers.',
+            'event_espresso').'</p>';
     }
     
     protected function _show_group_description_stop()
     {
-        return '<p>' . __('View if the description of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View if the description of the question group should be shown to customers.',
+            'event_espresso').'</p>';
     }
     
     protected function _bulk_actions_stop()
     {
-        return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
+        return '<p>'.__('Perform bulk actions to multiple question groups.', 'event_espresso').'</p>';
     }
     
     protected function _search_stop()
     {
-        return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Search through questions. The following sources will be searched: question group name and question group description.',
+            'event_espresso').'</p>';
     }
     
     protected function _add_new_question_group_stop()
     {
-        return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
+        return '<p>'.__('Click here to create a new question group.', 'event_espresso').'</p>';
     }
 }
\ No newline at end of file

admin_pages/general_settings/help_tours/Your_Organization_Help_Tour.class.php

Indentation +106 added lines, -106 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -18,121 +18,121 @@ 
 class Your_Organization_Help_Tour extends EE_Help_Tour
 {
     
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Your Organization Tour', 'event_espresso');
-        $this->_slug  = 'your-organization-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Your Organization Tour', 'event_espresso');
+		$this->_slug  = 'your-organization-joyride';
+	}
     
     
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            30 => array(
-                'id'      => 'contact_info_h4',
-                'content' => $this->_contact_information_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            40 => array(
-                'id'      => 'upload_image',
-                'content' => $this->_upload_image_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            50 => array(
-                'id'      => 'organization_facebook',
-                'content' => $this->_organization_facebook_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            60 => array(
-                'id'      => 'ueip_optin',
-                'content' => $this->_ueip_option_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            70 => array(
-                'id'      => 'espresso_major_buttons_wrapper',
-                'content' => $this->_end_tour_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 185
-                )
-            )
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			30 => array(
+				'id'      => 'contact_info_h4',
+				'content' => $this->_contact_information_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			40 => array(
+				'id'      => 'upload_image',
+				'content' => $this->_upload_image_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			50 => array(
+				'id'      => 'organization_facebook',
+				'content' => $this->_organization_facebook_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			60 => array(
+				'id'      => 'ueip_optin',
+				'content' => $this->_ueip_option_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			70 => array(
+				'id'      => 'espresso_major_buttons_wrapper',
+				'content' => $this->_end_tour_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 185
+				)
+			)
+		);
         
-        if (is_main_site()) {
-            $this->_stops[20] = array(
-                'id' => 'site_license_key',
-                'content' => $this->_site_license_key_stop(),
-                'options' => array(
-                    'tipLocation' => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            );
-        }
-        ksort( $this->_stops );
-    }
+		if (is_main_site()) {
+			$this->_stops[20] = array(
+				'id' => 'site_license_key',
+				'content' => $this->_site_license_key_stop(),
+				'options' => array(
+					'tipLocation' => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			);
+		}
+		ksort( $this->_stops );
+	}
     
     
-    protected function _start()
-    {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                'event_espresso') . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+				'event_espresso') . '</p>';
         
-        return $content;
-    }
+		return $content;
+	}
     
-    protected function _site_license_key_stop()
-    {
-        return '<p>' . __('Enter your support license key here to enable one-click updates.',
-            'event_espresso') . '</p>';
-    }
+	protected function _site_license_key_stop()
+	{
+		return '<p>' . __('Enter your support license key here to enable one-click updates.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _contact_information_stop()
-    {
-        return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-            'event_espresso') . '</p>';
-    }
+	protected function _contact_information_stop()
+	{
+		return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _upload_image_stop()
-    {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
-    }
+	protected function _upload_image_stop()
+	{
+		return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+	}
     
-    protected function _organization_facebook_stop()
-    {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
-    }
+	protected function _organization_facebook_stop()
+	{
+		return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+	}
     
-    protected function _ueip_option_stop()
-    {
-        return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-            'event_espresso') . '</p>';
-    }
+	protected function _ueip_option_stop()
+	{
+		return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _end_tour_stop()
-    {
-        return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-            'event_espresso') . '</p>';
-    }
+	protected function _end_tour_stop()
+	{
+		return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+			'event_espresso') . '</p>';
+	}
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -89,50 +89,50 @@
                 )
             );
         }
-        ksort( $this->_stops );
+        ksort($this->_stops);
     }
     
     
     protected function _start()
     {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                'event_espresso') . '</p>';
+        $content = '<h3>'.__('Organization Settings', 'event_espresso').'</h3>';
+        $content .= '<p>'.__('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+                'event_espresso').'</p>';
         
         return $content;
     }
     
     protected function _site_license_key_stop()
     {
-        return '<p>' . __('Enter your support license key here to enable one-click updates.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Enter your support license key here to enable one-click updates.',
+            'event_espresso').'</p>';
     }
     
     protected function _contact_information_stop()
     {
-        return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+            'event_espresso').'</p>';
     }
     
     protected function _upload_image_stop()
     {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add a logo. This can be used for invoices and tickets.', 'event_espresso').'</p>';
     }
     
     protected function _organization_facebook_stop()
     {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add links to various social media networks.', 'event_espresso').'</p>';
     }
     
     protected function _ueip_option_stop()
     {
-        return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+            'event_espresso').'</p>';
     }
     
     protected function _end_tour_stop()
     {
-        return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+            'event_espresso').'</p>';
     }
 }
\ No newline at end of file

admin_pages/maintenance/templates/migration_options_from_ee3.template.php

Indentation +48 added lines, -48 removed lines

@@ -26,7 +26,7 @@ 
         <span class="dashicons dashicons-admin-tools"></span>
         <?php esc_html_e("Migration Options", "event_espresso"); ?>
         <span class="tiny-text lt-grey-text"> &nbsp; <?php esc_html_e(' to migrate or not to migrate?',
-                    "event_espresso"); ?></span>
+					"event_espresso"); ?></span>
     </h2>
     <div class="ee-table-wrap">
         <table>
@@ -35,24 +35,24 @@ 
                 <td><h3><?php esc_html_e('1', 'event_espresso'); ?></h3></td>
                 <td>
                     <?php
-                    echo apply_filters(
-                            'FHEE__ee_migration_page__option_1_main',
-                            sprintf(
-                                    esc_html__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
-                                            "event_espresso"),
-                                    '<strong>',
-                                    '</strong>',
-                                    '<a id="migration-risks" class="" title="'
-                                    . esc_attr__('click for more details', "event_espresso")
-                                    . '">',
-                                    '</a>',
-                                    $current_db_state,
-                                    $next_db_state
-                            ),
-                            $current_db_state,
-                            $next_db_state
-                    );
-                    ?>
+					echo apply_filters(
+							'FHEE__ee_migration_page__option_1_main',
+							sprintf(
+									esc_html__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
+											"event_espresso"),
+									'<strong>',
+									'</strong>',
+									'<a id="migration-risks" class="" title="'
+									. esc_attr__('click for more details', "event_espresso")
+									. '">',
+									'</a>',
+									$current_db_state,
+									$next_db_state
+							),
+							$current_db_state,
+							$next_db_state
+					);
+					?>
                     <a id="display-migration-details"
                        class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
                        rel="migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?>
@@ -61,37 +61,37 @@ 
                        class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"
                        rel="migration-details"
                        style="display:none;"><?php echo sprintf(esc_html__('hide%1$sdetails%1$s-',
-                                'event_espresso'), '&nbsp;'); ?></a>
+								'event_espresso'), '&nbsp;'); ?></a>
                 </td>
                 <td>
                     <a id="db-backed-up"
                        class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text',
-                                sprintf(esc_html__("Migrate My %s Data to %s", "event_espresso"), $current_db_state,
-                                        $next_db_state), $current_db_state, $next_db_state); ?></a>
+								sprintf(esc_html__("Migrate My %s Data to %s", "event_espresso"), $current_db_state,
+										$next_db_state), $current_db_state, $next_db_state); ?></a>
                 </td>
             </tr>
             <tr>
                 <td colspan="3" style="padding: 0">
                     <div id="migration-details-dv" style="display: none; padding: 1em;">
 <span class="reminder-spn"><?php printf(esc_html__("%s Important: %s Before migrating, please back up your database and files.",
-            "event_espresso"), "<b>", "</b>"); ?></span>
+			"event_espresso"), "<b>", "</b>"); ?></span>
                         <p>
                             <?php
-                            printf(
-                                    esc_html__('%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
-                                            "event_espresso"),
-                                    '<b>',
-                                    '</b>',
-                                    "<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>",
-                                    "<a href='"
-                                    . admin_url('plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins')
-                                    . "'>",
-                                    "<a href='http://eventespresso.com/product/priority-support-tokens/'>",
-                                    '<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
-                                    "</a>",
-                                    '<br/>'
-                            );
-                            ?>
+							printf(
+									esc_html__('%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
+											"event_espresso"),
+									'<b>',
+									'</b>',
+									"<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>",
+									"<a href='"
+									. admin_url('plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins')
+									. "'>",
+									"<a href='http://eventespresso.com/product/priority-support-tokens/'>",
+									'<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
+									"</a>",
+									'<br/>'
+							);
+							?>
                         </p>
                         <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
                     </div>
@@ -101,12 +101,12 @@ 
                 <td><h3><?php esc_html_e('2', 'event_espresso'); ?></h3></td>
                 <td>
                     <?php echo apply_filters('FHEE__ee_migration_page__option_2_main',
-                            sprintf(esc_html__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
-                                    "event_espresso"), $current_db_state, $next_db_state,
-                                    $ultimate_db_state), $current_db_state, $next_db_state,
-                            $ultimate_db_state); ?><br/>
+							sprintf(esc_html__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
+									"event_espresso"), $current_db_state, $next_db_state,
+									$ultimate_db_state), $current_db_state, $next_db_state,
+							$ultimate_db_state); ?><br/>
                     <span class="reminder-spn"><?php esc_html_e('Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.',
-                                'event_espresso'); ?></span>
+								'event_espresso'); ?></span>
                     <a id="display-no-migration-details"
                        class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
                        rel="no-migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?>
@@ -115,13 +115,13 @@ 
                        class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"
                        rel="no-migration-details"
                        style="display:none;"><?php echo sprintf(esc_html__('hide%1$sdetails%1$s-',
-                                'event_espresso'), '&nbsp;'); ?></a>
+								'event_espresso'), '&nbsp;'); ?></a>
                 </td>
                 <td>
                     <a id="do-not-migrate" class="do-not-migrate button-primary"
                        href="<?php echo $reset_db_page_link; ?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text',
-                                sprintf(esc_html__("Just Start %s and Delete Existing Data", "event_espresso"),
-                                        $ultimate_db_state), $ultimate_db_state); ?></a>
+								sprintf(esc_html__("Just Start %s and Delete Existing Data", "event_espresso"),
+										$ultimate_db_state), $ultimate_db_state); ?></a>
                 </td>
             </tr>
             <tr>
@@ -129,8 +129,8 @@ 
                     <div id="no-migration-details-dv" style="display: none; padding: 1em;">
                         <p>
                             <?php echo apply_filters('FHEE__ee_migration_page__option_2_details',
-                                    sprintf(esc_html__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
-                                            "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
+									sprintf(esc_html__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
+											"event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
                         </p>
                     </div>
                 </td>