eventespresso / event-espresso-core

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/bot_trap/EED_Bot_Trap.module.php

Indentation +311 added lines, -311 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
      */
     public static function set_trap()
     {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
         add_action(
             'AHEE__ticket_selector_chart__template__after_ticket_selector',
             array('EED_Bot_Trap', 'generate_bot_trap'),
@@ -114,9 +114,9 @@ 
         $do_not_enter = esc_html__('please do not enter anything in this input', 'event_espresso');
         $time = microtime(true);
         $html = '<div class="tkt-slctr-request-processor-dv" style="float:left; margin:0 0 0 -999em; height: 0;">';
-        $html .= '<label for="tkt-slctr-request-processor-email-' . $time . '">' . $do_not_enter . '</label>';
+        $html .= '<label for="tkt-slctr-request-processor-email-'.$time.'">'.$do_not_enter.'</label>';
         $html .= '<input type="email" id="tkt-slctr-request-processor-email-';
-        $html .= $time . '" name="tkt-slctr-request-processor-email" value=""/>';
+        $html .= $time.'" name="tkt-slctr-request-processor-email" value=""/>';
         $html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
         if (EE_Registry::instance()->CFG->registration->use_encryption) {
             EE_Registry::instance()->load_core('EE_Encryption');
@@ -163,7 +163,7 @@ 
             return;
         }
         // check the given callback is valid first before executing
-        if (! is_callable($triggered_trap_callback)) {
+        if ( ! is_callable($triggered_trap_callback)) {
             // invalid callback so lets just sub in our default.
             $triggered_trap_callback = array('EED_Bot_Trap', 'triggered_trap_response');
         }

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

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.', '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.', '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)
+	{
+	}
 }

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())
         );
     }

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

modules/feeds/templates/espresso_events_feed.template.php

Spacing +9 added lines, -9 removed lines

@@ -10,13 +10,13 @@
  * @ version        4+
  */
 ?>
-<p><?php _e('Event Organizer: ', 'event_espresso') . espresso_organization_name($EVT_ID); ?><br/>
-    <?php _e('Organizer Email: ', 'event_espresso') . espresso_organization_email($EVT_ID); ?><br/>
-    <?php _e('Event Phone: ', 'event_espresso') . espresso_event_phone($EVT_ID); ?></p>
-<p><?php _e('Event Status: ', 'event_espresso') . espresso_event_status($EVT_ID); ?></p>
-<p><?php _e('Categories: ', 'event_espresso') . espresso_event_categories($EVT_ID); ?></p>
-<?php _e('Dates and Times: ', 'event_espresso') . espresso_list_of_event_dates($EVT_ID); ?>
-<?php _e('Available Tickets: ', 'event_espresso') . espresso_event_tickets_available($EVT_ID); ?>
-<p><?php _e('Event Venue: ', 'event_espresso') . espresso_venue_name(null, false); ?></p>
-<p><?php echo __('Description: ', 'event_espresso') . $event_description; ?></p><br/>
+<p><?php _e('Event Organizer: ', 'event_espresso').espresso_organization_name($EVT_ID); ?><br/>
+    <?php _e('Organizer Email: ', 'event_espresso').espresso_organization_email($EVT_ID); ?><br/>
+    <?php _e('Event Phone: ', 'event_espresso').espresso_event_phone($EVT_ID); ?></p>
+<p><?php _e('Event Status: ', 'event_espresso').espresso_event_status($EVT_ID); ?></p>
+<p><?php _e('Categories: ', 'event_espresso').espresso_event_categories($EVT_ID); ?></p>
+<?php _e('Dates and Times: ', 'event_espresso').espresso_list_of_event_dates($EVT_ID); ?>
+<?php _e('Available Tickets: ', 'event_espresso').espresso_event_tickets_available($EVT_ID); ?>
+<p><?php _e('Event Venue: ', 'event_espresso').espresso_venue_name(null, false); ?></p>
+<p><?php echo __('Description: ', 'event_espresso').$event_description; ?></p><br/>
  
\ No newline at end of file

payment_methods/Paypal_Express/forms/SettingsForm.php

Indentation +196 added lines, -196 removed lines

