eventespresso / event-espresso-core

modules/single_page_checkout/reg_steps/attendee_information/copy_attendee_info.template.php

Indentation +22 added lines, -22 removed lines

@@ -3,9 +3,9 @@ 
     <p class="spco-copy-all-attendee-pg">
         <label class="ee-checkbox-label-before ee-checkbox-label-wide">
             <?php _e(
-                'Use Attendee #1\'s information for ALL attendees',
-                'event_espresso'
-            ); ?>
+				'Use Attendee #1\'s information for ALL attendees',
+				'event_espresso'
+			); ?>
             <input id="spco-copy-all-attendee-chk" class="spco-copy-all-attendee-chk ee-do-not-validate" type="checkbox"
                    value="copy-all">
         </label>
@@ -13,23 +13,23 @@ 
 
     <p class="spco-copy-attendee-pg">
         <?php echo apply_filters(
-            'FHEE__registration_page_attendee_information__copy_attendee_pg',
-            sprintf(
-                __(
-                    'This option allows you to use the above information for all additional attendee question fields. %sPlease note:%s some events may have additional questions that you may still be required to answer in order to complete your registration.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            )
-        ); ?></p>
+			'FHEE__registration_page_attendee_information__copy_attendee_pg',
+			sprintf(
+				__(
+					'This option allows you to use the above information for all additional attendee question fields. %sPlease note:%s some events may have additional questions that you may still be required to answer in order to complete your registration.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			)
+		); ?></p>
 
     <a id="display-more-attendee-copy-options" class="display-the-hidden smaller-text float-right"
        rel="more-attendee-copy-options"><span class="dashicons dashicons-arrow-right"></span>
         <?php _e(
-            'advanced copy options',
-            'event_espresso'
-        ); ?></a>
+			'advanced copy options',
+			'event_espresso'
+		); ?></a>
     <a id="hide-more-attendee-copy-options" class="hide-the-displayed smaller-text float-right"
        rel="more-attendee-copy-options" style="display: none;"><span
             class="dashicons dashicons-arrow-down"></span><?php _e('basic copy options', 'event_espresso'); ?></a>
@@ -38,15 +38,15 @@ 
 
         <p class="spco-copy-attendee-pg">
             <?php _e(
-                'Only copy the above information to the following selected additional attendees.',
-                'event_espresso'
-            ); ?>
+				'Only copy the above information to the following selected additional attendees.',
+				'event_espresso'
+			); ?>
         </p>
 
         <?php
-        foreach ($spco_copy_attendee_chk as $spco_copy_chk) {
-            echo $spco_copy_chk;
-        } ?>
+		foreach ($spco_copy_attendee_chk as $spco_copy_chk) {
+			echo $spco_copy_chk;
+		} ?>
 
     </div>
     <div class="clear-float"></div>

modules/single_page_checkout/reg_steps/attendee_information/auto_copy_attendee_info.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@
 <p id="spco-auto-copy-attendee-pg" class="smaller-text lt-grey-text">
     <?php echo apply_filters(
-        'FHEE__registration_page_attendee_information__auto_copy_attendee_pg',
-        __(
-            'The above information will be used for any additional tickets/attendees.',
-            'event_espresso'
-        )
-    ); ?>
+		'FHEE__registration_page_attendee_information__auto_copy_attendee_pg',
+		__(
+			'The above information will be used for any additional tickets/attendees.',
+			'event_espresso'
+		)
+	); ?>
 </p>
\ No newline at end of file

modules/single_page_checkout/reg_steps/attendee_information/attendee_info_main.template.php

Indentation +32 added lines, -32 removed lines

@@ -5,16 +5,16 @@ 
 ?>
 <p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text">
     <?php echo apply_filters(
-        'FHEE__registration_page_attendee_information__attendee_information_pg',
-        sprintf(
-            __(
-                'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
-                'event_espresso'
-            ),
-            '<br />',
-            '<span class="asterisk">*</span>'
-        )
-    ); ?>
+		'FHEE__registration_page_attendee_information__attendee_information_pg',
+		sprintf(
+			__(
+				'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
+				'event_espresso'
+			),
+			'<br />',
+			'<span class="asterisk">*</span>'
+		)
+	); ?>
 </p>
 
 <?php
@@ -23,10 +23,10 @@ 
 $prev_ticket = 0;
 
 if (count($registrations) > 0) {
-    foreach ($registrations as $registration) {
-        if ($registration instanceof EE_Registration) {
-            $att_nmbr++;
-            ?>
+	foreach ($registrations as $registration) {
+		if ($registration instanceof EE_Registration) {
+			$att_nmbr++;
+			?>
 
             <div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link(); ?>"
                  class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID(); ?>">
@@ -46,19 +46,19 @@ 
                                     <th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
                                     <th scope="col" width="7.5%" class="jst-rght">
                                         <?php _e(
-                                            'Qty',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Qty',
+											'event_espresso'
+										); ?></th>
                                     <th scope="col" width="17.5%" class="jst-rght">
                                         <?php _e(
-                                            'Price',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Price',
+											'event_espresso'
+										); ?></th>
                                     <th scope="col" width="17.5%" class="jst-rght">
                                         <?php _e(
-                                            'Total',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Total',
+											'event_espresso'
+										); ?></th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -70,19 +70,19 @@ 
                 <?php } ?>
 
                 <?php
-                // ATTENDEE QUESTIONS
-                $reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link());
-                echo ${$reg_form};
-                ?>
+				// ATTENDEE QUESTIONS
+				$reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link());
+				echo ${$reg_form};
+				?>
 
             </div>
             <?php
-            $prev_event = $registration->event()->ID();
-            $prev_ticket = $registration->ticket()->ID();
-        } // if ( $registration instanceof EE_Registration )
-    } // end foreach ( $registrations as $registration )
+			$prev_event = $registration->event()->ID();
+			$prev_ticket = $registration->ticket()->ID();
+		} // if ( $registration instanceof EE_Registration )
+	} // end foreach ( $registrations as $registration )
 
