eventespresso / event-espresso-core

espresso.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
+    if ( ! function_exists('espresso_duplicate_plugin_error')) {
         /**
          *    espresso_duplicate_plugin_error
          *    displays if more than one version of EE is activated at the same time
@@ -62,7 +62,7 @@ 
     add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
     define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+    if ( ! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
         /**
          * espresso_minimum_php_version_error
          *
@@ -116,11 +116,11 @@ 
 
         register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
+        require_once __DIR__.'/core/bootstrap_espresso.php';
         bootstrap_espresso();
     }
 }
-if (! function_exists('espresso_deactivate_plugin')) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
     /**
      *    deactivate_plugin
      * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -131,8 +131,8 @@ 
      */
     function espresso_deactivate_plugin($plugin_basename = '')
     {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if ( ! function_exists('deactivate_plugins')) {
+            require_once ABSPATH.'wp-admin/includes/plugin.php';
         }
         unset($_GET['activate'], $_REQUEST['activate']);
         deactivate_plugins($plugin_basename);

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.38.rc.000');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.38.rc.000');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
\ No newline at end of file

core/domain/EnqueueAssetsInterface.php

Indentation +35 added lines, -35 removed lines

@@ -4,45 +4,45 @@
 interface EnqueueAssetsInterface
 {
 
-    /**
-     * a place to register scripts and stylesheets with WordPress core
-     * IMPORTANT !!!
-     * ALL JavaScript files need to be registered for loading in the footer
-     * by setting the 5th parameter of wp_register_script() to ` true `
-     *
-     * @return void
-     */
-    public function registerScriptsAndStylesheets();
+	/**
+	 * a place to register scripts and stylesheets with WordPress core
+	 * IMPORTANT !!!
+	 * ALL JavaScript files need to be registered for loading in the footer
+	 * by setting the 5th parameter of wp_register_script() to ` true `
+	 *
+	 * @return void
+	 */
+	public function registerScriptsAndStylesheets();
 
-    /**
-     * a place to enqueue previously registered stylesheets
-     * this will be called during the wp_enqueue_scripts hook for frontend requests
-     *
-     * @return void
-     */
-    public function enqueueStylesheets();
+	/**
+	 * a place to enqueue previously registered stylesheets
+	 * this will be called during the wp_enqueue_scripts hook for frontend requests
+	 *
+	 * @return void
+	 */
+	public function enqueueStylesheets();
 
-    /**
-     * a place to enqueue previously registered stylesheets
-     * this will be called during the admin_enqueue_scripts hook for admin requests
-     *
-     * @return void
-     */
-    public function enqueueAdminStylesheets();
+	/**
+	 * a place to enqueue previously registered stylesheets
+	 * this will be called during the admin_enqueue_scripts hook for admin requests
+	 *
+	 * @return void
+	 */
+	public function enqueueAdminStylesheets();
 
-    /**
-     * a place to enqueue previously registered scripts for frontend requests
-     *
-     * @return void
-     */
-    public function enqueueScripts();
+	/**
+	 * a place to enqueue previously registered scripts for frontend requests
+	 *
+	 * @return void
+	 */
+	public function enqueueScripts();
 
-    /**
-     * a place to enqueue previously registered scripts for admin requests
-     *
-     * @return void
-     */
-    public function enqueueAdminScripts();
+	/**
+	 * a place to enqueue previously registered scripts for admin requests
+	 *
+	 * @return void
+	 */
+	public function enqueueAdminScripts();
 }
 // End of file EnqueueAssetsInterface.php
 // Location: EventEspresso\core\domain/EnqueueAssetsInterface.php

admin_pages/messages/help_tabs/messages_overview_types.help_tab.php

Indentation +18 added lines, -18 removed lines

@@ -1,15 +1,15 @@ 
 <p><strong><?php esc_html_e('Message Types', 'event_espresso'); ?></strong></p>
 <p>
     <?php
-    printf(
-        esc_html__(
-            'Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:',
-            'event_espresso'
-        ),
-        '<em>',
-        '</em>'
-    );
-    ?>
+	printf(
+		esc_html__(
+			'Messages are email notifications that are sent out by Event Espresso. Message Types are the %1$skinds%2$s of messages that get delivered.  They can be thought of as the "type" of package that is being delivered by the messenger. For example, Event Espresso comes with two Message Types attached to the Email Messenger:',
+			'event_espresso'
+		),
+		'<em>',
+		'</em>'
+	);
+	?>
 </p>
 <ul>
     <li>
@@ -24,20 +24,20 @@ 
 <p><strong><?php esc_html_e('Contexts', 'event_espresso'); ?></strong></p>
 <p>
     <?php esc_html_e(
-        'Each Message Type (kind of message) has different contexts. Contexts are dynamic and typically represent recipients (individuals receiving email notifications). For example, when the Registration Confirmation message type is triggered, it will send out a message to the following recipients: Event Administrator, Primary Registrant, and Additional Registrants. On the other hand, the Payment Message Type has only two recipients: Event Administrator and Primary Registrant.',
-        'event_espresso'
-    ); ?>
+		'Each Message Type (kind of message) has different contexts. Contexts are dynamic and typically represent recipients (individuals receiving email notifications). For example, when the Registration Confirmation message type is triggered, it will send out a message to the following recipients: Event Administrator, Primary Registrant, and Additional Registrants. On the other hand, the Payment Message Type has only two recipients: Event Administrator and Primary Registrant.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'A message context can be deactivated by removing a recipient from the "TO" field. This will set the field to blank and you can save changes. Deactivated message contexts will appear in grey when viewed in the Messages Overview tab. To re-activate a message context, go to that message context and setup a recipient (using one of the available shortcodes) and save changes. This will reactivate the message context and it will appear as blue in the Messages Overview tab.',
-        'event_espresso'
-    ); ?>
+		'A message context can be deactivated by removing a recipient from the "TO" field. This will set the field to blank and you can save changes. Deactivated message contexts will appear in grey when viewed in the Messages Overview tab. To re-activate a message context, go to that message context and setup a recipient (using one of the available shortcodes) and save changes. This will reactivate the message context and it will appear as blue in the Messages Overview tab.',
+		'event_espresso'
+	); ?>
 </p>
 <p><strong><?php esc_html_e('Activation / Deactivation of Message Types', 'event_espresso'); ?></strong></p>
 <p>
     <?php esc_html_e(
-        'When a new install of Event Espresso is activated, all message types will be activated except for those for Cancelled and Declined registrations. The message types for Cancelled and Declined registrations can be easily activated through the Settings tab for Messages. Deactivating and re-activating Event Espresso will keep the current settings saved.',
-        'event_espresso'
-    ); ?>
+		'When a new install of Event Espresso is activated, all message types will be activated except for those for Cancelled and Declined registrations. The message types for Cancelled and Declined registrations can be easily activated through the Settings tab for Messages. Deactivating and re-activating Event Espresso will keep the current settings saved.',
+		'event_espresso'
+	); ?>
 </p>

