eventespresso / event-espresso-core

admin_pages/messages/help_tabs/messages_overview_types.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <p><strong><?php esc_html_e('Message Types', 'event_espresso'); ?></strong></p>
-<p><?php printf( esc_html__('Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p>
 <ul>
 <li>

admin_pages/messages/help_tabs/messages_templates.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <p><strong><?php esc_html_e('Message Templates', 'event_espresso'); ?></strong></p>
-<p><?php printf( esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).', 'event_espresso'); ?></p>
-<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso' ); ?></p>
\ No newline at end of file
+<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso'); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_message_templates_help_tab.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <h2><?php esc_html_e('What are Message Templates', 'event_espresso'); ?></h2>
-<p><?php printf( esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them like a “Form letter”. Templates are used to tell the system what you want your messages to look like and the content they will have when they are delivered.', 'event_espresso'), '<em>', '</em>' ); ?></p>
+<p><?php printf(esc_html__('Message Templates are the %1$sformat%2$s of the messages going out. Think of them like a “Form letter”. Templates are used to tell the system what you want your messages to look like and the content they will have when they are delivered.', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('There is a template created for each messenger/message type AND context combination. So example, Emails that are sent for the Payment confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, emails that are sent for the Registration confirmation have 3 templates, one for Event Administrator, Primary Registrant, and Registrant.', 'event_espresso'); ?></p>
-<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type and Context will have a global template created with some default content on creation.  You have the ability to edit this global template that will be used for all events you create.  However, you also have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso' ); ?></p>
\ No newline at end of file
+<p><?php esc_html_e('With the Event Espresso Messages system, every Messenger, Message Type and Context will have a global template created with some default content on creation.  You have the ability to edit this global template that will be used for all events you create.  However, you also have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso'); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_messages_templates_editor_help_tab.template.php

Spacing +5 added lines, -5 removed lines

@@ -2,29 +2,29 @@
 <p><?php _e('Here are a few things that you should know about the Message Template Editor:', 'event_espresso'); ?></p>
 <p><strong><?php esc_html_e('1. The Event Editor Title', 'event_espresso'); ?></strong></p>
 <p><?php echo $img1; ?></p>
-<p><?php printf( esc_html__( 'The Event Editor title is very helpful in indicating which template you are currently editing.  In the example above, we can see that we are editing the template that for the %1$sEmail%2$s messenger, the %1$sPayment%2$s message type, and the %1$sEvent Admin%2$s context (which for this message type means "recipient").', 'event_espresso'), '<strong>','</strong>' ); ?></p>
+<p><?php printf(esc_html__('The Event Editor title is very helpful in indicating which template you are currently editing.  In the example above, we can see that we are editing the template that for the %1$sEmail%2$s messenger, the %1$sPayment%2$s message type, and the %1$sEvent Admin%2$s context (which for this message type means "recipient").', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 <p><strong><?php esc_html_e('2. "Context Switcher" and Preview Button', 'event_espresso'); ?></strong></p>
 <p><?php echo $img2; ?></p>
 <p><?php esc_html_e('The context switcher allows you to quickly switch between templates. The current context you are working on is displayed in the dropdown. You can switch to any other template for contexts available to the messenger and message type template group you are working on.', 'event_espresso'); ?></p>
 <p><?php esc_html_e('Remember that contexts can represent different things. In this example they represent "recipients" and so they are labelled as such. In this example (for email payment confirmations), you may want Event Administrators to receive different information than Primary Registrants (the other context available to edit).', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<p><?php printf(esc_html__('The %sPreview%s button is simply a link to a special view of the current template displayed to give you an idea of how the actual message will look when delivered. More information on what the preview displays is available in the content of the help tab on the preview page.', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
 <p><strong><?php esc_html_e('3. Template Form Fields', 'event_espresso'); ?></strong></p>
 <p><?php echo $img3; ?><?php esc_html_e('The middle area of the page is dedicated to all the fields related to the message template. These fields are dynamic in the sense that different messengers may require different fields (and sometimes different message types will add or subtract fields as well.', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('When editing a "Email Payment Template", you will notice that there is a field labelled "Event List" along with "Main Content". The Event List field is a special field that holds the template for whenever the %1$s[EVENT_LIST]%2$s shortcode is used in the "Main Content" field. This is so you can more finely control how each "event" in the event list displays when shown in the Main content. The "Email Registration Template", has an additional field called "Registration List". It functions much the same except that the contents of the "Registration List" field are used to indicate how each registrant is listed in the Main Content when the %1$s[ATTENDEE_LIST]%2$s shortcode is parsed.', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
+<p><?php printf(esc_html__('When editing a "Email Payment Template", you will notice that there is a field labelled "Event List" along with "Main Content". The Event List field is a special field that holds the template for whenever the %1$s[EVENT_LIST]%2$s shortcode is used in the "Main Content" field. This is so you can more finely control how each "event" in the event list displays when shown in the Main content. The "Email Registration Template", has an additional field called "Registration List". It functions much the same except that the contents of the "Registration List" field are used to indicate how each registrant is listed in the Main Content when the %1$s[ATTENDEE_LIST]%2$s shortcode is parsed.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 <div style="clear:both"></div>
 <p><strong><?php esc_html_e('4. Valid Shortcodes Metabox', 'event_espresso'); ?></strong></p>
 <p>
 	<?php echo $img4; ?><?php esc_html_e('The "Valid Shortcodes" metabox contains a list of all the shortcodes that can be used for the displayed template. This list is dynamic and will vary between templates.', 'event_espresso'); ?>
 </p>
 <p><?php _e('This box is at a fixed height, but contents are scrollable. You can click the question mark to find out what the given shortcode will parse to when used in your template.', 'event_espresso'); ?></p>
-<p><?php printf( esc_html__('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<p><?php printf(esc_html__('%sAn important note:%s The system has been designed so that when you save the template, checks will be performed on each field to make sure that only valid shortcodes (or values) are used within them.  You will get a warning box with clear instructions if you\'ve tried to use a particular shortcode in a field that does not support it.  Also, you\'ll want to try the Preview button if you\'ve made any changes to the template to see if the changes are as you expected!', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
 <div style="clear:both"></div>
 <p><strong><?php esc_html_e('5. Override All Custom', 'event_espresso'); ?></strong></p>
 <p>
 	<?php echo $img5; ?>
-	<?php printf( esc_html__( 'When you are editing a template that is a global template (not a custom event template), you\'ll see an option in the Publish metabox in the right column labelled "Override all custom". When this option is selected, custom event templates for that %1$smessenger%2$s, %1$smessage type%2$s, and %1$scontext%2$s will be ignored and the global template will be used. Why would you want to do this? For this given example, you may want to be able to allow custom event templates to be able to modify the looks and content of what goes out to Primary Registrant but to never affect what the Event Administrator receives (as set by the global template).', 'event_espresso'), '<em>', '</em>' ); ?>
+	<?php printf(esc_html__('When you are editing a template that is a global template (not a custom event template), you\'ll see an option in the Publish metabox in the right column labelled "Override all custom". When this option is selected, custom event templates for that %1$smessenger%2$s, %1$smessage type%2$s, and %1$scontext%2$s will be ignored and the global template will be used. Why would you want to do this? For this given example, you may want to be able to allow custom event templates to be able to modify the looks and content of what goes out to Primary Registrant but to never affect what the Event Administrator receives (as set by the global template).', 'event_espresso'), '<em>', '</em>'); ?>
 </p>
 <p>
 <strong><?php esc_html_e('Recommendations', 'event_espresso'); ?></strong><br />

admin_pages/messages/templates/ee_msg_overview_help_tab.template.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		</li>
 		<li>
 			<?php esc_html_e('Messenger', 'event_espresso'); ?><br />
-			<?php printf( esc_html__('This column displays a number of different elements for the listed template.  First is the messenger that this template is delivered by.  The messenger title is linked to the editor for the first %1$scontext%2$s listed (context is labelled "recipients" for payment message types)', 'event_espresso'), '<em>', '</em>'); ?><br />
+			<?php printf(esc_html__('This column displays a number of different elements for the listed template.  First is the messenger that this template is delivered by.  The messenger title is linked to the editor for the first %1$scontext%2$s listed (context is labelled "recipients" for payment message types)', 'event_espresso'), '<em>', '</em>'); ?><br />
 			<?php esc_html_e('Below the Messenger title, is a list of different contexts.  The context label varies for each message type but it is usually labelled "Recipients".  You can click on each context title to go to the specific template for that context and edit it as desired.', 'event_espresso'); ?>
 		</li>
 	</ul>

admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
-<p><?php printf( esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available', 'event_espresso'); ?></p>
 
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
-<p><?php printf( esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso' ), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different', 'event_espresso'); ?></p>
\ No newline at end of file

modules/bot_trap/EED_Bot_Trap.module.php

Indentation +57 added lines, -57 removed lines

@@ -30,11 +30,11 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        if (
+		if (
 			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
 			\EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
-            \EED_Bot_Trap::set_trap();
+			\EED_Bot_Trap::set_trap();
 			// redirect bots to bogus success page
 			\EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
 		}
@@ -49,18 +49,18 @@ 
 	 *  @return 	void
 	 */
 	public static function set_trap() {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
-        add_action(
-            'AHEE__ticket_selector_chart__template__after_ticket_selector',
-            array('EED_Bot_Trap', 'generate_bot_trap'),
-            10, 2
-        );
-        add_action(
-            'EED_Ticket_Selector__process_ticket_selections__before',
-            array('EED_Bot_Trap', 'process_bot_trap'),
-            1, 2
-        );
-    }
+		define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+		add_action(
+			'AHEE__ticket_selector_chart__template__after_ticket_selector',
+			array('EED_Bot_Trap', 'generate_bot_trap'),
+			10, 2
+		);
+		add_action(
+			'EED_Ticket_Selector__process_ticket_selections__before',
+			array('EED_Bot_Trap', 'process_bot_trap'),
+			1, 2
+		);
+	}
 
 
 
@@ -71,15 +71,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-        if (
-            defined('DOING_AJAX')
-            && DOING_AJAX
-            && apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true)
-            && \EE_Registry::instance()->CFG->registration->use_bot_trap
-        ) {
-            \EED_Bot_Trap::set_trap();
-        }
-        add_action(
+		if (
+			defined('DOING_AJAX')
+			&& DOING_AJAX
+			&& apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true)
+			&& \EE_Registry::instance()->CFG->registration->use_bot_trap
+		) {
+			\EED_Bot_Trap::set_trap();
+		}
+		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
 			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
 			5
@@ -130,23 +130,23 @@ 
 
 
 	/**
-     * process_bot_trap
-     *
-     * @param array|string $triggered_trap_callback Callback that will be executed for handling the
-     *                                              response if the bot trap is triggered.
-     *                                              It should receive one argument: a boolean indicating
-     *                                              whether the trap was triggered by suspicious timing or not.
+	 * process_bot_trap
+	 *
+	 * @param array|string $triggered_trap_callback Callback that will be executed for handling the
+	 *                                              response if the bot trap is triggered.
+	 *                                              It should receive one argument: a boolean indicating
+	 *                                              whether the trap was triggered by suspicious timing or not.
 	 */
 	public static function process_bot_trap( $triggered_trap_callback = array() ) {
-        // what's your email address Mr. Bot ?
+		// what's your email address Mr. Bot ?
 		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] )
-                      && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
-            ? true
-            : false;
+					  && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
+			? true
+			: false;
 		// get encrypted timestamp for when the form was originally displayed
 		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            : '';
+			? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
+			: '';
 		// decrypt and convert to absolute  integer
 		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
 			EE_Registry::instance()->load_core( 'EE_Encryption' );
@@ -156,17 +156,17 @@ 
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
 		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS )
-            ? true
-            : false;
+			? true
+			: false;
 		// are we human ?
 		if ( $empty_trap && ! $suspicious_timing ) {
-		    do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
+			do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
 			return;
 		}
 		// check the given callback is valid first before executing
 		if ( ! is_callable($triggered_trap_callback ) ) {
 			// invalid callback so lets just sub in our default.
-            $triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
+			$triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
 		}
 		call_user_func_array($triggered_trap_callback, array( $suspicious_timing ) );
 	}
@@ -192,21 +192,21 @@ 
 			);
 		}
 		$redirect_url = apply_filters('FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url);
-        // if AJAX, return the redirect URL
-        if (defined('DOING_AJAX') && DOING_AJAX) {
-            echo wp_json_encode(
-                array_merge(
-                    \EE_Error::get_notices(false),
-                    array(
-                       'redirect_url' => $redirect_url
-                    )
-                )
-            );
-            exit();
-        }
-        wp_safe_redirect($redirect_url);
-        exit();
-    }
+		// if AJAX, return the redirect URL
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			echo wp_json_encode(
+				array_merge(
+					\EE_Error::get_notices(false),
+					array(
+					   'redirect_url' => $redirect_url
+					)
+				)
+			);
+			exit();
+		}
+		wp_safe_redirect($redirect_url);
+		exit();
+	}
 
 
 
@@ -237,9 +237,9 @@ 
 	 * @return    void
 	 */
 	public static function bot_trap_settings_form() {
-        EED_Bot_Trap::_bot_trap_settings_form()->enqueue_js();
-        echo EED_Bot_Trap::_bot_trap_settings_form()->get_html();
-    }
+		EED_Bot_Trap::_bot_trap_settings_form()->enqueue_js();
+		echo EED_Bot_Trap::_bot_trap_settings_form()->get_html();
+	}
 
 
 

Spacing +52 added lines, -52 removed lines

@@ -18,7 +18,7 @@ 
 	 * @return EED_Bot_Trap
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -31,12 +31,12 @@ 
 	 */
 	public static function set_hooks() {
         if (
-			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
+			apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
 			\EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
             \EED_Bot_Trap::set_trap();
 			// redirect bots to bogus success page
-			\EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
+			\EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
 		}
 	}
 
@@ -49,7 +49,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_trap() {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
         add_action(
             'AHEE__ticket_selector_chart__template__after_ticket_selector',
             array('EED_Bot_Trap', 'generate_bot_trap'),
@@ -81,12 +81,12 @@ 
         }
         add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'bot_trap_settings_form'),
 			5
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
 			10, 1
 		);
 	}
@@ -100,7 +100,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -111,15 +111,15 @@ 
 	 * @return    void
 	 */
 	public static function generate_bot_trap() {
-		$do_not_enter = esc_html__( 'please do not enter anything in this input', 'event_espresso' );
+		$do_not_enter = esc_html__('please do not enter anything in this input', 'event_espresso');
 		$time = microtime(true);
 		$html = '<div class="tkt-slctr-request-processor-dv" style="float:left; margin:0 0 0 -999em; height: 0;">';
-		$html .= '<label for="tkt-slctr-request-processor-email-' . $time . '">' . $do_not_enter  . '</label>';
-		$html .= '<input type="email" id="tkt-slctr-request-processor-email-' . $time  .'" name="tkt-slctr-request-processor-email" value=""/>';
+		$html .= '<label for="tkt-slctr-request-processor-email-'.$time.'">'.$do_not_enter.'</label>';
+		$html .= '<input type="email" id="tkt-slctr-request-processor-email-'.$time.'" name="tkt-slctr-request-processor-email" value=""/>';
 		$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$html .= EE_Encryption::instance()->encrypt( $time );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$html .= EE_Encryption::instance()->encrypt($time);
 		} else {
 			$html .= $time;
 		}
@@ -137,38 +137,38 @@ 
      *                                              It should receive one argument: a boolean indicating
      *                                              whether the trap was triggered by suspicious timing or not.
 	 */
-	public static function process_bot_trap( $triggered_trap_callback = array() ) {
+	public static function process_bot_trap($triggered_trap_callback = array()) {
         // what's your email address Mr. Bot ?
-		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] )
-                      && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
+		$empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email'])
+                      && $_REQUEST['tkt-slctr-request-processor-email'] === ''
             ? true
             : false;
 		// get encrypted timestamp for when the form was originally displayed
-		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
+		$bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token'])
+            ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token'])
             : '';
 		// decrypt and convert to absolute  integer
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
 		} else {
-			$bot_trap_timestamp = absint( $bot_trap_timestamp );
+			$bot_trap_timestamp = absint($bot_trap_timestamp);
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
-		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS )
+		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < (time() - HOUR_IN_SECONDS)
             ? true
             : false;
 		// are we human ?
-		if ( $empty_trap && ! $suspicious_timing ) {
+		if ($empty_trap && ! $suspicious_timing) {
 		    do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
 			return;
 		}
 		// check the given callback is valid first before executing
-		if ( ! is_callable($triggered_trap_callback ) ) {
+		if ( ! is_callable($triggered_trap_callback)) {
 			// invalid callback so lets just sub in our default.
-            $triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
+            $triggered_trap_callback = array('EED_Bot_Trap', 'triggered_trap_response');
 		}
-		call_user_func_array($triggered_trap_callback, array( $suspicious_timing ) );
+		call_user_func_array($triggered_trap_callback, array($suspicious_timing));
 	}
 
 
@@ -179,15 +179,15 @@ 
 	 *
 	 * @param bool  $suspicious_timing  If true, then the bot trap was triggered due to the suspicious timing test.
 	 */
-	public static function triggered_trap_response( $suspicious_timing ) {
+	public static function triggered_trap_response($suspicious_timing) {
 		// UH OH...
 		$redirect_url = add_query_arg(
-			array( 'ee' => 'ticket_selection_received' ),
+			array('ee' => 'ticket_selection_received'),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
-		if ( $suspicious_timing ) {
+		if ($suspicious_timing) {
 			$redirect_url = add_query_arg(
-				array( 'ee-notice' => urlencode( esc_html__( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
+				array('ee-notice' => urlencode(esc_html__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
 				$redirect_url
 			);
 		}
@@ -218,10 +218,10 @@ 
 	 * @return    void
 	 */
 	public static function display_bot_trap_success() {
-		add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
-		$bot_notice = esc_html__( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
-		$bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
-		EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
+		add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
+		$bot_notice = esc_html__('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
+		$bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
+		EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
 	}
 
 
@@ -256,20 +256,20 @@ 
 				'html_id'         			=> 'bot_trap_settings',
 				'layout_strategy' 	=> new EE_Admin_Two_Column_Layout(),
 				'subsections'     		=> array(
-					'bot_trap_hdr' 		=> new EE_Form_Section_HTML( EEH_HTML::h2( esc_html__( 'Bot Trap Settings', 'event_espresso' ) ) ),
+					'bot_trap_hdr' 		=> new EE_Form_Section_HTML(EEH_HTML::h2(esc_html__('Bot Trap Settings', 'event_espresso'))),
 					'use_bot_trap' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Enable Bot Trap', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
+							'html_label_text' 	=> esc_html__('Enable Bot Trap', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
 							'required'        		=> false
 						)
 					),
 					'use_encryption' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Encrypt Bot Trap Data', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
+							'html_label_text' 	=> esc_html__('Encrypt Bot Trap Data', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
 							'required'        		=> false
 						)
 					),
@@ -287,30 +287,30 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $bot_trap_settings_form->was_submitted() ) {
+			if ($bot_trap_settings_form->was_submitted()) {
 				// capture form data
 				$bot_trap_settings_form->receive_form_submission();
 				// validate form data
-				if ( $bot_trap_settings_form->is_valid() ) {
+				if ($bot_trap_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $bot_trap_settings_form->valid_data();
-					if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
-						$EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
-						$EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
+					if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
+						$EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
+						$EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
 					} else {
-						EE_Error::add_error( esc_html__( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(esc_html__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				} else {
-					if ( $bot_trap_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($bot_trap_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

Braces +3 added lines, -1 removed lines

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

modules/batch/EED_Batch.module.php

Indentation +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 		if ( NULL === error_get_last() || ! headers_sent() ) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+		echo wp_json_encode( $json );
 		exit();
 	}
 	

Spacing +55 added lines, -55 removed lines

@@ -17,13 +17,13 @@ 
  * @since		 	   4.8.30.rc.007
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-define( 'BATCH_URL', plugin_dir_url( __FILE__ ) );
+define('BATCH_URL', plugin_dir_url(__FILE__));
 
-class EED_Batch extends EED_Module{
+class EED_Batch extends EED_Module {
 	
 	/**
 	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
@@ -70,9 +70,9 @@ 
 	public static function set_hooks() {
 		//because this is a possibel attack vector, let's have this disabled until 
 		//we at least have a real use for it on the frontend
-		if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) {
-			add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
-			add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 );
+		if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
+			add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+			add_filter('template_include', array(self::instance(), 'override_template'), 99);
 		}
 	}
 	
@@ -80,28 +80,28 @@ 
 	 * Initializes some hooks for the admin in order to run batch jobs
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) );
-		add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
+		add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
+		add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
 		
 		//ajax
-		add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
-		add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
+		add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+		add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
 	}
 	
 	/**
 	 * Enqueues batch scripts on the frontend or admin, and creates a job
 	 */
 	public function enqueue_scripts() { 
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) 
+		if (isset($_REQUEST['espresso_batch']) 
 			|| 
 			( 
-				isset( $_REQUEST[ 'page' ] )
-				&& $_REQUEST[ 'page' ] == 'espresso_batch'
+				isset($_REQUEST['page'])
+				&& $_REQUEST['page'] == 'espresso_batch'
 			) 
 		) { 
-			switch( $this->batch_request_type() ) {
+			switch ($this->batch_request_type()) {
 				case self::batch_job:
 					$this->enqueue_scripts_styles_batch_create();
 					break;
@@ -117,11 +117,11 @@ 
 	 */
 	public function enqueue_scripts_styles_batch_create() {	
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_runner_init', BATCH_URL . 'assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_runner_init', BATCH_URL.'assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_runner_init', 'ee_job_i18n', 
 			array(
-				'return_url' => $_REQUEST['return_url' ],
+				'return_url' => $_REQUEST['return_url'],
 			));
 	}
 	
@@ -131,15 +131,15 @@ 
 	public function enqueue_scripts_styles_batch_file_create() {
 		//creates a job based on the request variable
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . 'assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_file_runner_init', BATCH_URL.'assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_file_runner_init', 'ee_job_i18n', 
 				array(
 					'download_and_redirecting' => sprintf( 
 							__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-							'<a href="' . $_REQUEST['return_url' ] .'">',
+							'<a href="'.$_REQUEST['return_url'].'">',
 							'</a>' ),
-					'return_url' => $_REQUEST['return_url' ],
+					'return_url' => $_REQUEST['return_url'],
 				));
 	}
 	
@@ -150,18 +150,18 @@ 
 	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
 	 */
 	protected function _enqueue_batch_job_scripts_and_styles_and_start_job() {
-		wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) );
-		wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
+		wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery'));
+		wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
 		//just copy the bits of EE admin's eei18n that we need in the JS
-		wp_localize_script( 'batch_runner', 'eei18n', array( 'ajax_url' => WP_AJAX_URL, 'is_admin' => (bool)is_admin() ) );
-		$job_handler_classname = stripslashes( $_GET[ 'job_handler' ] );
+		wp_localize_script('batch_runner', 'eei18n', array('ajax_url' => WP_AJAX_URL, 'is_admin' => (bool) is_admin()));
+		$job_handler_classname = stripslashes($_GET['job_handler']);
 		$request_data = array_diff_key( 
 				$_REQUEST, 
-				array_flip( array( 'action',  'page', 'ee', 'batch' ) ) );
+				array_flip(array('action', 'page', 'ee', 'batch')) );
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
 		//eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-		$job_response = $batch_runner->create_job( $job_handler_classname, $request_data );
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
 		//remember the response for later. We need it to display the page body
 		$this->_job_step_response = $job_response;
 		return $job_response;
@@ -172,9 +172,9 @@ 
 	 * @param string $template
 	 * @return string
 	 */
-	public function override_template( $template ) {
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) {
-			return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+	public function override_template($template) {
+		if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
+			return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html';
 		}
 		return $template;
 	}
@@ -185,11 +185,11 @@ 
 	public function register_admin_pages() {
 		add_submenu_page( 
 			'', //parent slug. we don't want this to actually appear in the menu
-			__( 'Batch Job', 'event_espresso' ), //page title
+			__('Batch Job', 'event_espresso'), //page title
 			'n/a', //menu title
 			'read', //we want this page to actually be accessible to anyone,  
 			'espresso_batch', //menu slug
-			array( self::instance(), 'show_admin_page' )
+			array(self::instance(), 'show_admin_page')
 		);
 	}
 	
@@ -199,8 +199,8 @@ 
 	 */
 	public function show_admin_page() { 
 		echo EEH_Template::locate_template( 
-			EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', 
-			array( 'batch_request_type' => $this->batch_request_type() )
+			EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', 
+			array('batch_request_type' => $this->batch_request_type())
 		);
 	}
 	
@@ -208,10 +208,10 @@ 
 	 * Receives ajax calls for continuing a job
 	 */
 	public function batch_continue() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->continue_job( $job_id);
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->continue_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	/**
@@ -219,10 +219,10 @@ 
 	 * @return type
 	 */
 	public function batch_cleanup() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->cleanup_job( $job_id );
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	
@@ -238,7 +238,7 @@ 
 	 *	'isEEajax' => true,//indicates this is a response from EE
 	 * )
 	 */
-	protected function _return_json( $data ) {
+	protected function _return_json($data) {
 		$json = array(
 			'notices' => EE_Error::get_notices(),
 			'data' => $data,
@@ -247,10 +247,10 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() ) {
+		if (NULL === error_get_last() || ! headers_sent()) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+        echo wp_json_encode($json);
 		exit();
 	}
 	
@@ -266,16 +266,16 @@ 
 	 * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
 	 */
 	public function batch_request_type() {
-		if( $this->_batch_request_type === null ) {
-			if( isset( $_GET[ 'batch' ] ) ) {
-				if( $_GET[ 'batch' ] == self::batch_job ) {
+		if ($this->_batch_request_type === null) {
+			if (isset($_GET['batch'])) {
+				if ($_GET['batch'] == self::batch_job) {
 					$this->_batch_request_type = self::batch_job;
-				} elseif( $_GET[ 'batch' ] == self::batch_file_job ) {
+				} elseif ($_GET['batch'] == self::batch_file_job) {
 					$this->_batch_request_type = self::batch_file_job;
 				}
 			}
 			//if we didn't find that it was a batch request, indicate it wasn't
-			if( $this->_batch_request_type === null ) {
+			if ($this->_batch_request_type === null) {
 				$this->_batch_request_type = self::batch_not_job;
 			}
 		}
@@ -286,7 +286,7 @@ 
 	 * Unnecessary
 	 * @param type $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		
 	}
 

shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.php

Spacing +135 added lines, -135 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -91,7 +91,7 @@ 
 	 * @return    void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Thank_You', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Thank_You', 'set_definitions'), 2);
 	}
 
 
@@ -104,22 +104,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		// AJAX for IPN monitoring
-		add_filter( 'heartbeat_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
+		add_filter('heartbeat_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
 		add_filter(
 			'heartbeat_nopriv_received',
-			array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ),
+			array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'),
 			10,
 			3
 		);
 		add_action(
 			'wp_ajax_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
 		add_action(
 			'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
@@ -134,8 +134,8 @@ 
 	 * @return    void
 	 */
 	public static function set_definitions() {
-		define( 'THANK_YOU_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'THANK_YOU_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ ) ) . 'templates' . DS );
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -147,13 +147,13 @@ 
 	 * @return    EE_Transaction
 	 */
 	public function get_txn() {
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			return $this->_current_txn;
 		}
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
-		if ( ! $TXN_model instanceof EEM_Transaction ) {
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
+		if ( ! $TXN_model instanceof EEM_Transaction) {
 			EE_Error::add_error(
-				__( 'The transaction model could not be established.', 'event_espresso' ),
+				__('The transaction model could not be established.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -161,9 +161,9 @@ 
 			return null;
 		}
 		//get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
-		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link( $this->_reg_url_link );
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
 		// verify TXN
-		if ( WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction ) {
+		if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved or the transaction data is not of the correct type.',
@@ -187,16 +187,16 @@ 
 	 * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
-	public function get_txn_payments( $since = 0 ) {
-		if ( ! $this->get_txn() ) {
+	public function get_txn_payments($since = 0) {
+		if ( ! $this->get_txn()) {
 			return false;
 		}
-		$args = array( 'order_by' => array( 'PAY_timestamp' => 'ASC' ) );
-		if ( $since > 0 ) {
-			$args[0] = array( 'PAY_timestamp' => array( '>', $since ) );
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
+		if ($since > 0) {
+			$args[0] = array('PAY_timestamp' => array('>', $since));
 		}
 		// get array of payments with most recent first
-		return $this->_current_txn->payments( $args );
+		return $this->_current_txn->payments($args);
 	}
 
 
@@ -208,11 +208,11 @@ 
 	 * @return    void
 	 */
 	private function _get_reg_url_link() {
-		if ( ! empty( $this->_reg_url_link ) ) {
+		if ( ! empty($this->_reg_url_link)) {
 			return;
 		}
 		// only do thank you page stuff if we have a REG_url_link in the url
-		if ( WP_DEBUG && ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' ) ) {
+		if (WP_DEBUG && ! EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -225,7 +225,7 @@ 
 			return;
 		}
 		// check for reg_url_link
-		$this->_reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link' );
+		$this->_reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link');
 	}
 
 
@@ -237,8 +237,8 @@ 
 	 * @param    string $reg_url_link
 	 * @return    string
 	 */
-	public function set_reg_url_link( $reg_url_link = null ) {
-		$this->_reg_url_link = ! empty( $reg_url_link ) ? $reg_url_link : $this->_reg_url_link;
+	public function set_reg_url_link($reg_url_link = null) {
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
 	}
 
 
@@ -251,28 +251,28 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		// remove site_url() from thank you page URL
-		$thank_you_page_URL = substr( EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen( home_url() ) );
+		$thank_you_page_URL = substr(EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen(home_url()));
 		// remove other non-essential details from URL
-		$thank_you_page_URL = trim( parse_url( $thank_you_page_URL, PHP_URL_PATH ), '/' );
+		$thank_you_page_URL = trim(parse_url($thank_you_page_URL, PHP_URL_PATH), '/');
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
-		if ( isset( $WP->request ) && trim( $WP->request, '/' ) !== $thank_you_page_URL ) {
+		if (isset($WP->request) && trim($WP->request, '/') !== $thank_you_page_URL) {
 			return;
 		} else if (
-			isset( $WP->query_vars['page_id'] )
-			&& (int)$WP->query_vars['page_id'] !== (int)EE_Registry::instance()->CFG->core->thank_you_page_id
+			isset($WP->query_vars['page_id'])
+			&& (int) $WP->query_vars['page_id'] !== (int) EE_Registry::instance()->CFG->core->thank_you_page_id
 		) {
 			return;
 		}
 		$this->_get_reg_url_link();
 		// resend_reg_confirmation_email ?
-		if ( EE_Registry::instance()->REQ->is_set( 'resend' ) ) {
+		if (EE_Registry::instance()->REQ->is_set('resend')) {
 			EES_Espresso_Thank_You::resend_reg_confirmation_email();
 		}
 		// load assets
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_js' ), 10 );
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		$this->_translate_strings();
 	}
 
@@ -326,12 +326,12 @@ 
 	public function load_js() {
 		wp_register_script(
 			'thank_you_page',
-			THANK_YOU_ASSETS_URL . 'thank_you_page.js',
-			array( 'espresso_core', 'heartbeat' ),
+			THANK_YOU_ASSETS_URL.'thank_you_page.js',
+			array('espresso_core', 'heartbeat'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
-		wp_enqueue_script( 'thank_you_page' );
+		wp_enqueue_script('thank_you_page');
 	}
 
 
@@ -345,9 +345,9 @@ 
 	 */
 	public function init() {
 		$this->_get_reg_url_link();
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			echo EEH_HTML::div(
-				EEH_HTML::h4( __( 'We\'re sorry...', 'event_espresso' ), '', '' ) .
+				EEH_HTML::h4(__('We\'re sorry...', 'event_espresso'), '', '').
 				sprintf(
 					__(
 						'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
@@ -361,8 +361,8 @@ 
 			return null;
 		}
 		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
-		if ( $this->_current_txn->status_ID() === EEM_Transaction::failed_status_code ) {
-			$this->_current_txn->set_status( EEM_Transaction::incomplete_status_code );
+		if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
 			$this->_current_txn->save();
 		}
 		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
@@ -375,15 +375,15 @@ 
 		);
 		$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		// txn status ?
-		if ( $this->_current_txn->is_completed() ) {
+		if ($this->_current_txn->is_completed()) {
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		} else if (
 			$this->_current_txn->is_incomplete()
-			&& ( $this->_primary_registrant->is_approved()
-			|| $this->_primary_registrant->is_pending_payment() )
+			&& ($this->_primary_registrant->is_approved()
+			|| $this->_primary_registrant->is_pending_payment())
 		) {
 			$this->_show_try_pay_again_link = true;
-		} else if ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() ) {
+		} else if ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
 			// its pending
 			$this->_show_try_pay_again_link = isset(
 				EE_Registry::instance()->CFG->registration->show_pending_payment_options
@@ -409,21 +409,21 @@ 
 		}
 		// link to SPCO
 		$revisit_spco_url = add_query_arg(
-			array( 'ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link ),
+			array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
 		// link to SPCO payment_options
 		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->payment_overview_url()
 			: add_query_arg(
-				array( 'step' => 'payment_options' ),
+				array('step' => 'payment_options'),
 				$revisit_spco_url
 			);
 		// link to SPCO attendee_information
 		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->edit_attendee_information_url()
 			: false;
-		do_action( 'AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn );
+		do_action('AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn);
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 	}
@@ -438,15 +438,15 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		$this->init();
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
 			return EE_Error::get_notices();
 		}
 		//EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $this->_current_txn ), true, 	'EE_Transaction: ' . $this->_current_txn->ID() );
 		// link to receipt
-		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url( 'html' );
-		if ( ! empty( $template_args['TXN_receipt_url'] ) ) {
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url('html');
+		if ( ! empty($template_args['TXN_receipt_url'])) {
 			$template_args['order_conf_desc'] = __(
 				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
 				'event_espresso'
@@ -458,13 +458,13 @@ 
 			);
 		}
 		$template_args['transaction'] = $this->_current_txn;
-		$template_args['revisit'] = EE_Registry::instance()->REQ->get( 'revisit', false );
-		add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_registration_details' ) );
-		if ( $this->_is_primary && ! $this->_current_txn->is_free() ) {
-			add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_ajax_content' ) );
+		$template_args['revisit'] = EE_Registry::instance()->REQ->get('revisit', false);
+		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
+		if ($this->_is_primary && ! $this->_current_txn->is_free()) {
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
 		}
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
 			$template_args,
 			true,
 			true
@@ -485,15 +485,15 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
+	public static function thank_you_page_IPN_monitor($response = array(), $data = array()) {
 		// does this heartbeat contain our data ?
-		if ( ! isset( $data['espresso_thank_you_page'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page'])) {
 			return $response;
 		}
 		// check for reg_url_link in the incoming heartbeat data
-		if ( ! isset( $data['espresso_thank_you_page']['e_reg_url_link'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page']['e_reg_url_link'])) {
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: __(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -508,15 +508,15 @@ 
 		EES_Espresso_Thank_You::set_definitions();
 		/** @var $espresso_thank_you_page EES_Espresso_Thank_You */
 		$espresso_thank_you_page = EES_Espresso_Thank_You::instance();
-		$espresso_thank_you_page->set_reg_url_link( $data['espresso_thank_you_page']['e_reg_url_link'] );
+		$espresso_thank_you_page->set_reg_url_link($data['espresso_thank_you_page']['e_reg_url_link']);
 		$espresso_thank_you_page->init();
 		//get TXN
 		$TXN = $espresso_thank_you_page->get_txn();
 		// no TXN? then get out
-		if ( ! $TXN instanceof EE_Transaction ) {
+		if ( ! $TXN instanceof EE_Transaction) {
 			$notices = EE_Error::get_notices();
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: sprintf(
 					__(
@@ -529,13 +529,13 @@ 
 			return $response;
 		}
 		// grab transient of TXN's status
-		$txn_status = isset( $data['espresso_thank_you_page']['txn_status'] )
+		$txn_status = isset($data['espresso_thank_you_page']['txn_status'])
 			? $data['espresso_thank_you_page']['txn_status']
 			: null;
 		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
-		if ( $txn_status !== $TXN->status_ID() ) {
+		if ($txn_status !== $TXN->status_ID()) {
 			// switch between two possible basic outcomes
-			switch ( $TXN->status_ID() ) {
+			switch ($TXN->status_ID()) {
 				// TXN has been updated in some way
 				case EEM_Transaction::overpaid_status_code:
 				case EEM_Transaction::complete_status_code:
@@ -550,25 +550,25 @@ 
 				case EEM_Transaction::failed_status_code:
 				default:
 					// keep on waiting...
-					return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+					return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 			}
 			// or is the TXN still failed (never been updated) ???
-		} else if ( $TXN->failed() ) {
+		} else if ($TXN->failed()) {
 			// keep on waiting...
-			return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+			return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 		}
 		// TXN is happening so let's get the payments now
 		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-		$since = isset( $data['espresso_thank_you_page']['get_payments_since'] )
+		$since = isset($data['espresso_thank_you_page']['get_payments_since'])
 			? $data['espresso_thank_you_page']['get_payments_since']
 			: 0;
 		// then check for payments
-		$payments = $espresso_thank_you_page->get_txn_payments( $since );
+		$payments = $espresso_thank_you_page->get_txn_payments($since);
 		// has a payment been processed ?
-		if ( ! empty( $payments ) || $espresso_thank_you_page->_is_offline_payment_method ) {
-			if ( $since ) {
+		if ( ! empty($payments) || $espresso_thank_you_page->_is_offline_payment_method) {
+			if ($since) {
 				$response['espresso_thank_you_page'] = array(
-					'new_payments'        => $espresso_thank_you_page->get_new_payments( $payments ),
+					'new_payments'        => $espresso_thank_you_page->get_new_payments($payments),
 					'transaction_details' => $espresso_thank_you_page->get_transaction_details(),
 					'txn_status'          => $TXN->status_ID()
 				);
@@ -594,9 +594,9 @@ 
 	 * @param    array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
 	 * @return    array
 	 */
-	private function _update_server_wait_time( $thank_you_page_data = array() ) {
+	private function _update_server_wait_time($thank_you_page_data = array()) {
 		$response['espresso_thank_you_page'] = array(
-			'still_waiting' => isset( $thank_you_page_data['initial_access'] )
+			'still_waiting' => isset($thank_you_page_data['initial_access'])
 				? time() - $thank_you_page_data['initial_access']
 				: 0,
 			'txn_status'    => $this->_current_txn->status_ID()
@@ -621,17 +621,17 @@ 
 		$template_args['is_primary'] = $this->_is_primary;
 		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
 		$template_args['resend_reg_confirmation_url'] = add_query_arg(
-			array( 'token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true' ),
+			array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
 			EE_Registry::instance()->CFG->core->thank_you_page_url()
 		);
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_attendee_information_url'],
 			'$SPCO_attendee_information_url'
 		);
 		echo EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
 			$template_args,
 			true,
 			true
@@ -644,16 +644,16 @@ 
 	 *    resend_reg_confirmation_email
 	 */
 	public static function resend_reg_confirmation_email() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		$reg_url_link = EE_Registry::instance()->REQ->get( 'token' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		$reg_url_link = EE_Registry::instance()->REQ->get('token');
 		// was a REG_ID passed ?
-		if ( $reg_url_link ) {
-			$registration = EE_Registry::instance()->load_model( 'Registration' )->get_one(
-				array( array( 'REG_url_link' => $reg_url_link ) )
+		if ($reg_url_link) {
+			$registration = EE_Registry::instance()->load_model('Registration')->get_one(
+				array(array('REG_url_link' => $reg_url_link))
 			);
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// resend email
-				EED_Messages::process_resend( array( '_REG_ID' => $registration->ID() ) );
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
 			} else {
 				EE_Error::add_error(
 					__(
@@ -677,16 +677,16 @@ 
 			);
 		}
 		// request sent via AJAX ?
-		if ( EE_FRONT_AJAX ) {
-			echo wp_json_encode( EE_Error::get_notices( false ) );
+		if (EE_FRONT_AJAX) {
+			echo wp_json_encode(EE_Error::get_notices(false));
 			die();
 			// or was JS disabled ?
 		} else {
 			// save errors so that they get picked up on the next request
-			EE_Error::get_notices( true, true );
+			EE_Error::get_notices(true, true);
 			wp_safe_redirect(
 				add_query_arg(
-					array( 'e_reg_url_link' => $reg_url_link ),
+					array('e_reg_url_link' => $reg_url_link),
 					EE_Registry::instance()->CFG->core->thank_you_page_url()
 				)
 			);
@@ -702,26 +702,26 @@ 
 	 * @return    void
 	 */
 	public function get_ajax_content() {
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			return;
 		}
 		// first determine which event(s) require pre-approval or not
 		$events = array();
 		$events_requiring_pre_approval = array();
-		foreach ( $this->_current_txn->registrations() as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		foreach ($this->_current_txn->registrations() as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$event = $registration->event();
-				if ( $event instanceof EE_Event ) {
-					if ( $registration->is_not_approved() && $registration->event() instanceof EE_Event ) {
-						$events_requiring_pre_approval[ $event->ID() ] = $event;
+				if ($event instanceof EE_Event) {
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
+						$events_requiring_pre_approval[$event->ID()] = $event;
 					} else {
-						$events[ $event->ID() ] = $event;
+						$events[$event->ID()] = $event;
 					}
 				}
 			}
 		}
-		$this->display_details_for_events_requiring_pre_approval( $events_requiring_pre_approval );
-		$this->display_details_for_events( $events );
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
+		$this->display_details_for_events($events);
 	}
 
 
@@ -733,8 +733,8 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-ajax-content-dv">
 				<div id="espresso-thank-you-page-ajax-transaction-dv"></div>
@@ -746,7 +746,7 @@ 
 							'event_espresso'
 							); ?></span>
 					</div>
-					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed ) : ?>
+					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
 						<p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
 							<?php echo apply_filters(
 								'EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg',
@@ -757,7 +757,7 @@ 
 							); ?>
 							<br/>
 							<span class="jst-rght ee-block small-text lt-grey-text">
-								<?php _e( 'current wait time ', 'event_espresso' ); ?>
+								<?php _e('current wait time ', 'event_espresso'); ?>
 							<span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
 						</p>
 					<?php endif; ?>
@@ -777,11 +777,11 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-not-approved-message-dv">
-				<h4 class="orange-text"><?php _e( 'Important Notice:', 'event_espresso' ); ?></h4>
+				<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
 				<p id="events-requiring-pre-approval-pg" class="small-text">
 					<?php echo apply_filters(
 						'AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message',
@@ -792,8 +792,8 @@ 
 					); ?>
 				</p>
 				<ul class="events-requiring-pre-approval-ul">
-					<?php foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event ) {
+					<?php foreach ($events as $event) {
+						if ($event instanceof EE_Event) {
 							echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
 								$event->name(),
 								'</li>';
@@ -820,12 +820,12 @@ 
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
-		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name( true );
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
 		// link to SPCO payment_options
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
@@ -835,7 +835,7 @@ 
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php',
 			$template_args,
 			true,
 			true
@@ -852,9 +852,9 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_row_html( $payment = null ) {
+	public function get_payment_row_html($payment = null) {
 		$html = '';
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->payment_method() instanceof EE_Payment_Method
 				&& $payment->status() === EEM_Payment::status_id_failed
@@ -863,31 +863,31 @@ 
 				// considering the registrant has made it to the Thank You page,
 				// any failed payments may actually be pending and the IPN is just slow
 				// so let's
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 			}
 			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-				? '<br /><span class="small-text">' . $payment->gateway_response() . '</span>'
+				? '<br /><span class="small-text">'.$payment->gateway_response().'</span>'
 				: '';
 			$html .= '
 				<tr>
 					<td>
-						' . $payment->timestamp() . '
+						' . $payment->timestamp().'
 					</td>
 					<td>
 						' . (
 								$payment->payment_method() instanceof EE_Payment_Method
 									? $payment->payment_method()->name()
-									: __( 'Unknown', 'event_espresso' )
-							) . '
+									: __('Unknown', 'event_espresso')
+							).'
 					</td>
 					<td class="jst-rght">
-						' . EEH_Template::format_currency( $payment->amount() ) . '
+						' . EEH_Template::format_currency($payment->amount()).'
 					</td>
 					<td class="jst-rght" style="line-height:1;">
-						' . $payment->pretty_status( true ) . $payment_declined_msg . '
+						' . $payment->pretty_status(true).$payment_declined_msg.'
 					</td>
 				</tr>';
-			do_action( 'AHEE__thank_you_page_payment_details_template__after_each_payment', $payment );
+			do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
 		}
 		return $html;
 	}
@@ -902,14 +902,14 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_details( $payments = array() ) {
+	public function get_payment_details($payments = array()) {
 		//prepare variables for displaying
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
 		$template_args['payments'] = array();
-		foreach ( $payments as $payment ) {
-			$template_args['payments'][] = $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
 		}
 		//create a hacky payment object, but dont save it
 		$payment = EE_Payment::new_instance(
@@ -922,8 +922,8 @@ 
 			)
 		);
 		$payment_method = $this->_current_txn->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content( $payment );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
 		} else {
 			$template_args['gateway_content'] = '';
 		}
@@ -931,19 +931,19 @@ 
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['payments'], '$payments' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
 		);
-		EEH_Template_Validator::verify_isnt_null( $template_args['gateway_content'], '$gateway_content' );
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_payment_options_url'],
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
 			$template_args,
 			true,
 			true
@@ -960,11 +960,11 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_new_payments( $payments = array() ) {
+	public function get_new_payments($payments = array()) {
 		$payments_html = '';
 		//prepare variables for displaying
-		foreach ( $payments as $payment ) {
-			$payments_html .= $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$payments_html .= $this->get_payment_row_html($payment);
 		}
 		return $payments_html;
 	}