eventespresso / event-espresso-core

shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.php

Indentation +214 added lines, -214 removed lines

@@ -24,8 +24,8 @@ 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    void
+	 * @deprecated 4.9.27
+	 * @return    void
 	 */
 	public static function set_hooks() {
 	}
@@ -33,8 +33,8 @@ 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    void
+	 * @deprecated 4.9.27
+	 * @return    void
 	 */
 	public static function set_hooks_admin() {
 	}
@@ -42,353 +42,353 @@ 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    void
+	 * @deprecated 4.9.27
+	 * @return    void
 	 */
 	public static function set_definitions() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    EE_Transaction
+	 * @deprecated 4.9.27
+	 * @return    EE_Transaction
 	 */
 	public function get_txn() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @param int $since
+	 * @deprecated 4.9.27
+	 * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
 	public function get_txn_payments( $since = 0 ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @param    string $reg_url_link
+	 * @deprecated 4.9.27
+	 * @param    string $reg_url_link
 	 * @return void
 	 */
 	public function set_reg_url_link( $reg_url_link = null ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @param    WP $WP
+	 * @deprecated 4.9.27
+	 * @param    WP $WP
 	 * @return    void
 	 */
 	public function run( WP $WP ) {
-    }
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return        void
+	 * @deprecated 4.9.27
+	 * @return        void
 	 */
 	protected function _translate_strings() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return        void
+	 * @deprecated 4.9.27
+	 * @return        void
 	 */
 	public function load_js() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    void
+	 * @deprecated 4.9.27
+	 * @return    void
 	 * @throws \EE_Error
 	 */
 	public function init() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @param    array $attributes
+	 * @deprecated 4.9.27
+	 * @param    array $attributes
 	 * @return    string
 	 * @throws \EE_Error
 	 */
 	public function process_shortcode( $attributes = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-        return '';
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+		return '';
+	}
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @param array $response
+	 * @deprecated 4.9.27
+	 * @param array $response
 	 * @param array $data
 	 * @return    array
 	 * @throws \EE_Error
 	 */
 	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 
 	/**
-     * @deprecated 4.9.27
-     * @return    string
+	 * @deprecated 4.9.27
+	 * @return    string
 	 * @throws \EE_Error
 	 */
 	public function get_registration_details() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * resend_reg_confirmation_email
-     *
-     * @deprecated 4.9.27
-     */
+	 *
+	 * @deprecated 4.9.27
+	 */
 	public static function resend_reg_confirmation_email() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * get_ajax_content
-     *
-     * @deprecated 4.9.27
-     * @return    void
+	 *
+	 * @deprecated 4.9.27
+	 * @return    void
 	 */
 	public function get_ajax_content() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * display_details_for_events
-     *
-     * @deprecated 4.9.27
-     * @param EE_Event[] $events
+	 *
+	 * @deprecated 4.9.27
+	 * @param EE_Event[] $events
 	 * @return void
 	 */
 	public function display_details_for_events( $events = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * display_details_for_events_requiring_pre_approval
-     *
-     * @deprecated 4.9.27
-     * @param EE_Event[] $events
+	 *
+	 * @deprecated 4.9.27
+	 * @param EE_Event[] $events
 	 * @return void
 	 */
 	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * get_transaction_details
-     *
-     * @deprecated 4.9.27
-     * @return string
+	 *
+	 * @deprecated 4.9.27
+	 * @return string
 	 * @throws \EE_Error
 	 */
 	public function get_transaction_details() {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * get_payment_row_html
-     *
-     * @deprecated 4.9.27
-     * @param    EE_Payment $payment
+	 *
+	 * @deprecated 4.9.27
+	 * @param    EE_Payment $payment
 	 * @return    string
 	 * @throws \EE_Error
 	 */
 	public function get_payment_row_html( $payment = null ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * get_payment_details
-     *
-     * @deprecated 4.9.27
-     * @param    array $payments
+	 *
+	 * @deprecated 4.9.27
+	 * @param    array $payments
 	 * @return    string
 	 * @throws \EE_Error
 	 */
 	public function get_payment_details( $payments = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 
 	/**
 	 * get_payment_details
-     *
-     * @deprecated 4.9.27
-     * @param array $payments
+	 *
+	 * @deprecated 4.9.27
+	 * @param array $payments
 	 * @return    string
 	 * @throws \EE_Error
 	 */
 	public function get_new_payments( $payments = array() ) {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-    }
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoThankYou instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+	}
 
 
 

Spacing +12 added lines, -12 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');
 }
 
 
@@ -80,7 +80,7 @@ 
      * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
-	public function get_txn_payments( $since = 0 ) {
+	public function get_txn_payments($since = 0) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -98,7 +98,7 @@ 
      * @param    string $reg_url_link
 	 * @return void
 	 */
-	public function set_reg_url_link( $reg_url_link = null ) {
+	public function set_reg_url_link($reg_url_link = null) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -116,7 +116,7 @@ 
      * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
     }
 
 
@@ -179,7 +179,7 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -200,7 +200,7 @@ 
 	 * @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()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -276,7 +276,7 @@ 
      * @param EE_Event[] $events
 	 * @return void
 	 */
-	public function display_details_for_events( $events = array() ) {
+	public function display_details_for_events($events = array()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -296,7 +296,7 @@ 
      * @param EE_Event[] $events
 	 * @return void
 	 */
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -337,7 +337,7 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_row_html( $payment = null ) {
+	public function get_payment_row_html($payment = null) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -358,7 +358,7 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_details( $payments = array() ) {
+	public function get_payment_details($payments = array()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(
@@ -379,7 +379,7 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_new_payments( $payments = array() ) {
+	public function get_new_payments($payments = array()) {
         \EE_Error::doing_it_wrong(
             __METHOD__,
             __(

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

Spacing +16 added lines, -16 removed lines

@@ -1,30 +1,30 @@ 
 <h2 class="section-heading display-box-heading">
 	<?php _e('Payment Overview', 'event_espresso'); ?>
 </h2>
-<?php  do_action( 'AHEE__thank_you_page_payment_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_payment_details_template__after_heading'); ?>
 
 <div id="espresso-thank-you-page-payment-details-dv">
-<?php if ( ! empty( $payments )){	 ?>
+<?php if ( ! empty($payments)) {	 ?>
 	<table class="ee-table">
 		<thead>
 			<tr>
 				<th width="35%" class="jst-left">
-					<?php _e('Payment Date','event_espresso')?>
+					<?php _e('Payment Date', 'event_espresso')?>
 				</th>
 				<th width="17.5%" class="jst-left">
-					<?php _e('Type','event_espresso');?>
+					<?php _e('Type', 'event_espresso'); ?>
 				</th>
 				<th width="17.5%" class="jst-rght">
-					<?php _e('Amount','event_espresso');?>
+					<?php _e('Amount', 'event_espresso'); ?>
 				</th>
 				<th width="30%" class="jst-rght">
-					<?php _e('Status','event_espresso');?>
+					<?php _e('Status', 'event_espresso'); ?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
 		<?php
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 				echo $payment;
 			}
 		?>
@@ -33,38 +33,38 @@ 
 <?php
 	} else {
 
-		if ( $transaction->total() ){
+		if ($transaction->total()) {
 
 			echo apply_filters(
 				'FHEE__payment_overview_template__no_payments_made',
-				sprintf (
-					__('%sNo payments towards this transaction have been received.%s', 'event_espresso' ),
+				sprintf(
+					__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
 					'<p class="important-notice">',
 					'</p>'
 				)
 			);
-			do_action( 'AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction );
+			do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
 
 		} else {
 
 			echo apply_filters(
 				'FHEE__payment_overview_template__no_payment_required',
-				sprintf (
-					__('%sNo payment is required for this transaction.%s', 'event_espresso' ),
+				sprintf(
+					__('%sNo payment is required for this transaction.%s', 'event_espresso'),
 					'<p>',
 					'</p>'
 				)
 			);
-			do_action( 'AHEE__thank_you_page_payment_details_template__no_payment_required' );
+			do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
 
 		 }
 
 	}
 	echo $gateway_content;
-	do_action( 'AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content );
+	do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
 
 ?>
 
 	<br/>
-	<?php  do_action( 'AHEE__thank_you_page_payment_details_template__after_payment_details' ); ?>
+	<?php  do_action('AHEE__thank_you_page_payment_details_template__after_payment_details'); ?>
 

modules/thank_you_page/templates/thank-you-page-overview.template.php

Spacing +6 added lines, -6 removed lines

@@ -3,13 +3,13 @@ 
 /** @var boolean $revisit */
 /** @var string $order_conf_desc */
 
-do_action( 'AHEE__thank_you_page_overview_template__top', $transaction );
+do_action('AHEE__thank_you_page_overview_template__top', $transaction);
 
 ?>
 
 <div id="espresso-thank-you-page-overview-dv" class="width-100" >
 
-	<?php if ( ! $revisit ) : ?>
+	<?php if ( ! $revisit) : ?>
 	<div class="ee-attention">
 		<div class="extra-padding-sides">
 			<?php echo apply_filters(
@@ -21,10 +21,10 @@ 
 					'<br />'
 				)
 			);
-			if ( ! empty( $TXN_receipt_url )) : ?>
+			if ( ! empty($TXN_receipt_url)) : ?>
 			<br/>
 			<div class="jst-rght">
-				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url;?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters( 'FHEE__thank_you_page_overview_template__order_conf_button_text', __( 'View Full Order Confirmation Receipt', 'event_espresso' )); ?></a>
+				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url; ?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters('FHEE__thank_you_page_overview_template__order_conf_button_text', __('View Full Order Confirmation Receipt', 'event_espresso')); ?></a>
 			</div>
 			<?php endif; ?>
 		</div>
@@ -33,9 +33,9 @@ 
 	<?php endif; ?>
 	<br/>
 
-	<?php  do_action( 'AHEE__thank_you_page_overview_template__content', $transaction ); ?>
+	<?php  do_action('AHEE__thank_you_page_overview_template__content', $transaction); ?>
 
 </div>
 <!-- end of espresso-thank-you-page-overview-dv -->
 
-<?php  do_action( 'AHEE__thank_you_page_overview_template__bottom', $transaction ); ?>
+<?php  do_action('AHEE__thank_you_page_overview_template__bottom', $transaction); ?>

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

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <h3><?php _e('Transaction Details', 'event_espresso'); ?></h3>
-<?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_transaction_details_template__after_heading'); ?>
 
 <div id="espresso-thank-you-page-transaction-details-dv">
 	<table class='ee-table'>
@@ -9,7 +9,7 @@ 
 					<label><?php _e('Total Cost: ', 'event_espresso'); ?></label>
 				</td>
 				<td>
-					<?php echo EEH_Template::format_currency( $transaction->total() ); ?>
+					<?php echo EEH_Template::format_currency($transaction->total()); ?>
 				</td>
 			</tr>
 			<tr>
@@ -17,7 +17,7 @@ 
 					<label><?php _e('Amount Owing: ', 'event_espresso'); ?></label>
 				</td>
 				<td class="<?php echo ($transaction->paid() == $transaction->total()) ? 'ee-transaction-paid' : 'ee-transaction-unpaid' ?>">
-					<?php echo EEH_Template::format_currency( $transaction->remaining() ); ?>
+					<?php echo EEH_Template::format_currency($transaction->remaining()); ?>
 				</td>
 			</tr>
 			<tr>
@@ -25,8 +25,8 @@ 
 					<label><?php _e('Transaction Status: ', 'event_espresso'); ?></label>
 				</td>
 				<td>
-					<?php $transaction->e_pretty_status( TRUE );
-					if ( $show_try_pay_again_link && ! $transaction->is_completed() ) { ?>
+					<?php $transaction->e_pretty_status(TRUE);
+					if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
 					 &nbsp; <span class="small-text"><a href='<?php echo $SPCO_payment_options_url?>'><?php _e('View Payment Options', 'event_espresso'); ?></a></span>
 					<?php } ?>
 				</td>
@@ -39,11 +39,11 @@ 
 					<?php  echo $primary_registrant_name; ?>
 				</td>
 			</tr>
-            <?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_transaction_table_row', $transaction ); ?>
+            <?php  do_action('AHEE__thank_you_page_transaction_details_template__after_transaction_table_row', $transaction); ?>
 		</tbody>
 	</table>
 
-<?php if ( $show_try_pay_again_link && ! $transaction->is_completed() ) { ?>
+<?php if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
 	<p class="small-text jst-rght">
 		<a href='<?php echo $SPCO_payment_options_url?>'><?php _e("Click here to view Payment Options", 'event_espresso'); ?></a>
 	</p>
@@ -52,6 +52,6 @@ 
 
 <?php }?>
 
-    <?php  do_action( 'AHEE__thank_you_page_transaction_details_template__after_transaction_details' ); ?>
+    <?php  do_action('AHEE__thank_you_page_transaction_details_template__after_transaction_details'); ?>
 
 </div>

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

Spacing +24 added lines, -24 removed lines

@@ -5,81 +5,81 @@ 
 /** @type string $SPCO_attendee_information_url */
 ?>
 <h3 class="ee-registration-details-h3"><?php _e('Registration Details', 'event_espresso'); ?></h3>
-<?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_registration_details_template__after_heading'); ?>
 
 <div class="ee-registration-details-dv">
 <?php
 $registrations = $transaction->registrations();
-$registrations = is_array( $registrations ) ? $registrations : array();
-$reg_count = count( $registrations );
+$registrations = is_array($registrations) ? $registrations : array();
+$reg_count = count($registrations);
 $reg_cntr = 0;
 $event_name = '';
 $wait_list = false;
-foreach ( $registrations as $registration ) {
-	if ( $registration instanceof EE_Registration ) {
-		if ( $event_name != $registration->event_name() && ! empty( $event_name )) { ?>
+foreach ($registrations as $registration) {
+	if ($registration instanceof EE_Registration) {
+		if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
 		</tbody>
 	</table>
 		<?php
 		}
 		$reg_cntr++;
-		if ( $event_name != $registration->event_name() ) {
+		if ($event_name != $registration->event_name()) {
 	?>
 	<h5>
-		<span class="smaller-text grey-text"><?php _e('for','event_espresso');?>: </span> <?php echo htmlentities( $registration->event_name(), ENT_QUOTES, 'UTF-8' );?>
+		<span class="smaller-text grey-text"><?php _e('for', 'event_espresso'); ?>: </span> <?php echo htmlentities($registration->event_name(), ENT_QUOTES, 'UTF-8'); ?>
 	</h5>
 	<table class='ee-table ee-registrations-list'>
 		<thead>
 			<tr>
 				<th width="40%">
-					<?php _e("Registrant Name",'event_espresso')?>
+					<?php _e("Registrant Name", 'event_espresso')?>
 				</th>
 				<th width="25%" class="jst-left">
-					<?php _e("REG Code",'event_espresso');?>
+					<?php _e("REG Code", 'event_espresso'); ?>
 				</th>
 				<th width="35%" class="jst-left">
-					<?php _e("REG Status",'event_espresso');?>
+					<?php _e("REG Status", 'event_espresso'); ?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
 	<?php
 		}
-		if ( $is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link() )) { ?>
+		if ($is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
 			<tr>
 				<td width="40%">
 				<?php
-					if ( $registration->attendee() instanceof EE_Attendee ) {
-						echo $registration->attendee()->full_name( TRUE );
+					if ($registration->attendee() instanceof EE_Attendee) {
+						echo $registration->attendee()->full_name(TRUE);
 					}
 				?>
 					<p class="tiny-text" style="margin: .75em 0 0;">
 					<?php
-					if ( $registration->count_question_groups() ) {
+					if ($registration->count_question_groups()) {
 					?>
-						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url();?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso');?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso');?></a>
+						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url(); ?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso'); ?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso'); ?></a>
 					<?php } ?>
-						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg( array( 'token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true' ), EE_Registry::instance()->CFG->core->thank_you_page_url() );?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso');?>" rel="<?php echo $registration->reg_url_link();?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso');?></a>
+						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg(array('token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true'), EE_Registry::instance()->CFG->core->thank_you_page_url()); ?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso'); ?>" rel="<?php echo $registration->reg_url_link(); ?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso'); ?></a>
 					</p>
 				</td>
 				<td width="25%" class="jst-left">
 					<?php $registration->e('REG_code') ?>
 				</td>
 				<td width="35%" class="jst-left">
-					<?php $registration->e_pretty_status( TRUE )?>
+					<?php $registration->e_pretty_status(TRUE)?>
 					<?php
-						if ( $registration->status_ID() === EEM_Registration::status_id_wait_list ) {
+						if ($registration->status_ID() === EEM_Registration::status_id_wait_list) {
 							$wait_list = true;
 						}
 					?>
 				</td>
 			</tr>
-            <?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration ); ?>
+            <?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration); ?>
         <?php
 			$event_name = $registration->event_name();
 
 		}
-		if ( $reg_cntr >= $reg_count ) {
+		if ($reg_cntr >= $reg_count) {
 			?>
 			</tbody>
 			</table>
@@ -88,12 +88,12 @@ 
 	}
 }
 ?>
-<?php if ( $is_primary && $SPCO_attendee_information_url ) { ?>
+<?php if ($is_primary && $SPCO_attendee_information_url) { ?>
 	<p class="small-text jst-rght">
 		<a href='<?php echo $SPCO_attendee_information_url?>'><?php _e("Click here to edit All Attendee Information", 'event_espresso'); ?></a>
 	</p>
 <?php } ?>
-	<?php if ( $wait_list ) { ?>
+	<?php if ($wait_list) { ?>
 
 			<?php
 			echo apply_filters(
@@ -113,7 +113,7 @@ 
 	<?php } ?>
 
 
-	<?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_details' ); ?>
+	<?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_details'); ?>
 
 </div>
 <!-- end of .registration-details -->

modules/thank_you_page/EED_Thank_You_Page.module.php

Indentation +915 added lines, -915 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -141,8 +141,8 @@ 
      */
     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);
     }
 
 
@@ -333,7 +333,7 @@ 
     {
         wp_register_script(
             'thank_you_page',
-            THANK_YOU_ASSETS_URL . 'thank_you_page.js',
+            THANK_YOU_ASSETS_URL.'thank_you_page.js',
             array('espresso_core', 'heartbeat'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -354,7 +354,7 @@ 
         $this->_get_reg_url_link();
         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',
@@ -469,7 +469,7 @@ 
             add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
         }
         return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
             $template_args,
             true,
             true
@@ -636,7 +636,7 @@ 
             '$SPCO_attendee_information_url'
         );
         echo EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
             $template_args,
             true,
             true
@@ -844,7 +844,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
@@ -875,25 +875,25 @@ 
                 $payment->set_status(EEM_Payment::status_id_pending);
             }
             $payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-                ? '<br /><span class="small-text">' . $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')
-                ) . '
+                ).'
 					</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);
@@ -952,7 +952,7 @@ 
             '$SPCO_payment_options_url'
         );
         return EEH_Template::locate_template(
-            THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+            THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
             $template_args,
             true,
             true

core/domain/entities/shortcodes/EspressoThankYou.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             return;
         }
         $post = reset($wp_query->posts);
-        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id ) {
+        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
             return;
         }
         $this->is_thank_you_page = true;

Indentation +68 added lines, -68 removed lines

@@ -20,74 +20,74 @@
 class EspressoThankYou extends EspressoShortcode
 {
 
-    /**
-     * @var boolean $is_thank_you_page
-     */
-    private $is_thank_you_page = false;
-
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_THANK_YOU';
-    }
-
-
-
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
-
-
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
-            return;
-        }
-        $post = reset($wp_query->posts);
-        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id ) {
-            return;
-        }
-        $this->is_thank_you_page = true;
-        \EED_Thank_You_Page::instance()->load_resources();
-    }
-
-
-
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws \EE_Error
-     */
-    public function processShortcode($attributes = array())
-    {
-        return $this->is_thank_you_page
-            ? \EED_Thank_You_Page::instance()->thank_you_page_results()
-            : '';
-    }
+	/**
+	 * @var boolean $is_thank_you_page
+	 */
+	private $is_thank_you_page = false;
+
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_THANK_YOU';
+	}
+
+
+
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
+
+
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
+			return;
+		}
+		$post = reset($wp_query->posts);
+		if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id ) {
+			return;
+		}
+		$this->is_thank_you_page = true;
+		\EED_Thank_You_Page::instance()->load_resources();
+	}
+
+
+
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return $this->is_thank_you_page
+			? \EED_Thank_You_Page::instance()->thank_you_page_results()
+			: '';
+	}
 
 
 

core/services/collections/CollectionLoader.php

Indentation +30 added lines, -30 removed lines

@@ -221,37 +221,37 @@
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
 	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
-	        // every unique object gets added to the collection, but not duplicates of the exact same object
-            case CollectionDetails::ID_OBJECT_HASH :
-                $identifier = spl_object_hash($entity);
-                break;
-            // only one entity per class can be added to collection, like a singleton
-            case CollectionDetails::ID_CLASS_NAME :
-                $identifier = get_class($entity);
-                break;
-            // objects added to the collection based on entity callback, so the entity itself decides
-            case CollectionDetails::ID_CALLBACK_METHOD :
-                $identifier_callback = $this->collection_details->identifierCallback();
-                if ( ! method_exists($entity, $identifier_callback)) {
-                    throw new InvalidEntityException(
-                        $entity,
-                        $this->collection_details->getCollectionInterface(),
-                        sprintf(
-                            __(
-                                'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
+		switch($this->collection_details->identifierType()) {
+			// every unique object gets added to the collection, but not duplicates of the exact same object
+			case CollectionDetails::ID_OBJECT_HASH :
+				$identifier = spl_object_hash($entity);
+				break;
+			// only one entity per class can be added to collection, like a singleton
+			case CollectionDetails::ID_CLASS_NAME :
+				$identifier = get_class($entity);
+				break;
+			// objects added to the collection based on entity callback, so the entity itself decides
+			case CollectionDetails::ID_CALLBACK_METHOD :
+				$identifier_callback = $this->collection_details->identifierCallback();
+				if ( ! method_exists($entity, $identifier_callback)) {
+					throw new InvalidEntityException(
+						$entity,
+						$this->collection_details->getCollectionInterface(),
+						sprintf(
+							__(
+								'The current collection is configured to use a method named "%1$s" when setting or retrieving objects. The supplied entity is an instance
                                 of "%2$s", but does not contain this method.',
-                                'event_espresso'
-                            ),
-                            $identifier_callback,
-                            get_class($entity)
-                        )
-                    );
-                }
-                $identifier = $entity->{$identifier_callback}();
-                break;
-
-        }
+								'event_espresso'
+							),
+							$identifier_callback,
+							get_class($entity)
+						)
+					);
+				}
+				$identifier = $entity->{$identifier_callback}();
+				break;
+
+		}
 		return apply_filters(
 			'FHEE__CollectionLoader__addEntityToCollection__identifier',
 			$identifier,

Spacing +35 added lines, -35 removed lines

@@ -8,8 +8,8 @@ 
 use EventEspresso\core\services\locators\LocatorInterface;
 use EventEspresso\core\services\locators\FileLocator;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -81,8 +81,8 @@ 
 		LocatorInterface $file_locator = null
 	) {
 		$this->collection_details = $collection_details;
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( $this->collection_details->getCollectionInterface() );
+		if ( ! $collection instanceof CollectionInterface) {
+			$collection = new Collection($this->collection_details->getCollectionInterface());
 		}
 		$this->collection = $collection;
 		$this->file_locator = $file_locator;
@@ -110,12 +110,12 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
 	protected function loadAllFromFilepaths() {
-		if ( ! $this->file_locator instanceof FileLocator ) {
+		if ( ! $this->file_locator instanceof FileLocator) {
 			$this->file_locator = new FileLocator();
 		}
-		$this->file_locator->setFileMask( $this->collection_details->getFileMask() );
+		$this->file_locator->setFileMask($this->collection_details->getFileMask());
 		// find all of the files that match the file mask in the specified folder
-		$this->file_locator->locate( $this->collection_details->getCollectionPaths() );
+		$this->file_locator->locate($this->collection_details->getCollectionPaths());
 		// filter the results
 		$filepaths = (array) apply_filters(
 			'FHEE__CollectionLoader__loadAllFromFilepath__filepaths',
@@ -123,11 +123,11 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( $filepaths as $filepath ) {
-			$this->loadClassFromFilepath( $filepath );
+		foreach ($filepaths as $filepath) {
+			$this->loadClassFromFilepath($filepath);
 		}
 	}
 
@@ -144,22 +144,22 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidFilePathException
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 */
-	protected function loadClassFromFilepath( $filepath ) {
-		if ( ! is_string( $filepath ) ) {
-			throw new InvalidDataTypeException( '$filepath', $filepath, 'string' );
+	protected function loadClassFromFilepath($filepath) {
+		if ( ! is_string($filepath)) {
+			throw new InvalidDataTypeException('$filepath', $filepath, 'string');
 		}
-		if ( ! is_readable( $filepath ) ) {
-			throw new InvalidFilePathException( $filepath );
+		if ( ! is_readable($filepath)) {
+			throw new InvalidFilePathException($filepath);
 		}
-		require_once( $filepath );
+		require_once($filepath);
 		// extract filename from path
-		$file_name = basename( $filepath );
+		$file_name = basename($filepath);
 		// now remove any file extensions
-		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename( $file_name );
-		if ( ! class_exists( $class_name ) ) {
-			throw new InvalidClassException( $class_name );
+		$class_name = \EEH_File::get_classname_from_filepath_with_standard_filename($file_name);
+		if ( ! class_exists($class_name)) {
+			throw new InvalidClassException($class_name);
 		}
-		return $this->addEntityToCollection( new $class_name(), $file_name );
+		return $this->addEntityToCollection(new $class_name(), $file_name);
 	}
 
 
@@ -173,15 +173,15 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
-	protected function addEntityToCollection( $entity, $identifier ) {
+	protected function addEntityToCollection($entity, $identifier) {
 		do_action(
 			'FHEE__CollectionLoader__addEntityToCollection__entity',
 			$entity,
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		$identifier = $this->setIdentifier( $entity, $identifier );
-		if ( $this->collection->has( $identifier ) ) {
+		$identifier = $this->setIdentifier($entity, $identifier);
+		if ($this->collection->has($identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_already_added',
 				$this,
@@ -190,7 +190,7 @@ 
 			);
 			return CollectionLoader::ENTITY_EXISTS;
 		}
-		if( $this->collection->add( $entity, $identifier ) ) {
+		if ($this->collection->add($entity, $identifier)) {
 			do_action(
 				'FHEE__CollectionLoader__addEntityToCollection__entity_added',
 				$this,
@@ -220,8 +220,8 @@ 
 	 * @return string
 	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
 	 */
-	protected function setIdentifier( $entity, $identifier ) {
-	    switch($this->collection_details->identifierType()) {
+	protected function setIdentifier($entity, $identifier) {
+	    switch ($this->collection_details->identifierType()) {
 	        // every unique object gets added to the collection, but not duplicates of the exact same object
             case CollectionDetails::ID_OBJECT_HASH :
                 $identifier = spl_object_hash($entity);
@@ -278,8 +278,8 @@ 
 			$this->collection_details->collectionName(),
 			$this->collection_details
 		);
-		foreach ( $FQCNs as $FQCN ) {
-			$this->loadClassFromFQCN( $FQCN );
+		foreach ($FQCNs as $FQCN) {
+			$this->loadClassFromFQCN($FQCN);
 		}
 	}
 
@@ -295,15 +295,15 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 * @throws \EventEspresso\core\exceptions\InvalidClassException
 	 */
-	protected function loadClassFromFQCN( $FQCN ) {
-		if ( ! is_string( $FQCN ) ) {
-			throw new InvalidDataTypeException( '$FQCN', $FQCN, 'string' );
+	protected function loadClassFromFQCN($FQCN) {
+		if ( ! is_string($FQCN)) {
+			throw new InvalidDataTypeException('$FQCN', $FQCN, 'string');
 		}
-		if ( ! class_exists( $FQCN ) ) {
-			throw new InvalidClassException( $FQCN );
+		if ( ! class_exists($FQCN)) {
+			throw new InvalidClassException($FQCN);
 		}
 		return $this->addEntityToCollection(
-			\EE_Registry::instance()->create( $FQCN ),
+			\EE_Registry::instance()->create($FQCN),
 			$FQCN
 		);
 	}

core/helpers/EEH_Event_View.helper.php

Doc Comments +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      * get_event
      * attempts to retrieve an EE_Event object any way it can
      *
-     * @param int|WP_Post $EVT_ID
+     * @param integer $EVT_ID
      * @return EE_Event|null
      * @throws \EE_Error
      */
@@ -113,7 +113,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -133,7 +133,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -444,7 +444,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]

Indentation +92 added lines, -92 removed lines

@@ -32,47 +32,47 @@ 
 
 
 
-    /**
-     * get_event
-     * attempts to retrieve an EE_Event object any way it can
-     *
-     * @param int|WP_Post $EVT_ID
-     * @return EE_Event|null
-     * @throws \EE_Error
-     */
+	/**
+	 * get_event
+	 * attempts to retrieve an EE_Event object any way it can
+	 *
+	 * @param int|WP_Post $EVT_ID
+	 * @return EE_Event|null
+	 * @throws \EE_Error
+	 */
 	public static function get_event( $EVT_ID = 0 ) {
-        // international newspaper?
-        global $post;
-        $EVT_ID = $EVT_ID instanceof WP_Post && $EVT_ID->post_type === 'espresso_events'
-            ? $EVT_ID->ID
-            : absint($EVT_ID);
-        // do we already have the Event  you are looking for?
-        if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
-            return EEH_Event_View::$_event;
-        }
-        //reset property so that the new event is cached.
-        EEH_Event_View::$_event = null;
-
-        if ($EVT_ID || $post instanceof WP_Post) {
-            //if the post type is for an event and it has a cached event and we don't have a different incoming $EVT_ID
-            //then let's just use that cached event on the $post object.
-            if ($post->post_type === 'espresso_events'
-                && isset($post->EE_Event)
-                && ($EVT_ID === 0
-                    || $EVT_ID === $post->ID
-                    )
-            ) {
-                EEH_Event_View::$_event = $post->EE_Event;
-            }
-
-            //If the event we have isn't an event but we do have an EVT_ID, let's try getting the event using the ID.
-            if (! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
-                EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
-            }
-        }
-
-        return EEH_Event_View::$_event;
-    }
+		// international newspaper?
+		global $post;
+		$EVT_ID = $EVT_ID instanceof WP_Post && $EVT_ID->post_type === 'espresso_events'
+			? $EVT_ID->ID
+			: absint($EVT_ID);
+		// do we already have the Event  you are looking for?
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
+			return EEH_Event_View::$_event;
+		}
+		//reset property so that the new event is cached.
+		EEH_Event_View::$_event = null;
+
+		if ($EVT_ID || $post instanceof WP_Post) {
+			//if the post type is for an event and it has a cached event and we don't have a different incoming $EVT_ID
+			//then let's just use that cached event on the $post object.
+			if ($post->post_type === 'espresso_events'
+				&& isset($post->EE_Event)
+				&& ($EVT_ID === 0
+					|| $EVT_ID === $post->ID
+					)
+			) {
+				EEH_Event_View::$_event = $post->EE_Event;
+			}
+
+			//If the event we have isn't an event but we do have an EVT_ID, let's try getting the event using the ID.
+			if (! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			}
+		}
+
+		return EEH_Event_View::$_event;
+	}
 
 
 
@@ -148,58 +148,58 @@ 
 	 * @return    string
 	 */
 	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
-        global $post;
+		global $post;
 		ob_start();
 		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
 			// admin has chosen "full description"
-            // for the "Event Espresso - Events > Templates > Display Description" option
+			// for the "Event Espresso - Events > Templates > Display Description" option
 			the_content();
 		} else if (( is_archive() && espresso_display_excerpt_in_event_list() ) ) {
-            if ( has_excerpt( $post->ID )) {
-                // admin has chosen "excerpt (short desc)"
-                // for the "Event Espresso - Events > Templates > Display Description" option
-                // AND an excerpt actually exists
-                the_excerpt();
-            } else {
-                // admin has chosen "excerpt (short desc)"
-                // for the "Event Espresso - Events > Templates > Display Description" option
-                // but NO excerpt actually exists, so we need to create one
-                if ( ! empty( $num_words )) {
-                    if ( empty( $more )) {
-                        $more_link_text = __( '(more…)' );
-                        $more = ' <a href="' . get_permalink() . '"';
-                        $more .= ' class="more-link"';
-                        $more .= \EED_Events_Archive::link_target();
-                        $more .= '>' . $more_link_text . '</a>';
-                        $more = apply_filters( 'the_content_more_link', $more, $more_link_text );
-                    }
-                    $content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
-
-                    $content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
-                } else {
-                    $content =  get_the_content();
-                }
-                global $allowedtags;
-                // make sure links are allowed
-                $allowedtags['a'] = isset($allowedtags['a'])
-                    ? $allowedtags['a']
-                    : array();
-                // as well as target attribute
-                $allowedtags['a']['target'] = isset($allowedtags['a']['target'])
-                    ? $allowedtags['a']['target']
-                    : false;
-                // but get previous value so we can reset it
-                $prev_value = $allowedtags['a']['target'];
-                $allowedtags['a']['target'] = true;
-                $content = wp_kses( $content, $allowedtags );
-                $content = strip_shortcodes( $content );
-                echo apply_filters( 'the_content', $content );
-                $allowedtags['a']['target'] = $prev_value;
-            }
-        } else {
-            // admin has chosen "none"
-            // for the "Event Espresso - Events > Templates > Display Description" option
-            echo apply_filters( 'the_content', '' );
+			if ( has_excerpt( $post->ID )) {
+				// admin has chosen "excerpt (short desc)"
+				// for the "Event Espresso - Events > Templates > Display Description" option
+				// AND an excerpt actually exists
+				the_excerpt();
+			} else {
+				// admin has chosen "excerpt (short desc)"
+				// for the "Event Espresso - Events > Templates > Display Description" option
+				// but NO excerpt actually exists, so we need to create one
+				if ( ! empty( $num_words )) {
+					if ( empty( $more )) {
+						$more_link_text = __( '(more&hellip;)' );
+						$more = ' <a href="' . get_permalink() . '"';
+						$more .= ' class="more-link"';
+						$more .= \EED_Events_Archive::link_target();
+						$more .= '>' . $more_link_text . '</a>';
+						$more = apply_filters( 'the_content_more_link', $more, $more_link_text );
+					}
+					$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+
+					$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				} else {
+					$content =  get_the_content();
+				}
+				global $allowedtags;
+				// make sure links are allowed
+				$allowedtags['a'] = isset($allowedtags['a'])
+					? $allowedtags['a']
+					: array();
+				// as well as target attribute
+				$allowedtags['a']['target'] = isset($allowedtags['a']['target'])
+					? $allowedtags['a']['target']
+					: false;
+				// but get previous value so we can reset it
+				$prev_value = $allowedtags['a']['target'];
+				$allowedtags['a']['target'] = true;
+				$content = wp_kses( $content, $allowedtags );
+				$content = strip_shortcodes( $content );
+				echo apply_filters( 'the_content', $content );
+				$allowedtags['a']['target'] = $prev_value;
+			}
+		} else {
+			// admin has chosen "none"
+			// for the "Event Espresso - Events > Templates > Display Description" option
+			echo apply_filters( 'the_content', '' );
 		}
 		return ob_get_clean();
 	}
@@ -246,11 +246,11 @@ 
 					$url = get_term_link( $term, 'espresso_venue_categories' );
 					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
 						$category_links[] = '<a href="' . esc_url( $url )
-                                            . '" rel="tag"'
-                                            . \EED_Events_Archive::link_target()
-                                            .'>'
-                                            . $term->name
-                                            . '</a>';
+											. '" rel="tag"'
+											. \EED_Events_Archive::link_target()
+											.'>'
+											. $term->name
+											. '</a>';
 					}
 				}
 			}

Spacing +115 added lines, -115 removed lines

@@ -40,7 +40,7 @@ 
      * @return EE_Event|null
      * @throws \EE_Error
      */
-	public static function get_event( $EVT_ID = 0 ) {
+	public static function get_event($EVT_ID = 0) {
         // international newspaper?
         global $post;
         $EVT_ID = $EVT_ID instanceof WP_Post && $EVT_ID->post_type === 'espresso_events'
@@ -66,7 +66,7 @@ 
             }
 
             //If the event we have isn't an event but we do have an EVT_ID, let's try getting the event using the ID.
-            if (! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
+            if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
                 EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
             }
         }
@@ -83,8 +83,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -97,9 +97,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -125,13 +125,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -147,15 +147,15 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
         global $post;
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 			// admin has chosen "full description"
             // for the "Event Espresso - Events > Templates > Display Description" option
 			the_content();
-		} else if (( is_archive() && espresso_display_excerpt_in_event_list() ) ) {
-            if ( has_excerpt( $post->ID )) {
+		} else if ((is_archive() && espresso_display_excerpt_in_event_list())) {
+            if (has_excerpt($post->ID)) {
                 // admin has chosen "excerpt (short desc)"
                 // for the "Event Espresso - Events > Templates > Display Description" option
                 // AND an excerpt actually exists
@@ -164,20 +164,20 @@ 
                 // admin has chosen "excerpt (short desc)"
                 // for the "Event Espresso - Events > Templates > Display Description" option
                 // but NO excerpt actually exists, so we need to create one
-                if ( ! empty( $num_words )) {
-                    if ( empty( $more )) {
-                        $more_link_text = __( '(more…)' );
-                        $more = ' <a href="' . get_permalink() . '"';
+                if ( ! empty($num_words)) {
+                    if (empty($more)) {
+                        $more_link_text = __('(more&hellip;)');
+                        $more = ' <a href="'.get_permalink().'"';
                         $more .= ' class="more-link"';
                         $more .= \EED_Events_Archive::link_target();
-                        $more .= '>' . $more_link_text . '</a>';
-                        $more = apply_filters( 'the_content_more_link', $more, $more_link_text );
+                        $more .= '>'.$more_link_text.'</a>';
+                        $more = apply_filters('the_content_more_link', $more, $more_link_text);
                     }
-                    $content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+                    $content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-                    $content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+                    $content = wp_trim_words($content, $num_words, ' ').$more;
                 } else {
-                    $content =  get_the_content();
+                    $content = get_the_content();
                 }
                 global $allowedtags;
                 // make sure links are allowed
@@ -191,15 +191,15 @@ 
                 // but get previous value so we can reset it
                 $prev_value = $allowedtags['a']['target'];
                 $allowedtags['a']['target'] = true;
-                $content = wp_kses( $content, $allowedtags );
-                $content = strip_shortcodes( $content );
-                echo apply_filters( 'the_content', $content );
+                $content = wp_kses($content, $allowedtags);
+                $content = strip_shortcodes($content);
+                echo apply_filters('the_content', $content);
                 $allowedtags['a']['target'] = $prev_value;
             }
         } else {
             // admin has chosen "none"
             // for the "Event Espresso - Events > Templates > Display Description" option
-            echo apply_filters( 'the_content', '' );
+            echo apply_filters('the_content', '');
 		}
 		return ob_get_clean();
 	}
@@ -213,13 +213,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	EE_Ticket[]
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -235,17 +235,17 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url )
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url)
                                             . '" rel="tag"'
                                             . \EED_Events_Archive::link_target()
                                             .'>'
@@ -255,7 +255,7 @@ 
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -269,10 +269,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -286,10 +286,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -303,10 +303,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -320,10 +320,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_latest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_latest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -335,13 +335,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime( 'DTT_EVT_start', 'M' );?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime('DTT_EVT_start', 'M'); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -356,17 +356,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -381,17 +381,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -406,17 +406,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -431,17 +431,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -459,17 +459,17 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === null){
-			if($event instanceof EE_Event && $event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === null) {
+			if ($event instanceof EE_Event && $event->is_expired()) {
 				$include_expired = true;
-			}else{
+			} else {
 				$include_expired = false;
 			}
 		}
 
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -485,11 +485,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -503,10 +503,10 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -523,26 +523,26 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link_text = ! empty( $link ) ? $link : __('edit this event');
+				$link_text = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" ';
-				$link .= ' title="' . esc_attr( $post_type_obj->labels->edit_item ) . '"';
+				$link = '<a class="post-edit-link" href="'.$url.'" ';
+				$link .= ' title="'.esc_attr($post_type_obj->labels->edit_item).'"';
 				$link .= \EED_Events_Archive::link_target();
-				$link .='>' . $link_text . '</a>';
+				$link .= '>'.$link_text.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';