eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Venue_Shortcodes.lib.php

Indentation +311 added lines, -311 removed lines

@@ -17,315 +17,315 @@
 {
 
 
-    /**
-     * Will hold the EE_Event if available
-     *
-     * @var EE_Event
-     */
-    protected $_event;
-
-    /**
-     * Will hold the EE_Venue if available
-     *
-     * @var EE_Venue
-     */
-    protected $_venue;
-
-
-    /**
-     * Initialize properties
-     */
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Venue Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to venue related data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[VENUE_TITLE]'             => esc_html__('The title for the event venue', 'event_espresso'),
-            '[VENUE_DESCRIPTION]'       => esc_html__('The description for the event venue', 'event_espresso'),
-            '[VENUE_URL]'               => esc_html__('A url to a webpage for the venue', 'event_espresso'),
-            '[VENUE_DETAILS_URL]'       => sprintf(
-                esc_html__(
-                    'This shortcode outputs the url or website address to the venue details page on this website. This differs from %s which outputs what is entered in the "url" field in the venue details page.',
-                    'event_espresso'
-                ),
-                '[VENUE_URL]'
-            ),
-            '[VENUE_IMAGE]'             => esc_html__('An image representing the event venue', 'event_espresso'),
-            '[VENUE_PHONE]'             => esc_html__('The phone number for the venue', 'event_espresso'),
-            '[VENUE_ADDRESS]'           => esc_html__('The address for the venue', 'event_espresso'),
-            '[VENUE_ADDRESS2]'          => esc_html__('Address 2 for the venue', 'event_espresso'),
-            '[VENUE_CITY]'              => esc_html__('The city the venue is in', 'event_espresso'),
-            '[VENUE_STATE]'             => esc_html__('The state the venue is located in', 'event_espresso'),
-            '[VENUE_COUNTRY]'           => esc_html__('The country the venue is located in', 'event_espresso'),
-            '[VENUE_FORMATTED_ADDRESS]' => esc_html__(
-                'This just outputs the venue address in a semantic address format.',
-                'event_espresso'
-            ),
-            '[VENUE_ZIP]'               => esc_html__('The zip code for the venue address', 'event_espresso'),
-            '[VENUE_META_*]'            => esc_html__(
-                'This is a special dynamic shortcode. After the "*", add the exact name for your custom field, if there is a value set for that custom field within the venue then it will be output in place of this shortcode.',
-                'event_espresso'
-            ),
-            '[GOOGLE_MAP_URL]'          => esc_html__(
-                'URL for the google map associated with the venue.',
-                'event_espresso'
-            ),
-            '[GOOGLE_MAP_LINK]'         => esc_html__('Link to a google map for the venue', 'event_espresso'),
-            '[GOOGLE_MAP_IMAGE]'        => esc_html__('Google map for venue wrapped in image tags', 'event_espresso'),
-        );
-    }
-
-
-    /**
-     * Parse incoming shortcode
-     *
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     */
-    protected function _parser($shortcode)
-    {
-        $this->_venue = $this->_get_venue();
-        // If there is no venue object by now then get out.
-        if (! $this->_venue instanceof EE_Venue) {
-            return '';
-        }
-
-        switch ($shortcode) {
-            case '[VENUE_TITLE]':
-                return $this->_venue('title');
-                break;
-
-            case '[VENUE_DESCRIPTION]':
-                return $this->_venue('description');
-                break;
-
-            case '[VENUE_URL]':
-                return $this->_venue('url');
-                break;
-
-            case '[VENUE_IMAGE]':
-                return $this->_venue('image');
-                break;
-
-            case '[VENUE_PHONE]':
-                return $this->_venue('phone');
-                break;
-
-            case '[VENUE_ADDRESS]':
-                return $this->_venue('address');
-                break;
-
-            case '[VENUE_ADDRESS2]':
-                return $this->_venue('address2');
-                break;
-
-            case '[VENUE_CITY]':
-                return $this->_venue('city');
-                break;
-
-            case '[VENUE_COUNTRY]':
-                return $this->_venue('country');
-                break;
-
-            case '[VENUE_STATE]':
-                return $this->_venue('state');
-                break;
-
-            case '[VENUE_ZIP]':
-                return $this->_venue('zip');
-                break;
-
-            case '[VENUE_FORMATTED_ADDRESS]':
-                return $this->_venue('formatted_address');
-                break;
-
-            case '[GOOGLE_MAP_URL]':
-                return $this->_venue('gmap_url');
-                break;
-
-            case '[GOOGLE_MAP_LINK]':
-                return $this->_venue('gmap_link');
-                break;
-
-            case '[GOOGLE_MAP_IMAGE]':
-                return $this->_venue('gmap_link_img');
-                break;
-
-            case '[VENUE_DETAILS_URL]':
-                return $this->_venue('permalink');
-                break;
-        }
-
-        if (strpos($shortcode, '[VENUE_META_*') !== false) {
-            $shortcode = str_replace('[VENUE_META_*', '', $shortcode);
-            $shortcode = trim(str_replace(']', '', $shortcode));
-
-            // pull the meta value from the venue post
-            $venue_meta = $this->_venue->get_post_meta($shortcode, true);
-
-            return ! empty($venue_meta) ? $venue_meta : '';
-        }
-    }
-
-    /**
-     * This retrieves the EE_Venue from the available data object.
-     *
-     * @return EE_Venue|null
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     */
-    private function _get_venue()
-    {
-
-        // we need the EE_Event object to get the venue.
-        $this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
-
-        // if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the
-        // reg_obj instead.
-        if (! $this->_event instanceof EE_Event) {
-            $aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-            $aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
-
-            $this->_event = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration
-                ? $aee->reg_obj->event()
-                : null;
-
-            // if still empty do we have a ticket data item?
-            $this->_event = ! $this->_event instanceof EE_Event
-                            && $this->_data instanceof EE_Ticket
-                            && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-                ? $this->_extra_data['data']->tickets[ $this->_data->ID() ]['EE_Event']
-                : $this->_event;
-
-            // if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee
-            // and use that.
-            $this->_event = ! $this->_event instanceof EE_Event && $aee instanceof EE_Messages_Addressee
-                ? reset($aee->events)
-                : $this->_event;
-        }
-
-        // If we have an event object use it to pull the venue.
-        if ($this->_event instanceof EE_Event) {
-            return $this->_event->get_first_related('Venue');
-        }
-
-        return null;
-    }
-
-    /**
-     * This retrieves the specified venue information
-     *
-     * @param string $field What Venue field to retrieve
-     * @return string What was retrieved!
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     */
-    private function _venue($field)
-    {
-
-        if (! $this->_venue instanceof EE_Venue) {
-            return '';
-        } //no venue so get out.
-
-        switch ($field) {
-            case 'title':
-                return $this->_venue->get('VNU_name');
-                break;
-
-            case 'description':
-                return $this->_venue->get('VNU_desc');
-                break;
-
-            case 'url':
-                $url = $this->_venue->get('VNU_url');
-                return empty($url) ? $this->_venue->get_permalink() : $url;
-                break;
-
-            case 'permalink':
-                return $this->_venue->get_permalink();
-                break;
-
-            case 'image':
-                return '<img src="' . $this->_venue->feature_image_url(array(200, 200,))
-                       . '" alt="' . sprintf(
-                           esc_attr__('%s Feature Image', 'event_espresso'),
-                           $this->_venue->get('VNU_name')
-                       ) . '" />';
-                break;
-
-            case 'phone':
-                return $this->_venue->get('VNU_phone');
-                break;
-
-            case 'address':
-                return $this->_venue->get('VNU_address');
-                break;
-
-            case 'address2':
-                return $this->_venue->get('VNU_address2');
-                break;
-
-            case 'city':
-                return $this->_venue->get('VNU_city');
-                break;
-
-            case 'state':
-                $state = $this->_venue->state_obj();
-                return is_object($state) ? $state->get('STA_name') : '';
-                break;
-
-            case 'country':
-                $country = $this->_venue->country_obj();
-                return is_object($country) ? $country->get('CNT_name') : '';
-                break;
-
-            case 'zip':
-                return $this->_venue->get('VNU_zip');
-                break;
-
-            case 'formatted_address':
-                return EEH_Address::format($this->_venue);
-                break;
-
-            case 'gmap_link':
-            case 'gmap_url':
-            case 'gmap_link_img':
-                $atts = $this->get_map_attributes($this->_venue, $field);
-                return EEH_Maps::google_map_link($atts);
-                break;
-        }
-        return '';
-    }
-
-
-    /**
-     * Generates the attributes for retrieving a google_map artifact.
-     *
-     * @param EE_Venue $venue
-     * @param string   $field
-     * @return array
-     * @throws EE_Error
-     */
-    protected function get_map_attributes(EE_Venue $venue, $field = 'gmap_link')
-    {
-        $state = $venue->state_obj();
-        $country = $venue->country_obj();
-        $atts = array(
-            'id'      => $venue->ID(),
-            'address' => $venue->get('VNU_address'),
-            'city'    => $venue->get('VNU_city'),
-            'state'   => is_object($state) ? $state->get('STA_name') : '',
-            'zip'     => $venue->get('VNU_zip'),
-            'country' => is_object($country) ? $country->get('CNT_name') : '',
-            'type'    => $field === 'gmap_link' ? 'url' : 'map',
-            'map_w'   => 200,
-            'map_h'   => 200,
-        );
-        if ($field === 'gmap_url') {
-            $atts['type'] = 'url_only';
-        }
-        return $atts;
-    }
+	/**
+	 * Will hold the EE_Event if available
+	 *
+	 * @var EE_Event
+	 */
+	protected $_event;
+
+	/**
+	 * Will hold the EE_Venue if available
+	 *
+	 * @var EE_Venue
+	 */
+	protected $_venue;
+
+
+	/**
+	 * Initialize properties
+	 */
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Venue Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to venue related data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[VENUE_TITLE]'             => esc_html__('The title for the event venue', 'event_espresso'),
+			'[VENUE_DESCRIPTION]'       => esc_html__('The description for the event venue', 'event_espresso'),
+			'[VENUE_URL]'               => esc_html__('A url to a webpage for the venue', 'event_espresso'),
+			'[VENUE_DETAILS_URL]'       => sprintf(
+				esc_html__(
+					'This shortcode outputs the url or website address to the venue details page on this website. This differs from %s which outputs what is entered in the "url" field in the venue details page.',
+					'event_espresso'
+				),
+				'[VENUE_URL]'
+			),
+			'[VENUE_IMAGE]'             => esc_html__('An image representing the event venue', 'event_espresso'),
+			'[VENUE_PHONE]'             => esc_html__('The phone number for the venue', 'event_espresso'),
+			'[VENUE_ADDRESS]'           => esc_html__('The address for the venue', 'event_espresso'),
+			'[VENUE_ADDRESS2]'          => esc_html__('Address 2 for the venue', 'event_espresso'),
+			'[VENUE_CITY]'              => esc_html__('The city the venue is in', 'event_espresso'),
+			'[VENUE_STATE]'             => esc_html__('The state the venue is located in', 'event_espresso'),
+			'[VENUE_COUNTRY]'           => esc_html__('The country the venue is located in', 'event_espresso'),
+			'[VENUE_FORMATTED_ADDRESS]' => esc_html__(
+				'This just outputs the venue address in a semantic address format.',
+				'event_espresso'
+			),
+			'[VENUE_ZIP]'               => esc_html__('The zip code for the venue address', 'event_espresso'),
+			'[VENUE_META_*]'            => esc_html__(
+				'This is a special dynamic shortcode. After the "*", add the exact name for your custom field, if there is a value set for that custom field within the venue then it will be output in place of this shortcode.',
+				'event_espresso'
+			),
+			'[GOOGLE_MAP_URL]'          => esc_html__(
+				'URL for the google map associated with the venue.',
+				'event_espresso'
+			),
+			'[GOOGLE_MAP_LINK]'         => esc_html__('Link to a google map for the venue', 'event_espresso'),
+			'[GOOGLE_MAP_IMAGE]'        => esc_html__('Google map for venue wrapped in image tags', 'event_espresso'),
+		);
+	}
+
+
+	/**
+	 * Parse incoming shortcode
+	 *
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 */
+	protected function _parser($shortcode)
+	{
+		$this->_venue = $this->_get_venue();
+		// If there is no venue object by now then get out.
+		if (! $this->_venue instanceof EE_Venue) {
+			return '';
+		}
+
+		switch ($shortcode) {
+			case '[VENUE_TITLE]':
+				return $this->_venue('title');
+				break;
+
+			case '[VENUE_DESCRIPTION]':
+				return $this->_venue('description');
+				break;
+
+			case '[VENUE_URL]':
+				return $this->_venue('url');
+				break;
+
+			case '[VENUE_IMAGE]':
+				return $this->_venue('image');
+				break;
+
+			case '[VENUE_PHONE]':
+				return $this->_venue('phone');
+				break;
+
+			case '[VENUE_ADDRESS]':
+				return $this->_venue('address');
+				break;
+
+			case '[VENUE_ADDRESS2]':
+				return $this->_venue('address2');
+				break;
+
+			case '[VENUE_CITY]':
+				return $this->_venue('city');
+				break;
+
+			case '[VENUE_COUNTRY]':
+				return $this->_venue('country');
+				break;
+
+			case '[VENUE_STATE]':
+				return $this->_venue('state');
+				break;
+
+			case '[VENUE_ZIP]':
+				return $this->_venue('zip');
+				break;
+
+			case '[VENUE_FORMATTED_ADDRESS]':
+				return $this->_venue('formatted_address');
+				break;
+
+			case '[GOOGLE_MAP_URL]':
+				return $this->_venue('gmap_url');
+				break;
+
+			case '[GOOGLE_MAP_LINK]':
+				return $this->_venue('gmap_link');
+				break;
+
+			case '[GOOGLE_MAP_IMAGE]':
+				return $this->_venue('gmap_link_img');
+				break;
+
+			case '[VENUE_DETAILS_URL]':
+				return $this->_venue('permalink');
+				break;
+		}
+
+		if (strpos($shortcode, '[VENUE_META_*') !== false) {
+			$shortcode = str_replace('[VENUE_META_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
+
+			// pull the meta value from the venue post
+			$venue_meta = $this->_venue->get_post_meta($shortcode, true);
+
+			return ! empty($venue_meta) ? $venue_meta : '';
+		}
+	}
+
+	/**
+	 * This retrieves the EE_Venue from the available data object.
+	 *
+	 * @return EE_Venue|null
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 */
+	private function _get_venue()
+	{
+
+		// we need the EE_Event object to get the venue.
+		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
+
+		// if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the
+		// reg_obj instead.
+		if (! $this->_event instanceof EE_Event) {
+			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
+
+			$this->_event = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration
+				? $aee->reg_obj->event()
+				: null;
+
+			// if still empty do we have a ticket data item?
+			$this->_event = ! $this->_event instanceof EE_Event
+							&& $this->_data instanceof EE_Ticket
+							&& $this->_extra_data['data'] instanceof EE_Messages_Addressee
+				? $this->_extra_data['data']->tickets[ $this->_data->ID() ]['EE_Event']
+				: $this->_event;
+
+			// if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee
+			// and use that.
+			$this->_event = ! $this->_event instanceof EE_Event && $aee instanceof EE_Messages_Addressee
+				? reset($aee->events)
+				: $this->_event;
+		}
+
+		// If we have an event object use it to pull the venue.
+		if ($this->_event instanceof EE_Event) {
+			return $this->_event->get_first_related('Venue');
+		}
+
+		return null;
+	}
+
+	/**
+	 * This retrieves the specified venue information
+	 *
+	 * @param string $field What Venue field to retrieve
+	 * @return string What was retrieved!
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 */
+	private function _venue($field)
+	{
+
+		if (! $this->_venue instanceof EE_Venue) {
+			return '';
+		} //no venue so get out.
+
+		switch ($field) {
+			case 'title':
+				return $this->_venue->get('VNU_name');
+				break;
+
+			case 'description':
+				return $this->_venue->get('VNU_desc');
+				break;
+
+			case 'url':
+				$url = $this->_venue->get('VNU_url');
+				return empty($url) ? $this->_venue->get_permalink() : $url;
+				break;
+
+			case 'permalink':
+				return $this->_venue->get_permalink();
+				break;
+
+			case 'image':
+				return '<img src="' . $this->_venue->feature_image_url(array(200, 200,))
+					   . '" alt="' . sprintf(
+						   esc_attr__('%s Feature Image', 'event_espresso'),
+						   $this->_venue->get('VNU_name')
+					   ) . '" />';
+				break;
+
+			case 'phone':
+				return $this->_venue->get('VNU_phone');
+				break;
+
+			case 'address':
+				return $this->_venue->get('VNU_address');
+				break;
+
+			case 'address2':
+				return $this->_venue->get('VNU_address2');
+				break;
+
+			case 'city':
+				return $this->_venue->get('VNU_city');
+				break;
+
+			case 'state':
+				$state = $this->_venue->state_obj();
+				return is_object($state) ? $state->get('STA_name') : '';
+				break;
+
+			case 'country':
+				$country = $this->_venue->country_obj();
+				return is_object($country) ? $country->get('CNT_name') : '';
+				break;
+
+			case 'zip':
+				return $this->_venue->get('VNU_zip');
+				break;
+
+			case 'formatted_address':
+				return EEH_Address::format($this->_venue);
+				break;
+
+			case 'gmap_link':
+			case 'gmap_url':
+			case 'gmap_link_img':
+				$atts = $this->get_map_attributes($this->_venue, $field);
+				return EEH_Maps::google_map_link($atts);
+				break;
+		}
+		return '';
+	}
+
+
+	/**
+	 * Generates the attributes for retrieving a google_map artifact.
+	 *
+	 * @param EE_Venue $venue
+	 * @param string   $field
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function get_map_attributes(EE_Venue $venue, $field = 'gmap_link')
+	{
+		$state = $venue->state_obj();
+		$country = $venue->country_obj();
+		$atts = array(
+			'id'      => $venue->ID(),
+			'address' => $venue->get('VNU_address'),
+			'city'    => $venue->get('VNU_city'),
+			'state'   => is_object($state) ? $state->get('STA_name') : '',
+			'zip'     => $venue->get('VNU_zip'),
+			'country' => is_object($country) ? $country->get('CNT_name') : '',
+			'type'    => $field === 'gmap_link' ? 'url' : 'map',
+			'map_w'   => 200,
+			'map_h'   => 200,
+		);
+		if ($field === 'gmap_url') {
+			$atts['type'] = 'url_only';
+		}
+		return $atts;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
     {
         $this->_venue = $this->_get_venue();
         // If there is no venue object by now then get out.
-        if (! $this->_venue instanceof EE_Venue) {
+        if ( ! $this->_venue instanceof EE_Venue) {
             return '';
         }
 
@@ -184,7 +184,7 @@ 
 
         // if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the
         // reg_obj instead.
-        if (! $this->_event instanceof EE_Event) {
+        if ( ! $this->_event instanceof EE_Event) {
             $aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
             $aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
@@ -196,7 +196,7 @@ 
             $this->_event = ! $this->_event instanceof EE_Event
                             && $this->_data instanceof EE_Ticket
                             && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-                ? $this->_extra_data['data']->tickets[ $this->_data->ID() ]['EE_Event']
+                ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event']
                 : $this->_event;
 
             // if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee
@@ -225,7 +225,7 @@ 
     private function _venue($field)
     {
 
-        if (! $this->_venue instanceof EE_Venue) {
+        if ( ! $this->_venue instanceof EE_Venue) {
             return '';
         } //no venue so get out.
 
@@ -248,11 +248,11 @@ 
                 break;
 
             case 'image':
-                return '<img src="' . $this->_venue->feature_image_url(array(200, 200,))
-                       . '" alt="' . sprintf(
+                return '<img src="'.$this->_venue->feature_image_url(array(200, 200,))
+                       . '" alt="'.sprintf(
                            esc_attr__('%s Feature Image', 'event_espresso'),
                            $this->_venue->get('VNU_name')
-                       ) . '" />';
+                       ).'" />';
                 break;
 
             case 'phone':

core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
                 return '<img src="'
                        . EE_Registry::instance()->CFG->organization->get_pretty(
                            'logo_url'
-                       ) . '" id="headerImage" />';
+                       ).'" id="headerImage" />';
                 break;
 
             case '[CO_LOGO_URL]':
@@ -149,7 +149,7 @@ 
 
             // set custom attrs if present (or default)
             $prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-            return $prefix . $tax_number;
+            return $prefix.$tax_number;
         }
 
         return '';

Indentation +135 added lines, -135 removed lines

@@ -19,139 +19,139 @@
 {
 
 
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Organization Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to organization related data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[COMPANY]'          => esc_html__('Event organization name', 'event_espresso'),
-            '[CO_ADD1]'          => esc_html__('Address 1 value for the organization', 'event_espresso'),
-            '[CO_ADD2]'          => esc_html__('Address 2 value for the organization', 'event_espresso'),
-            '[CO_CITY]'          => esc_html__('City the organization is in', 'event_espresso'),
-            '[CO_STATE]'         => esc_html__('State the organization is located in', 'event_espresso'),
-            '[CO_ZIP]'           => esc_html__('The zip code for the organization', 'event_espresso'),
-            '[CO_LOGO]'          => esc_html__('The logo image for the organization', 'event_espresso'),
-            '[CO_EMAIL]'         => esc_html__('The primary email address for the organization', 'event_espresso'),
-            '[CO_PHONE]'         => esc_html__('The phone number for the organization', 'event_espresso'),
-            '[CO_LOGO_URL]'      => esc_html__(
-                'Just the link to the image used as the logo for the organization',
-                'event_espresso'
-            ),
-            '[CO_FACEBOOK_URL]'  => esc_html__('Link to organization Facebook page', 'event_espresso'),
-            '[CO_TWITTER_URL]'   => esc_html__('Link to organization Twitter page', 'event_espresso'),
-            '[CO_PINTEREST_URL]' => esc_html__('Link to organization Pinterest page', 'event_espresso'),
-            '[CO_GOOGLE_URL]'    => esc_html__('Link to organization Google page', 'event_espresso'),
-            '[CO_LINKEDIN_URL]'  => esc_html__('Link to organization LinkedIn page', 'event_espresso'),
-            '[CO_INSTAGRAM_URL]' => esc_html__('Link to organization Instagram page', 'event_espresso'),
-            '[CO_TAX_NUMBER_*]'  => sprintf(
-                esc_html__(
-                    'This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ),
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-
-        switch ($shortcode) {
-            case '[COMPANY]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('name');
-                break;
-
-            case '[CO_ADD1]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
-                break;
-
-            case '[CO_ADD2]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
-                break;
-
-            case '[CO_CITY]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('city');
-                break;
-
-            case '[CO_STATE]':
-                $state = EE_Registry::instance()->load_model('State')->get_one_by_ID(
-                    EE_Registry::instance()->CFG->organization->STA_ID
-                );
-                return $state instanceof EE_State ? $state->name() : '';
-                break;
-
-            case '[CO_ZIP]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('zip');
-                break;
-
-            case '[CO_EMAIL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('email');
-                break;
-
-            case '[CO_PHONE]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('phone');
-                break;
-
-            case '[CO_LOGO]':
-                return '<img src="'
-                       . EE_Registry::instance()->CFG->organization->get_pretty(
-                           'logo_url'
-                       ) . '" id="headerImage" />';
-                break;
-
-            case '[CO_LOGO_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
-                break;
-
-            case '[CO_FACEBOOK_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
-                break;
-
-            case '[CO_TWITTER_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
-                break;
-
-            case '[CO_PINTEREST_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
-                break;
-
-            case '[CO_LINKEDIN_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
-                break;
-
-            case '[CO_GOOGLE_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('google');
-                break;
-
-            case '[CO_INSTAGRAM_URL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
-                break;
-        }
-
-        // also allow for parameter shortcode
-        if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== false) {
-            // first see if there is any company tax number set and bail early if not
-            $tax_number = EE_Registry::instance()->CFG->organization->vat;
-            if (empty($tax_number)) {
-                return '';
-            }
-
-            // see if there are any attributes.
-            $attrs = $this->_get_shortcode_attrs($shortcode);
-
-            // set custom attrs if present (or default)
-            $prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-            return $prefix . $tax_number;
-        }
-
-        return '';
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Organization Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to organization related data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[COMPANY]'          => esc_html__('Event organization name', 'event_espresso'),
+			'[CO_ADD1]'          => esc_html__('Address 1 value for the organization', 'event_espresso'),
+			'[CO_ADD2]'          => esc_html__('Address 2 value for the organization', 'event_espresso'),
+			'[CO_CITY]'          => esc_html__('City the organization is in', 'event_espresso'),
+			'[CO_STATE]'         => esc_html__('State the organization is located in', 'event_espresso'),
+			'[CO_ZIP]'           => esc_html__('The zip code for the organization', 'event_espresso'),
+			'[CO_LOGO]'          => esc_html__('The logo image for the organization', 'event_espresso'),
+			'[CO_EMAIL]'         => esc_html__('The primary email address for the organization', 'event_espresso'),
+			'[CO_PHONE]'         => esc_html__('The phone number for the organization', 'event_espresso'),
+			'[CO_LOGO_URL]'      => esc_html__(
+				'Just the link to the image used as the logo for the organization',
+				'event_espresso'
+			),
+			'[CO_FACEBOOK_URL]'  => esc_html__('Link to organization Facebook page', 'event_espresso'),
+			'[CO_TWITTER_URL]'   => esc_html__('Link to organization Twitter page', 'event_espresso'),
+			'[CO_PINTEREST_URL]' => esc_html__('Link to organization Pinterest page', 'event_espresso'),
+			'[CO_GOOGLE_URL]'    => esc_html__('Link to organization Google page', 'event_espresso'),
+			'[CO_LINKEDIN_URL]'  => esc_html__('Link to organization LinkedIn page', 'event_espresso'),
+			'[CO_INSTAGRAM_URL]' => esc_html__('Link to organization Instagram page', 'event_espresso'),
+			'[CO_TAX_NUMBER_*]'  => sprintf(
+				esc_html__(
+					'This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			),
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+
+		switch ($shortcode) {
+			case '[COMPANY]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
+				break;
+
+			case '[CO_ADD1]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
+				break;
+
+			case '[CO_ADD2]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
+				break;
+
+			case '[CO_CITY]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
+				break;
+
+			case '[CO_STATE]':
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(
+					EE_Registry::instance()->CFG->organization->STA_ID
+				);
+				return $state instanceof EE_State ? $state->name() : '';
+				break;
+
+			case '[CO_ZIP]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
+				break;
+
+			case '[CO_EMAIL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
+				break;
+
+			case '[CO_PHONE]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
+				break;
+
+			case '[CO_LOGO]':
+				return '<img src="'
+					   . EE_Registry::instance()->CFG->organization->get_pretty(
+						   'logo_url'
+					   ) . '" id="headerImage" />';
+				break;
+
+			case '[CO_LOGO_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
+				break;
+
+			case '[CO_FACEBOOK_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
+				break;
+
+			case '[CO_TWITTER_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
+				break;
+
+			case '[CO_PINTEREST_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
+				break;
+
+			case '[CO_LINKEDIN_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
+				break;
+
+			case '[CO_GOOGLE_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
+				break;
+
+			case '[CO_INSTAGRAM_URL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
+				break;
+		}
+
+		// also allow for parameter shortcode
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== false) {
+			// first see if there is any company tax number set and bail early if not
+			$tax_number = EE_Registry::instance()->CFG->organization->vat;
+			if (empty($tax_number)) {
+				return '';
+			}
+
+			// see if there are any attributes.
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+
+			// set custom attrs if present (or default)
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+			return $prefix . $tax_number;
+		}
+
+		return '';
+	}
 }

core/libraries/shortcodes/EE_Payment_Shortcodes.lib.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     protected function _parser($shortcode)
     {
         // ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
-        if (! $this->_data instanceof EE_Payment) {
+        if ( ! $this->_data instanceof EE_Payment) {
             return '';
         }
 

Indentation +89 added lines, -89 removed lines

@@ -18,93 +18,93 @@
 {
 
 
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Payment Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to payments.', 'event_espresso');
-        $this->_shortcodes = array(
-            '[PAYMENT_TIMESTAMP]' => esc_html__(
-                'Outputs the date of the payment (using the default date format).',
-                'event_espresso'
-            ),
-            '[PAYMENT_METHOD]' => esc_html__('Outputs a the payment method.', 'event_espresso'),
-            '[PAYMENT_AMOUNT]' => esc_html__('Outputs the payment amount (with currency symbol).', 'event_espresso'),
-            '[PAYMENT_GATEWAY]' => esc_html__('Outputs the gateway used for the payment.', 'event_espresso'),
-            '[PAYMENT_GATEWAY_RESPONSE]' => esc_html__('Outputs the payment gateway response.', 'event_espresso'),
-            '[PAYMENT_GATEWAY_TXN_ID]' => esc_html__(
-                'This will either be the gateway transaction ID, or the manual ID added with payment applied via the admin.',
-                'event_espresso'
-            ),
-            '[PAYMENT_PO_NUMBER]' => esc_html__('Purchase Order number (if present)', 'event_espresso'),
-            '[PAYMENT_EXTRA_ACCOUNTING]' => esc_html__(
-                'Any extra accounting messages. Typically added with payments made via the admin.',
-                'event_espresso'
-            ),
-            '[PAYMENT_STATUS]' => esc_html__('The status of the payment.', 'event_espresso'),
-            // '[PAYMENT_STATUS_WITH_ICONS]' => esc_html__('The status of the payment including icons representing the status.', 'event_espresso')
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-        // ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
-        if (! $this->_data instanceof EE_Payment) {
-            return '';
-        }
-
-        $payment = $this->_data;
-
-        switch ($shortcode) {
-            case '[PAYMENT_TIMESTAMP]':
-                return $payment->timestamp();
-                break;
-
-            case '[PAYMENT_METHOD]':
-                // previously the column 'PAY_source' was known as 'PAY_method'
-                return $payment->source();
-                break;
-
-            case '[PAYMENT_AMOUNT]':
-                return $payment->amount_no_code();
-                break;
-
-            case '[PAYMENT_GATEWAY]':
-                // previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
-                if ($payment->payment_method() instanceof EE_Payment_Method) {
-                    return $payment->payment_method()->name();
-                } else {
-                    return esc_html__('Unknown', 'event_espresso');
-                }
-                break;
-
-            case '[PAYMENT_GATEWAY_RESPONSE]':
-                return $payment->gateway_response();
-                break;
-
-            case '[PAYMENT_GATEWAY_TXN_ID]':
-                return $payment->txn_id_chq_nmbr();
-                break;
-
-            case '[PAYMENT_PO_NUMBER]':
-                return $payment->po_number();
-                break;
-
-            case '[PAYMENT_EXTRA_ACCOUNTING]':
-                return $payment->extra_accntng();
-                break;
-
-            case '[PAYMENT_STATUS]':
-                return $payment->pretty_status();
-                break;
-
-            case '[PAYMENT_STATUS_WITH_ICONS]':
-                return $payment->pretty_status(true);
-                break;
-
-            default:
-                return '';
-                break;
-        }
-    }
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Payment Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to payments.', 'event_espresso');
+		$this->_shortcodes = array(
+			'[PAYMENT_TIMESTAMP]' => esc_html__(
+				'Outputs the date of the payment (using the default date format).',
+				'event_espresso'
+			),
+			'[PAYMENT_METHOD]' => esc_html__('Outputs a the payment method.', 'event_espresso'),
+			'[PAYMENT_AMOUNT]' => esc_html__('Outputs the payment amount (with currency symbol).', 'event_espresso'),
+			'[PAYMENT_GATEWAY]' => esc_html__('Outputs the gateway used for the payment.', 'event_espresso'),
+			'[PAYMENT_GATEWAY_RESPONSE]' => esc_html__('Outputs the payment gateway response.', 'event_espresso'),
+			'[PAYMENT_GATEWAY_TXN_ID]' => esc_html__(
+				'This will either be the gateway transaction ID, or the manual ID added with payment applied via the admin.',
+				'event_espresso'
+			),
+			'[PAYMENT_PO_NUMBER]' => esc_html__('Purchase Order number (if present)', 'event_espresso'),
+			'[PAYMENT_EXTRA_ACCOUNTING]' => esc_html__(
+				'Any extra accounting messages. Typically added with payments made via the admin.',
+				'event_espresso'
+			),
+			'[PAYMENT_STATUS]' => esc_html__('The status of the payment.', 'event_espresso'),
+			// '[PAYMENT_STATUS_WITH_ICONS]' => esc_html__('The status of the payment including icons representing the status.', 'event_espresso')
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+		// ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
+		if (! $this->_data instanceof EE_Payment) {
+			return '';
+		}
+
+		$payment = $this->_data;
+
+		switch ($shortcode) {
+			case '[PAYMENT_TIMESTAMP]':
+				return $payment->timestamp();
+				break;
+
+			case '[PAYMENT_METHOD]':
+				// previously the column 'PAY_source' was known as 'PAY_method'
+				return $payment->source();
+				break;
+
+			case '[PAYMENT_AMOUNT]':
+				return $payment->amount_no_code();
+				break;
+
+			case '[PAYMENT_GATEWAY]':
+				// previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
+				if ($payment->payment_method() instanceof EE_Payment_Method) {
+					return $payment->payment_method()->name();
+				} else {
+					return esc_html__('Unknown', 'event_espresso');
+				}
+				break;
+
+			case '[PAYMENT_GATEWAY_RESPONSE]':
+				return $payment->gateway_response();
+				break;
+
+			case '[PAYMENT_GATEWAY_TXN_ID]':
+				return $payment->txn_id_chq_nmbr();
+				break;
+
+			case '[PAYMENT_PO_NUMBER]':
+				return $payment->po_number();
+				break;
+
+			case '[PAYMENT_EXTRA_ACCOUNTING]':
+				return $payment->extra_accntng();
+				break;
+
+			case '[PAYMENT_STATUS]':
+				return $payment->pretty_status();
+				break;
+
+			case '[PAYMENT_STATUS_WITH_ICONS]':
+				return $payment->pretty_status(true);
+				break;
+
+			default:
+				return '';
+				break;
+		}
+	}
 }

core/libraries/shortcodes/EE_Event_Author_Shortcodes.lib.php

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
         // now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
         $event = $this->_data instanceof EE_Event ? $this->_data : null;
 
-        if (! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event) {
+        if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event) {
             return '';
         }
 
@@ -83,22 +83,22 @@ 
                 break;
 
             case '[EVENT_AUTHOR_FORMATTED_EMAIL]':
-                if (! empty($recipient)) {
+                if ( ! empty($recipient)) {
                     $email = ! empty($recipient->fname)
-                        ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>'
+                        ? $recipient->fname.' '.$recipient->lname.'<'.$recipient->admin_email.'>'
                         : EE_Registry::instance()->CFG->organization->get_pretty(
                             'name'
-                        ) . '<' . $recipient->admin_email . '>';
+                        ).'<'.$recipient->admin_email.'>';
                 } else {
                     $email = null;
                 }
                 if (empty($email) && ! empty($event)) {
                     $user = $this->_get_author_for_event($event);
                     $email = ! empty($user->first_name)
-                        ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>'
+                        ? $user->first_name.' '.$user->last_name.'<'.$user->user_email.'>'
                         : EE_Registry::instance()->CFG->organization->get_pretty(
                             'name'
-                        ) . '<' . $user->user_email . '>';
+                        ).'<'.$user->user_email.'>';
                 }
                 return $email;
                 break;

Indentation +99 added lines, -99 removed lines

@@ -20,116 +20,116 @@
 class EE_Event_Author_Shortcodes extends EE_Shortcodes
 {
 
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
 
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Event Author Details Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to event_author data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[EVENT_AUTHOR_FNAME]' => esc_html__('Parses to the first name of the event author.', 'event_espresso'),
-            '[EVENT_AUTHOR_LNAME]' => esc_html__('Parses to the last name of the event author.', 'event_espresso'),
-            '[EVENT_AUTHOR_FORMATTED_EMAIL]' => esc_html__(
-                'Parses to a formatted email address of the event author (fname lname &lt;email@address.com&gt;).  <strong>NOTE:</strong> If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.',
-                'event_espresso'
-            ),
-            '[EVENT_AUTHOR_EMAIL]' => esc_html__(
-                'Parses to the unformatted email address of the event author',
-                'event_espresso'
-            ),
-        );
-    }
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Event Author Details Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to event_author data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[EVENT_AUTHOR_FNAME]' => esc_html__('Parses to the first name of the event author.', 'event_espresso'),
+			'[EVENT_AUTHOR_LNAME]' => esc_html__('Parses to the last name of the event author.', 'event_espresso'),
+			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => esc_html__(
+				'Parses to a formatted email address of the event author (fname lname &lt;email@address.com&gt;).  <strong>NOTE:</strong> If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.',
+				'event_espresso'
+			),
+			'[EVENT_AUTHOR_EMAIL]' => esc_html__(
+				'Parses to the unformatted email address of the event author',
+				'event_espresso'
+			),
+		);
+	}
 
 
-    protected function _parser($shortcode)
-    {
-        // make sure we end up with a copy of the EE_Messages_Addressee object
-        $recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $recipient = ! $recipient instanceof EE_Messages_Addressee && is_array(
-            $this->_data
-        ) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
-            : $recipient;
-        $recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_extra_data['data'] : $recipient;
+	protected function _parser($shortcode)
+	{
+		// make sure we end up with a copy of the EE_Messages_Addressee object
+		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array(
+			$this->_data
+		) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
+			: $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+			? $this->_extra_data['data'] : $recipient;
 
-        // now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
-        $event = $this->_data instanceof EE_Event ? $this->_data : null;
+		// now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
+		$event = $this->_data instanceof EE_Event ? $this->_data : null;
 
-        if (! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event) {
-            return '';
-        }
+		if (! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event) {
+			return '';
+		}
 
-        switch ($shortcode) {
-            case '[EVENT_AUTHOR_FNAME]':
-                $fname = ! empty($recipient) ? $recipient->fname : null;
-                if (empty($fname) && ! empty($event)) {
-                    $user = $this->_get_author_for_event($event);
-                    $fname = $user->first_name;
-                }
-                return $fname;
-                break;
+		switch ($shortcode) {
+			case '[EVENT_AUTHOR_FNAME]':
+				$fname = ! empty($recipient) ? $recipient->fname : null;
+				if (empty($fname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$fname = $user->first_name;
+				}
+				return $fname;
+				break;
 
-            case '[EVENT_AUTHOR_LNAME]':
-                $lname = ! empty($recipient) ? $recipient->lname : null;
-                if (empty($lname) && ! empty($event)) {
-                    $user = $this->_get_author_for_event($event);
-                    $lname = $user->last_name;
-                }
-                return $lname;
-                break;
+			case '[EVENT_AUTHOR_LNAME]':
+				$lname = ! empty($recipient) ? $recipient->lname : null;
+				if (empty($lname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$lname = $user->last_name;
+				}
+				return $lname;
+				break;
 
-            case '[EVENT_AUTHOR_FORMATTED_EMAIL]':
-                if (! empty($recipient)) {
-                    $email = ! empty($recipient->fname)
-                        ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>'
-                        : EE_Registry::instance()->CFG->organization->get_pretty(
-                            'name'
-                        ) . '<' . $recipient->admin_email . '>';
-                } else {
-                    $email = null;
-                }
-                if (empty($email) && ! empty($event)) {
-                    $user = $this->_get_author_for_event($event);
-                    $email = ! empty($user->first_name)
-                        ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>'
-                        : EE_Registry::instance()->CFG->organization->get_pretty(
-                            'name'
-                        ) . '<' . $user->user_email . '>';
-                }
-                return $email;
-                break;
+			case '[EVENT_AUTHOR_FORMATTED_EMAIL]':
+				if (! empty($recipient)) {
+					$email = ! empty($recipient->fname)
+						? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>'
+						: EE_Registry::instance()->CFG->organization->get_pretty(
+							'name'
+						) . '<' . $recipient->admin_email . '>';
+				} else {
+					$email = null;
+				}
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$email = ! empty($user->first_name)
+						? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>'
+						: EE_Registry::instance()->CFG->organization->get_pretty(
+							'name'
+						) . '<' . $user->user_email . '>';
+				}
+				return $email;
+				break;
 
-            case '[EVENT_AUTHOR_EMAIL]':
-                $email = ! empty($recipient) ? $recipient->admin_email : null;
-                if (empty($email) && ! empty($event)) {
-                    $user = $this->_get_author_for_event($event);
-                    $email = $user->user_email;
-                }
-                return $email;
-                break;
+			case '[EVENT_AUTHOR_EMAIL]':
+				$email = ! empty($recipient) ? $recipient->admin_email : null;
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$email = $user->user_email;
+				}
+				return $email;
+				break;
 
-            default:
-                return '';
-                break;
-        }
-    }
+			default:
+				return '';
+				break;
+		}
+	}
 
 
-    /**
-     * Helper method to return the user object for the author of the given EE_Event
-     *
-     * @param EE_Event $event
-     *
-     * @return WP_User
-     */
-    private function _get_author_for_event(EE_Event $event)
-    {
-        $author_id = $event->wp_user();
-        $user_data = get_userdata((int) $author_id);
-        return $user_data;
-    }
+	/**
+	 * Helper method to return the user object for the author of the given EE_Event
+	 *
+	 * @param EE_Event $event
+	 *
+	 * @return WP_User
+	 */
+	private function _get_author_for_event(EE_Event $event)
+	{
+		$author_id = $event->wp_user();
+		$user_data = get_userdata((int) $author_id);
+		return $user_data;
+	}
 }