@@ -20,208 +20,208 @@
 class SettingsForm extends EE_Payment_Method_Form
 {
 
-    /**
-     * @var string of HTML being the help tab link
-     */
-    protected $helpTabLink;
+	/**
+	 * @var string of HTML being the help tab link
+	 */
+	protected $helpTabLink;
 
-    /**
-     * SettingsForm constructor.
-     *
-     * @param array $options_array
-     * @param string     $help_tab_link
-     */
-    public function __construct(array $options_array = array(), $help_tab_link)
-    {
-        $this->helpTabLink = $help_tab_link;
-        $options_array = array_replace_recursive(
-            array(
-                'extra_meta_inputs' => array(
-                    'api_username' => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('API Username %s', 'event_espresso'),
-                                $help_tab_link
-                            ),
-                            'required'        => true,
-                        )
-                    ),
-                    'api_password' => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('API Password %s', 'event_espresso'),
-                                $help_tab_link
-                            ),
-                            'required'        => true,
-                        )
-                    ),
-                    'api_signature' => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('API Signature %s', 'event_espresso'),
-                                $help_tab_link
-                            ),
-                            'required'        => true,
-                        )
-                    ),
-                    'request_shipping_addr' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('Request Shipping Address %s', 'event_espresso'),
-                                $help_tab_link
-                            ),
-                            'html_help_text'  => esc_html__(
-                            // @codingStandardsIgnoreStart
-                                'If set to "Yes", then a shipping address will be requested on the PayPal checkout page.',
-                                // @codingStandardsIgnoreEnd
-                                'event_espresso'
-                            ),
-                            'required'        => true,
-                            'default'         => false,
-                        )
-                    ),
-                    'image_url' => new EE_Admin_File_Uploader_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('Image URL %s', 'event_espresso'),
-                                $help_tab_link
-                            ),
-                            'html_help_text'  => esc_html__(
-                                'Used for your business/personal logo on the PayPal page',
-                                'event_espresso'
-                            ),
-                            'required'        => false,
-                        )
-                    ),
-                )
-            ),
-            $options_array
-        );
-        parent::__construct($options_array);
-    }
+	/**
+	 * SettingsForm constructor.
+	 *
+	 * @param array $options_array
+	 * @param string     $help_tab_link
+	 */
+	public function __construct(array $options_array = array(), $help_tab_link)
+	{
+		$this->helpTabLink = $help_tab_link;
+		$options_array = array_replace_recursive(
+			array(
+				'extra_meta_inputs' => array(
+					'api_username' => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('API Username %s', 'event_espresso'),
+								$help_tab_link
+							),
+							'required'        => true,
+						)
+					),
+					'api_password' => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('API Password %s', 'event_espresso'),
+								$help_tab_link
+							),
+							'required'        => true,
+						)
+					),
+					'api_signature' => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('API Signature %s', 'event_espresso'),
+								$help_tab_link
+							),
+							'required'        => true,
+						)
+					),
+					'request_shipping_addr' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('Request Shipping Address %s', 'event_espresso'),
+								$help_tab_link
+							),
+							'html_help_text'  => esc_html__(
+							// @codingStandardsIgnoreStart
+								'If set to "Yes", then a shipping address will be requested on the PayPal checkout page.',
+								// @codingStandardsIgnoreEnd
+								'event_espresso'
+							),
+							'required'        => true,
+							'default'         => false,
+						)
+					),
+					'image_url' => new EE_Admin_File_Uploader_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('Image URL %s', 'event_espresso'),
+								$help_tab_link
+							),
+							'html_help_text'  => esc_html__(
+								'Used for your business/personal logo on the PayPal page',
+								'event_espresso'
+							),
+							'required'        => false,
+						)
+					),
+				)
+			),
+			$options_array
+		);
+		parent::__construct($options_array);
+	}
 
 
 