admin_pages/payments/help_tabs/payment_methods_overview.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
                 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
                 'event_espresso'
             ),
-            '<img src="' . admin_url('images/media-button-image.gif') . '">'
+            '<img src="'.admin_url('images/media-button-image.gif').'">'
         );
         ?>
     </li>

Indentation +37 added lines, -37 removed lines

@@ -12,62 +12,62 @@ 
         <strong><?php esc_html_e('Name', 'event_espresso'); ?></strong>
         <br>
         <?php esc_html_e(
-            'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.',
-            'event_espresso'
-        ); ?>
+			'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Description', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.',
-            'event_espresso'
-        ); ?>
+			'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Admin-Only Name', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'The name of the payment method as seen internally by site administrators and staff.',
-            'event_espresso'
-        ); ?>
+			'The name of the payment method as seen internally by site administrators and staff.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Admin-Only Description', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'The description of the payment method as seen internally by site administrators and staff.',
-            'event_espresso'
-        ); ?>
+			'The description of the payment method as seen internally by site administrators and staff.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Debug (sandbox) Mode', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.',
-            'event_espresso'
-        ); ?>
+			'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Open by Default', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)',
-            'event_espresso'
-        ); ?>
+			'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)',
+			'event_espresso'
+		); ?>
     </li>
     <li>
         <strong><?php esc_html_e('Button URL', 'event_espresso'); ?></strong>
         <br />
         <?php