-    echo $default_hidden_inputs;
+	echo $default_hidden_inputs;
 } // end if ( count( $registrations ) > 0 )
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
                     </h4>
                 <?php } ?>
                 <?php if ($registration->ticket()->ID() !== $prev_ticket) { ?>
-                    <?php if (! $revisit) { ?>
+                    <?php if ( ! $revisit) { ?>
                         <div class="spco-ticket-info-dv small-text">
                             <h5><?php _e('Details', 'event_espresso'); ?></h5>
                             <table>
@@ -62,7 +62,7 @@ 
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php echo $ticket_line_item[ $registration->ticket()->ID() ]; ?>
+                                <?php echo $ticket_line_item[$registration->ticket()->ID()]; ?>
                                 </tbody>
                             </table>
                         </div>

modules/single_page_checkout/templates/registration_page_wrapper.template.php

Indentation +48 added lines, -48 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <div id="ee-single-page-checkout-dv" class="">
     <?php
-    if (! $empty_cart) {
+    if ( ! $empty_cart) {
         if (apply_filters('FHEE__registration_page_wrapper_template__display_time_limit', false)) { ?>
             <p id="spco-registration-time-limit-pg" class="spco-steps-pg ee-attention important-notice"
                style="display: none;">
@@ -9,13 +9,13 @@ 
                         'FHEE__registration_page_wrapper_template___time_limit',
                         __('You have %1$s to complete your registration.', 'event_espresso')
                     ),
-                    '<span id="spco-registration-time-limit-spn" class="spco-registration-time-limit-spn">' . $registration_time_limit . '</span>'
+                    '<span id="spco-registration-time-limit-spn" class="spco-registration-time-limit-spn">'.$registration_time_limit.'</span>'
                 );
                 ?>
                 <span id="spco-registration-expiration-spn" class="" style="display:none;"></span>
             </p>
         <?php }
-        if (! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
+        if ( ! $revisit && apply_filters('FHEE__registration_page_wrapper_template__steps_display', true)) {
             ?>
             <h2 id="spco-steps-big-hdr" class="spco-steps-big-hdr"><?php _e(' Steps', 'event_espresso'); ?></h2>
 
@@ -61,7 +61,7 @@ 
         foreach ($reg_steps as $reg_step) {
             if ($reg_step instanceof EE_SPCO_Reg_Step && $reg_step->slug() != 'finalize_registration') {
                 $slug = $reg_step->slug();
-                do_action('AHEE__' . $slug . '__reg_step_start', $reg_step);
+                do_action('AHEE__'.$slug.'__reg_step_start', $reg_step);
                 // todo: deprecate hook AHEE__registration_page_attendee_information__start
                 ?>
                 <div id="spco-<?php echo $slug; ?>-dv" class="spco-step-dv <?php echo $reg_step->div_class(); ?>">

modules/invoice/EED_Invoice.module.php

Indentation +73 added lines, -73 removed lines

@@ -12,87 +12,87 @@
 {
 
 
-    /**
-     * @return EED_Invoice
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Invoice
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
 
 
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        EE_Config::register_route('download_invoice', 'EED_Invoice', 'download_invoice');
-        EE_Config::register_route('launch_invoice', 'EED_Invoice', 'launch_invoice');
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		EE_Config::register_route('download_invoice', 'EED_Invoice', 'download_invoice');
+		EE_Config::register_route('launch_invoice', 'EED_Invoice', 'launch_invoice');
+	}
 
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
 
 
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
-        } else {
-            $msg = __('The Invoice.class.php file could not be loaded.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-    }
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+		if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
+			require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+		} else {
+			$msg = __('The Invoice.class.php file could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+	}
 
 
-    /**
-     *    invoice_launch
-     *
-     * @access    public
-     * @return    void
-     */
-    public function launch_invoice()
-    {
-        $this->run(null);
-        if (EE_Registry::instance()->REQ->is_set('id')) {
-            $id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
-            $invoice = new Invoice($id);
-            $invoice->send_invoice();
-        }
-    }
+	/**
+	 *    invoice_launch
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function launch_invoice()
+	{
+		$this->run(null);
+		if (EE_Registry::instance()->REQ->is_set('id')) {
+			$id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
+			$invoice = new Invoice($id);
+			$invoice->send_invoice();
+		}
+	}
 
 
-    /**
-     *    download_invoice
-     *
-     * @access    public
-     * @return    void
-     */
-    public function download_invoice()
-    {
-        $this->run(null);
-        if (EE_Registry::instance()->REQ->is_set('id')) {
-            $id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
-            $invoice = new Invoice($_REQUEST['id']);
-            // send invoice but force download
-            $invoice->send_invoice(true);
-        }
-    }
+	/**
+	 *    download_invoice
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function download_invoice()
+	{
+		$this->run(null);
+		if (EE_Registry::instance()->REQ->is_set('id')) {
+			$id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
+			$invoice = new Invoice($_REQUEST['id']);
+			// send invoice but force download
+			$invoice->send_invoice(true);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
      */
     public function run($WP)
     {
-        if (is_readable(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php')) {
-            require_once(EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php');
+        if (is_readable(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php')) {
+            require_once(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php');
         } else {
             $msg = __('The Invoice.class.php file could not be loaded.', 'event_espresso');
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);

modules/venues_archive/EED_Venues_Archive.module.php

Indentation +172 added lines, -172 removed lines

@@ -29,176 +29,176 @@
 class EED_Venues_Archive extends EED_Module
 {
 
-    /**
-     * @return EED_Venues_Archive
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_hooks()
-    {
-        /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
-        $custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-        $custom_post_types = $custom_post_type_definitions->getDefinitions();
-        EE_Config::register_route(
-            $custom_post_types['espresso_venues']['plural_slug'],
-            'Venues_Archive',
-            'run'
-        );
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     * run - initial module setup
-     *
-     * @access    public
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-        // check what template is loaded
-        add_filter('template_include', array($this, 'template_include'), 999, 1);
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-    }
-
-
-    /**
-     * template_include
-     *
-     * @access public
-     * @param  string $template
-     * @return string
-     */
-    public function template_include($template)
-    {
-        // not a custom template?
-        if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)
-                                   ->get_selected_template() != 'archive-espresso_venues.php'
-        ) {
-            EEH_Template::load_espresso_theme_functions();
-            // then add extra event data via hooks
-            add_filter('the_title', array($this, 'the_title'), 100, 1);
-            // don't know if theme uses the_excerpt
-            add_filter('the_excerpt', array($this, 'venue_details'), 100);
-            // or the_content
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // don't display entry meta because the existing theme will take care of that
-            add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
-        }
-        return $template;
-    }
-
-
-    /**
-     * the_title
-     *
-     * @access public
-     * @param  string $title
-     * @return string
-     */
-    public function the_title($title = '')
-    {
-        return $title;
-    }
-
-
-    /**
-     *    venue_details
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_details($content)
-    {
-        global $post;
-        if ($post->post_type == 'espresso_venues'
-            && ! post_password_required()
-        ) {
-            // since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
-            // it uses the_content() for displaying the $post->post_content
-            // so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
-            // we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-            remove_filter('the_excerpt', array($this, 'venue_details'), 100);
-            remove_filter('the_content', array($this, 'venue_details'), 100);
-            // add filters we want
-            add_filter('the_content', array($this, 'venue_location'), 110);
-            add_filter('the_excerpt', array($this, 'venue_location'), 110);
-            // now load our template
-            $template = EEH_Template::locate_template('content-espresso_venues-details.php');
-            // now add our filter back in, plus some others
-            add_filter('the_excerpt', array($this, 'venue_details'), 100);
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // remove other filters we added so they won't get applied to the next post
-            remove_filter('the_content', array($this, 'venue_location'), 110);
-            remove_filter('the_excerpt', array($this, 'venue_location'), 110);
-            // we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-        }
-        return ! empty($template) ? $template : $content;
-    }
-
-
-    /**
-     * venue_location
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_location($content)
-    {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
-    }
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
-            // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            wp_enqueue_style($this->theme);
-        }
-    }
+	/**
+	 * @return EED_Venues_Archive
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_hooks()
+	{
+		/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
+		$custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+		$custom_post_types = $custom_post_type_definitions->getDefinitions();
+		EE_Config::register_route(
+			$custom_post_types['espresso_venues']['plural_slug'],
+			'Venues_Archive',
+			'run'
+		);
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 * run - initial module setup
+	 *
+	 * @access    public
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+		// check what template is loaded
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+	}
+
+
+	/**
+	 * template_include
+	 *
+	 * @access public
+	 * @param  string $template
+	 * @return string
+	 */
+	public function template_include($template)
+	{
+		// not a custom template?
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)
+								   ->get_selected_template() != 'archive-espresso_venues.php'
+		) {
+			EEH_Template::load_espresso_theme_functions();
+			// then add extra event data via hooks
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			// don't know if theme uses the_excerpt
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			// or the_content
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// don't display entry meta because the existing theme will take care of that
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
+		}
+		return $template;
+	}
+
+
+	/**
+	 * the_title
+	 *
+	 * @access public
+	 * @param  string $title
+	 * @return string
+	 */
+	public function the_title($title = '')
+	{
+		return $title;
+	}
+
+
+	/**
+	 *    venue_details
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_details($content)
+	{
+		global $post;
+		if ($post->post_type == 'espresso_venues'
+			&& ! post_password_required()
+		) {
+			// since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
+			// it uses the_content() for displaying the $post->post_content
+			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
+			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+			remove_filter('the_content', array($this, 'venue_details'), 100);
+			// add filters we want
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
+			// now load our template
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
+			// now add our filter back in, plus some others
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// remove other filters we added so they won't get applied to the next post
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
+			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
+		}
+		return ! empty($template) ? $template : $content;
+	}
+
+
+	/**
+	 * venue_location
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_location($content)
+	{
+		return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+	}
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
+			// first check theme folder
+			if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
+				wp_register_style(
+					$this->theme,
+					get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			} elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
+				wp_register_style(
+					$this->theme,
+					EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			wp_enqueue_style($this->theme);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -170,7 +170,7 @@ 
      */
     public function venue_location($content)
     {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+        return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
     }
 
 
@@ -185,16 +185,16 @@ 
         // get some style
         if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
             // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
+            if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
                 wp_register_style(
                     $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
+                    get_stylesheet_directory_uri().$this->theme.DS.'style.css',
                     array('dashicons', 'espresso_default')
                 );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
+            } elseif (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
                 wp_register_style(
                     $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
+                    EE_TEMPLATES_URL.$this->theme.DS.'style.css',
                     array('dashicons', 'espresso_default')
                 );
             }

modules/venue_single/EED_Venue_Single.module.php

Indentation +167 added lines, -167 removed lines

@@ -29,171 +29,171 @@
 class EED_Venue_Single extends EED_Module
 {
 
-    /**
-     * @return EED_Venue_Single
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_hooks()
-    {
-        /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
-        $custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-        $custom_post_types = $custom_post_type_definitions->getDefinitions();
-        EE_Config::register_route(
-            $custom_post_types['espresso_venues']['singular_slug'],
-            'Venue_Single',
-            'run'
-        );
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     * run - initial module setup
-     *
-     * @access    public
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-        // check what template is loaded
-        add_filter('template_include', array($this, 'template_include'), 999, 1);
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-    }
-
-
-    /**
-     * template_include
-     *
-     * @access public
-     * @param  string $template
-     * @return string
-     */
-    public function template_include($template)
-    {
-        // not a custom template?
-        if (EE_Registry::instance()
-                       ->load_core('Front_Controller', array(), false, true)
-                       ->get_selected_template() != 'single-espresso_venues.php'
-        ) {
-            EEH_Template::load_espresso_theme_functions();
-            // then add extra event data via hooks
-            add_filter('the_title', array($this, 'the_title'), 100, 1);
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // don't display entry meta because the existing theme will take car of that
-            add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
-        }
-        return $template;
-    }
-
-
-    /**
-     * the_title
-     *
-     * @access public
-     * @param  string $title
-     * @return string
-     */
-    public function the_title($title = '')
-    {
-        return $title;
-    }
-
-
-    /**
-     *    venue_details
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_details($content)
-    {
-        global $post;
-        if ($post->post_type == 'espresso_venues'
-            && ! post_password_required()
-        ) {
-            // since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
-            // it uses the_content() for displaying the $post->post_content
-            // so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
-            // we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-            remove_filter('the_content', array($this, 'venue_details'), 100);
-            // add filters we want
-            add_filter('the_content', array($this, 'venue_location'), 110);
-            // now load our template
-            $template = EEH_Template::locate_template('content-espresso_venues-details.php');
-            // remove other filters we added so they won't get applied to the next post
-            remove_filter('the_content', array($this, 'venue_location'), 110);
-        }
-        // we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-        return ! empty($template) ? $template : $content;
-    }
-
-
-    /**
-     * venue_location
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_location($content)
-    {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
-    }
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access public
-     * @return void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
-            // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            wp_enqueue_style($this->theme);
-            if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
-                add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
-            }
-        }
-    }
+	/**
+	 * @return EED_Venue_Single
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_hooks()
+	{
+		/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
+		$custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+		$custom_post_types = $custom_post_type_definitions->getDefinitions();
+		EE_Config::register_route(
+			$custom_post_types['espresso_venues']['singular_slug'],
+			'Venue_Single',
+			'run'
+		);
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 * run - initial module setup
+	 *
+	 * @access    public
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+		// check what template is loaded
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+	}
+
+
+	/**
+	 * template_include
+	 *
+	 * @access public
+	 * @param  string $template
+	 * @return string
+	 */
+	public function template_include($template)
+	{
+		// not a custom template?
+		if (EE_Registry::instance()
+					   ->load_core('Front_Controller', array(), false, true)
+					   ->get_selected_template() != 'single-espresso_venues.php'
+		) {
+			EEH_Template::load_espresso_theme_functions();
+			// then add extra event data via hooks
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// don't display entry meta because the existing theme will take car of that
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
+		}
+		return $template;
+	}
+
+
+	/**
+	 * the_title
+	 *
+	 * @access public
+	 * @param  string $title
+	 * @return string
+	 */
+	public function the_title($title = '')
+	{
+		return $title;
+	}
+
+
+	/**
+	 *    venue_details
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_details($content)
+	{
+		global $post;
+		if ($post->post_type == 'espresso_venues'
+			&& ! post_password_required()
+		) {
+			// since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
+			// it uses the_content() for displaying the $post->post_content
+			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
+			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
+			remove_filter('the_content', array($this, 'venue_details'), 100);
+			// add filters we want
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			// now load our template
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
+			// remove other filters we added so they won't get applied to the next post
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+		}
+		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
+		return ! empty($template) ? $template : $content;
+	}
+
+
+	/**
+	 * venue_location
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_location($content)
+	{
+		return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+	}
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
+			// first check theme folder
+			if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
+				wp_register_style(
+					$this->theme,
+					get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			} elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
+				wp_register_style(
+					$this->theme,
+					EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			wp_enqueue_style($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
+			}
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
      */
     public function venue_location($content)
     {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+        return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
     }
 
 
@@ -177,16 +177,16 @@ 
         // get some style
         if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
             // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
+            if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
                 wp_register_style(
                     $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
+                    get_stylesheet_directory_uri().$this->theme.DS.'style.css',
                     array('dashicons', 'espresso_default')
                 );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . DS . 'style.css')) {
+            } elseif (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
                 wp_register_style(
                     $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
+                    EE_TEMPLATES_URL.$this->theme.DS.'style.css',
                     array('dashicons', 'espresso_default')
                 );
             }

modules/batch/EED_Batch.module.php

Spacing +8 added lines, -8 removed lines

@@ -124,7 +124,7 @@ 
         $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
         wp_enqueue_script(
             'batch_runner_init',
-            BATCH_URL . 'assets/batch_runner_init.js',
+            BATCH_URL.'assets/batch_runner_init.js',
             array('batch_runner'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -148,7 +148,7 @@ 
         $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
         wp_enqueue_script(
             'batch_file_runner_init',
-            BATCH_URL . 'assets/batch_file_runner_init.js',
+            BATCH_URL.'assets/batch_file_runner_init.js',
             array('batch_runner'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -160,7 +160,7 @@ 
             array(
                 'download_and_redirecting' => sprintf(
                     __('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-                    '<a href="' . $_REQUEST['return_url'] . '">',
+                    '<a href="'.$_REQUEST['return_url'].'">',
                     '</a>'
                 ),
                 'return_url'               => $_REQUEST['return_url'],
@@ -179,18 +179,18 @@ 
     {
         wp_register_script(
             'progress_bar',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js',
+            EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js',
             array('jquery')
         );
         wp_enqueue_style(
             'progress_bar',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css',
+            EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css',
             array(),
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_script(
             'batch_runner',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js',
+            EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js',
             array('progress_bar')
         );
         // just copy the bits of EE admin's eei18n that we need in the JS
@@ -225,7 +225,7 @@ 
     public function override_template($template)
     {
         if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
-            return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+            return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html';
         }
         return $template;
     }
@@ -252,7 +252,7 @@ 
     public function show_admin_page()
     {
         echo EEH_Template::locate_template(
-            EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html',
+            EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html',
             array('batch_request_type' => $this->batch_request_type())
         );
     }

Indentation +310 added lines, -310 removed lines

@@ -23,336 +23,336 @@
 class EED_Batch extends EED_Module
 {
 
-    /**
-     * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
-     * processes data only
-     */
-    const batch_job = 'job';
-    /**
-     * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
-     * produces a file for download
-     */
-    const batch_file_job = 'file';
-    /**
-     * Possibly value for $_REQUEST[ 'batch' ]. Indicates this request is NOT
-     * for a batch job. It's the same as not providing the $_REQUEST[ 'batch' ]
-     * at all
-     */
-    const batch_not_job = 'none';
+	/**
+	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
+	 * processes data only
+	 */
+	const batch_job = 'job';
+	/**
+	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
+	 * produces a file for download
+	 */
+	const batch_file_job = 'file';
+	/**
+	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates this request is NOT
+	 * for a batch job. It's the same as not providing the $_REQUEST[ 'batch' ]
+	 * at all
+	 */
+	const batch_not_job = 'none';
 
-    /**
-     *
-     * @var string 'file', or 'job', or false to indicate its not a batch request at all
-     */
-    protected $_batch_request_type = null;
+	/**
+	 *
+	 * @var string 'file', or 'job', or false to indicate its not a batch request at all
+	 */
+	protected $_batch_request_type = null;
 
-    /**
-     * Because we want to use the response in both the localized JS and in the body
-     * we need to make this response available between method calls
-     *
-     * @var \EventEspressoBatchRequest\Helpers\JobStepResponse
-     */
-    protected $_job_step_response = null;
+	/**
+	 * Because we want to use the response in both the localized JS and in the body
+	 * we need to make this response available between method calls
+	 *
+	 * @var \EventEspressoBatchRequest\Helpers\JobStepResponse
+	 */
+	protected $_job_step_response = null;
 
-    /**
-     * Gets the batch instance
-     *
-     * @return EED_Batch
-     */
-    public static function instance()
-    {
-        return self::get_instance();
-    }
+	/**
+	 * Gets the batch instance
+	 *
+	 * @return EED_Batch
+	 */
+	public static function instance()
+	{
+		return self::get_instance();
+	}
 
-    /**
-     * Sets hooks to enable batch jobs on the frontend. Disabled by default
-     * because it's an attack vector and there are currently no implementations
-     */
-    public static function set_hooks()
-    {
-        // because this is a possibel attack vector, let's have this disabled until
-        // we at least have a real use for it on the frontend
-        if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
-            add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
-            add_filter('template_include', array(self::instance(), 'override_template'), 99);
-        }
-    }
+	/**
+	 * Sets hooks to enable batch jobs on the frontend. Disabled by default
+	 * because it's an attack vector and there are currently no implementations
+	 */
+	public static function set_hooks()
+	{
+		// because this is a possibel attack vector, let's have this disabled until
+		// we at least have a real use for it on the frontend
+		if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
+			add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+			add_filter('template_include', array(self::instance(), 'override_template'), 99);
+		}
+	}
 
-    /**
-     * Initializes some hooks for the admin in order to run batch jobs
-     */
-    public static function set_hooks_admin()
-    {
-        add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
-        add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+	/**
+	 * Initializes some hooks for the admin in order to run batch jobs
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
+		add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
 
-        // ajax
-        add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
-        add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
-        add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
-        add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
-    }
+		// ajax
+		add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+		add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+	}
 
-    /**
-     * Enqueues batch scripts on the frontend or admin, and creates a job
-     */
-    public function enqueue_scripts()
-    {
-        if (isset($_REQUEST['espresso_batch'])
-            ||
-            (
-                isset($_REQUEST['page'])
-                && $_REQUEST['page'] == 'espresso_batch'
-            )
-        ) {
-            switch ($this->batch_request_type()) {
-                case self::batch_job:
-                    $this->enqueue_scripts_styles_batch_create();
-                    break;
-                case self::batch_file_job:
-                    $this->enqueue_scripts_styles_batch_file_create();
-                    break;
-            }
-        }
-    }
+	/**
+	 * Enqueues batch scripts on the frontend or admin, and creates a job
+	 */
+	public function enqueue_scripts()
+	{
+		if (isset($_REQUEST['espresso_batch'])
+			||
+			(
+				isset($_REQUEST['page'])
+				&& $_REQUEST['page'] == 'espresso_batch'
+			)
+		) {
+			switch ($this->batch_request_type()) {
+				case self::batch_job:
+					$this->enqueue_scripts_styles_batch_create();
+					break;
+				case self::batch_file_job:
+					$this->enqueue_scripts_styles_batch_file_create();
+					break;
+			}
+		}
+	}
 
-    /**
-     * Create a batch job, enqueues a script to run it, and localizes some data for it
-     */
-    public function enqueue_scripts_styles_batch_create()
-    {
-        $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-        wp_enqueue_script(
-            'batch_runner_init',
-            BATCH_URL . 'assets/batch_runner_init.js',
-            array('batch_runner'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
-        wp_localize_script(
-            'batch_runner_init',
-            'ee_job_i18n',
-            array(
-                'return_url' => $_REQUEST['return_url'],
-            )
-        );
-    }
+	/**
+	 * Create a batch job, enqueues a script to run it, and localizes some data for it
+	 */
+	public function enqueue_scripts_styles_batch_create()
+	{
+		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
+		wp_enqueue_script(
+			'batch_runner_init',
+			BATCH_URL . 'assets/batch_runner_init.js',
+			array('batch_runner'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script(
+			'batch_runner_init',
+			'ee_job_i18n',
+			array(
+				'return_url' => $_REQUEST['return_url'],
+			)
+		);
+	}
 
-    /**
-     * Creates a batch job which will download a file, enqueues a script to run the job, and localizes some data for it
-     */
-    public function enqueue_scripts_styles_batch_file_create()
-    {
-        // creates a job based on the request variable
-        $job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-        wp_enqueue_script(
-            'batch_file_runner_init',
-            BATCH_URL . 'assets/batch_file_runner_init.js',
-            array('batch_runner'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
-        wp_localize_script(
-            'batch_file_runner_init',
-            'ee_job_i18n',
-            array(
-                'download_and_redirecting' => sprintf(
-                    __('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-                    '<a href="' . $_REQUEST['return_url'] . '">',
-                    '</a>'
-                ),
-                'return_url'               => $_REQUEST['return_url'],
-            )
-        );
-    }
+	/**
+	 * Creates a batch job which will download a file, enqueues a script to run the job, and localizes some data for it
+	 */
+	public function enqueue_scripts_styles_batch_file_create()
+	{
+		// creates a job based on the request variable
+		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
+		wp_enqueue_script(
+			'batch_file_runner_init',
+			BATCH_URL . 'assets/batch_file_runner_init.js',
+			array('batch_runner'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script(
+			'batch_file_runner_init',
+			'ee_job_i18n',
+			array(
+				'download_and_redirecting' => sprintf(
+					__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
+					'<a href="' . $_REQUEST['return_url'] . '">',
+					'</a>'
+				),
+				'return_url'               => $_REQUEST['return_url'],
+			)
+		);
+	}
 
-    /**
-     * Enqueues scripts and styles common to any batch job, and creates
-     * a job from the request data, and stores the response in the
-     * $this->_job_step_response property
-     *
-     * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
-     */
-    protected function _enqueue_batch_job_scripts_and_styles_and_start_job()
-    {
-        wp_register_script(
-            'progress_bar',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js',
-            array('jquery')
-        );
-        wp_enqueue_style(
-            'progress_bar',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css',
-            array(),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_script(
-            'batch_runner',
-            EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js',
-            array('progress_bar')
-        );
-        // just copy the bits of EE admin's eei18n that we need in the JS
-        wp_localize_script(
-            'batch_runner',
-            'eei18n',
-            array(
-                'ajax_url'      => WP_AJAX_URL,
-                'is_admin'      => (bool) is_admin(),
-                'error_message' => esc_html__('An error occurred and the job has been stopped. Please refresh the page to try again.', 'event_espresso'),
-            )
-        );
-        $job_handler_classname = stripslashes($_GET['job_handler']);
-        $request_data = array_diff_key(
-            $_REQUEST,
-            array_flip(array('action', 'page', 'ee', 'batch'))
-        );
-        $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-        // eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-        $job_response = $batch_runner->create_job($job_handler_classname, $request_data);
-        // remember the response for later. We need it to display the page body
-        $this->_job_step_response = $job_response;
-        return $job_response;
-    }
+	/**
+	 * Enqueues scripts and styles common to any batch job, and creates
+	 * a job from the request data, and stores the response in the
+	 * $this->_job_step_response property
+	 *
+	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
+	 */
+	protected function _enqueue_batch_job_scripts_and_styles_and_start_job()
+	{
+		wp_register_script(
+			'progress_bar',
+			EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js',
+			array('jquery')
+		);
+		wp_enqueue_style(
+			'progress_bar',
+			EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css',
+			array(),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_script(
+			'batch_runner',
+			EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js',
+			array('progress_bar')
+		);
+		// just copy the bits of EE admin's eei18n that we need in the JS
+		wp_localize_script(
+			'batch_runner',
+			'eei18n',
+			array(
+				'ajax_url'      => WP_AJAX_URL,
+				'is_admin'      => (bool) is_admin(),
+				'error_message' => esc_html__('An error occurred and the job has been stopped. Please refresh the page to try again.', 'event_espresso'),
+			)
+		);
+		$job_handler_classname = stripslashes($_GET['job_handler']);
+		$request_data = array_diff_key(
+			$_REQUEST,
+			array_flip(array('action', 'page', 'ee', 'batch'))
+		);
+		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
+		// eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
+		// remember the response for later. We need it to display the page body
+		$this->_job_step_response = $job_response;
+		return $job_response;
+	}
 
-    /**
-     * If we are doing a frontend batch job, this makes it so WP shows our template's HTML
-     *
-     * @param string $template
-     * @return string
-     */
-    public function override_template($template)
-    {
-        if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
-            return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
-        }
-        return $template;
-    }
+	/**
+	 * If we are doing a frontend batch job, this makes it so WP shows our template's HTML
+	 *
+	 * @param string $template
+	 * @return string
+	 */
+	public function override_template($template)
+	{
+		if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
+			return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+		}
+		return $template;
+	}
 
-    /**
-     * Adds an admin page which doesn't appear in the admin menu
-     */
-    public function register_admin_pages()
-    {
-        add_submenu_page(
-            '', // parent slug. we don't want this to actually appear in the menu
-            __('Batch Job', 'event_espresso'), // page title
-            'n/a', // menu title
-            'read', // we want this page to actually be accessible to anyone,
-            'espresso_batch', // menu slug
-            array(self::instance(), 'show_admin_page')
-        );
-    }
+	/**
+	 * Adds an admin page which doesn't appear in the admin menu
+	 */
+	public function register_admin_pages()
+	{
+		add_submenu_page(
+			'', // parent slug. we don't want this to actually appear in the menu
+			__('Batch Job', 'event_espresso'), // page title
+			'n/a', // menu title
+			'read', // we want this page to actually be accessible to anyone,
+			'espresso_batch', // menu slug
+			array(self::instance(), 'show_admin_page')
+		);
+	}
 
-    /**
-     * Renders the admin page, after most of the work was already done during enqueuing scripts
-     * of creating the job and localizing some data
-     */
-    public function show_admin_page()
-    {
-        echo EEH_Template::locate_template(
-            EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html',
-            array('batch_request_type' => $this->batch_request_type())
-        );
-    }
+	/**
+	 * Renders the admin page, after most of the work was already done during enqueuing scripts
+	 * of creating the job and localizing some data
+	 */
+	public function show_admin_page()
+	{
+		echo EEH_Template::locate_template(
+			EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html',
+			array('batch_request_type' => $this->batch_request_type())
+		);
+	}
 
-    /**
-     * Receives ajax calls for continuing a job
-     */
-    public function batch_continue()
-    {
-        $job_id = sanitize_text_field($_REQUEST['job_id']);
-        $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-        $response_obj = $batch_runner->continue_job($job_id);
-        $this->_return_json($response_obj->to_array());
-    }
+	/**
+	 * Receives ajax calls for continuing a job
+	 */
+	public function batch_continue()
+	{
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
+		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
+		$response_obj = $batch_runner->continue_job($job_id);
+		$this->_return_json($response_obj->to_array());
+	}
 
-    /**
-     * Receives the ajax call to cleanup a job
-     *
-     * @return type
-     */
-    public function batch_cleanup()
-    {
-        $job_id = sanitize_text_field($_REQUEST['job_id']);
-        $batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-        $response_obj = $batch_runner->cleanup_job($job_id);
-        $this->_return_json($response_obj->to_array());
-    }
+	/**
+	 * Receives the ajax call to cleanup a job
+	 *
+	 * @return type
+	 */
+	public function batch_cleanup()
+	{
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
+		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_return_json($response_obj->to_array());
+	}
 
 
-    /**
-     * Returns a json response
-     *
-     * @param array $data The data we want to send echo via in the JSON response's "data" element
-     *
-     * The returned json object is created from an array in the following format:
-     * array(
-     *    'notices' => '', // - contains any EE_Error formatted notices
-     *    'data' => array() //this can be any key/value pairs that a method returns for later json parsing by the js.
-     *    We're also going to include the template args with every package (so js can pick out any specific template
-     *    args that might be included in here)
-     *    'isEEajax' => true,//indicates this is a response from EE
-     * )
-     */
-    protected function _return_json($data)
-    {
-        $json = array(
-            'notices'  => EE_Error::get_notices(),
-            'data'     => $data,
-            'isEEajax' => true
-            // special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
-        );
+	/**
+	 * Returns a json response
+	 *
+	 * @param array $data The data we want to send echo via in the JSON response's "data" element
+	 *
+	 * The returned json object is created from an array in the following format:
+	 * array(
+	 *    'notices' => '', // - contains any EE_Error formatted notices
+	 *    'data' => array() //this can be any key/value pairs that a method returns for later json parsing by the js.
+	 *    We're also going to include the template args with every package (so js can pick out any specific template
+	 *    args that might be included in here)
+	 *    'isEEajax' => true,//indicates this is a response from EE
+	 * )
+	 */
+	protected function _return_json($data)
+	{
+		$json = array(
+			'notices'  => EE_Error::get_notices(),
+			'data'     => $data,
+			'isEEajax' => true
+			// special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
+		);
 
 
-        // make sure there are no php errors or headers_sent.  Then we can set correct json header.
-        if (null === error_get_last() || ! headers_sent()) {
-            header('Content-Type: application/json; charset=UTF-8');
-        }
-        echo wp_json_encode($json);
-        exit();
-    }
+		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
+		if (null === error_get_last() || ! headers_sent()) {
+			header('Content-Type: application/json; charset=UTF-8');
+		}
+		echo wp_json_encode($json);
+		exit();
+	}
 
-    /**
-     * Gets the job step response which was done during the enqueuing of scripts
-     *
-     * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
-     */
-    public function job_step_response()
-    {
-        return $this->_job_step_response;
-    }
+	/**
+	 * Gets the job step response which was done during the enqueuing of scripts
+	 *
+	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
+	 */
+	public function job_step_response()
+	{
+		return $this->_job_step_response;
+	}
 
-    /**
-     * Gets the batch request type indicated in the $_REQUEST
-     *
-     * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
-     */
-    public function batch_request_type()
-    {
-        if ($this->_batch_request_type === null) {
-            if (isset($_GET['batch'])) {
-                if ($_GET['batch'] == self::batch_job) {
-                    $this->_batch_request_type = self::batch_job;
-                } elseif ($_GET['batch'] == self::batch_file_job) {
-                    $this->_batch_request_type = self::batch_file_job;
-                }
-            }
-            // if we didn't find that it was a batch request, indicate it wasn't
-            if ($this->_batch_request_type === null) {
-                $this->_batch_request_type = self::batch_not_job;
-            }
-        }
-        return $this->_batch_request_type;
-    }
+	/**
+	 * Gets the batch request type indicated in the $_REQUEST
+	 *
+	 * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
+	 */
+	public function batch_request_type()
+	{
+		if ($this->_batch_request_type === null) {
+			if (isset($_GET['batch'])) {
+				if ($_GET['batch'] == self::batch_job) {
+					$this->_batch_request_type = self::batch_job;
+				} elseif ($_GET['batch'] == self::batch_file_job) {
+					$this->_batch_request_type = self::batch_file_job;
+				}
+			}
+			// if we didn't find that it was a batch request, indicate it wasn't
+			if ($this->_batch_request_type === null) {
+				$this->_batch_request_type = self::batch_not_job;
+			}
+		}
+		return $this->_batch_request_type;
+	}
 
-    /**
-     * Unnecessary
-     *
-     * @param type $WP
-     */
-    public function run($WP)
-    {
-    }
+	/**
+	 * Unnecessary
+	 *
+	 * @param type $WP
+	 */
+	public function run($WP)
+	{
+	}
 }

modules/feeds/templates/espresso_venues_feed.template.php

Spacing +7 added lines, -7 removed lines

@@ -10,11 +10,11 @@
  * @ version        4+
  */
 ?>
-<p><?php _e('Organizer Name: ', 'event_espresso') . espresso_organization_name($VNU_ID); ?><br/>
-    <?php _e('Organizer Email: ', 'event_espresso') . espresso_organization_email($VNU_ID); ?><br/>
-    <?php _e('Venue Phone: ', 'event_espresso') . espresso_venue_phone($VNU_ID); ?></p>
-<p><?php _e('Categories: ', 'event_espresso') . espresso_venue_categories($VNU_ID); ?></p>
-<p><?php _e('Address: ', 'event_espresso') . espresso_venue_address($VNU_ID); ?></p>
-<p><?php _e('Website: ', 'event_espresso') . espresso_venue_website($VNU_ID); ?></p>
-<p><?php echo __('Description: ', 'event_espresso') . $venue_description; ?></p><br/>
+<p><?php _e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?><br/>
+    <?php _e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?><br/>
+    <?php _e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?></p>
+<p><?php _e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php _e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php _e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php echo __('Description: ', 'event_espresso').$venue_description; ?></p><br/>
  
\ No newline at end of file