-    /**
-     * Does the normal validation, but also verifies the PayPal API credentials work.
-     * If they don't, sets a validation error on the entire form, and adds validation errors (which are really more tips)
-     * on each of the inputs that could be the cause of the problem.
-     * @throws EntityNotFoundException
-     */
-    public function _validate()
-    {
-        parent::_validate();
-        if (! $this->_payment_method_type instanceof \EE_PMT_Paypal_Express) {
-            throw new EntityNotFoundException('EE_PMT_Paypal_Express', '$this->_payment_method_type');
-        }
-        if (! $this->_payment_method_type->get_gateway() instanceof \EEG_Paypal_Express) {
-            throw new EntityNotFoundException('EEG_Paypal_Express', '$this->_payment_method_type->get_gateway()');
-        }
-        $credentials_message = $this->checkForCredentialsErrors();
-        if ($credentials_message !== '') {
-            $this->add_validation_error($credentials_message);
-            $this->get_input('PMD_debug_mode')->add_validation_error(
-                esc_html__('If you are using PayPal Sandbox (test) credentials, Debug mode should be set to "Yes". Otherwise, if you are using live PayPal credentials, set this to "No".', 'event_espresso')
-            );
-            $this->get_input('api_username')->add_validation_error(
-                sprintf(
-                    esc_html__('Are you sure this is your API username, not your login username?%1$s', 'event_espresso'),
-                    $this->helpTabLink()
-                )
-            );
-            $this->get_input('api_password')->add_validation_error(
-                sprintf(
-                    esc_html__('Are you sure this is your API password, not your login password.%1$s', 'event_espresso'),
-                    $this->helpTabLink()
-                )
-            );
-            $this->get_input('api_signature')->add_validation_error(
-                sprintf(
-                    esc_html__('Please verify your API signature is correct.%1$s', 'event_espresso'),
-                    $this->helpTabLink()
-                )
-            );
-        }
-    }
+	/**
+	 * Does the normal validation, but also verifies the PayPal API credentials work.
+	 * If they don't, sets a validation error on the entire form, and adds validation errors (which are really more tips)
+	 * on each of the inputs that could be the cause of the problem.
+	 * @throws EntityNotFoundException
+	 */
+	public function _validate()
+	{
+		parent::_validate();
+		if (! $this->_payment_method_type instanceof \EE_PMT_Paypal_Express) {
+			throw new EntityNotFoundException('EE_PMT_Paypal_Express', '$this->_payment_method_type');
+		}
+		if (! $this->_payment_method_type->get_gateway() instanceof \EEG_Paypal_Express) {
+			throw new EntityNotFoundException('EEG_Paypal_Express', '$this->_payment_method_type->get_gateway()');
+		}
+		$credentials_message = $this->checkForCredentialsErrors();
+		if ($credentials_message !== '') {
+			$this->add_validation_error($credentials_message);
+			$this->get_input('PMD_debug_mode')->add_validation_error(
+				esc_html__('If you are using PayPal Sandbox (test) credentials, Debug mode should be set to "Yes". Otherwise, if you are using live PayPal credentials, set this to "No".', 'event_espresso')
+			);
+			$this->get_input('api_username')->add_validation_error(
+				sprintf(
+					esc_html__('Are you sure this is your API username, not your login username?%1$s', 'event_espresso'),
+					$this->helpTabLink()
+				)
+			);
+			$this->get_input('api_password')->add_validation_error(
+				sprintf(
+					esc_html__('Are you sure this is your API password, not your login password.%1$s', 'event_espresso'),
+					$this->helpTabLink()
+				)
+			);
+			$this->get_input('api_signature')->add_validation_error(
+				sprintf(
+					esc_html__('Please verify your API signature is correct.%1$s', 'event_espresso'),
+					$this->helpTabLink()
+				)
+			);
+		}
+	}
 
 
 