-        printf(
-            esc_html__(
-                'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
-                'event_espresso'
-            ),
-            '<img src="' . admin_url('images/media-button-image.gif') . '">'
-        );
-        ?>
+		printf(
+			esc_html__(
+				'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.',
+				'event_espresso'
+			),
+			'<img src="' . admin_url('images/media-button-image.gif') . '">'
+		);
+		?>
     </li>
     <li><strong><?php esc_html_e('Usable From', 'event_espresso'); ?></strong>
         <br />
@@ -75,15 +75,15 @@ 
         <ul>
             <li>
                 <?php esc_html_e(
-                    'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.',
-                    'event_espresso'
-                ); ?>
+					'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.',
+					'event_espresso'
+				); ?>
             </li>
             <li>
                 <?php esc_html_e(
-                    'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.',
-                    'event_espresso'
-                ); ?>
+					'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.',
+					'event_espresso'
+				); ?>
             </li>
         </ul>
     </li>
@@ -91,14 +91,14 @@ 
 <strong><?php esc_html_e('Recommendations', 'event_espresso'); ?></strong>
 <br />
 <?php esc_html_e(
-    'To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
-    'event_espresso'
+	'To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
+	'event_espresso'
 ); ?>
 <p>
     <strong><?php esc_html_e('Screen Options', 'event_espresso'); ?></strong>
     <br />
     <?php esc_html_e(
-        'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
-        'event_espresso'
-    ); ?>
+		'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
+		'event_espresso'
+	); ?>
 </p>
\ No newline at end of file

core/libraries/shortcodes/EE_Datetime_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
     private function _get_datetimes_from_event(EE_Event $event)
     {
         return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
+            ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs']
             : [];
     }
 
@@ -182,7 +182,7 @@ 
     private function _get_datetimes_from_ticket(EE_Ticket $ticket)
     {
         return isset($this->_extra_data['data']->tickets)
-            ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
+            ? $this->_extra_data['data']->tickets[$ticket->ID()]['dtt_objs']
             : [];
     }
 }

Indentation +164 added lines, -164 removed lines

