eventespresso / event-espresso-core

modules/ticket_selector/EED_Ticket_Selector.module.php

Spacing +8 added lines, -8 removed lines

@@ -138,10 +138,10 @@ 
         if (defined('TICKET_SELECTOR_ASSETS_URL')) {
             return;
         }
-        define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+        define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
         define(
             'TICKET_SELECTOR_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+            str_replace('\\', '/', plugin_dir_path(__FILE__)).'templates/'
         );
         // initialize config
         EED_Ticket_Selector::instance()->set_config();
@@ -163,7 +163,7 @@ 
      */
     public static function ticketSelector()
     {
-        if (! EED_Ticket_Selector::$ticket_selector instanceof DisplayTicketSelector) {
+        if ( ! EED_Ticket_Selector::$ticket_selector instanceof DisplayTicketSelector) {
             EED_Ticket_Selector::$ticket_selector = new DisplayTicketSelector(
                 EED_Ticket_Selector::getRequest(),
                 EED_Ticket_Selector::ticketConfig(),
@@ -190,7 +190,7 @@ 
      */
     public static function getIframeEmbedButton()
     {
-        if (! self::$iframe_embed_button instanceof TicketSelectorIframeEmbedButton) {
+        if ( ! self::$iframe_embed_button instanceof TicketSelectorIframeEmbedButton) {
             self::$iframe_embed_button = new TicketSelectorIframeEmbedButton();
         }
         return self::$iframe_embed_button;
@@ -298,7 +298,7 @@ 
             // add some style
             wp_register_style(
                 'ticket_selector',
-                TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css',
+                TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css',
                 [],
                 EVENT_ESPRESSO_VERSION
             );
@@ -306,7 +306,7 @@ 
             // make it dance
             wp_register_script(
                 'ticket_selector',
-                TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js',
+                TICKET_SELECTOR_ASSETS_URL.'ticket_selector.js',
                 ['espresso_core'],
                 EVENT_ESPRESSO_VERSION,
                 true
@@ -353,7 +353,7 @@ 
      */
     public static function iframeCss(array $iframe_css)
     {
-        $iframe_css['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css';
+        $iframe_css['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css';
         return $iframe_css;
     }
 
@@ -366,7 +366,7 @@ 
      */
     public static function iframeJs(array $iframe_js)
     {
-        $iframe_js['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js';
+        $iframe_js['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL.'ticket_selector.js';
         return $iframe_js;
     }
 

Indentation +487 added lines, -487 removed lines

@@ -18,491 +18,491 @@
  */
 class EED_Ticket_Selector extends EED_Module
 {
-    /**
-     * @var DisplayTicketSelector $ticket_selector
-     */
-    private static $ticket_selector;
-
-    /**
-     * @var TicketSelectorIframeEmbedButton $iframe_embed_button
-     */
-    private static $iframe_embed_button;
-
-
-    /**
-     * @return EED_Module|EED_Ticket_Selector
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * @return EE_Ticket_Selector_Config
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function ticketConfig()
-    {
-        EED_Ticket_Selector::instance()->set_config();
-        return EED_Ticket_Selector::instance()->config();
-    }
-
-
-    /**
-     * @return void
-     */
-    protected function set_config()
-    {
-        if ($this->_config instanceof EE_Ticket_Selector_Config) {
-            return;
-        }
-        $this->set_config_section('template_settings');
-        $this->set_config_class('EE_Ticket_Selector_Config');
-        $this->set_config_name('EED_Ticket_Selector');
-    }
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks()
-    {
-        // routing
-        EE_Config::register_route(
-            'iframe',
-            'EED_Ticket_Selector',
-            'ticket_selector_iframe',
-            'ticket_selector'
-        );
-        EE_Config::register_route(
-            'process_ticket_selections',
-            'EED_Ticket_Selector',
-            'process_ticket_selections'
-        );
-        EE_Config::register_route(
-            'cancel_ticket_selections',
-            'EED_Ticket_Selector',
-            'cancel_ticket_selections'
-        );
-        add_action('wp_loaded', ['EED_Ticket_Selector', 'set_definitions'], 2);
-        add_action('AHEE_event_details_header_bottom', ['EED_Ticket_Selector', 'display_ticket_selector'], 10, 1);
-        add_action('wp_enqueue_scripts', ['EED_Ticket_Selector', 'translate_js_strings'], 0);
-        add_action('wp_enqueue_scripts', ['EED_Ticket_Selector', 'load_tckt_slctr_assets'], 10);
-        EED_Ticket_Selector::loadIframeAssets();
-    }
-
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks_admin()
-    {
-        // hook into the end of the \EE_Admin_Page::_load_page_dependencies()
-        // to load assets for "espresso_events" page on the "edit" route (action)
-        add_action(
-            'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__edit',
-            ['EED_Ticket_Selector', 'ticket_selector_iframe_embed_button'],
-            10
-        );
-        /**
-         * Make sure assets for the ticket selector are loaded on the espresso registrations route so  admin side
-         * registrations work.
-         */
-        add_action(
-            'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_registrations__new_registration',
-            ['EED_Ticket_Selector', 'set_definitions'],
-            10
-        );
-    }
-
-
-    /**
-     *    set_definitions
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function set_definitions()
-    {
-        // don't do this twice
-        if (defined('TICKET_SELECTOR_ASSETS_URL')) {
-            return;
-        }
-        define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        define(
-            'TICKET_SELECTOR_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
-        );
-        // initialize config
-        EED_Ticket_Selector::instance()->set_config();
-        // if config is not set, initialize
-        if (
-            ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
-        ) {
-            EED_Ticket_Selector::instance()->set_config();
-            EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector =
-                EED_Ticket_Selector::instance()->config();
-        }
-    }
-
-
-    /**
-     * @return DisplayTicketSelector
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function ticketSelector()
-    {
-        if (! EED_Ticket_Selector::$ticket_selector instanceof DisplayTicketSelector) {
-            EED_Ticket_Selector::$ticket_selector = new DisplayTicketSelector(
-                EED_Ticket_Selector::getRequest(),
-                EED_Ticket_Selector::ticketConfig(),
-                EED_Events_Archive::is_iframe()
-            );
-        }
-        return EED_Ticket_Selector::$ticket_selector;
-    }
-
-
-    /**
-     * gets the ball rolling
-     *
-     * @param WP $WP
-     * @return void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @return TicketSelectorIframeEmbedButton
-     */
-    public static function getIframeEmbedButton()
-    {
-        if (! self::$iframe_embed_button instanceof TicketSelectorIframeEmbedButton) {
-            self::$iframe_embed_button = new TicketSelectorIframeEmbedButton();
-        }
-        return self::$iframe_embed_button;
-    }
-
-
-    /**
-     * ticket_selector_iframe_embed_button
-     *
-     * @return void
-     */
-    public static function ticket_selector_iframe_embed_button()
-    {
-        $iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
-        $iframe_embed_button->addEventEditorIframeEmbedButton();
-    }
-
-
-    /**
-     * ticket_selector_iframe
-     *
-     * @return void
-     * @throws DomainException
-     */
-    public function ticket_selector_iframe()
-    {
-        EE_Dependency_Map::register_dependencies(
-            TicketSelectorIframe::class,
-            [
-                'EEM_Event'                                            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\CurrentPage'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\RequestInterface' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $ticket_selector_iframe = LoaderFactory::getLoader()->getNew(TicketSelectorIframe::class);
-        $ticket_selector_iframe->display();
-    }
-
-
-    /**
-     * creates buttons for selecting number of attendees for an event
-     *
-     * @param WP_Post|int $event
-     * @param bool        $view_details
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function display_ticket_selector($event = null, $view_details = false)
-    {
-        return EED_Ticket_Selector::ticketSelector()->display($event, $view_details);
-    }
-
-
-    /**
-     * @return bool  or FALSE
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function process_ticket_selections()
-    {
-        /** @var EventEspresso\modules\ticket_selector\ProcessTicketSelector $form */
-        $form = LoaderFactory::getLoader()->getShared('EventEspresso\modules\ticket_selector\ProcessTicketSelector');
-        return $form->processTicketSelections();
-    }
-
-
-    /**
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function cancel_ticket_selections()
-    {
-        /** @var EventEspresso\modules\ticket_selector\ProcessTicketSelector $form */
-        $form = LoaderFactory::getLoader()->getShared('EventEspresso\modules\ticket_selector\ProcessTicketSelector');
-        return $form->cancelTicketSelections();
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function translate_js_strings()
-    {
-        EE_Registry::$i18n_js_strings['please_select_date_filter_notice'] = esc_html__(
-            'please select a datetime',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function load_tckt_slctr_assets()
-    {
-        if (apply_filters('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', false)) {
-            // add some style
-            wp_register_style(
-                'ticket_selector',
-                TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css',
-                [],
-                EVENT_ESPRESSO_VERSION
-            );
-            wp_enqueue_style('ticket_selector');
-            // make it dance
-            wp_register_script(
-                'ticket_selector',
-                TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js',
-                ['espresso_core'],
-                EVENT_ESPRESSO_VERSION,
-                true
-            );
-            wp_enqueue_script('ticket_selector');
-            require_once EE_LIBRARIES
-                         . 'form_sections/strategies/display/EE_Checkbox_Dropdown_Selector_Display_Strategy.strategy.php';
-            EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function loadIframeAssets()
-    {
-        // for event lists
-        add_filter(
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
-            ['EED_Ticket_Selector', 'iframeCss']
-        );
-        add_filter(
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
-            ['EED_Ticket_Selector', 'iframeJs']
-        );
-        // for ticket selectors
-        add_filter(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
-            ['EED_Ticket_Selector', 'iframeCss']
-        );
-        add_filter(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            ['EED_Ticket_Selector', 'iframeJs']
-        );
-    }
-
-
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     *
-     * @param array $iframe_css
-     * @return array
-     */
-    public static function iframeCss(array $iframe_css)
-    {
-        $iframe_css['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css';
-        return $iframe_css;
-    }
-
-
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     *
-     * @param array $iframe_js
-     * @return array
-     */
-    public static function iframeJs(array $iframe_js)
-    {
-        $iframe_js['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js';
-        return $iframe_js;
-    }
-
-
-    /****************************** DEPRECATED ******************************/
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function display_view_details_btn()
-    {
-        // todo add doing_it_wrong() notice during next major version
-        return EED_Ticket_Selector::ticketSelector()->displayViewDetailsButton();
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function display_ticket_selector_submit()
-    {
-        // todo add doing_it_wrong() notice during next major version
-        return EED_Ticket_Selector::ticketSelector()->displaySubmitButton();
-    }
-
-
-    /**
-     * @param string $permalink_string
-     * @param int    $id
-     * @param string $new_title
-     * @param string $new_slug
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @deprecated
-     */
-    public static function iframe_code_button($permalink_string, $id, $new_title = '', $new_slug = '')
-    {
-        $request = self::getRequest();
-        // todo add doing_it_wrong() notice during next major version
-        if (
-            $request->getRequestParam('page') === 'espresso_events'
-            && $request->getRequestParam('action') === 'edit'
-        ) {
-            $iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
-            $iframe_embed_button->addEventEditorIframeEmbedButton();
-        }
-        return '';
-    }
-
-
-    /**
-     * @param int    $ID
-     * @param string $external_url
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function ticket_selector_form_open($ID = 0, $external_url = '')
-    {
-        // todo add doing_it_wrong() notice during next major version
-        return EED_Ticket_Selector::ticketSelector()->formOpen($ID, $external_url);
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function ticket_selector_form_close()
-    {
-        // todo add doing_it_wrong() notice during next major version
-        return EED_Ticket_Selector::ticketSelector()->formClose();
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function no_tkt_slctr_end_dv()
-    {
-        // todo add doing_it_wrong() notice during next major version
-        return EED_Ticket_Selector::ticketSelector()->ticketSelectorEndDiv();
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.13
-     */
-    public static function tkt_slctr_end_dv()
-    {
-        return EED_Ticket_Selector::ticketSelector()->clearTicketSelector();
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated
-     */
-    public static function clear_tkt_slctr()
-    {
-        return EED_Ticket_Selector::ticketSelector()->clearTicketSelector();
-    }
-
-
-    /**
-     * @deprecated
-     */
-    public static function load_tckt_slctr_assets_admin()
-    {
-        $request = self::getRequest();
-        // todo add doing_it_wrong() notice during next major version
-        if (
-            $request->getRequestParam('page') === 'espresso_events'
-            && $request->getRequestParam('action') === 'edit'
-        ) {
-            $iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
-            $iframe_embed_button->embedButtonAssets();
-        }
-    }
+	/**
+	 * @var DisplayTicketSelector $ticket_selector
+	 */
+	private static $ticket_selector;
+
+	/**
+	 * @var TicketSelectorIframeEmbedButton $iframe_embed_button
+	 */
+	private static $iframe_embed_button;
+
+
+	/**
+	 * @return EED_Module|EED_Ticket_Selector
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * @return EE_Ticket_Selector_Config
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function ticketConfig()
+	{
+		EED_Ticket_Selector::instance()->set_config();
+		return EED_Ticket_Selector::instance()->config();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	protected function set_config()
+	{
+		if ($this->_config instanceof EE_Ticket_Selector_Config) {
+			return;
+		}
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
+	}
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks()
+	{
+		// routing
+		EE_Config::register_route(
+			'iframe',
+			'EED_Ticket_Selector',
+			'ticket_selector_iframe',
+			'ticket_selector'
+		);
+		EE_Config::register_route(
+			'process_ticket_selections',
+			'EED_Ticket_Selector',
+			'process_ticket_selections'
+		);
+		EE_Config::register_route(
+			'cancel_ticket_selections',
+			'EED_Ticket_Selector',
+			'cancel_ticket_selections'
+		);
+		add_action('wp_loaded', ['EED_Ticket_Selector', 'set_definitions'], 2);
+		add_action('AHEE_event_details_header_bottom', ['EED_Ticket_Selector', 'display_ticket_selector'], 10, 1);
+		add_action('wp_enqueue_scripts', ['EED_Ticket_Selector', 'translate_js_strings'], 0);
+		add_action('wp_enqueue_scripts', ['EED_Ticket_Selector', 'load_tckt_slctr_assets'], 10);
+		EED_Ticket_Selector::loadIframeAssets();
+	}
+
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks_admin()
+	{
+		// hook into the end of the \EE_Admin_Page::_load_page_dependencies()
+		// to load assets for "espresso_events" page on the "edit" route (action)
+		add_action(
+			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__edit',
+			['EED_Ticket_Selector', 'ticket_selector_iframe_embed_button'],
+			10
+		);
+		/**
+		 * Make sure assets for the ticket selector are loaded on the espresso registrations route so  admin side
+		 * registrations work.
+		 */
+		add_action(
+			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_registrations__new_registration',
+			['EED_Ticket_Selector', 'set_definitions'],
+			10
+		);
+	}
+
+
+	/**
+	 *    set_definitions
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function set_definitions()
+	{
+		// don't do this twice
+		if (defined('TICKET_SELECTOR_ASSETS_URL')) {
+			return;
+		}
+		define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		define(
+			'TICKET_SELECTOR_TEMPLATES_PATH',
+			str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+		);
+		// initialize config
+		EED_Ticket_Selector::instance()->set_config();
+		// if config is not set, initialize
+		if (
+			! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
+		) {
+			EED_Ticket_Selector::instance()->set_config();
+			EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector =
+				EED_Ticket_Selector::instance()->config();
+		}
+	}
+
+
+	/**
+	 * @return DisplayTicketSelector
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function ticketSelector()
+	{
+		if (! EED_Ticket_Selector::$ticket_selector instanceof DisplayTicketSelector) {
+			EED_Ticket_Selector::$ticket_selector = new DisplayTicketSelector(
+				EED_Ticket_Selector::getRequest(),
+				EED_Ticket_Selector::ticketConfig(),
+				EED_Events_Archive::is_iframe()
+			);
+		}
+		return EED_Ticket_Selector::$ticket_selector;
+	}
+
+
+	/**
+	 * gets the ball rolling
+	 *
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @return TicketSelectorIframeEmbedButton
+	 */
+	public static function getIframeEmbedButton()
+	{
+		if (! self::$iframe_embed_button instanceof TicketSelectorIframeEmbedButton) {
+			self::$iframe_embed_button = new TicketSelectorIframeEmbedButton();
+		}
+		return self::$iframe_embed_button;
+	}
+
+
+	/**
+	 * ticket_selector_iframe_embed_button
+	 *
+	 * @return void
+	 */
+	public static function ticket_selector_iframe_embed_button()
+	{
+		$iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
+		$iframe_embed_button->addEventEditorIframeEmbedButton();
+	}
+
+
+	/**
+	 * ticket_selector_iframe
+	 *
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function ticket_selector_iframe()
+	{
+		EE_Dependency_Map::register_dependencies(
+			TicketSelectorIframe::class,
+			[
+				'EEM_Event'                                            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\CurrentPage'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\RequestInterface' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$ticket_selector_iframe = LoaderFactory::getLoader()->getNew(TicketSelectorIframe::class);
+		$ticket_selector_iframe->display();
+	}
+
+
+	/**
+	 * creates buttons for selecting number of attendees for an event
+	 *
+	 * @param WP_Post|int $event
+	 * @param bool        $view_details
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function display_ticket_selector($event = null, $view_details = false)
+	{
+		return EED_Ticket_Selector::ticketSelector()->display($event, $view_details);
+	}
+
+
+	/**
+	 * @return bool  or FALSE
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function process_ticket_selections()
+	{
+		/** @var EventEspresso\modules\ticket_selector\ProcessTicketSelector $form */
+		$form = LoaderFactory::getLoader()->getShared('EventEspresso\modules\ticket_selector\ProcessTicketSelector');
+		return $form->processTicketSelections();
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function cancel_ticket_selections()
+	{
+		/** @var EventEspresso\modules\ticket_selector\ProcessTicketSelector $form */
+		$form = LoaderFactory::getLoader()->getShared('EventEspresso\modules\ticket_selector\ProcessTicketSelector');
+		return $form->cancelTicketSelections();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function translate_js_strings()
+	{
+		EE_Registry::$i18n_js_strings['please_select_date_filter_notice'] = esc_html__(
+			'please select a datetime',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function load_tckt_slctr_assets()
+	{
+		if (apply_filters('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', false)) {
+			// add some style
+			wp_register_style(
+				'ticket_selector',
+				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css',
+				[],
+				EVENT_ESPRESSO_VERSION
+			);
+			wp_enqueue_style('ticket_selector');
+			// make it dance
+			wp_register_script(
+				'ticket_selector',
+				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js',
+				['espresso_core'],
+				EVENT_ESPRESSO_VERSION,
+				true
+			);
+			wp_enqueue_script('ticket_selector');
+			require_once EE_LIBRARIES
+						 . 'form_sections/strategies/display/EE_Checkbox_Dropdown_Selector_Display_Strategy.strategy.php';
+			EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function loadIframeAssets()
+	{
+		// for event lists
+		add_filter(
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
+			['EED_Ticket_Selector', 'iframeCss']
+		);
+		add_filter(
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
+			['EED_Ticket_Selector', 'iframeJs']
+		);
+		// for ticket selectors
+		add_filter(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
+			['EED_Ticket_Selector', 'iframeCss']
+		);
+		add_filter(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+			['EED_Ticket_Selector', 'iframeJs']
+		);
+	}
+
+
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 *
+	 * @param array $iframe_css
+	 * @return array
+	 */
+	public static function iframeCss(array $iframe_css)
+	{
+		$iframe_css['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css';
+		return $iframe_css;
+	}
+
+
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 *
+	 * @param array $iframe_js
+	 * @return array
+	 */
+	public static function iframeJs(array $iframe_js)
+	{
+		$iframe_js['ticket_selector'] = TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js';
+		return $iframe_js;
+	}
+
+
+	/****************************** DEPRECATED ******************************/
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function display_view_details_btn()
+	{
+		// todo add doing_it_wrong() notice during next major version
+		return EED_Ticket_Selector::ticketSelector()->displayViewDetailsButton();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function display_ticket_selector_submit()
+	{
+		// todo add doing_it_wrong() notice during next major version
+		return EED_Ticket_Selector::ticketSelector()->displaySubmitButton();
+	}
+
+
+	/**
+	 * @param string $permalink_string
+	 * @param int    $id
+	 * @param string $new_title
+	 * @param string $new_slug
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @deprecated
+	 */
+	public static function iframe_code_button($permalink_string, $id, $new_title = '', $new_slug = '')
+	{
+		$request = self::getRequest();
+		// todo add doing_it_wrong() notice during next major version
+		if (
+			$request->getRequestParam('page') === 'espresso_events'
+			&& $request->getRequestParam('action') === 'edit'
+		) {
+			$iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
+			$iframe_embed_button->addEventEditorIframeEmbedButton();
+		}
+		return '';
+	}
+
+
+	/**
+	 * @param int    $ID
+	 * @param string $external_url
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function ticket_selector_form_open($ID = 0, $external_url = '')
+	{
+		// todo add doing_it_wrong() notice during next major version
+		return EED_Ticket_Selector::ticketSelector()->formOpen($ID, $external_url);
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function ticket_selector_form_close()
+	{
+		// todo add doing_it_wrong() notice during next major version
+		return EED_Ticket_Selector::ticketSelector()->formClose();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function no_tkt_slctr_end_dv()
+	{
+		// todo add doing_it_wrong() notice during next major version
+		return EED_Ticket_Selector::ticketSelector()->ticketSelectorEndDiv();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.13
+	 */
+	public static function tkt_slctr_end_dv()
+	{
+		return EED_Ticket_Selector::ticketSelector()->clearTicketSelector();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated
+	 */
+	public static function clear_tkt_slctr()
+	{
+		return EED_Ticket_Selector::ticketSelector()->clearTicketSelector();
+	}
+
+
+	/**
+	 * @deprecated
+	 */
+	public static function load_tckt_slctr_assets_admin()
+	{
+		$request = self::getRequest();
+		// todo add doing_it_wrong() notice during next major version
+		if (
+			$request->getRequestParam('page') === 'espresso_events'
+			&& $request->getRequestParam('action') === 'edit'
+		) {
+			$iframe_embed_button = EED_Ticket_Selector::getIframeEmbedButton();
+			$iframe_embed_button->embedButtonAssets();
+		}
+	}
 }

caffeinated/core/libraries/shortcodes/EE_Question_List_Shortcodes.lib.php

Spacing +4 added lines, -4 removed lines

@@ -94,16 +94,16 @@
             ? $this->_extra_data['template']['question_list']
             : $template;
         $ans_result       = '';
-        $answers          = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
-            ? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs']
+        $answers          = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'])
+            ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']
             : [];
         $questions        = ! empty($this->_extra_data['data']->questions)
             ? $this->_extra_data['data']->questions
             : [];
         foreach ($answers as $answer) {
             // first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ])
-                ? $questions[ $answer->ID() ]
+            $question = isset($questions[$answer->ID()])
+                ? $questions[$answer->ID()]
                 : null;
             $question = ! $question instanceof EE_Question
                 ? $answer->question()

Indentation +95 added lines, -95 removed lines

@@ -15,109 +15,109 @@
  */
 class EE_Question_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
 
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Questions and Answers Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes related to custom questions and answers', 'event_espresso');
-        $this->_shortcodes = [
-            '[QUESTION_LIST]' => esc_html__(
-                'This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
-                'event_espresso'
-            ),
-        ];
-    }
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Questions and Answers Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes related to custom questions and answers', 'event_espresso');
+		$this->_shortcodes = [
+			'[QUESTION_LIST]' => esc_html__(
+				'This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
+				'event_espresso'
+			),
+		];
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[QUESTION_LIST]':
-                return $this->_get_question_list();
-        }
-        return '';
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[QUESTION_LIST]':
+				return $this->_get_question_list();
+		}
+		return '';
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_question_list()
-    {
-        $this->_validate_list_requirements();
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_question_list()
+	{
+		$this->_validate_list_requirements();
 
-        if ($this->_data['data'] instanceof EE_Registration) {
-            // for when [QUESTION_LIST] is used in the [attendee_list] field.
-            return $this->_get_question_answer_list_for_attendee();
-        }
-        // for when [QUESTION_LIST] is used in the main content field.
-        if (
-            $this->_data['data'] instanceof EE_Messages_Addressee
-            && $this->_data['data']->reg_obj instanceof EE_Registration
-        ) {
-            return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
-        }
-        return '';
-    }
+		if ($this->_data['data'] instanceof EE_Registration) {
+			// for when [QUESTION_LIST] is used in the [attendee_list] field.
+			return $this->_get_question_answer_list_for_attendee();
+		}
+		// for when [QUESTION_LIST] is used in the main content field.
+		if (
+			$this->_data['data'] instanceof EE_Messages_Addressee
+			&& $this->_data['data']->reg_obj instanceof EE_Registration
+		) {
+			return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
+		}
+		return '';
+	}
 
 
-    /**
-     * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
-     * answers for that attendee since that is what we really need (we can derive the questions from the answers);
-     *
-     * @param null $reg_obj
-     * @return string parsed template.
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_question_answer_list_for_attendee($reg_obj = null)
-    {
-        $valid_shortcodes = ['question'];
-        $reg_obj          = $reg_obj instanceof EE_Registration
-            ? $reg_obj
-            : $this->_data['data'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list'])
-            ? $this->_data['template']['question_list']
-            : '';
-        $template         = empty($template) && isset($this->_extra_data['template']['question_list'])
-            ? $this->_extra_data['template']['question_list']
-            : $template;
-        $ans_result       = '';
-        $answers          = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
-            ? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs']
-            : [];
-        $questions        = ! empty($this->_extra_data['data']->questions)
-            ? $this->_extra_data['data']->questions
-            : [];
-        foreach ($answers as $answer) {
-            // first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ])
-                ? $questions[ $answer->ID() ]
-                : null;
-            $question = ! $question instanceof EE_Question
-                ? $answer->question()
-                : $question;
-            if ($question instanceof EE_Question and $question->admin_only()) {
-                continue;
-            }
-            $ans_result .= $this->_shortcode_helper->parse_question_list_template(
-                $template,
-                $answer,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
+	/**
+	 * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
+	 * answers for that attendee since that is what we really need (we can derive the questions from the answers);
+	 *
+	 * @param null $reg_obj
+	 * @return string parsed template.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_question_answer_list_for_attendee($reg_obj = null)
+	{
+		$valid_shortcodes = ['question'];
+		$reg_obj          = $reg_obj instanceof EE_Registration
+			? $reg_obj
+			: $this->_data['data'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list'])
+			? $this->_data['template']['question_list']
+			: '';
+		$template         = empty($template) && isset($this->_extra_data['template']['question_list'])
+			? $this->_extra_data['template']['question_list']
+			: $template;
+		$ans_result       = '';
+		$answers          = ! empty($this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs'])
+			? $this->_extra_data['data']->registrations[ $reg_obj->ID() ]['ans_objs']
+			: [];
+		$questions        = ! empty($this->_extra_data['data']->questions)
+			? $this->_extra_data['data']->questions
+			: [];
+		foreach ($answers as $answer) {
+			// first see if the question is in our $questions array.  If not then try to get from answer object
+			$question = isset($questions[ $answer->ID() ])
+				? $questions[ $answer->ID() ]
+				: null;
+			$question = ! $question instanceof EE_Question
+				? $answer->question()
+				: $question;
+			if ($question instanceof EE_Question and $question->admin_only()) {
+				continue;
+			}
+			$ans_result .= $this->_shortcode_helper->parse_question_list_template(
+				$template,
+				$answer,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
 
-        return $ans_result;
-    }
+		return $ans_result;
+	}
 }

caffeinated/brewing_regular.php

Spacing +31 added lines, -31 removed lines

@@ -12,10 +12,10 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 
 // defined some new constants related to caffeinated folder
-define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
-define('EE_CAF_CORE', EE_CAFF_PATH . 'core/');
-define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries/');
-define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods/');
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core/');
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries/');
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods/');
 
 
 /**
@@ -65,11 +65,11 @@ 
         add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
         add_filter(
             'AHEE__EE_System__load_core_configuration__complete',
-            function () {
+            function() {
                 EE_Register_Payment_Method::register(
                     'caffeinated_payment_methods',
                     [
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR),
                     ]
                 );
             }
@@ -124,7 +124,7 @@ 
      */
     public function caf_helper_paths($paths)
     {
-        $paths[] = EE_CAF_CORE . 'helpers/';
+        $paths[] = EE_CAF_CORE.'helpers/';
         return $paths;
     }
 
@@ -145,11 +145,11 @@ 
         global $wpdb;
         // use same method of getting creator id as the version introducing the change
         $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table   = $wpdb->prefix . "esp_price_type";
-        $price_table        = $wpdb->prefix . "esp_price";
+        $price_type_table   = $wpdb->prefix."esp_price_type";
+        $price_table        = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
             $SQL                  =
-                'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+                'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; // include trashed price types
             $tax_price_type_count = $wpdb->get_var($SQL);
             if ($tax_price_type_count <= 1) {
                 $wpdb->insert(
@@ -163,11 +163,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ],
                     [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d', // PRT_wp_user
                     ]
                 );
@@ -183,11 +183,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ],
                     [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d' // PRT_wp_user
                     ]
                 );
@@ -207,15 +207,15 @@ 
                             'PRC_wp_user'    => $default_creator_id,
                         ],
                         [
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
+                            '%d', // PRT_id
+                            '%f', // PRC_amount
+                            '%s', // PRC_name
+                            '%s', // PRC_desc
+                            '%d', // PRC_is_default
+                            '%d', // PRC_overrides
+                            '%d', // PRC_deleted
+                            '%d', // PRC_order
+                            '%d', // PRC_parent
                             '%d' // PRC_wp_user
                         ]
                     );
@@ -234,8 +234,8 @@ 
      */
     public function caffeinated_modules_to_register($modules_to_register = [])
     {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
+        if (is_readable(EE_CAFF_PATH.'modules')) {
+            $caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules/*', GLOB_ONLYDIR);
             if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
                 $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
             }

Indentation +315 added lines, -315 removed lines

@@ -27,323 +27,323 @@
  */
 class EE_Brewing_Regular extends EE_BASE implements InterminableInterface
 {
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * EE_Brewing_Regular constructor.
-     *
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableAnalysis $table_analysis)
-    {
-        $this->_table_analysis = $table_analysis;
-        if (defined('EE_CAFF_PATH')) {
-            $this->setInitializationHooks();
-            $this->setApiRegistrationHooks();
-            $this->setSwitchHooks();
-            $this->setDefaultFilterHooks();
-            // caffeinated constructed
-            do_action('AHEE__EE_Brewing_Regular__construct__complete');
-        }
-    }
-
-
-    /**
-     * Various hooks used for extending features via registration of modules or extensions.
-     */
-    private function setApiRegistrationHooks()
-    {
-        add_filter(
-            'FHEE__EE_Config__register_modules__modules_to_register',
-            [$this, 'caffeinated_modules_to_register']
-        );
-        add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
-        add_filter(
-            'AHEE__EE_System__load_core_configuration__complete',
-            function () {
-                EE_Register_Payment_Method::register(
-                    'caffeinated_payment_methods',
-                    [
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
-                    ]
-                );
-            }
-        );
-    }
-
-
-    /**
-     * Various hooks used for modifying initialization or activation processes.
-     */
-    private function setInitializationHooks()
-    {
-        // activation
-        add_action('AHEE__EEH_Activation__initialize_db_content', [$this, 'initialize_caf_db_content']);
-        // load caff init
-        add_action('AHEE__EE_System__set_hooks_for_core', [$this, 'caffeinated_init']);
-        // load caff scripts
-        add_action('wp_enqueue_scripts', [$this, 'enqueue_caffeinated_scripts'], 10);
-    }
-
-
-    /**
-     * Various hooks used for switch (on/off) type filters.
-     */
-    private function setSwitchHooks()
-    {
-        // remove the "powered by" credit link from receipts and invoices
-        add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
-        // seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
-        add_filter('FHEE__ee_show_affiliate_links', '__return_false');
-    }
-
-
-    /**
-     * Various filters for affecting default configuration values in the caffeinated
-     * context.
-     */
-    private function setDefaultFilterHooks()
-    {
-        add_filter(
-            'FHEE__EE_Admin_Config__show_reg_footer__default',
-            '__return_true'
-        );
-    }
-
-
-    /**
-     * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
-     *
-     * @param array $paths original helper paths array
-     * @return array             new array of paths
-     */
-    public function caf_helper_paths($paths)
-    {
-        $paths[] = EE_CAF_CORE . 'helpers/';
-        return $paths;
-    }
-
-
-    /**
-     * Upon brand-new activation, if this is a new activation of CAF, we want to add
-     * some global prices that will show off EE4's capabilities. However, if they're upgrading
-     * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
-     * This action should only be called when EE 4.x.0.P is initially activated.
-     * Right now the only CAF content are these global prices. If there's more in the future, then
-     * we should probably create a caf file to contain it all instead just a function like this.
-     * Right now, we ASSUME the only price types in the system are default ones
-     *
-     * @global wpdb $wpdb
-     */
-    public function initialize_caf_db_content()
-    {
-        global $wpdb;
-        // use same method of getting creator id as the version introducing the change
-        $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table   = $wpdb->prefix . "esp_price_type";
-        $price_table        = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL                  =
-                'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
-            $tax_price_type_count = $wpdb->get_var($SQL);
-            if ($tax_price_type_count <= 1) {
-                $wpdb->insert(
-                    $price_type_table,
-                    [
-                        'PRT_name'       => esc_html__("Regional Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 60,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ],
-                    [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d', // PRT_wp_user
-                    ]
-                );
-                // federal tax
-                $result = $wpdb->insert(
-                    $price_type_table,
-                    [
-                        'PRT_name'       => esc_html__("Federal Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 70,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ],
-                    [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d' // PRT_wp_user
-                    ]
-                );
-                if ($result) {
-                    $wpdb->insert(
-                        $price_table,
-                        [
-                            'PRT_ID'         => $wpdb->insert_id,
-                            'PRC_amount'     => 15.00,
-                            'PRC_name'       => esc_html__("Sales Tax", "event_espresso"),
-                            'PRC_desc'       => '',
-                            'PRC_is_default' => true,
-                            'PRC_overrides'  => null,
-                            'PRC_deleted'    => false,
-                            'PRC_order'      => 50,
-                            'PRC_parent'     => null,
-                            'PRC_wp_user'    => $default_creator_id,
-                        ],
-                        [
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
-                            '%d' // PRC_wp_user
-                        ]
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     *    caffeinated_modules_to_register
-     *
-     * @access public
-     * @param array $modules_to_register
-     * @return array
-     */
-    public function caffeinated_modules_to_register($modules_to_register = [])
-    {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
-            if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
-                $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
-            }
-        }
-        return $modules_to_register;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function caffeinated_init()
-    {
-        // Custom Post Type hooks
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            [$this, 'filter_taxonomies']
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            [$this, 'filter_cpts']
-        );
-        add_filter(
-            'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
-            [$this, 'nav_metabox_items']
-        );
-        EE_Registry::instance()->load_file(
-            EE_CAFF_PATH,
-            'EE_Caf_Messages',
-            'class',
-            [],
-            false
-        );
-        // caffeinated_init__complete hook
-        do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
-    }
-
-
-    public function enqueue_caffeinated_scripts()
-    {
-        // sound of crickets...
-    }
-
-
-    /**
-     * callbacks below here
-     *
-     * @param array $taxonomy_array
-     * @return array
-     */
-    public function filter_taxonomies(array $taxonomy_array)
-    {
-        $taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
-        return $taxonomy_array;
-    }
-
-
-    /**
-     * @param array $cpt_array
-     * @return mixed
-     */
-    public function filter_cpts(array $cpt_array)
-    {
-        $cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
-        return $cpt_array;
-    }
-
-
-    /**
-     * @param array $menuitems
-     * @return array
-     */
-    public function nav_metabox_items(array $menuitems)
-    {
-        $menuitems[] = [
-            'title'       => esc_html__('Venue List', 'event_espresso'),
-            'url'         => get_post_type_archive_link('espresso_venues'),
-            'description' => esc_html__('Archive page for all venues.', 'event_espresso'),
-        ];
-        return $menuitems;
-    }
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * EE_Brewing_Regular constructor.
+	 *
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableAnalysis $table_analysis)
+	{
+		$this->_table_analysis = $table_analysis;
+		if (defined('EE_CAFF_PATH')) {
+			$this->setInitializationHooks();
+			$this->setApiRegistrationHooks();
+			$this->setSwitchHooks();
+			$this->setDefaultFilterHooks();
+			// caffeinated constructed
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
+		}
+	}
+
+
+	/**
+	 * Various hooks used for extending features via registration of modules or extensions.
+	 */
+	private function setApiRegistrationHooks()
+	{
+		add_filter(
+			'FHEE__EE_Config__register_modules__modules_to_register',
+			[$this, 'caffeinated_modules_to_register']
+		);
+		add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
+		add_filter(
+			'AHEE__EE_System__load_core_configuration__complete',
+			function () {
+				EE_Register_Payment_Method::register(
+					'caffeinated_payment_methods',
+					[
+						'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+					]
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * Various hooks used for modifying initialization or activation processes.
+	 */
+	private function setInitializationHooks()
+	{
+		// activation
+		add_action('AHEE__EEH_Activation__initialize_db_content', [$this, 'initialize_caf_db_content']);
+		// load caff init
+		add_action('AHEE__EE_System__set_hooks_for_core', [$this, 'caffeinated_init']);
+		// load caff scripts
+		add_action('wp_enqueue_scripts', [$this, 'enqueue_caffeinated_scripts'], 10);
+	}
+
+
+	/**
+	 * Various hooks used for switch (on/off) type filters.
+	 */
+	private function setSwitchHooks()
+	{
+		// remove the "powered by" credit link from receipts and invoices
+		add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
+		// seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
+		add_filter('FHEE__ee_show_affiliate_links', '__return_false');
+	}
+
+
+	/**
+	 * Various filters for affecting default configuration values in the caffeinated
+	 * context.
+	 */
+	private function setDefaultFilterHooks()
+	{
+		add_filter(
+			'FHEE__EE_Admin_Config__show_reg_footer__default',
+			'__return_true'
+		);
+	}
+
+
+	/**
+	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
+	 *
+	 * @param array $paths original helper paths array
+	 * @return array             new array of paths
+	 */
+	public function caf_helper_paths($paths)
+	{
+		$paths[] = EE_CAF_CORE . 'helpers/';
+		return $paths;
+	}
+
+
+	/**
+	 * Upon brand-new activation, if this is a new activation of CAF, we want to add
+	 * some global prices that will show off EE4's capabilities. However, if they're upgrading
+	 * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
+	 * This action should only be called when EE 4.x.0.P is initially activated.
+	 * Right now the only CAF content are these global prices. If there's more in the future, then
+	 * we should probably create a caf file to contain it all instead just a function like this.
+	 * Right now, we ASSUME the only price types in the system are default ones
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function initialize_caf_db_content()
+	{
+		global $wpdb;
+		// use same method of getting creator id as the version introducing the change
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
+		$price_type_table   = $wpdb->prefix . "esp_price_type";
+		$price_table        = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL                  =
+				'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
+			if ($tax_price_type_count <= 1) {
+				$wpdb->insert(
+					$price_type_table,
+					[
+						'PRT_name'       => esc_html__("Regional Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 60,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					],
+					[
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d', // PRT_wp_user
+					]
+				);
+				// federal tax
+				$result = $wpdb->insert(
+					$price_type_table,
+					[
+						'PRT_name'       => esc_html__("Federal Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 70,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					],
+					[
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d' // PRT_wp_user
+					]
+				);
+				if ($result) {
+					$wpdb->insert(
+						$price_table,
+						[
+							'PRT_ID'         => $wpdb->insert_id,
+							'PRC_amount'     => 15.00,
+							'PRC_name'       => esc_html__("Sales Tax", "event_espresso"),
+							'PRC_desc'       => '',
+							'PRC_is_default' => true,
+							'PRC_overrides'  => null,
+							'PRC_deleted'    => false,
+							'PRC_order'      => 50,
+							'PRC_parent'     => null,
+							'PRC_wp_user'    => $default_creator_id,
+						],
+						[
+							'%d',// PRT_id
+							'%f',// PRC_amount
+							'%s',// PRC_name
+							'%s',// PRC_desc
+							'%d',// PRC_is_default
+							'%d',// PRC_overrides
+							'%d',// PRC_deleted
+							'%d',// PRC_order
+							'%d',// PRC_parent
+							'%d' // PRC_wp_user
+						]
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 *    caffeinated_modules_to_register
+	 *
+	 * @access public
+	 * @param array $modules_to_register
+	 * @return array
+	 */
+	public function caffeinated_modules_to_register($modules_to_register = [])
+	{
+		if (is_readable(EE_CAFF_PATH . 'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
+			}
+		}
+		return $modules_to_register;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function caffeinated_init()
+	{
+		// Custom Post Type hooks
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			[$this, 'filter_taxonomies']
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			[$this, 'filter_cpts']
+		);
+		add_filter(
+			'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
+			[$this, 'nav_metabox_items']
+		);
+		EE_Registry::instance()->load_file(
+			EE_CAFF_PATH,
+			'EE_Caf_Messages',
+			'class',
+			[],
+			false
+		);
+		// caffeinated_init__complete hook
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
+	}
+
+
+	public function enqueue_caffeinated_scripts()
+	{
+		// sound of crickets...
+	}
+
+
+	/**
+	 * callbacks below here
+	 *
+	 * @param array $taxonomy_array
+	 * @return array
+	 */
+	public function filter_taxonomies(array $taxonomy_array)
+	{
+		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
+		return $taxonomy_array;
+	}
+
+
+	/**
+	 * @param array $cpt_array
+	 * @return mixed
+	 */
+	public function filter_cpts(array $cpt_array)
+	{
+		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
+		return $cpt_array;
+	}
+
+
+	/**
+	 * @param array $menuitems
+	 * @return array
+	 */
+	public function nav_metabox_items(array $menuitems)
+	{
+		$menuitems[] = [
+			'title'       => esc_html__('Venue List', 'event_espresso'),
+			'url'         => get_post_type_archive_link('espresso_venues'),
+			'description' => esc_html__('Archive page for all venues.', 'event_espresso'),
+		];
+		return $menuitems;
+	}
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 }
 
 
 $brewing = new EE_Brewing_Regular(
-    EE_Registry::instance()->create('TableAnalysis', [], true)
+	EE_Registry::instance()->create('TableAnalysis', [], true)
 );

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Spacing +5 added lines, -5 removed lines

@@ -114,7 +114,7 @@ 
             ? null
             : $this->_data;
 
-        if (! $registration instanceof EE_Registration) {
+        if ( ! $registration instanceof EE_Registration) {
             // let's attempt to get the txn_id for the error message.
             $txn_id  = isset($this->_extra->txn) && $this->_extra->txn instanceof EE_Transaction
                 ? $this->_extra->txn->ID()
@@ -131,12 +131,12 @@ 
         }
 
         // attendee obj for this registration
-        $attendee = isset($this->_extra->registrations[ $registration->ID() ]['att_obj'])
-            ? $this->_extra->registrations[ $registration->ID() ]['att_obj']
+        $attendee = isset($this->_extra->registrations[$registration->ID()]['att_obj'])
+            ? $this->_extra->registrations[$registration->ID()]['att_obj']
             : null;
 
-        if (! $attendee instanceof EE_Attendee) {
-            $msg     = esc_html__(
+        if ( ! $attendee instanceof EE_Attendee) {
+            $msg = esc_html__(
                 'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
                 'event_espresso'
             );

Indentation +188 added lines, -188 removed lines

@@ -15,192 +15,192 @@
  */
 class EE_Attendee_Shortcodes extends EE_Shortcodes
 {
-    /**
-     * hold all extra data.
-     *
-     * @var array
-     */
-    protected $_extra;
-
-
-    /**
-     * EE_Attendee_Shortcodes constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Attendee Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
-        $this->_shortcodes = [
-            '[FNAME]'                          => esc_html__('First Name of an attendee.', 'event_espresso'),
-            '[LNAME]'                          => esc_html__('Last Name of an attendee.', 'event_espresso'),
-            '[ATTENDEE_EMAIL]'                 => esc_html__('Email address for the attendee.', 'event_espresso'),
-            '[EDIT_ATTENDEE_LINK]'             => esc_html__(
-                'Edit Registration Link (typically you\'d only use this for messages going to event administrators)',
-                'event_espresso'
-            ),
-            '[REGISTRATION_ID]'                => esc_html__(
-                'Unique Registration ID for the registration',
-                'event_espresso'
-            ),
-            '[REGISTRATION_CODE]'              => esc_html__(
-                'Unique Registration Code for the registration',
-                'event_espresso'
-            ),
-            '[REGISTRATION_STATUS_ID]'         => esc_html__(
-                'Parses to the registration status for the attendee',
-                'event_espresso'
-            ),
-            '[REGISTRATION_STATUS_LABEL]'      => esc_html__(
-                'Parses to the status label for the registrant',
-                'event_espresso'
-            ),
-            '[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__(
-                'Parses to the total amount paid for this registration.',
-                'event_espresso'
-            ),
-            '[FRONTEND_EDIT_REG_LINK]'         => esc_html__(
-                'Generates a link for the given registration to edit this registration details on the frontend.',
-                'event_espresso'
-            ),
-            '[PHONE_NUMBER]'                   => esc_html__(
-                'The Phone Number for the Registration.',
-                'event_espresso'
-            ),
-            '[ADDRESS]'                        => esc_html__('The Address for the Registration', 'event_espresso'),
-            '[ADDRESS2]'                       => esc_html__(
-                'Whatever was in the address 2 field for the registration.',
-                'event_espresso'
-            ),
-            '[CITY]'                           => esc_html__('The city for the registration.', 'event_espresso'),
-            '[ZIP_PC]'                         => esc_html__(
-                'The ZIP (or Postal) Code for the Registration.',
-                'event_espresso'
-            ),
-            '[ADDRESS_STATE]'                  => esc_html__(
-                'The state/province for the registration.',
-                'event_espresso'
-            ),
-            '[COUNTRY]'                        => esc_html__('The country for the registration.', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * handles shortcode parsing
-     *
-     * @access protected
-     * @param string $shortcode the shortcode to be parsed.
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-
-
-        $this->_extra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_extra_data['data']
-            : null;
-
-        // incoming object should only be a registration object.
-        $registration = ! $this->_data instanceof EE_Registration
-            ? null
-            : $this->_data;
-
-        if (! $registration instanceof EE_Registration) {
-            // let's attempt to get the txn_id for the error message.
-            $txn_id  = isset($this->_extra->txn) && $this->_extra->txn instanceof EE_Transaction
-                ? $this->_extra->txn->ID()
-                : esc_html__('Unknown', 'event_espresso');
-            $msg     = esc_html__(
-                'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.',
-                'event_espresso'
-            );
-            $dev_msg = sprintf(
-                esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
-                $txn_id
-            );
-            throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
-        }
-
-        // attendee obj for this registration
-        $attendee = isset($this->_extra->registrations[ $registration->ID() ]['att_obj'])
-            ? $this->_extra->registrations[ $registration->ID() ]['att_obj']
-            : null;
-
-        if (! $attendee instanceof EE_Attendee) {
-            $msg     = esc_html__(
-                'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
-                'event_espresso'
-            );
-            $dev_msg = sprintf(
-                esc_html__('The registration ID for this request is: %s', 'event_espresso'),
-                $registration->ID()
-            );
-            throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
-        }
-
-        switch ($shortcode) {
-            case '[FNAME]':
-                return $attendee->fname();
-
-            case '[LNAME]':
-                return $attendee->lname();
-
-            case '[ATTENDEE_EMAIL]':
-                return $attendee->email();
-
-            case '[EDIT_ATTENDEE_LINK]':
-                return $registration->get_admin_edit_url();
-
-            case '[REGISTRATION_CODE]':
-                return $registration->reg_code();
-
-            case '[REGISTRATION_ID]':
-                return $registration->ID();
-
-            case '[FRONTEND_EDIT_REG_LINK]':
-                return $registration->edit_attendee_information_url();
-
-            case '[PHONE_NUMBER]':
-                return $attendee->phone();
-
-            case '[ADDRESS]':
-                return $attendee->address();
-
-            case '[ADDRESS2]':
-                return $attendee->address2();
-
-            case '[CITY]':
-                return $attendee->city();
-
-            case '[ZIP_PC]':
-                return $attendee->zip();
-
-            case '[ADDRESS_STATE]':
-                $state_obj = $attendee->state_obj();
-                return $state_obj instanceof EE_State ? $state_obj->name() : '';
-
-            case '[COUNTRY]':
-                $country_obj = $attendee->country_obj();
-                return $country_obj instanceof EE_Country ? $country_obj->name() : '';
-
-            case '[REGISTRATION_STATUS_ID]':
-                return $registration->status_ID();
-
-            case '[REGISTRATION_STATUS_LABEL]':
-                return $registration->pretty_status();
-
-            case '[REGISTRATION_TOTAL_AMOUNT_PAID]':
-                return $registration->pretty_paid();
-        }
-
-        return '';
-    }
+	/**
+	 * hold all extra data.
+	 *
+	 * @var array
+	 */
+	protected $_extra;
+
+
+	/**
+	 * EE_Attendee_Shortcodes constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
+		$this->_shortcodes = [
+			'[FNAME]'                          => esc_html__('First Name of an attendee.', 'event_espresso'),
+			'[LNAME]'                          => esc_html__('Last Name of an attendee.', 'event_espresso'),
+			'[ATTENDEE_EMAIL]'                 => esc_html__('Email address for the attendee.', 'event_espresso'),
+			'[EDIT_ATTENDEE_LINK]'             => esc_html__(
+				'Edit Registration Link (typically you\'d only use this for messages going to event administrators)',
+				'event_espresso'
+			),
+			'[REGISTRATION_ID]'                => esc_html__(
+				'Unique Registration ID for the registration',
+				'event_espresso'
+			),
+			'[REGISTRATION_CODE]'              => esc_html__(
+				'Unique Registration Code for the registration',
+				'event_espresso'
+			),
+			'[REGISTRATION_STATUS_ID]'         => esc_html__(
+				'Parses to the registration status for the attendee',
+				'event_espresso'
+			),
+			'[REGISTRATION_STATUS_LABEL]'      => esc_html__(
+				'Parses to the status label for the registrant',
+				'event_espresso'
+			),
+			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__(
+				'Parses to the total amount paid for this registration.',
+				'event_espresso'
+			),
+			'[FRONTEND_EDIT_REG_LINK]'         => esc_html__(
+				'Generates a link for the given registration to edit this registration details on the frontend.',
+				'event_espresso'
+			),
+			'[PHONE_NUMBER]'                   => esc_html__(
+				'The Phone Number for the Registration.',
+				'event_espresso'
+			),
+			'[ADDRESS]'                        => esc_html__('The Address for the Registration', 'event_espresso'),
+			'[ADDRESS2]'                       => esc_html__(
+				'Whatever was in the address 2 field for the registration.',
+				'event_espresso'
+			),
+			'[CITY]'                           => esc_html__('The city for the registration.', 'event_espresso'),
+			'[ZIP_PC]'                         => esc_html__(
+				'The ZIP (or Postal) Code for the Registration.',
+				'event_espresso'
+			),
+			'[ADDRESS_STATE]'                  => esc_html__(
+				'The state/province for the registration.',
+				'event_espresso'
+			),
+			'[COUNTRY]'                        => esc_html__('The country for the registration.', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * handles shortcode parsing
+	 *
+	 * @access protected
+	 * @param string $shortcode the shortcode to be parsed.
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+
+
+		$this->_extra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+			? $this->_extra_data['data']
+			: null;
+
+		// incoming object should only be a registration object.
+		$registration = ! $this->_data instanceof EE_Registration
+			? null
+			: $this->_data;
+
+		if (! $registration instanceof EE_Registration) {
+			// let's attempt to get the txn_id for the error message.
+			$txn_id  = isset($this->_extra->txn) && $this->_extra->txn instanceof EE_Transaction
+				? $this->_extra->txn->ID()
+				: esc_html__('Unknown', 'event_espresso');
+			$msg     = esc_html__(
+				'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.',
+				'event_espresso'
+			);
+			$dev_msg = sprintf(
+				esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
+				$txn_id
+			);
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
+		}
+
+		// attendee obj for this registration
+		$attendee = isset($this->_extra->registrations[ $registration->ID() ]['att_obj'])
+			? $this->_extra->registrations[ $registration->ID() ]['att_obj']
+			: null;
+
+		if (! $attendee instanceof EE_Attendee) {
+			$msg     = esc_html__(
+				'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.',
+				'event_espresso'
+			);
+			$dev_msg = sprintf(
+				esc_html__('The registration ID for this request is: %s', 'event_espresso'),
+				$registration->ID()
+			);
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
+		}
+
+		switch ($shortcode) {
+			case '[FNAME]':
+				return $attendee->fname();
+
+			case '[LNAME]':
+				return $attendee->lname();
+
+			case '[ATTENDEE_EMAIL]':
+				return $attendee->email();
+
+			case '[EDIT_ATTENDEE_LINK]':
+				return $registration->get_admin_edit_url();
+
+			case '[REGISTRATION_CODE]':
+				return $registration->reg_code();
+
+			case '[REGISTRATION_ID]':
+				return $registration->ID();
+
+			case '[FRONTEND_EDIT_REG_LINK]':
+				return $registration->edit_attendee_information_url();
+
+			case '[PHONE_NUMBER]':
+				return $attendee->phone();
+
+			case '[ADDRESS]':
+				return $attendee->address();
+
+			case '[ADDRESS2]':
+				return $attendee->address2();
+
+			case '[CITY]':
+				return $attendee->city();
+
+			case '[ZIP_PC]':
+				return $attendee->zip();
+
+			case '[ADDRESS_STATE]':
+				$state_obj = $attendee->state_obj();
+				return $state_obj instanceof EE_State ? $state_obj->name() : '';
+
+			case '[COUNTRY]':
+				$country_obj = $attendee->country_obj();
+				return $country_obj instanceof EE_Country ? $country_obj->name() : '';
+
+			case '[REGISTRATION_STATUS_ID]':
+				return $registration->status_ID();
+
+			case '[REGISTRATION_STATUS_LABEL]':
+				return $registration->pretty_status();
+
+			case '[REGISTRATION_TOTAL_AMOUNT_PAID]':
+				return $registration->pretty_paid();
+		}
+
+		return '';
+	}
 }

core/libraries/shortcodes/EE_Attendee_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
         $att_result    = '';
         $registrations =
             isset($this->_extra_data['data']->tickets)
-                ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['reg_objs']
+                ? $this->_extra_data['data']->tickets[$ticket->ID()]['reg_objs']
                 : [];
 
         // each attendee in this case should be an attendee object.
@@ -185,7 +185,7 @@ 
     private function _get_registrations_from_event(EE_Event $event)
     {
         return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['reg_objs']
+            ? $this->_extra_data['data']->events[$event->ID()]['reg_objs']
             : [];
     }
 }

Indentation +168 added lines, -168 removed lines

@@ -18,172 +18,172 @@
  */
 class EE_Attendee_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Attendee List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to attendee lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[ATTENDEE_LIST]' => esc_html__('Will output a list of attendees', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[ATTENDEE_LIST]':
-                return $this->_get_attendee_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_attendee_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_attendee_list_for_main();
-        }
-        if ($this->_data['data'] instanceof EE_Event) {
-            return $this->_get_attendee_list_for_event();
-        }
-        if ($this->_data['data'] instanceof EE_Ticket) {
-            return $this->_get_registration_list_for_ticket();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * This returns the parsed attendee list for main template;
-     */
-    private function _get_attendee_list_for_main()
-    {
-        $valid_shortcodes = ['attendee', 'event_list', 'ticket_list', 'question_list', 'recipient_details'];
-        $template         = $this->_data['template'];
-        $data             = $this->_data['data'];
-        $attendees        = '';
-
-        // now we need to loop through the attendee list and send data to the EE_Parser helper.
-        foreach ($data->reg_objs as $registration) {
-            $attendees .= $this->_shortcode_helper->parse_attendee_list_template(
-                $template,
-                $registration,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $attendees;
-    }
-
-
-    /**
-     * return parsed list of attendees for an event
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_attendee_list_for_event()
-    {
-        $valid_shortcodes = ['attendee', 'ticket_list', 'question_list', 'recipient_details'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list'])
-            ? $this->_data['template']['attendee_list']
-            : $this->_extra_data['template']['attendee_list'];
-        $event            = $this->_data['data'];
-
-        // let's remove any existing [EVENT_LIST] shortcode from the attendee list template so that we don't get recursion.
-        $template = str_replace('[EVENT_LIST]', '', $template);
-
-        // here we're setting up the attendees for the attendee_list template for THIS event.
-        $att_result    = '';
-        $registrations = $this->_get_registrations_from_event($event);
-
-        // each attendee in this case should be an attendee object.
-        foreach ($registrations as $registration) {
-            $att_result .= $this->_shortcode_helper->parse_attendee_list_template(
-                $template,
-                $registration,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $att_result;
-    }
-
-
-    /**
-     * return parsed list of attendees for a ticket
-     *
-     * @return string
-     */
-    private function _get_registration_list_for_ticket()
-    {
-        $valid_shortcodes = ['attendee', 'event_list', 'question_list', 'recipient_details'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list'])
-            ? $this->_data['template']['attendee_list']
-            : $this->_extra_data['template']['attendee_list'];
-        $ticket           = $this->_data['data'];
-
-        // let's remove any existing [TICKET_LIST] (or related) shortcode from the attendee list template so that we don't get recursion.
-        $template = str_replace('[TICKET_LIST]', '', $template);
-        $template = str_replace('[RECIPIENT_TICKET_LIST]', '', $template);
-        $template = str_replace('[PRIMARY_REGISTRANT_TICKET_LIST]', '', $template);
-
-        // here we're setting up the attendees for the attendee_list template for THIS ticket.
-        $att_result    = '';
-        $registrations =
-            isset($this->_extra_data['data']->tickets)
-                ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['reg_objs']
-                : [];
-
-        // each attendee in this case should be an attendee object.
-        foreach ($registrations as $registration) {
-            $att_result .= $this->_shortcode_helper->parse_attendee_list_template(
-                $template,
-                $registration,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $att_result;
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return array|mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_registrations_from_event(EE_Event $event)
-    {
-        return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['reg_objs']
-            : [];
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Attendee List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[ATTENDEE_LIST]' => esc_html__('Will output a list of attendees', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[ATTENDEE_LIST]':
+				return $this->_get_attendee_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_attendee_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_attendee_list_for_main();
+		}
+		if ($this->_data['data'] instanceof EE_Event) {
+			return $this->_get_attendee_list_for_event();
+		}
+		if ($this->_data['data'] instanceof EE_Ticket) {
+			return $this->_get_registration_list_for_ticket();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * This returns the parsed attendee list for main template;
+	 */
+	private function _get_attendee_list_for_main()
+	{
+		$valid_shortcodes = ['attendee', 'event_list', 'ticket_list', 'question_list', 'recipient_details'];
+		$template         = $this->_data['template'];
+		$data             = $this->_data['data'];
+		$attendees        = '';
+
+		// now we need to loop through the attendee list and send data to the EE_Parser helper.
+		foreach ($data->reg_objs as $registration) {
+			$attendees .= $this->_shortcode_helper->parse_attendee_list_template(
+				$template,
+				$registration,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $attendees;
+	}
+
+
+	/**
+	 * return parsed list of attendees for an event
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_attendee_list_for_event()
+	{
+		$valid_shortcodes = ['attendee', 'ticket_list', 'question_list', 'recipient_details'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list'])
+			? $this->_data['template']['attendee_list']
+			: $this->_extra_data['template']['attendee_list'];
+		$event            = $this->_data['data'];
+
+		// let's remove any existing [EVENT_LIST] shortcode from the attendee list template so that we don't get recursion.
+		$template = str_replace('[EVENT_LIST]', '', $template);
+
+		// here we're setting up the attendees for the attendee_list template for THIS event.
+		$att_result    = '';
+		$registrations = $this->_get_registrations_from_event($event);
+
+		// each attendee in this case should be an attendee object.
+		foreach ($registrations as $registration) {
+			$att_result .= $this->_shortcode_helper->parse_attendee_list_template(
+				$template,
+				$registration,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $att_result;
+	}
+
+
+	/**
+	 * return parsed list of attendees for a ticket
+	 *
+	 * @return string
+	 */
+	private function _get_registration_list_for_ticket()
+	{
+		$valid_shortcodes = ['attendee', 'event_list', 'question_list', 'recipient_details'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['attendee_list'])
+			? $this->_data['template']['attendee_list']
+			: $this->_extra_data['template']['attendee_list'];
+		$ticket           = $this->_data['data'];
+
+		// let's remove any existing [TICKET_LIST] (or related) shortcode from the attendee list template so that we don't get recursion.
+		$template = str_replace('[TICKET_LIST]', '', $template);
+		$template = str_replace('[RECIPIENT_TICKET_LIST]', '', $template);
+		$template = str_replace('[PRIMARY_REGISTRANT_TICKET_LIST]', '', $template);
+
+		// here we're setting up the attendees for the attendee_list template for THIS ticket.
+		$att_result    = '';
+		$registrations =
+			isset($this->_extra_data['data']->tickets)
+				? $this->_extra_data['data']->tickets[ $ticket->ID() ]['reg_objs']
+				: [];
+
+		// each attendee in this case should be an attendee object.
+		foreach ($registrations as $registration) {
+			$att_result .= $this->_shortcode_helper->parse_attendee_list_template(
+				$template,
+				$registration,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $att_result;
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return array|mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_registrations_from_event(EE_Event $event)
+	{
+		return isset($this->_extra_data['data']->events)
+			? $this->_extra_data['data']->events[ $event->ID() ]['reg_objs']
+			: [];
+	}
 }

core/admin/EE_Admin_Page_Menu_Group.core.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
 
     private function _group_link()
     {
-        return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
+        return '<span class="ee_menu_group"  onclick="return false;">'.$this->menu_label.'</span>';
     }
 }

Indentation +23 added lines, -23 removed lines

@@ -13,31 +13,31 @@
  */
 class EE_Admin_Page_Menu_Group extends EE_Admin_Page_Menu_Map
 {
-    /**
-     * @throws EE_Error
-     */
-    public function __construct($menu_args = [])
-    {
-        $required = ['menu_label', 'menu_slug', 'menu_order', 'parent_slug'];
-        parent::__construct($menu_args, $required);
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	public function __construct($menu_args = [])
+	{
+		$required = ['menu_label', 'menu_slug', 'menu_order', 'parent_slug'];
+		parent::__construct($menu_args, $required);
+	}
 
 
-    protected function _add_menu_page()
-    {
-        return add_submenu_page(
-            $this->parent_slug,
-            $this->menu_label,
-            $this->_group_link(),
-            $this->capability,
-            $this->menu_slug,
-            '__return_false'
-        );
-    }
+	protected function _add_menu_page()
+	{
+		return add_submenu_page(
+			$this->parent_slug,
+			$this->menu_label,
+			$this->_group_link(),
+			$this->capability,
+			$this->menu_slug,
+			'__return_false'
+		);
+	}
 
 
-    private function _group_link()
-    {
-        return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
-    }
+	private function _group_link()
+	{
+		return '<span class="ee_menu_group"  onclick="return false;">' . $this->menu_label . '</span>';
+	}
 }

core/admin/EE_Admin_Page_Main_Menu.core.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
             $this->icon_url,
             $this->position
         );
-        if (! empty($this->subtitle)) {
+        if ( ! empty($this->subtitle)) {
             add_submenu_page(
                 $this->parent_slug,
                 $this->subtitle,

Indentation +63 added lines, -63 removed lines

@@ -9,76 +9,76 @@
  */
 class EE_Admin_Page_Main_Menu extends EE_Admin_Page_Menu_Map
 {
-    /**
-     * If included int incoming params, then this class will also register a Sub Menue Admin page with a different
-     * subtitle than the main menu item.
-     *
-     * @since 4.4.0
-     *
-     * @var string
-     */
-    public $subtitle;
+	/**
+	 * If included int incoming params, then this class will also register a Sub Menue Admin page with a different
+	 * subtitle than the main menu item.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @var string
+	 */
+	public $subtitle;
 
-    /**
-     * The page to a icon used for this menu.
-     *
-     * @since  4.4.0
-     * @see    http://codex.wordpress.org/Function_Reference/add_menu_page#Parameters
-     *        for what can be set for this property.
-     * @var string
-     */
-    public $icon_url;
+	/**
+	 * The page to a icon used for this menu.
+	 *
+	 * @since  4.4.0
+	 * @see    http://codex.wordpress.org/Function_Reference/add_menu_page#Parameters
+	 *        for what can be set for this property.
+	 * @var string
+	 */
+	public $icon_url;
 
 
-    /**
-     * What position in the main menu order for the WP admin menu this menu item
-     * should show.
-     *
-     * @since  4.4.0
-     * @see    http://codex.wordpress.org/Function_Reference/add_menu_page#Parameters
-     *        for what can be set for this property.
-     * @var integer
-     */
-    public $position;
+	/**
+	 * What position in the main menu order for the WP admin menu this menu item
+	 * should show.
+	 *
+	 * @since  4.4.0
+	 * @see    http://codex.wordpress.org/Function_Reference/add_menu_page#Parameters
+	 *        for what can be set for this property.
+	 * @var integer
+	 */
+	public $position;
 
 
-    /**
-     * @throws EE_Error
-     */
-    public function __construct($menu_args)
-    {
-        $required = ['menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page'];
+	/**
+	 * @throws EE_Error
+	 */
+	public function __construct($menu_args)
+	{
+		$required = ['menu_label', 'parent_slug', 'menu_slug', 'menu_group', 'menu_order', 'admin_init_page'];
 
-        parent::__construct($menu_args, $required);
+		parent::__construct($menu_args, $required);
 
-        $this->position = ! empty($this->position) ? (int) $this->position : $this->position;
-    }
+		$this->position = ! empty($this->position) ? (int) $this->position : $this->position;
+	}
 
 
-    /**
-     * Uses the proper WP utility for registering a menu page for the main WP pages.
-     */
-    protected function _add_menu_page()
-    {
-        $main = add_menu_page(
-            $this->title,
-            $this->menu_label,
-            $this->capability,
-            $this->parent_slug,
-            $this->menu_callback,
-            $this->icon_url,
-            $this->position
-        );
-        if (! empty($this->subtitle)) {
-            add_submenu_page(
-                $this->parent_slug,
-                $this->subtitle,
-                $this->subtitle,
-                $this->capability,
-                $this->menu_slug,
-                $this->menu_callback
-            );
-        }
-        return $main;
-    }
+	/**
+	 * Uses the proper WP utility for registering a menu page for the main WP pages.
+	 */
+	protected function _add_menu_page()
+	{
+		$main = add_menu_page(
+			$this->title,
+			$this->menu_label,
+			$this->capability,
+			$this->parent_slug,
+			$this->menu_callback,
+			$this->icon_url,
+			$this->position
+		);
+		if (! empty($this->subtitle)) {
+			add_submenu_page(
+				$this->parent_slug,
+				$this->subtitle,
+				$this->subtitle,
+				$this->capability,
+				$this->menu_slug,
+				$this->menu_callback
+			);
+		}
+		return $main;
+	}
 }

core/domain/services/admin/privacy/policy/privacy_policy.template.php

Indentation +80 added lines, -80 removed lines

@@ -7,10 +7,10 @@ 
 ?>
 <h2><?php esc_html_e('Event Registration Data', 'event_espresso'); ?></h2>
 <p><?php
-    esc_html_e(
-        'We collect information about you during event registration. This information may include but is not limited to:',
-        'event_espresso'
-    ); ?></p>
+	esc_html_e(
+		'We collect information about you during event registration. This information may include but is not limited to:',
+		'event_espresso'
+	); ?></p>
 <ul>
     <li><?php esc_html_e('Your names', 'event_espresso'); ?></li>
     <li><?php esc_html_e('Billing address', 'event_espresso'); ?></li>
@@ -18,16 +18,16 @@ 
     <li><?php esc_html_e('Email address', 'event_espresso'); ?></li>
     <li><?php esc_html_e('Phone number', 'event_espresso'); ?></li>
     <li><?php
-        esc_html_e(
-            'Location and traffic data (including partial IP address and browser type)',
-            'event_espresso'
-        ); ?>
+		esc_html_e(
+			'Location and traffic data (including partial IP address and browser type)',
+			'event_espresso'
+		); ?>
     </li>
     <li><?php
-        esc_html_e(
-            'Any other details that might be requested from you for the purpose of processing your registration or ticket purchase',
-            'event_espresso'
-        ); ?>
+		esc_html_e(
+			'Any other details that might be requested from you for the purpose of processing your registration or ticket purchase',
+			'event_espresso'
+		); ?>
     </li>
 </ul>
 
@@ -36,101 +36,101 @@ 
     <li><?php esc_html_e('Send you important account/purchase/service information.', 'event_espresso'); ?></li>
     <li><?php esc_html_e('Respond to your queries, refund requests, or complaints.', 'event_espresso'); ?></li>
     <li><?php
-        esc_html_e(
-            'Process payments and prevent fraudulent transactions. We do this on the basis of our legitimate business interests.',
-            'event_espresso'
-        ); ?></li>
+		esc_html_e(
+			'Process payments and prevent fraudulent transactions. We do this on the basis of our legitimate business interests.',
+			'event_espresso'
+		); ?></li>
     <li><?php
-        esc_html_e(
-            'Set up and administer your account, provide technical and customer support, and to verify your identity.',
-            'event_espresso'
-        ); ?></li>
+		esc_html_e(
+			'Set up and administer your account, provide technical and customer support, and to verify your identity.',
+			'event_espresso'
+		); ?></li>
 </ul>
 
 <?php if (! empty($active_onsite_payment_methods) || ! empty($active_offsite_payment_methods)) { ?>
     <h2><?php esc_html_e('Billing Information', 'event_espresso'); ?> </h2>
     <?php
-    // if onsite or offsite payment methods are active
-    if (! empty($active_onsite_payment_methods)) { ?>
+	// if onsite or offsite payment methods are active
+	if (! empty($active_onsite_payment_methods)) { ?>
         <p><?php
-            esc_html_e(
-                'In order to process payments, we collect billing information on-site. Sensitive billing information is not stored on our server, but may be handled while in-transit to the payment processing server.',
-                'event_espresso'
-            ); ?></p>
+			esc_html_e(
+				'In order to process payments, we collect billing information on-site. Sensitive billing information is not stored on our server, but may be handled while in-transit to the payment processing server.',
+				'event_espresso'
+			); ?></p>
         <p><?php
-            printf(
-                esc_html_x(
-                    'Please see the privacy policy of %1$s.',
-                    'Please see the privacy policy of PayPal Pro',
-                    'event_espresso'
-                ),
-                implode(
-                    ', ',
-                    array_merge(
-                        $active_onsite_payment_methods,
-                        $active_offsite_payment_methods
-                    )
-                )
-            ); ?></p>
+			printf(
+				esc_html_x(
+					'Please see the privacy policy of %1$s.',
+					'Please see the privacy policy of PayPal Pro',
+					'event_espresso'
+				),
+				implode(
+					', ',
+					array_merge(
+						$active_onsite_payment_methods,
+						$active_offsite_payment_methods
+					)
+				)
+			); ?></p>
         <p><?php
-            esc_html_e(
-                'Masked billing information may be stored on our servers (eg only the last 4 digits of credit card numbers are stored: **** **** **** 1234).',
-                'event_espresso'
-            ); ?></p>
+			esc_html_e(
+				'Masked billing information may be stored on our servers (eg only the last 4 digits of credit card numbers are stored: **** **** **** 1234).',
+				'event_espresso'
+			); ?></p>
     <?php } elseif (! empty($active_offsite_payment_methods)) { // IF OFFSITE PAYMENT METHOD ACTIVE ?>
         <p><?php
-            printf(
-                esc_html_x(
-                    'Billing information is sent directly to the payment processor, and is not handled by our servers. Please see the privacy policy of %1$s.',
-                    'Billing information is sent directly to the payment processor, and is not handled by our servers. Please see the privacy policy of PayPal Pro.',
-                    'event_espresso'
-                ),
-                implode(', ', $active_offsite_payment_methods)
-            ); ?></p>
+			printf(
+				esc_html_x(
+					'Billing information is sent directly to the payment processor, and is not handled by our servers. Please see the privacy policy of %1$s.',
+					'Billing information is sent directly to the payment processor, and is not handled by our servers. Please see the privacy policy of PayPal Pro.',
+					'event_espresso'
+				),
+				implode(', ', $active_offsite_payment_methods)
+			); ?></p>
     <?php } ?>
     <h2><?php esc_html_e('Payment Logging', 'event_espresso'); ?></h2>
     <p><?php
-        esc_html_e(
-            'Site administrators may keep a log of communications with the payment processors in order to verify payments are being processed correctly. These logs are automatically deleted after a week.',
-            'event_espresso'
-        ); ?></p>
+		esc_html_e(
+			'Site administrators may keep a log of communications with the payment processors in order to verify payments are being processed correctly. These logs are automatically deleted after a week.',
+			'event_espresso'
+		); ?></p>
 <?php } ?>
 
 <h2><?php esc_html_e('Event Registration Cookies', 'event_espresso'); ?></h2>
 <p><?php
-    printf(
-        esc_html_x(
-            'When you begin registering for an event and select a ticket quantity, a cookie will be used to track your registration. This cookie lasts %1$s.',
-            'When you begin registering for an event and select a ticket quantity, a cookie will be used to track your registration. This cookie lasts 2 hours.',
-            'event_espresso'
-        ),
-        $session_lifespan
-    ); ?></p>
+	printf(
+		esc_html_x(
+			'When you begin registering for an event and select a ticket quantity, a cookie will be used to track your registration. This cookie lasts %1$s.',
+			'When you begin registering for an event and select a ticket quantity, a cookie will be used to track your registration. This cookie lasts 2 hours.',
+			'event_espresso'
+		),
+		$session_lifespan
+	); ?></p>
 
 <h2><?php esc_html_e('Email History Data', 'event_espresso'); ?></h2>
 <p><?php
-    esc_html_e(
-        'We keep a record of the emails sent to you. This is to ensure communication is successfully sent and its information is accurate.',
-        'event_espresso'
-    ); ?></p>
+	esc_html_e(
+		'We keep a record of the emails sent to you. This is to ensure communication is successfully sent and its information is accurate.',
+		'event_espresso'
+	); ?></p>
 
 <h2><?php esc_html_e('Event Check-In Record', 'event_espresso'); ?></h2>
 <p><?php
-    esc_html_e(
-        'When you attend an event, an event manager may record the time you check in or out of the event.',
-        'event_espresso'
-    ); ?></p>
+	esc_html_e(
+		'When you attend an event, an event manager may record the time you check in or out of the event.',
+		'event_espresso'
+	); ?></p>
 
 <h2><?php esc_html_e('Event Registration Data Retention', 'event_espresso'); ?></h2>
 <p><?php
-    esc_html_e(
-        'Personal data is stored at least until the date of the event, and may be kept indefinitely in case of future registrations.',
-        'event_espresso'
-    ); ?></p>
+	esc_html_e(
+		'Personal data is stored at least until the date of the event, and may be kept indefinitely in case of future registrations.',
+		'event_espresso'
+	); ?></p>
 
 <h2><?php esc_html_e('Event Registration Data Erasure and Export', 'event_espresso'); ?></h2>
 <p><?php
-    esc_html_e(
-        'You have the right to request your personal data be sent to you electronically, and the right to request your registration data be erased after the event. To do so, please contact the event manager or site administrator.',
-        'event_espresso'
-    ); ?></p>
+	esc_html_e(
+		'You have the right to request your personal data be sent to you electronically, and the right to request your registration data be erased after the event. To do so, please contact the event manager or site administrator.',
+		'event_espresso'
+	); ?></p>

Spacing +3 added lines, -3 removed lines

@@ -47,11 +47,11 @@ 
         ); ?></li>
 </ul>
 
-<?php if (! empty($active_onsite_payment_methods) || ! empty($active_offsite_payment_methods)) { ?>
+<?php if ( ! empty($active_onsite_payment_methods) || ! empty($active_offsite_payment_methods)) { ?>
     <h2><?php esc_html_e('Billing Information', 'event_espresso'); ?> </h2>
     <?php
     // if onsite or offsite payment methods are active
-    if (! empty($active_onsite_payment_methods)) { ?>
+    if ( ! empty($active_onsite_payment_methods)) { ?>
         <p><?php
             esc_html_e(
                 'In order to process payments, we collect billing information on-site. Sensitive billing information is not stored on our server, but may be handled while in-transit to the payment processing server.',
@@ -77,7 +77,7 @@ 
                 'Masked billing information may be stored on our servers (eg only the last 4 digits of credit card numbers are stored: **** **** **** 1234).',
                 'event_espresso'
             ); ?></p>
-    <?php } elseif (! empty($active_offsite_payment_methods)) { // IF OFFSITE PAYMENT METHOD ACTIVE ?>
+    <?php } elseif ( ! empty($active_offsite_payment_methods)) { // IF OFFSITE PAYMENT METHOD ACTIVE ?>
         <p><?php
             printf(
                 esc_html_x(

public/Espresso_Arabica_2014/loop-espresso_events.php

Indentation +34 added lines, -34 removed lines

@@ -11,48 +11,48 @@
  * @version     4+
  */
 if (have_posts()) :
-    if (apply_filters('FHEE__archive_espresso_events_template__show_header', true)) : ?>
+	if (apply_filters('FHEE__archive_espresso_events_template__show_header', true)) : ?>
         <header class="page-header">
             <h1 class="page-title">
                 <?php
-                if (is_day()) :
-                    printf(esc_html__('Today\'s Events: %s', 'event_espresso'), get_the_date());
-                elseif (is_month()) :
-                    printf(
-                        esc_html__('Events This Month: %s', 'event_espresso'),
-                        get_the_date(_x('F Y', 'monthly archives date format', 'event_espresso'))
-                    );
-                elseif (is_year()) :
-                    printf(
-                        esc_html__('Events This Year: %s', 'event_espresso'),
-                        get_the_date(_x('Y', 'yearly archives date format', 'event_espresso'))
-                    );
-                else :
-                    echo apply_filters(
-                        'FHEE__archive_espresso_events_template__upcoming_events_h1',
-                        esc_html__('Upcoming Events', 'event_espresso')
-                    );
-                endif;
-                ?>
+				if (is_day()) :
+					printf(esc_html__('Today\'s Events: %s', 'event_espresso'), get_the_date());
+				elseif (is_month()) :
+					printf(
+						esc_html__('Events This Month: %s', 'event_espresso'),
+						get_the_date(_x('F Y', 'monthly archives date format', 'event_espresso'))
+					);
+				elseif (is_year()) :
+					printf(
+						esc_html__('Events This Year: %s', 'event_espresso'),
+						get_the_date(_x('Y', 'yearly archives date format', 'event_espresso'))
+					);
+				else :
+					echo apply_filters(
+						'FHEE__archive_espresso_events_template__upcoming_events_h1',
+						esc_html__('Upcoming Events', 'event_espresso')
+					);
+				endif;
+				?>
             </h1>
 
         </header><!-- .page-header -->
 
         <?php
-    endif;
-    // allow other stuff
-    do_action('AHEE__archive_espresso_events_template__before_loop');
-    // Start the Loop.
-    while (have_posts()) : the_post();
-        // Include the post TYPE-specific template for the content.
-        espresso_get_template_part('content', 'espresso_events-shortcode');
-    endwhile;
-    // Previous/next page navigation.
-    espresso_pagination();
-    // allow moar other stuff
-    do_action('AHEE__archive_espresso_events_template__after_loop');
+	endif;
+	// allow other stuff
+	do_action('AHEE__archive_espresso_events_template__before_loop');
+	// Start the Loop.
+	while (have_posts()) : the_post();
+		// Include the post TYPE-specific template for the content.
+		espresso_get_template_part('content', 'espresso_events-shortcode');
+	endwhile;
+	// Previous/next page navigation.
+	espresso_pagination();
+	// allow moar other stuff
+	do_action('AHEE__archive_espresso_events_template__after_loop');
 else :
-    // If no content, include the "No posts found" template.
-    espresso_get_template_part('content', 'none');
+	// If no content, include the "No posts found" template.
+	espresso_get_template_part('content', 'none');
 endif;
 

Braces +6 added lines, -2 removed lines

@@ -27,11 +27,13 @@ 
                         esc_html__('Events This Year: %s', 'event_espresso'),
                         get_the_date(_x('Y', 'yearly archives date format', 'event_espresso'))
                     );
-                else :
+                else {
+                	:
                     echo apply_filters(
                         'FHEE__archive_espresso_events_template__upcoming_events_h1',
                         esc_html__('Upcoming Events', 'event_espresso')
                     );
+                }
                 endif;
                 ?>
             </h1>
@@ -51,8 +53,10 @@ 
     espresso_pagination();
     // allow moar other stuff
     do_action('AHEE__archive_espresso_events_template__after_loop');
-else :
+else {
+	:
     // If no content, include the "No posts found" template.
     espresso_get_template_part('content', 'none');
+}
 endif;