core/libraries/shortcodes/EE_Email_Shortcodes.lib.php

Indentation +163 added lines, -163 removed lines

@@ -19,167 +19,167 @@
 {
 
 
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Email Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes related to emails', 'event_espresso');
-        $this->_shortcodes = array(
-            '[SITE_ADMIN_EMAIL]'               => esc_html__(
-                'Will be replaced with the admin email for the site that Event Espresso is installed on',
-                'event_espresso'
-            ),
-            '[EVENT_AUTHOR_FORMATTED_EMAIL]'   => sprintf(
-                esc_html__(
-                    'This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ),
-            '[EVENT_AUTHOR_EMAIL]'             => sprintf(
-                esc_html__(
-                    'This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).',
-                    'event_espresso'
-                ),
-                '[EVENT_AUTHOR_FORMATTED_EMAIL]'
-            ),
-            '[CO_FORMATTED_EMAIL]'             => esc_html__(
-                'This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"',
-                'event_espresso'
-            ),
-            '[CO_EMAIL]'                       => esc_html__(
-                'This will parse to the email address only for the organization set in Your Organization Settings.',
-                'event_espresso'
-            ),
-            '[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__(
-                'This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"',
-                'event_espresso'
-            ),
-            '[ESPRESSO_ADMIN_EMAIL]'           => esc_html__(
-                'This parses to the email address only for the organization set in Your Organization Settings page.',
-                'event_espresso'
-            ),
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-
-        switch ($shortcode) {
-            case '[SITE_ADMIN_EMAIL]':
-                return $this->_get_site_admin_email();
-                break;
-
-            case '[EVENT_AUTHOR_FORMATTED_EMAIL]':
-                return $this->_get_event_admin_emails();
-                break;
-
-            case '[EVENT_AUTHOR_EMAIL]':
-                return $this->_get_event_admin_emails(false);
-                break;
-
-            case '[CO_FORMATTED_EMAIL]':
-            case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <'
-                       . EE_Registry::instance()->CFG->organization->get_pretty('email') . '>';
-                break;
-
-            case '[CO_EMAIL]':
-            case '[ESPRESSO_ADMIN_EMAIL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('email');
-                break;
-
-            default:
-                return '';
-                break;
-        }
-    }
-
-
-    /**
-     * This simply returns the site admin email (result for parsing "[SITE_ADMIN_EMAIL]" shortcode)
-     *
-     * @access private
-     * @return string email address of site admin
-     */
-    private function _get_site_admin_email()
-    {
-        return get_bloginfo('admin_email');
-    }
-
-
-    private function _get_event_admin_emails($fancy_headers = true)
-    {
-
-        if (! empty($this->_data->admin_email)) {
-            if (! $fancy_headers) {
-                return $this->_data->admin_email;
-            }
-            return ! empty($this->_data->fname)
-                ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>'
-                : EE_Registry::instance()->CFG->organization->get_pretty(
-                    'name'
-                ) . ' <' . $this->_data->admin_email . '>';
-        }
-
-        // k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
-
-        $admin_email = array();
-
-        // loop through events and set the list of event_ids to retrieve so we can do ONE query.
-        foreach ($this->_data->events as $event) {
-            $ids[] = $event['ID'];
-        }
-
-        // get all the events
-        $events = EE_Registry::instance()->load_model('Event')->get_all(array(array('EVT_ID' => array('IN', $ids))));
-
-        // now loop through each event and setup the details
-        $admin_details = array();
-        $cnt = 0;
-        foreach ($events as $event) {
-            $user = get_userdata($event->get('EVT_wp_user'));
-            $admin_details[ $cnt ] = new stdClass();
-            $admin_details[ $cnt ]->email = $user->user_email;
-            $admin_details[ $cnt ]->first_name = $user->user_firstname;
-            $admin_details[ $cnt ]->last_name = $user->user_lastname;
-            $cnt++;
-        }
-
-        // results?
-        if (empty($admin_details) || ! is_array($admin_details)) {
-            $msg[] = esc_html__('The admin details could not be retrieved from the database.', 'event_espresso');
-            $msg[] = sprintf(esc_html__('Query: %s', 'event_espresso'), $sql);
-            $msg[] = sprintf(esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, true));
-            $msg[] = sprintf(esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, true));
-            $msg[] = sprintf(esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details));
-            do_action('AHEE_log', __FILE__, __FUNCTION__, implode(PHP_EOL, $msg), 'shortcode_parser');
-        }
-
-        foreach ($admin_details as $admin) {
-            // only add an admin email if it is present.
-            if (empty($admin->email) || $admin->email == '') {
-                continue;
-            }
-
-            if (! $fancy_headers) {
-                $admin_email[] = $admin->email;
-                continue;
-            }
-
-            $admin_email[] = ! empty($admin->first_name)
-                ? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>'
-                : EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <' . $admin->email . '>';
-        }
-
-        $admin_email = implode(',', $admin_email);
-        return $admin_email;
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Email Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes related to emails', 'event_espresso');
+		$this->_shortcodes = array(
+			'[SITE_ADMIN_EMAIL]'               => esc_html__(
+				'Will be replaced with the admin email for the site that Event Espresso is installed on',
+				'event_espresso'
+			),
+			'[EVENT_AUTHOR_FORMATTED_EMAIL]'   => sprintf(
+				esc_html__(
+					'This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			),
+			'[EVENT_AUTHOR_EMAIL]'             => sprintf(
+				esc_html__(
+					'This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).',
+					'event_espresso'
+				),
+				'[EVENT_AUTHOR_FORMATTED_EMAIL]'
+			),
+			'[CO_FORMATTED_EMAIL]'             => esc_html__(
+				'This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"',
+				'event_espresso'
+			),
+			'[CO_EMAIL]'                       => esc_html__(
+				'This will parse to the email address only for the organization set in Your Organization Settings.',
+				'event_espresso'
+			),
+			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__(
+				'This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"',
+				'event_espresso'
+			),
+			'[ESPRESSO_ADMIN_EMAIL]'           => esc_html__(
+				'This parses to the email address only for the organization set in Your Organization Settings page.',
+				'event_espresso'
+			),
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+
+		switch ($shortcode) {
+			case '[SITE_ADMIN_EMAIL]':
+				return $this->_get_site_admin_email();
+				break;
+
+			case '[EVENT_AUTHOR_FORMATTED_EMAIL]':
+				return $this->_get_event_admin_emails();
+				break;
+
+			case '[EVENT_AUTHOR_EMAIL]':
+				return $this->_get_event_admin_emails(false);
+				break;
+
+			case '[CO_FORMATTED_EMAIL]':
+			case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <'
+					   . EE_Registry::instance()->CFG->organization->get_pretty('email') . '>';
+				break;
+
+			case '[CO_EMAIL]':
+			case '[ESPRESSO_ADMIN_EMAIL]':
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
+				break;
+
+			default:
+				return '';
+				break;
+		}
+	}
+
+
+	/**
+	 * This simply returns the site admin email (result for parsing "[SITE_ADMIN_EMAIL]" shortcode)
+	 *
+	 * @access private
+	 * @return string email address of site admin
+	 */
+	private function _get_site_admin_email()
+	{
+		return get_bloginfo('admin_email');
+	}
+
+
+	private function _get_event_admin_emails($fancy_headers = true)
+	{
+
+		if (! empty($this->_data->admin_email)) {
+			if (! $fancy_headers) {
+				return $this->_data->admin_email;
+			}
+			return ! empty($this->_data->fname)
+				? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>'
+				: EE_Registry::instance()->CFG->organization->get_pretty(
+					'name'
+				) . ' <' . $this->_data->admin_email . '>';
+		}
+
+		// k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
+
+		$admin_email = array();
+
+		// loop through events and set the list of event_ids to retrieve so we can do ONE query.
+		foreach ($this->_data->events as $event) {
+			$ids[] = $event['ID'];
+		}
+
+		// get all the events
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array(array('EVT_ID' => array('IN', $ids))));
+
+		// now loop through each event and setup the details
+		$admin_details = array();
+		$cnt = 0;
+		foreach ($events as $event) {
+			$user = get_userdata($event->get('EVT_wp_user'));
+			$admin_details[ $cnt ] = new stdClass();
+			$admin_details[ $cnt ]->email = $user->user_email;
+			$admin_details[ $cnt ]->first_name = $user->user_firstname;
+			$admin_details[ $cnt ]->last_name = $user->user_lastname;
+			$cnt++;
+		}
+
+		// results?
+		if (empty($admin_details) || ! is_array($admin_details)) {
+			$msg[] = esc_html__('The admin details could not be retrieved from the database.', 'event_espresso');
+			$msg[] = sprintf(esc_html__('Query: %s', 'event_espresso'), $sql);
+			$msg[] = sprintf(esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, true));
+			$msg[] = sprintf(esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, true));
+			$msg[] = sprintf(esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details));
+			do_action('AHEE_log', __FILE__, __FUNCTION__, implode(PHP_EOL, $msg), 'shortcode_parser');
+		}
+
+		foreach ($admin_details as $admin) {
+			// only add an admin email if it is present.
+			if (empty($admin->email) || $admin->email == '') {
+				continue;
+			}
+
+			if (! $fancy_headers) {
+				$admin_email[] = $admin->email;
+				continue;
+			}
+
+			$admin_email[] = ! empty($admin->first_name)
+				? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>'
+				: EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <' . $admin->email . '>';
+		}
+
+		$admin_email = implode(',', $admin_email);
+		return $admin_email;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -87,8 +87,8 @@ 
 
             case '[CO_FORMATTED_EMAIL]':
             case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]':