@@ -18,168 +18,168 @@
  */
 class EE_Datetime_List_Shortcodes extends EE_Shortcodes
 {
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Datetime List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to datetime lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[DATETIME_LIST]' => esc_html__(
-                'Will output a list of datetimes according to the layout specified in the datetime list field.',
-                'event_espresso'
-            ),
-        ];
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[DATETIME_LIST]':
-                return $this->_get_datetime_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetime_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Ticket) {
-            return $this->_get_datetime_list_for_ticket();
-        }
-        if ($this->_data['data'] instanceof EE_Event) {
-            return $this->_get_datetime_list_for_event();
-        }
-        if (
-            $this->_data['data'] instanceof EE_Messages_Addressee
-            && $this->_data['data']->reg_obj instanceof EE_Registration
-        ) {
-            return $this->_get_datetime_list_for_registration();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * return parsed list of datetimes for an event
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetime_list_for_event()
-    {
-        $event            = $this->_data['data'];
-        $valid_shortcodes = ['datetime', 'attendee'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
-            ? $this->_data['template']['datetime_list']
-            : $this->_extra_data['template']['datetime_list'];
-
-        // here we're setting up the datetimes for the datetime list template for THIS event.
-        $dtt_parsed = '';
-        $datetimes  = $this->_get_datetimes_from_event($event);
-
-        // each datetime in this case should be an datetime object.
-        foreach ($datetimes as $datetime) {
-            $dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
-                $template,
-                $datetime,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $dtt_parsed;
-    }
-
-
-    /**
-     * return parsed list of datetimes for an ticket
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    private function _get_datetime_list_for_ticket()
-    {
-        $valid_shortcodes = ['datetime', 'attendee'];
-
-        $template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
-            ? $this->_data['template']['datetime_list']
-            : $this->_extra_data['template']['datetime_list'];
-        $ticket   = $this->_data['data'];
-
-        // here we're setting up the datetimes for the datetime list template for THIS ticket.
-        $dtt_parsed = '';
-        $datetimes  = $this->_get_datetimes_from_ticket($ticket);
-
-        // each datetime in this case should be an datetime object.
-        foreach ($datetimes as $datetime) {
-            $dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
-                $template,
-                $datetime,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $dtt_parsed;
-    }
-
-
-    /**
-     * return parsed list of datetimes from a given registration.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    private function _get_datetime_list_for_registration()
-    {
-        $registration = $this->_data['data']->reg_obj;
-
-        // now let's just get the ticket, set $this->_data['data'] to the ticket and then call _get_datetime_list_for__ticket();
-        $this->_data['data'] = $registration->ticket();
-        return $this->_get_datetime_list_for_ticket();
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return array|mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetimes_from_event(EE_Event $event)
-    {
-        return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
-            : [];
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return array|mixed
-     * @throws EE_Error
-     */
-    private function _get_datetimes_from_ticket(EE_Ticket $ticket)
-    {
-        return isset($this->_extra_data['data']->tickets)
-            ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
-            : [];
-    }
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Datetime List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to datetime lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[DATETIME_LIST]' => esc_html__(
+				'Will output a list of datetimes according to the layout specified in the datetime list field.',
+				'event_espresso'
+			),
+		];
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[DATETIME_LIST]':
+				return $this->_get_datetime_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetime_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Ticket) {
+			return $this->_get_datetime_list_for_ticket();
+		}
+		if ($this->_data['data'] instanceof EE_Event) {
+			return $this->_get_datetime_list_for_event();
+		}
+		if (
+			$this->_data['data'] instanceof EE_Messages_Addressee
+			&& $this->_data['data']->reg_obj instanceof EE_Registration
+		) {
+			return $this->_get_datetime_list_for_registration();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * return parsed list of datetimes for an event
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetime_list_for_event()
+	{
+		$event            = $this->_data['data'];
+		$valid_shortcodes = ['datetime', 'attendee'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
+			? $this->_data['template']['datetime_list']
+			: $this->_extra_data['template']['datetime_list'];
+
+		// here we're setting up the datetimes for the datetime list template for THIS event.
+		$dtt_parsed = '';
+		$datetimes  = $this->_get_datetimes_from_event($event);
+
+		// each datetime in this case should be an datetime object.
+		foreach ($datetimes as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
+				$template,
+				$datetime,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $dtt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of datetimes for an ticket
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	private function _get_datetime_list_for_ticket()
+	{
+		$valid_shortcodes = ['datetime', 'attendee'];
+
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
+			? $this->_data['template']['datetime_list']
+			: $this->_extra_data['template']['datetime_list'];
+		$ticket   = $this->_data['data'];
+
+		// here we're setting up the datetimes for the datetime list template for THIS ticket.
+		$dtt_parsed = '';
+		$datetimes  = $this->_get_datetimes_from_ticket($ticket);
+
+		// each datetime in this case should be an datetime object.
+		foreach ($datetimes as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
+				$template,
+				$datetime,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $dtt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of datetimes from a given registration.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	private function _get_datetime_list_for_registration()
+	{
+		$registration = $this->_data['data']->reg_obj;
+
+		// now let's just get the ticket, set $this->_data['data'] to the ticket and then call _get_datetime_list_for__ticket();
+		$this->_data['data'] = $registration->ticket();
+		return $this->_get_datetime_list_for_ticket();
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return array|mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetimes_from_event(EE_Event $event)
+	{
+		return isset($this->_extra_data['data']->events)
+			? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
+			: [];
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return array|mixed
+	 * @throws EE_Error
+	 */
+	private function _get_datetimes_from_ticket(EE_Ticket $ticket)
+	{
+		return isset($this->_extra_data['data']->tickets)
+			? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
+			: [];
+	}
 }

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
     private function _get_tickets_from_event(EE_Event $event)
     {
         return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
+            ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs']
             : [];
     }
 
@@ -216,7 +216,7 @@ 
     private function _get_ticket_list_from_registration(EE_Registration $registration)
     {
         return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
+            ? [$this->_extra_data['data']->registrations[$registration->ID()]['tkt_obj']]
             : [];
     }
 }

Indentation +204 added lines, -204 removed lines

@@ -18,208 +18,208 @@
  */
 class EE_Ticket_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Ticket List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to ticket lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[TICKET_LIST]' => esc_html__('Will output a list of tickets', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[TICKET_LIST]':
-                return $this->_get_ticket_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_ticket_list_for_main();
-        }
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_ticket_list_for_attendee();
-        }
-        if ($this->_data['data'] instanceof EE_Event) {
-            return $this->_get_ticket_list_for_event();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * This returns the parsed ticket list for main template;
-     */
-    private function _get_ticket_list_for_main()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'event_list',
-            'attendee_list',
-            'datetime_list',
-            'attendee',
-            'line_item_list',
-            'primary_registration_details',
-            'recipient_details',
-        ];
-        $template         = $this->_data['template'];
-        $data             = $this->_data['data'];
-        $ticket_list      = '';
-
-
-        // now we need to loop through the ticket list and send data to the EE_Parser helper.
-        foreach ($data->tickets as $ticket) {
-            $ticket_list .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket['ticket'],
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $ticket_list;
-    }
-
-
-    /**
-     * return parsed list of tickets for an event
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_for_event()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'attendee_list',
-            'datetime_list',
-            'attendee',
-            'venue',
-            'line_item_list',
-            'primary_registration_details',
-            'recipient_details',
-        ];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
-            ? $this->_data['template']['ticket_list']
-            : $this->_extra_data['template']['ticket_list'];
-        $event            = $this->_data['data'];
-
-        // let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
-        $template = str_replace('[EVENT_LIST]', '', $template);
-
-        // here we're setting up the tickets for the ticket list template for THIS event.
-        $tkt_parsed = '';
-        $tickets    = $this->_get_tickets_from_event($event);
-
-        // each ticket in this case should be an ticket object.
-        foreach ($tickets as $ticket) {
-            $tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $tkt_parsed;
-    }
-
-
-    /**
-     * return parsed list of tickets for an attendee
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_for_attendee()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'event_list',
-            'datetime_list',
-            'attendee',
-            'primary_registration_details',
-            'recipient_details',
-        ];
-
-        $template     = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
-            ? $this->_data['template']['ticket_list']
-            : $this->_extra_data['template']['ticket_list'];
-        $registration = $this->_data['data'];
-
-        // let's remove any existing [ATTENDEE_LIST] shortcode from the ticket list template so that we don't get recursion.
-        $template = str_replace('[ATTENDEE_LIST]', '', $template);
-
-        // here we're setting up the tickets for the ticket list template for THIS attendee.
-        $tkt_parsed = '';
-        $tickets    = $this->_get_ticket_list_from_registration($registration);
-
-        // each ticket in this case should be an ticket object.
-        foreach ($tickets as $ticket) {
-            $tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $tkt_parsed;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_tickets_from_event(EE_Event $event)
-    {
-        return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
-            : [];
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_from_registration(EE_Registration $registration)
-    {
-        return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
-            : [];
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Ticket List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to ticket lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[TICKET_LIST]' => esc_html__('Will output a list of tickets', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[TICKET_LIST]':
+				return $this->_get_ticket_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_ticket_list_for_main();
+		}
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_ticket_list_for_attendee();
+		}
+		if ($this->_data['data'] instanceof EE_Event) {
+			return $this->_get_ticket_list_for_event();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * This returns the parsed ticket list for main template;
+	 */
+	private function _get_ticket_list_for_main()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'event_list',
+			'attendee_list',
+			'datetime_list',
+			'attendee',
+			'line_item_list',
+			'primary_registration_details',
+			'recipient_details',
+		];
+		$template         = $this->_data['template'];
+		$data             = $this->_data['data'];
+		$ticket_list      = '';
+
+
+		// now we need to loop through the ticket list and send data to the EE_Parser helper.
+		foreach ($data->tickets as $ticket) {
+			$ticket_list .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket['ticket'],
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $ticket_list;
+	}
+
+
+	/**
+	 * return parsed list of tickets for an event
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_for_event()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'attendee_list',
+			'datetime_list',
+			'attendee',
+			'venue',
+			'line_item_list',
+			'primary_registration_details',
+			'recipient_details',
+		];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
+			? $this->_data['template']['ticket_list']
+			: $this->_extra_data['template']['ticket_list'];
+		$event            = $this->_data['data'];
+
+		// let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
+		$template = str_replace('[EVENT_LIST]', '', $template);
+
+		// here we're setting up the tickets for the ticket list template for THIS event.
+		$tkt_parsed = '';
+		$tickets    = $this->_get_tickets_from_event($event);
+
+		// each ticket in this case should be an ticket object.
+		foreach ($tickets as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $tkt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of tickets for an attendee
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_for_attendee()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'event_list',
+			'datetime_list',
+			'attendee',
+			'primary_registration_details',
+			'recipient_details',
+		];
+
+		$template     = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
+			? $this->_data['template']['ticket_list']
+			: $this->_extra_data['template']['ticket_list'];
+		$registration = $this->_data['data'];
+
+		// let's remove any existing [ATTENDEE_LIST] shortcode from the ticket list template so that we don't get recursion.
+		$template = str_replace('[ATTENDEE_LIST]', '', $template);
+
+		// here we're setting up the tickets for the ticket list template for THIS attendee.
+		$tkt_parsed = '';
+		$tickets    = $this->_get_ticket_list_from_registration($registration);
+
+		// each ticket in this case should be an ticket object.
+		foreach ($tickets as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $tkt_parsed;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_tickets_from_event(EE_Event $event)
+	{
+		return isset($this->_extra_data['data']->events)
+			? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
+			: [];
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_from_registration(EE_Registration $registration)
+	{
+		return isset($this->_extra_data['data']->registrations)
+			? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
+			: [];
+	}
 }

core/libraries/shortcodes/EE_Event_List_Shortcodes.lib.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
     private function _get_events_from_registration(EE_Registration $registration)
     {
         return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
+            ? [$this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']]
             : [];
     }
 }

Indentation +152 added lines, -152 removed lines

@@ -18,156 +18,156 @@
  */
 class EE_Event_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Event List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to event lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[EVENT_LIST]' => esc_html__('Will output a list of events', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[EVENT_LIST]':
-                return $this->_get_event_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_event_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_event_list_for_main();
-        }
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_event_list_for_registration();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * This returns the parsed event list for main template
-     *
-     * @return string
-     */
-    private function _get_event_list_for_main()
-    {
-
-        $valid_shortcodes = [
-            'event',
-            'attendee_list',
-            'ticket_list',
-            'datetime_list',
-            'venue',
-            'attendee',
-            'recipient_list',
-            'recipient_details',
-            'primary_registration_list',
-            'primary_registration_details',
-            'event_author',
-            'organization',
-        ];
-        $template         = $this->_data['template'];
-        $data             = $this->_data['data'];
-        $events           = '';
-
-        // now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
-        foreach ($data->events as $event) {
-            $events .= $this->_shortcode_helper->parse_event_list_template(
-                $template,
-                $event['event'],
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-        return $events;
-    }
-
-
-    /**
-     * This returns the parsed event list for an attendee
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_event_list_for_registration()
-    {
-        $valid_shortcodes = [
-            'event',
-            'ticket_list',
-            'datetime_list',
-            'attendee',
-            'event_author',
-            'recipient_details',
-            'recipient_list',
-            'venue',
-            'organization',
-        ];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['event_list'])
-            ? $this->_data['template']['event_list']
-            : $this->_extra_data['template']['event_list'];
-        $registration     = $this->_data['data'];
-
-        // let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
-        $template = str_replace('[ATTENDEE_LIST]', '', $template);
-
-        // here we're setting up the events for the event_list template for THIS registration.
-        $all_events = $this->_get_events_from_registration($registration);
-
-        // we're NOT going to prepare a list of attendees this time around
-        $events = '';
-
-        foreach ($all_events as $event) {
-            $events .= $this->_shortcode_helper->parse_event_list_template(
-                $template,
-                $event,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $events;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_events_from_registration(EE_Registration $registration)
-    {
-        return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
-            : [];
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Event List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to event lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[EVENT_LIST]' => esc_html__('Will output a list of events', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[EVENT_LIST]':
+				return $this->_get_event_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_event_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_event_list_for_main();
+		}
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_event_list_for_registration();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * This returns the parsed event list for main template
+	 *
+	 * @return string
+	 */
+	private function _get_event_list_for_main()
+	{
+
+		$valid_shortcodes = [
+			'event',
+			'attendee_list',
+			'ticket_list',
+			'datetime_list',
+			'venue',
+			'attendee',
+			'recipient_list',
+			'recipient_details',
+			'primary_registration_list',
+			'primary_registration_details',
+			'event_author',
+			'organization',
+		];
+		$template         = $this->_data['template'];
+		$data             = $this->_data['data'];
+		$events           = '';
+
+		// now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
+		foreach ($data->events as $event) {
+			$events .= $this->_shortcode_helper->parse_event_list_template(
+				$template,
+				$event['event'],
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+		return $events;
+	}
+
+
+	/**
+	 * This returns the parsed event list for an attendee
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_event_list_for_registration()
+	{
+		$valid_shortcodes = [
+			'event',
+			'ticket_list',
+			'datetime_list',
+			'attendee',
+			'event_author',
+			'recipient_details',
+			'recipient_list',
+			'venue',
+			'organization',
+		];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['event_list'])
+			? $this->_data['template']['event_list']
+			: $this->_extra_data['template']['event_list'];
+		$registration     = $this->_data['data'];
+
+		// let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
+		$template = str_replace('[ATTENDEE_LIST]', '', $template);
+
+		// here we're setting up the events for the event_list template for THIS registration.
+		$all_events = $this->_get_events_from_registration($registration);
+
+		// we're NOT going to prepare a list of attendees this time around
+		$events = '';
+
+		foreach ($all_events as $event) {
+			$events .= $this->_shortcode_helper->parse_event_list_template(
+				$template,
+				$event,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $events;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_events_from_registration(EE_Registration $registration)
+	{
+		return isset($this->_extra_data['data']->registrations)
+			? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
+			: [];
+	}
 }

payment_methods/Bank/templates/bank_intro.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 esc_html_e(
-    'Bank is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a bank transfer.',
-    'event_espresso'
+	'Bank is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a bank transfer.',
+	'event_espresso'
 );

payment_methods/Check/templates/check_intro.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 esc_html_e(
-    'Check is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a check.',
-    'event_espresso'
+	'Check is an offline payment method for accepting payments. Payments are processed manually by providing your registrants/attendees with information on how to pay with a check.',
+	'event_espresso'
 );