-    /**
-     * Gets the HTML to show the link to the help tab
-     * @return string
-     */
-    protected function helpTabLink()
-    {
-        return $this->helpTabLink;
-    }
-    /**
-     * Tests the the PayPal API credentials work ok
-     * @return string of an error using the credentials, otherwise, if the credentials work, returns a blank string
-     */
-    protected function checkForCredentialsErrors()
-    {
-        $request_params = array(
-            'METHOD'    => 'GetBalance',
-            'VERSION'   => '204.0',
-            'USER'      => urlencode($this->get_input_value('api_username')),
-            'PWD'       => urlencode($this->get_input_value('api_password')),
-            'SIGNATURE' => urlencode($this->get_input_value('api_signature')),
-        );
-        $gateway_url = $this->get_input_value('PMD_debug_mode')
-            ? 'https://api-3t.sandbox.paypal.com/nvp'
-            : 'https://api-3t.paypal.com/nvp';
-        // Request Customer Details.
-        $response = wp_remote_post(
-            $gateway_url,
-            array(
-                'method'      => 'POST',
-                'timeout'     => 45,
-                'httpversion' => '1.1',
-                'cookies'     => array(),
-                'headers'     => array(),
-                'body'        => http_build_query($request_params, '', '&'),
-            )
-        );
-        if (is_wp_error($response) || empty($response['body'])) {
-            // If we got here then there was an error in this request.
-            // maybe is turned off. We don't know the credentials are invalid
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__('Your PayPal credentials could not be verified. There was an error communicating with PayPal, it was %1$s', 'event_espresso'),
-                    $response->get_error_message()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        $response_args = array();
-        parse_str(urldecode($response['body']), $response_args);
+	/**
+	 * Gets the HTML to show the link to the help tab
+	 * @return string
+	 */
+	protected function helpTabLink()
+	{
+		return $this->helpTabLink;
+	}
+	/**
+	 * Tests the the PayPal API credentials work ok
+	 * @return string of an error using the credentials, otherwise, if the credentials work, returns a blank string
+	 */
+	protected function checkForCredentialsErrors()
+	{
+		$request_params = array(
+			'METHOD'    => 'GetBalance',
+			'VERSION'   => '204.0',
+			'USER'      => urlencode($this->get_input_value('api_username')),
+			'PWD'       => urlencode($this->get_input_value('api_password')),
+			'SIGNATURE' => urlencode($this->get_input_value('api_signature')),
+		);
+		$gateway_url = $this->get_input_value('PMD_debug_mode')
+			? 'https://api-3t.sandbox.paypal.com/nvp'
+			: 'https://api-3t.paypal.com/nvp';
+		// Request Customer Details.
+		$response = wp_remote_post(
+			$gateway_url,
+			array(
+				'method'      => 'POST',
+				'timeout'     => 45,
+				'httpversion' => '1.1',
+				'cookies'     => array(),
+				'headers'     => array(),
+				'body'        => http_build_query($request_params, '', '&'),
+			)
+		);
+		if (is_wp_error($response) || empty($response['body'])) {
+			// If we got here then there was an error in this request.
+			// maybe is turned off. We don't know the credentials are invalid
+			EE_Error::add_error(
+				sprintf(
+					esc_html__('Your PayPal credentials could not be verified. There was an error communicating with PayPal, it was %1$s', 'event_espresso'),
+					$response->get_error_message()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		$response_args = array();
+		parse_str(urldecode($response['body']), $response_args);
 
-        if (empty($response_args['ACK'])) {
-            EE_Error::add_error(
-                esc_html__('Your PayPal credentials could not be verified. Part of their response was missing.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        if (in_array(
-            $response_args['ACK'],
-            array(
-                'Success',
-                'SuccessWithWarning'
-            ),
-            true
-        )
-        ) {
-            return '';
-        } else {
-            return sprintf(
-                esc_html__('Your PayPal API credentials appear to be invalid. PayPal said "%1$s (%2$s)". Please see tips below.', 'event_espresso'),
-                isset($response_args['L_LONGMESSAGE0']) ? $response_args['L_LONGMESSAGE0'] : esc_html__('No error message received from PayPal', 'event_espresso'),
-                isset($response_args['L_ERRORCODE0']) ? $response_args['L_ERRORCODE0'] : 0
-            );
-        }
-    }
+		if (empty($response_args['ACK'])) {
+			EE_Error::add_error(
+				esc_html__('Your PayPal credentials could not be verified. Part of their response was missing.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		if (in_array(
+			$response_args['ACK'],
+			array(
+				'Success',
+				'SuccessWithWarning'
+			),
+			true
+		)
+		) {
+			return '';
+		} else {
+			return sprintf(
+				esc_html__('Your PayPal API credentials appear to be invalid. PayPal said "%1$s (%2$s)". Please see tips below.', 'event_espresso'),
+				isset($response_args['L_LONGMESSAGE0']) ? $response_args['L_LONGMESSAGE0'] : esc_html__('No error message received from PayPal', 'event_espresso'),
+				isset($response_args['L_ERRORCODE0']) ? $response_args['L_ERRORCODE0'] : 0
+			);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -111,10 +111,10 @@
     public function _validate()
     {
         parent::_validate();
-        if (! $this->_payment_method_type instanceof \EE_PMT_Paypal_Express) {
+        if ( ! $this->_payment_method_type instanceof \EE_PMT_Paypal_Express) {
             throw new EntityNotFoundException('EE_PMT_Paypal_Express', '$this->_payment_method_type');
         }
-        if (! $this->_payment_method_type->get_gateway() instanceof \EEG_Paypal_Express) {
+        if ( ! $this->_payment_method_type->get_gateway() instanceof \EEG_Paypal_Express) {
             throw new EntityNotFoundException('EEG_Paypal_Express', '$this->_payment_method_type->get_gateway()');
         }
         $credentials_message = $this->checkForCredentialsErrors();

payment_methods/Paypal_Express/EE_PMT_Paypal_Express.pm.php

Indentation +77 added lines, -77 removed lines

@@ -15,90 +15,90 @@
 class EE_PMT_Paypal_Express extends EE_PMT_Base
 {
 
-    /**
-     * EE_PMT_Paypal_Express constructor.
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
-        $this->_gateway = new EEG_Paypal_Express();
+	/**
+	 * EE_PMT_Paypal_Express constructor.
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
+		$this->_gateway = new EEG_Paypal_Express();
 
-        $this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
-        $this->_template_path = $this->file_folder() . 'templates' . DS;
-        $this->_default_description = esc_html__(
-            // @codingStandardsIgnoreStart
-            'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
-            // @codingStandardsIgnoreEnd
-            'event_espresso'
-        );
-        $this->_default_button_url = $this->file_url() . 'lib' . DS . 'paypal-express-checkout-logo-gold-160.png';
+		$this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
+		$this->_template_path = $this->file_folder() . 'templates' . DS;
+		$this->_default_description = esc_html__(
+			// @codingStandardsIgnoreStart
+			'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
+			// @codingStandardsIgnoreEnd
+			'event_espresso'
+		);
+		$this->_default_button_url = $this->file_url() . 'lib' . DS . 'paypal-express-checkout-logo-gold-160.png';
 
-        parent::__construct($pm_instance);
-    }
+		parent::__construct($pm_instance);
+	}
 
 
-    /**
-     * Adds the help tab.
-     *
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title'    => esc_html__('PayPal Express Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_paypal_express'
-            )
-        );
-    }
+	/**
+	 * Adds the help tab.
+	 *
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title'    => esc_html__('PayPal Express Settings', 'event_espresso'),
+				'filename' => 'payment_methods_overview_paypal_express'
+			)
+		);
+	}
 
 
-    /**
-     * Gets the form for all the settings related to this payment method type.
-     *
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        $form = new SettingsForm(array(), $this->get_help_tab_link());
-        return $form;
-    }
+	/**
+	 * Gets the form for all the settings related to this payment method type.
+	 *
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		$form = new SettingsForm(array(), $this->get_help_tab_link());
+		return $form;
+	}
 
 
-    /**
-     * Creates a billing form for this payment method type.
-     *
-     * @param \EE_Transaction $transaction
-     * @return \EE_Billing_Info_Form
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        if ($this->_pm_instance->debug_mode()) {
-            $form = new EE_Billing_Info_Form(
-                $this->_pm_instance,
-                array(
-                    'name' => 'paypal_express_Info_Form',
-                    'subsections' => array(
-                        'paypal_express_debug_info' => new EE_Form_Section_Proper(
-                            array(
-                                'layout_strategy' => new EE_Template_Layout(
-                                    array(
-                                        'layout_template_file' => $this->_template_path
-                                                                    . 'paypal_express_debug_info.template.php',
-                                        'template_args'        => array(
-                                            'debug_mode' => $this->_pm_instance->debug_mode()
-                                        )
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            );
-            return $form;
-        }
+	/**
+	 * Creates a billing form for this payment method type.
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return \EE_Billing_Info_Form
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		if ($this->_pm_instance->debug_mode()) {
+			$form = new EE_Billing_Info_Form(
+				$this->_pm_instance,
+				array(
+					'name' => 'paypal_express_Info_Form',
+					'subsections' => array(
+						'paypal_express_debug_info' => new EE_Form_Section_Proper(
+							array(
+								'layout_strategy' => new EE_Template_Layout(
+									array(
+										'layout_template_file' => $this->_template_path
+																	. 'paypal_express_debug_info.template.php',
+										'template_args'        => array(
+											'debug_mode' => $this->_pm_instance->debug_mode()
+										)
+									)
+								)
+							)
+						)
+					)
+				)
+			);
+			return $form;
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -20,18 +20,18 @@
      */
     public function __construct($pm_instance = null)
     {
-        require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
+        require_once($this->file_folder().'EEG_Paypal_Express.gateway.php');
         $this->_gateway = new EEG_Paypal_Express();
 
         $this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
-        $this->_template_path = $this->file_folder() . 'templates' . DS;
+        $this->_template_path = $this->file_folder().'templates'.DS;
         $this->_default_description = esc_html__(
             // @codingStandardsIgnoreStart
             'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
             // @codingStandardsIgnoreEnd
             'event_espresso'
         );
-        $this->_default_button_url = $this->file_url() . 'lib' . DS . 'paypal-express-checkout-logo-gold-160.png';
+        $this->_default_button_url = $this->file_url().'lib'.DS.'paypal-express-checkout-logo-gold-160.png';
 
         parent::__construct($pm_instance);
     }