-                return EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <'
-                       . EE_Registry::instance()->CFG->organization->get_pretty('email') . '>';
+                return EE_Registry::instance()->CFG->organization->get_pretty('name').' <'
+                       . EE_Registry::instance()->CFG->organization->get_pretty('email').'>';
                 break;
 
             case '[CO_EMAIL]':
@@ -118,15 +118,15 @@ 
     private function _get_event_admin_emails($fancy_headers = true)
     {
 
-        if (! empty($this->_data->admin_email)) {
-            if (! $fancy_headers) {
+        if ( ! empty($this->_data->admin_email)) {
+            if ( ! $fancy_headers) {
                 return $this->_data->admin_email;
             }
             return ! empty($this->_data->fname)
-                ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>'
+                ? $this->_data->fname.' '.$this->_data->lname.' <'.$this->_data->admin_email.'>'
                 : EE_Registry::instance()->CFG->organization->get_pretty(
                     'name'
-                ) . ' <' . $this->_data->admin_email . '>';
+                ).' <'.$this->_data->admin_email.'>';
         }
 
         // k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
@@ -146,10 +146,10 @@ 
         $cnt = 0;
         foreach ($events as $event) {
             $user = get_userdata($event->get('EVT_wp_user'));
-            $admin_details[ $cnt ] = new stdClass();
-            $admin_details[ $cnt ]->email = $user->user_email;
-            $admin_details[ $cnt ]->first_name = $user->user_firstname;
-            $admin_details[ $cnt ]->last_name = $user->user_lastname;
+            $admin_details[$cnt] = new stdClass();
+            $admin_details[$cnt]->email = $user->user_email;
+            $admin_details[$cnt]->first_name = $user->user_firstname;
+            $admin_details[$cnt]->last_name = $user->user_lastname;
             $cnt++;
         }
 
@@ -169,14 +169,14 @@ 
                 continue;
             }
 
-            if (! $fancy_headers) {
+            if ( ! $fancy_headers) {
                 $admin_email[] = $admin->email;
                 continue;
             }
 
             $admin_email[] = ! empty($admin->first_name)
-                ? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>'
-                : EE_Registry::instance()->CFG->organization->get_pretty('name') . ' <' . $admin->email . '>';
+                ? $admin->first_name.' '.$admin->last_name.' <'.$admin->email.'>'
+                : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$admin->email.'>';
         }
 
         $admin_email = implode(',', $admin_email);

core/libraries/form_sections/form_handlers/FormHandlerInterface.php

Indentation +136 added lines, -136 removed lines

@@ -19,206 +19,206 @@
 interface FormHandlerInterface
 {
 
-    /**
-     * the absolute top level form section being used on the page
-     *
-     * @return \EE_Form_Section_Proper
-     */
-    public function form();
+	/**
+	 * the absolute top level form section being used on the page
+	 *
+	 * @return \EE_Form_Section_Proper
+	 */
+	public function form();
 
 
 
-    /**
-     * @param \EE_Form_Section_Proper $form
-     */
-    public function setForm(\EE_Form_Section_Proper $form);
+	/**
+	 * @param \EE_Form_Section_Proper $form
+	 */
+	public function setForm(\EE_Form_Section_Proper $form);
 
 
 
-    /**
-     * if set to false, then this form has no displayable content,
-     * and will only be used for processing data sent passed via GET or POST
-     *
-     * @return boolean
-     */
-    public function displayable();
+	/**
+	 * if set to false, then this form has no displayable content,
+	 * and will only be used for processing data sent passed via GET or POST
+	 *
+	 * @return boolean
+	 */
+	public function displayable();
 
 
 
-    /**
-     * @param boolean $displayable
-     */
-    public function setDisplayable($displayable = false);
+	/**
+	 * @param boolean $displayable
+	 */
+	public function setDisplayable($displayable = false);
 
 
 
-    /**
-     * a public name for the form that can be displayed on the frontend of a site
-     *
-     * @return string
-     */
-    public function formName();
+	/**
+	 * a public name for the form that can be displayed on the frontend of a site
+	 *
+	 * @return string
+	 */
+	public function formName();
 
 
 
-    /**
-     * a public name for the form that can be displayed, but only in the admin
-     *
-     * @return string
-     */
-    public function adminName();
+	/**
+	 * a public name for the form that can be displayed, but only in the admin
+	 *
+	 * @return string
+	 */
+	public function adminName();
 
 
 
-    /**
-     * a URL friendly string that can be used for identifying the form
-     *
-     * @return string
-     */
-    public function slug();
+	/**
+	 * a URL friendly string that can be used for identifying the form
+	 *
+	 * @return string
+	 */
+	public function slug();
 
 
 
-    /**
-     * @return string
-     */
-    public function submitBtnText();
+	/**
+	 * @return string
+	 */
+	public function submitBtnText();
 
 
 
-    /**
-     * @param string $submit_btn_text
-     */
-    public function setSubmitBtnText($submit_btn_text);
+	/**
+	 * @param string $submit_btn_text
+	 */
+	public function setSubmitBtnText($submit_btn_text);
 
 
 
-    /**
-     * @return string
-     */
-    public function formAction();
+	/**
+	 * @return string
+	 */
+	public function formAction();
 
 
 
-    /**
-     * @param string $form_action
-     */
-    public function setFormAction($form_action);
+	/**
+	 * @param string $form_action
+	 */
+	public function setFormAction($form_action);
 
 
 
-    /**
-     * @param array $form_args
-     */
-    public function addFormActionArgs($form_args = array());
+	/**
+	 * @param array $form_args
+	 */
+	public function addFormActionArgs($form_args = array());
 
 
 
-    /**
-     * if data regarding the form's state needs to be persisted,
-     * then this method can be used to retrieve that data
-     *
-     * @return string
-     */
-    public function formConfig();
+	/**
+	 * if data regarding the form's state needs to be persisted,
+	 * then this method can be used to retrieve that data
+	 *
+	 * @return string
+	 */
+	public function formConfig();
 
 
 
-    /**
-     * if data regarding the form's state needs to be persisted,
-     * the this method can be used for setting the persisted data locally
-     *
-     * @param string $form_config
-     */
-    public function setFormConfig($form_config);
+	/**
+	 * if data regarding the form's state needs to be persisted,
+	 * the this method can be used for setting the persisted data locally
+	 *
+	 * @param string $form_config
+	 */
+	public function setFormConfig($form_config);
 
 
 
-    /**
-     * called after the form is instantiated
-     * and used for performing any logic that needs to occur early
-     * before any of the other methods are called.
-     * returns true if everything is ok to proceed,
-     * and false if no further form logic should be implemented
-     *
-     * @return boolean
-     */
-    public function initialize();
+	/**
+	 * called after the form is instantiated
+	 * and used for performing any logic that needs to occur early
+	 * before any of the other methods are called.
+	 * returns true if everything is ok to proceed,
+	 * and false if no further form logic should be implemented
+	 *
+	 * @return boolean
+	 */
+	public function initialize();
 
 
 
-    /**
-     * used for setting up css and js
-     *
-     * @return void
-     */
-    public function enqueueStylesAndScripts();
+	/**
+	 * used for setting up css and js
+	 *
+	 * @return void
+	 */
+	public function enqueueStylesAndScripts();
 
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function generate();
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function generate();
 
 
 
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     */
-    public function display();
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 */
+	public function display();
 
 
 
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $submitted_form_data
-     * @return bool
-     */
-    public function process($submitted_form_data = array());
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $submitted_form_data
+	 * @return bool
+	 */
+	public function process($submitted_form_data = array());
 
 
 
-    /**
-     * creates and returns an EE_Submit_Input labeled "Submit"
-     *
-     * @param string $text
-     * @return \EE_Submit_Input
-     */
-    public function generateSubmitButton($text = '');
+	/**
+	 * creates and returns an EE_Submit_Input labeled "Submit"
+	 *
+	 * @param string $text
+	 * @return \EE_Submit_Input
+	 */
+	public function generateSubmitButton($text = '');
 
 
 
-    /**
-     * calls generateSubmitButton() and appends it onto the form along with a float clearing div
-     *
-     * @return void
-     */
-    public function appendSubmitButton();
+	/**
+	 * calls generateSubmitButton() and appends it onto the form along with a float clearing div
+	 *
+	 * @return void
+	 */
+	public function appendSubmitButton();
 
 
 
-    /**
-     * creates and returns an EE_Submit_Input labeled "Cancel"
-     *
-     * @param string $text
-     * @return \EE_Submit_Input
-     */
-    public function generateCancelButton($text = '');
+	/**
+	 * creates and returns an EE_Submit_Input labeled "Cancel"
+	 *
+	 * @param string $text
+	 * @return \EE_Submit_Input
+	 */
+	public function generateCancelButton($text = '');
 
 
 
-    /**
-     * appends a float clearing div onto end of form
-     *
-     * @return void
-     */
-    public function clearFormButtonFloats();
+	/**
+	 * appends a float clearing div onto end of form
+	 *
+	 * @return void
+	 */
+	public function clearFormButtonFloats();
 }

core/libraries/form_sections/form_handlers/SequentialStepFormInterface.php

Indentation +33 added lines, -33 removed lines

@@ -16,55 +16,55 @@
 {
 
 
-    /**
-     * @return int
-     */
-    public function order();
+	/**
+	 * @return int
+	 */
+	public function order();
 
 
 
-    /**
-     * @param int $order
-     * @throws InvalidArgumentException
-     */
-    public function setOrder($order);
+	/**
+	 * @param int $order
+	 * @throws InvalidArgumentException
+	 */
+	public function setOrder($order);
 
 
 
-    /**
-     * @return string
-     */
-    public function redirectUrl();
+	/**
+	 * @return string
+	 */
+	public function redirectUrl();
 
 
 
-    /**
-     * @param string $redirect_url
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function setRedirectUrl($redirect_url);
+	/**
+	 * @param string $redirect_url
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function setRedirectUrl($redirect_url);
 
 
 
-    /**
-     * @param array $redirect_args
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function addRedirectArgs($redirect_args = array());
+	/**
+	 * @param array $redirect_args
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function addRedirectArgs($redirect_args = array());
 
 
 
-    /**
-     * @return string
-     */
-    public function redirectTo();
+	/**
+	 * @return string
+	 */
+	public function redirectTo();
 
 
 
-    /**
-     * @param string $redirect_to
-     */
-    public function setRedirectTo($redirect_to);
+	/**
+	 * @param string $redirect_to
+	 */
+	public function setRedirectTo($redirect_to);
 }

core/libraries/form_sections/inputs/EE_Checkbox_Dropdown_Selector_Input.input.php

Indentation +57 added lines, -57 removed lines

@@ -12,68 +12,68 @@
 class EE_Checkbox_Dropdown_Selector_Input extends EE_Form_Input_With_Options_Base
 {
 
-    /**
-     * @var string text to display on the select button itself
-     */
-    protected $_select_button_text;
+	/**
+	 * @var string text to display on the select button itself
+	 */
+	protected $_select_button_text;
 
-    /**
-     * @param array $answer_options
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        $this->_select_button_text = EEH_Array::is_set(
-            $input_settings,
-            'select_button_text',
-            esc_html__('Select', 'event_espresso')
-        );
-        $display_strategy = new EE_Checkbox_Dropdown_Selector_Display_Strategy();
-        $this->_set_display_strategy($display_strategy);
-        $this->load_iframe_assets($display_strategy);
-        $this->_add_validation_strategy(
-            new EE_Many_Valued_Validation_Strategy(
-                array(
-                    new EE_Enum_Validation_Strategy(
-                        isset($input_settings['validation_error_message'])
-                            ? $input_settings['validation_error_message']
-                            : null
-                    ),
-                )
-            )
-        );
-        $this->_multiple_selections = true;
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array $answer_options
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		$this->_select_button_text = EEH_Array::is_set(
+			$input_settings,
+			'select_button_text',
+			esc_html__('Select', 'event_espresso')
+		);
+		$display_strategy = new EE_Checkbox_Dropdown_Selector_Display_Strategy();
+		$this->_set_display_strategy($display_strategy);
+		$this->load_iframe_assets($display_strategy);
+		$this->_add_validation_strategy(
+			new EE_Many_Valued_Validation_Strategy(
+				array(
+					new EE_Enum_Validation_Strategy(
+						isset($input_settings['validation_error_message'])
+							? $input_settings['validation_error_message']
+							: null
+					),
+				)
+			)
+		);
+		$this->_multiple_selections = true;
+		parent::__construct($answer_options, $input_settings);
+	}
 
-    /*
+	/*
      * Returns the text to display in the select button
      */
-    public function select_button_text()
-    {
-        return $this->_select_button_text;
-    }
+	public function select_button_text()
+	{
+		return $this->_select_button_text;
+	}
 
-    /*
+	/*
      * add css and js for iframes
      */
-    protected function load_iframe_assets(EE_Checkbox_Dropdown_Selector_Display_Strategy $display_strategy)
-    {
-        add_filter(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
-            array($display_strategy, 'iframe_css')
-        );
-        add_filter(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            array($display_strategy, 'iframe_js')
-        );
-        add_filter(
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
-            array($display_strategy, 'iframe_css')
-        );
-        add_filter(
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
-            array($display_strategy, 'iframe_js')
-        );
-    }
+	protected function load_iframe_assets(EE_Checkbox_Dropdown_Selector_Display_Strategy $display_strategy)
+	{
+		add_filter(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
+			array($display_strategy, 'iframe_css')
+		);
+		add_filter(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+			array($display_strategy, 'iframe_js')
+		);
+		add_filter(
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
+			array($display_strategy, 'iframe_css')
+		);
+		add_filter(
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
+			array($display_strategy, 'iframe_js')
+		);
+	}
 }

core/libraries/form_sections/inputs/EE_Button_Input.php

Indentation +34 added lines, -34 removed lines

@@ -11,42 +11,42 @@
 class EE_Button_Input extends EE_Form_Input_Base
 {
 
-    /**
-     * @var string of HTML to put between the button tags
-     */
-    protected $_button_content;
-    /**
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        if (empty($options['button_content'])) {
-            $options['button_content'] = esc_html__('Button', 'event_espresso');
-        }
-        $this->_set_display_strategy(new EE_Button_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
-        $this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
-        parent::__construct($options);
-    }
+	/**
+	 * @var string of HTML to put between the button tags
+	 */
+	protected $_button_content;
+	/**
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		if (empty($options['button_content'])) {
+			$options['button_content'] = esc_html__('Button', 'event_espresso');
+		}
+		$this->_set_display_strategy(new EE_Button_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
+		parent::__construct($options);
+	}
 
 
 
-    /**
-     * Sets the button content
-     * @see EE_Button_Input::$_button_content
-     * @param string $new_content
-     */
-    public function set_button_content($new_content)
-    {
-        $this->_button_content = $new_content;
-    }
+	/**
+	 * Sets the button content
+	 * @see EE_Button_Input::$_button_content
+	 * @param string $new_content
+	 */
+	public function set_button_content($new_content)
+	{
+		$this->_button_content = $new_content;
+	}
     
-    /**
-     * Gets the button content
-     * @return string
-     */
-    public function button_content()
-    {
-        return $this->_button_content;
-    }
+	/**
+	 * Gets the button content
+	 * @return string
+	 */
+	public function button_content()
+	{
+		return $this->_button_content;
+	}
 }