eventespresso / event-espresso-core

core/libraries/messages/EE_Message_To_Generate_From_Queue.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     protected function _get_subject($custom_subject = '')
     {
-        if (! empty($custom_subject)) {
+        if ( ! empty($custom_subject)) {
             return $custom_subject;
         }
         $this->queue->get_message_repository()->rewind();

Indentation +77 added lines, -77 removed lines

@@ -12,90 +12,90 @@
  */
 class EE_Message_To_Generate_From_Queue extends EE_Message_To_Generate
 {
-    /**
-     * Will hold an EE_Messages_Queue object
-     * @type EE_Messages_Queue
-     */
-    public $queue = array();
+	/**
+	 * Will hold an EE_Messages_Queue object
+	 * @type EE_Messages_Queue
+	 */
+	public $queue = array();
 
-    /**
-     * @param string            $messenger_name  The messenger being used to send the message
-     * @param string            $message_type_name  The message type being used to grab variations etc.
-     * @param EE_Messages_Queue $queue
-     * @param string            $custom_subject  Used if a custom subject is desired for the generated aggregate EE_Message object
-     */
-    public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '')
-    {
-        $this->queue = $queue;
-        parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
-        if ($this->valid()) {
-            $this->_message->set_content($this->_get_content());
-            $this->_message->set_subject($this->_get_subject($custom_subject));
-            $this->_message->set_GRP_ID($this->getGroupIdFromMessageRepo());
-        }
-    }
+	/**
+	 * @param string            $messenger_name  The messenger being used to send the message
+	 * @param string            $message_type_name  The message type being used to grab variations etc.
+	 * @param EE_Messages_Queue $queue
+	 * @param string            $custom_subject  Used if a custom subject is desired for the generated aggregate EE_Message object
+	 */
+	public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '')
+	{
+		$this->queue = $queue;
+		parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
+		if ($this->valid()) {
+			$this->_message->set_content($this->_get_content());
+			$this->_message->set_subject($this->_get_subject($custom_subject));
+			$this->_message->set_GRP_ID($this->getGroupIdFromMessageRepo());
+		}
+	}
 
 
 
-    /**
-     * Uses the EE_Messages_Queue currently set on this object to generate the content
-     * for the single EE_Message aggregate object returned by get_EE_Message
-     * @return string;
-     */
-    protected function _get_content()
-    {
-        $content = '';
-        $this->queue->get_message_repository()->rewind();
-        while ($this->queue->get_message_repository()->valid()) {
-            $content .= $this->queue->get_message_repository()->current()->content();
-            $this->queue->get_message_repository()->next();
-        }
-        return $content;
-    }
+	/**
+	 * Uses the EE_Messages_Queue currently set on this object to generate the content
+	 * for the single EE_Message aggregate object returned by get_EE_Message
+	 * @return string;
+	 */
+	protected function _get_content()
+	{
+		$content = '';
+		$this->queue->get_message_repository()->rewind();
+		while ($this->queue->get_message_repository()->valid()) {
+			$content .= $this->queue->get_message_repository()->current()->content();
+			$this->queue->get_message_repository()->next();
+		}
+		return $content;
+	}
 
 
-    /**
-     * Return a subject string to use for `MSG_Subject` in the aggregate EE_Message object.
-     * @param string $custom_subject
-     *
-     * @return string
-     */
-    protected function _get_subject($custom_subject = '')
-    {
-        if (! empty($custom_subject)) {
-            return $custom_subject;
-        }
-        $this->queue->get_message_repository()->rewind();
-        $count_of_items = $this->queue->get_message_repository()->count();
+	/**
+	 * Return a subject string to use for `MSG_Subject` in the aggregate EE_Message object.
+	 * @param string $custom_subject
+	 *
+	 * @return string
+	 */
+	protected function _get_subject($custom_subject = '')
+	{
+		if (! empty($custom_subject)) {
+			return $custom_subject;
+		}
+		$this->queue->get_message_repository()->rewind();
+		$count_of_items = $this->queue->get_message_repository()->count();
 
-        // if $count of items in queue == 1, then let's just return the subject for that item.
-        if ($count_of_items === 1) {
-            return $this->queue->get_message_repository()->current()->subject();
-        }
-        // phpcs:disable WordPress.WP.I18n.MissingSingularPlaceholder
-        return sprintf(
-            _n(
-                'Showing Aggregate output for 1 result',
-                'Showing Aggregate output for %d items',
-                $count_of_items,
-                'event_espresso'
-            ),
-            $count_of_items
-        );
-        // phpcs:enable
-    }
+		// if $count of items in queue == 1, then let's just return the subject for that item.
+		if ($count_of_items === 1) {
+			return $this->queue->get_message_repository()->current()->subject();
+		}
+		// phpcs:disable WordPress.WP.I18n.MissingSingularPlaceholder
+		return sprintf(
+			_n(
+				'Showing Aggregate output for 1 result',
+				'Showing Aggregate output for %d items',
+				$count_of_items,
+				'event_espresso'
+			),
+			$count_of_items
+		);
+		// phpcs:enable
+	}
 
 
-    /**
-     * Uses the EE_Messages_Queue currently set on this object to set the GRP_ID
-     * for the single EE_Message aggregate object returned by get_EE_Message
-     * @return int;
-     */
-    protected function getGroupIdFromMessageRepo()
-    {
-        $this->queue->get_message_repository()->rewind();
-        if ($this->queue->get_message_repository()->valid()) {
-            return $this->queue->get_message_repository()->current()->GRP_ID();
-        }
-    }
+	/**
+	 * Uses the EE_Messages_Queue currently set on this object to set the GRP_ID
+	 * for the single EE_Message aggregate object returned by get_EE_Message
+	 * @return int;
+	 */
+	protected function getGroupIdFromMessageRepo()
+	{
+		$this->queue->get_message_repository()->rewind();
+		if ($this->queue->get_message_repository()->valid()) {
+			return $this->queue->get_message_repository()->current()->GRP_ID();
+		}
+	}
 }

core/libraries/shortcodes/EE_Venue_Shortcodes.lib.php

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':

Indentation +295 added lines, -295 removed lines

@@ -15,299 +15,299 @@
  */
 class EE_Venue_Shortcodes extends EE_Shortcodes
 {
-    /**
-     * 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');
-
-            case '[VENUE_DESCRIPTION]':
-                return $this->_venue('description');
-
-            case '[VENUE_URL]':
-                return $this->_venue('url');
-
-            case '[VENUE_IMAGE]':
-                return $this->_venue('image');
-
-            case '[VENUE_PHONE]':
-                return $this->_venue('phone');
-
-            case '[VENUE_ADDRESS]':
-                return $this->_venue('address');
-
-            case '[VENUE_ADDRESS2]':
-                return $this->_venue('address2');
-
-            case '[VENUE_CITY]':
-                return $this->_venue('city');
-
-            case '[VENUE_COUNTRY]':
-                return $this->_venue('country');
-
-            case '[VENUE_STATE]':
-                return $this->_venue('state');
-
-            case '[VENUE_ZIP]':
-                return $this->_venue('zip');
-
-            case '[VENUE_FORMATTED_ADDRESS]':
-                return $this->_venue('formatted_address');
-
-            case '[GOOGLE_MAP_URL]':
-                return $this->_venue('gmap_url');
-
-            case '[GOOGLE_MAP_LINK]':
-                return $this->_venue('gmap_link');
-
-            case '[GOOGLE_MAP_IMAGE]':
-                return $this->_venue('gmap_link_img');
-
-            case '[VENUE_DETAILS_URL]':
-                return $this->_venue('permalink');
-        }
-
-        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');
+
+			case '[VENUE_DESCRIPTION]':
+				return $this->_venue('description');
+
+			case '[VENUE_URL]':
+				return $this->_venue('url');
+
+			case '[VENUE_IMAGE]':
+				return $this->_venue('image');
+
+			case '[VENUE_PHONE]':
+				return $this->_venue('phone');
+
+			case '[VENUE_ADDRESS]':
+				return $this->_venue('address');
+
+			case '[VENUE_ADDRESS2]':
+				return $this->_venue('address2');
+
+			case '[VENUE_CITY]':
+				return $this->_venue('city');
+
+			case '[VENUE_COUNTRY]':
+				return $this->_venue('country');
+
+			case '[VENUE_STATE]':
+				return $this->_venue('state');
+
+			case '[VENUE_ZIP]':
+				return $this->_venue('zip');
+
+			case '[VENUE_FORMATTED_ADDRESS]':
+				return $this->_venue('formatted_address');
+
+			case '[GOOGLE_MAP_URL]':
+				return $this->_venue('gmap_url');
+
+			case '[GOOGLE_MAP_LINK]':
+				return $this->_venue('gmap_link');
+
+			case '[GOOGLE_MAP_IMAGE]':
+				return $this->_venue('gmap_link_img');
+
+			case '[VENUE_DETAILS_URL]':
+				return $this->_venue('permalink');
+		}
+
+		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;
+	}
 }

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 +69 added lines, -69 removed lines

@@ -16,87 +16,87 @@
  */
 class EE_Payment_Shortcodes extends EE_Shortcodes
 {
-    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 _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')
+		);
+	}
 
 
-    /**
-     * @param string $shortcode
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    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 '';
-        }
+	/**
+	 * @param string $shortcode
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	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;
+		$payment = $this->_data;
 
-        switch ($shortcode) {
-            case '[PAYMENT_TIMESTAMP]':
-                return $payment->timestamp();
+		switch ($shortcode) {
+			case '[PAYMENT_TIMESTAMP]':
+				return $payment->timestamp();
 
-            case '[PAYMENT_METHOD]':
-                // previously the column 'PAY_source' was known as 'PAY_method'
-                return $payment->source();
+			case '[PAYMENT_METHOD]':
+				// previously the column 'PAY_source' was known as 'PAY_method'
+				return $payment->source();
 
-            case '[PAYMENT_AMOUNT]':
-                return $payment->amount_no_code();
+			case '[PAYMENT_AMOUNT]':
+				return $payment->amount_no_code();
 
-            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');
-                }
+			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');
+				}
 
-            case '[PAYMENT_GATEWAY_RESPONSE]':
-                return $payment->gateway_response();
+			case '[PAYMENT_GATEWAY_RESPONSE]':
+				return $payment->gateway_response();
 
-            case '[PAYMENT_GATEWAY_TXN_ID]':
-                return $payment->txn_id_chq_nmbr();
+			case '[PAYMENT_GATEWAY_TXN_ID]':
+				return $payment->txn_id_chq_nmbr();
 
-            case '[PAYMENT_PO_NUMBER]':
-                return $payment->po_number();
+			case '[PAYMENT_PO_NUMBER]':
+				return $payment->po_number();
 
-            case '[PAYMENT_EXTRA_ACCOUNTING]':
-                return $payment->extra_accntng();
+			case '[PAYMENT_EXTRA_ACCOUNTING]':
+				return $payment->extra_accntng();
 
-            case '[PAYMENT_STATUS]':
-                return $payment->pretty_status();
+			case '[PAYMENT_STATUS]':
+				return $payment->pretty_status();
 
-            case '[PAYMENT_STATUS_WITH_ICONS]':
-                return $payment->pretty_status(true);
+			case '[PAYMENT_STATUS_WITH_ICONS]':
+				return $payment->pretty_status(true);
 
-            default:
-                return '';
-        }
-    }
+			default:
+				return '';
+		}
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
         $key_begin_range = $january_is_month_1 ? 1 : 0;
         $key_range = range($key_begin_range, $key_begin_range + 11);
         if ($leading_zero) {
-            array_walk($key_range, array( $this, '_zero_pad' ));
+            array_walk($key_range, array($this, '_zero_pad'));
         }
         $value_range = range(1, 12);
-        array_walk($value_range, array( $this, '_zero_pad' ));
+        array_walk($value_range, array($this, '_zero_pad'));
         parent::__construct(
             array_combine(
                 $key_range,

Indentation +31 added lines, -31 removed lines

@@ -9,36 +9,36 @@
  */
 class EE_Month_Input extends EE_Select_Input
 {
-    /**
-     * @param bool  $leading_zero
-     * @param array $input_settings
-     * @param bool $january_is_month_1 whether january should have value of 1; or it should be month 0
-     */
-    public function __construct($leading_zero = false, $input_settings = array(), $january_is_month_1 = true)
-    {
-        $key_begin_range = $january_is_month_1 ? 1 : 0;
-        $key_range = range($key_begin_range, $key_begin_range + 11);
-        if ($leading_zero) {
-            array_walk($key_range, array( $this, '_zero_pad' ));
-        }
-        $value_range = range(1, 12);
-        array_walk($value_range, array( $this, '_zero_pad' ));
-        parent::__construct(
-            array_combine(
-                $key_range,
-                $value_range
-            ),
-            $input_settings
-        );
-    }
+	/**
+	 * @param bool  $leading_zero
+	 * @param array $input_settings
+	 * @param bool $january_is_month_1 whether january should have value of 1; or it should be month 0
+	 */
+	public function __construct($leading_zero = false, $input_settings = array(), $january_is_month_1 = true)
+	{
+		$key_begin_range = $january_is_month_1 ? 1 : 0;
+		$key_range = range($key_begin_range, $key_begin_range + 11);
+		if ($leading_zero) {
+			array_walk($key_range, array( $this, '_zero_pad' ));
+		}
+		$value_range = range(1, 12);
+		array_walk($value_range, array( $this, '_zero_pad' ));
+		parent::__construct(
+			array_combine(
+				$key_range,
+				$value_range
+			),
+			$input_settings
+		);
+	}
 
-    /**
-     * Changes int 1 to 01, etc. Useful with array_walk
-     * @param int $input
-     * @param mixed $key
-     */
-    protected function _zero_pad(&$input, $key)
-    {
-        $input = str_pad($input, 2, '0', STR_PAD_LEFT);
-    }
+	/**
+	 * Changes int 1 to 01, etc. Useful with array_walk
+	 * @param int $input
+	 * @param mixed $key
+	 */
+	protected function _zero_pad(&$input, $key)
+	{
+		$input = str_pad($input, 2, '0', STR_PAD_LEFT);
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
         $select_options = array();
         foreach ($answer_options as $model_obj) {
             if ($this->_naming_method) {
-                $display_value = call_user_func(array( $model_obj, $this->_naming_method ));
+                $display_value = call_user_func(array($model_obj, $this->_naming_method));
             } else {
                 $display_value = $model_obj->name();
             }
-            $select_options[ $model_obj->ID() ] = $display_value;
+            $select_options[$model_obj->ID()] = $display_value;
         }
         parent::set_select_options($select_options);
     }

Indentation +61 added lines, -61 removed lines

@@ -11,75 +11,75 @@
  */
 class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input
 {
-    protected $_naming_method;
+	protected $_naming_method;
 
 
 
-    /**
-     *
-     * @param EE_Base_Class[] $answer_options
-     * @param array $input_settings {
-     *      @var EE_Base_Class[] or array $default
-     *      @var string $naming_method function name on the class which will be used for getting the displayed-name.
-     *     example:     if the class were an EE_Event, this could be slug(), description(), name() (default)
-     * }
-     */
-    public function __construct($answer_options = array(), $input_settings = array())
-    {
-        if (isset($input_settings['naming_method'])) {
-            $this->set_option_naming_method($input_settings['naming_method']);
-        }
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 *
+	 * @param EE_Base_Class[] $answer_options
+	 * @param array $input_settings {
+	 *      @var EE_Base_Class[] or array $default
+	 *      @var string $naming_method function name on the class which will be used for getting the displayed-name.
+	 *     example:     if the class were an EE_Event, this could be slug(), description(), name() (default)
+	 * }
+	 */
+	public function __construct($answer_options = array(), $input_settings = array())
+	{
+		if (isset($input_settings['naming_method'])) {
+			$this->set_option_naming_method($input_settings['naming_method']);
+		}
+		parent::__construct($answer_options, $input_settings);
+	}
 
-    /**
-     * Sets the method name which will be called when outputting the options list
-     * @param string $method
-     */
-    public function set_option_naming_method($method)
-    {
-        $this->_naming_method = $method;
-    }
+	/**
+	 * Sets the method name which will be called when outputting the options list
+	 * @param string $method
+	 */
+	public function set_option_naming_method($method)
+	{
+		$this->_naming_method = $method;
+	}
 
 
 
-    /**
-     * You CAN pass an array of model objects instead of simple values for teh options
-     * @param EE_Base_Class[] $answer_options
-     * @return null|void
-     */
-    public function set_select_options($answer_options = array())
-    {
-        // convert the model objects to select from into normal select options
-        $select_options = array();
-        foreach ($answer_options as $model_obj) {
-            if ($this->_naming_method) {
-                $display_value = call_user_func(array( $model_obj, $this->_naming_method ));
-            } else {
-                $display_value = $model_obj->name();
-            }
-            $select_options[ $model_obj->ID() ] = $display_value;
-        }
-        parent::set_select_options($select_options);
-    }
+	/**
+	 * You CAN pass an array of model objects instead of simple values for teh options
+	 * @param EE_Base_Class[] $answer_options
+	 * @return null|void
+	 */
+	public function set_select_options($answer_options = array())
+	{
+		// convert the model objects to select from into normal select options
+		$select_options = array();
+		foreach ($answer_options as $model_obj) {
+			if ($this->_naming_method) {
+				$display_value = call_user_func(array( $model_obj, $this->_naming_method ));
+			} else {
+				$display_value = $model_obj->name();
+			}
+			$select_options[ $model_obj->ID() ] = $display_value;
+		}
+		parent::set_select_options($select_options);
+	}
 
 
 
-    /**
-     * if they passed in an array of model objects for the default, convert it
-     * into the format EE_Select_Multiple expects
-     * @param EE_Base_Class[]|array $values
-     */
-    public function set_default($values)
-    {
-        $defaults_as_simple_ids = array();
-        foreach ($values as $key => $value) {
-            if ($value instanceof EE_Base_Class) {
-                $defaults_as_simple_ids[] = $value->ID();
-            } else {
-                $defaults_as_simple_ids[] = $value;
-            }
-        }
-        parent::set_default($defaults_as_simple_ids);
-    }
+	/**
+	 * if they passed in an array of model objects for the default, convert it
+	 * into the format EE_Select_Multiple expects
+	 * @param EE_Base_Class[]|array $values
+	 */
+	public function set_default($values)
+	{
+		$defaults_as_simple_ids = array();
+		foreach ($values as $key => $value) {
+			if ($value instanceof EE_Base_Class) {
+				$defaults_as_simple_ids[] = $value->ID();
+			} else {
+				$defaults_as_simple_ids[] = $value;
+			}
+		}
+		parent::set_default($defaults_as_simple_ids);
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     public function __construct($answer_options, $input_settings = array())
     {
         $this->_set_display_strategy(new EE_Select_Multiple_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->_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);
     }

Indentation +11 added lines, -11 removed lines

@@ -9,15 +9,15 @@
  */
 class EE_Select_Multiple_Input extends EE_Form_Input_With_Options_Base
 {
-    /**
-     * @param array | EE_Question_Option[] $answer_options
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Select_Multiple_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 | EE_Question_Option[] $answer_options
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Select_Multiple_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);
+	}
 }

core/libraries/form_sections/strategies/normalization/EE_Many_Valued_Normalization.strategy.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         }
         $normalized_array_value = array();
         foreach ($items_to_normalize as $key => $individual_item) {
-            $normalized_array_value[ $key ] = $this->normalize_one($individual_item);
+            $normalized_array_value[$key] = $this->normalize_one($individual_item);
         }
         return $normalized_array_value;
     }
@@ -74,12 +74,12 @@ 
         if ($normalized_values === null) {
             $normalized_values = array();
         }
-        if (! is_array($normalized_values)) {
+        if ( ! is_array($normalized_values)) {
             $normalized_values = array($normalized_values);
         }
         $non_normal_values = array();
         foreach ($normalized_values as $key => $value) {
-            $non_normal_values[ $key ] = $this->unnormalize_one($value);
+            $non_normal_values[$key] = $this->unnormalize_one($value);
         }
         return $non_normal_values;
     }

Indentation +86 added lines, -86 removed lines

@@ -9,90 +9,90 @@
  */
 class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base
 {
-    protected $_individual_item_normalization_strategy = array();
-
-
-
-    /**
-     * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
-     */
-    public function __construct($individual_item_normalization_strategy)
-    {
-        $this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Normalizes the input into an array, and normalizes each item according to its
-     * individual item normalization strategy
-     *
-     * @param array | string $value_to_normalize
-     * @return array
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            $items_to_normalize = $value_to_normalize;
-        } elseif ($value_to_normalize !== null) {
-            $items_to_normalize = array($value_to_normalize);
-        } else {
-            $items_to_normalize = array();
-        }
-        $normalized_array_value = array();
-        foreach ($items_to_normalize as $key => $individual_item) {
-            $normalized_array_value[ $key ] = $this->normalize_one($individual_item);
-        }
-        return $normalized_array_value;
-    }
-
-
-
-    /**
-     * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
-     *
-     * @param string $individual_value_to_normalize but definitely NOT an array
-     * @return mixed
-     */
-    public function normalize_one($individual_value_to_normalize)
-    {
-        return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
-    }
-
-
-
-    /**
-     * Converts the array of normalized things to an array of raw html values.
-     *
-     * @param array $normalized_values
-     * @return string[]
-     */
-    public function unnormalize($normalized_values)
-    {
-        if ($normalized_values === null) {
-            $normalized_values = array();
-        }
-        if (! is_array($normalized_values)) {
-            $normalized_values = array($normalized_values);
-        }
-        $non_normal_values = array();
-        foreach ($normalized_values as $key => $value) {
-            $non_normal_values[ $key ] = $this->unnormalize_one($value);
-        }
-        return $non_normal_values;
-    }
-
-
-
-    /**
-     * Unnormalizes an individual item in the array of values
-     *
-     * @param mixed $individual_value_to_unnormalize but certainly NOT an array
-     * @return string
-     */
-    public function unnormalize_one($individual_value_to_unnormalize)
-    {
-        return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
-    }
+	protected $_individual_item_normalization_strategy = array();
+
+
+
+	/**
+	 * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
+	 */
+	public function __construct($individual_item_normalization_strategy)
+	{
+		$this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Normalizes the input into an array, and normalizes each item according to its
+	 * individual item normalization strategy
+	 *
+	 * @param array | string $value_to_normalize
+	 * @return array
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			$items_to_normalize = $value_to_normalize;
+		} elseif ($value_to_normalize !== null) {
+			$items_to_normalize = array($value_to_normalize);
+		} else {
+			$items_to_normalize = array();
+		}
+		$normalized_array_value = array();
+		foreach ($items_to_normalize as $key => $individual_item) {
+			$normalized_array_value[ $key ] = $this->normalize_one($individual_item);
+		}
+		return $normalized_array_value;
+	}
+
+
+
+	/**
+	 * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
+	 *
+	 * @param string $individual_value_to_normalize but definitely NOT an array
+	 * @return mixed
+	 */
+	public function normalize_one($individual_value_to_normalize)
+	{
+		return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
+	}
+
+
+
+	/**
+	 * Converts the array of normalized things to an array of raw html values.
+	 *
+	 * @param array $normalized_values
+	 * @return string[]
+	 */
+	public function unnormalize($normalized_values)
+	{
+		if ($normalized_values === null) {
+			$normalized_values = array();
+		}
+		if (! is_array($normalized_values)) {
+			$normalized_values = array($normalized_values);
+		}
+		$non_normal_values = array();
+		foreach ($normalized_values as $key => $value) {
+			$non_normal_values[ $key ] = $this->unnormalize_one($value);
+		}
+		return $non_normal_values;
+	}
+
+
+
+	/**
+	 * Unnormalizes an individual item in the array of values
+	 *
+	 * @param mixed $individual_value_to_unnormalize but certainly NOT an array
+	 * @return string
+	 */
+	public function unnormalize_one($individual_value_to_unnormalize)
+	{
+		return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Template_Layout.strategy.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
         // loop through incoming options
         foreach ($template_options as $key => $value) {
             // add underscore to $key to match property names
-            $_key = '_' . $key;
+            $_key = '_'.$key;
             if (property_exists($this, $_key)) {
                 $this->{$_key} = $value;
             }
@@ -182,9 +182,9 @@ 
             $subsection_name = self::prep_form_subsection_key_name($subsection_name);
             if (strpos($subsection_name, '[') !== false) {
                 $sub_name = explode('[', $subsection_name);
-                $this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
+                $this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection);
             } else {
-                $this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
+                $this->_template_args[$subsection_name] = $this->layout_subsection($subsection);
             }
         }
         //      d( $this->_template_args );
@@ -203,7 +203,7 @@ 
     public static function prep_form_subsection_key_name($subsection_name = '')
     {
         $subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
-        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
+        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name;
     }
 
 

Indentation +196 added lines, -196 removed lines

@@ -22,200 +22,200 @@
  */
 class EE_Template_Layout extends EE_Div_Per_Section_Layout
 {
-    protected $_layout_template_file       = null;
-
-    protected $_layout_begin_template_file = null;
-
-    protected $_input_template_file        = null;
-
-    protected $_subsection_template_file   = null;
-
-    protected $_layout_end_template_file   = null;
-
-    protected $_template_args              = array();
-
-
-
-    /**
-     * @param array $template_options {
-     * @type string $_layout_template_file
-     * @type string $_begin_template_file
-     * @type string $_input_template_file
-     * @type string $_subsection_template_file
-     * @type string $_end_template_file
-     * @type array  $_template_args
-     *                                }
-     */
-    public function __construct($template_options = array())
-    {
-        // loop through incoming options
-        foreach ($template_options as $key => $value) {
-            // add underscore to $key to match property names
-            $_key = '_' . $key;
-            if (property_exists($this, $_key)) {
-                $this->{$_key} = $value;
-            }
-        }
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Also has the side effect of enqueuing any needed JS and CSS for
-     * this form.
-     * Creates all the HTML necessary for displaying this form, its inputs, and
-     * proper subsections.
-     * Returns the HTML
-     *
-     * @return string
-     */
-    public function layout_form()
-    {
-        if ($this->_layout_template_file) {
-            return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), true, true);
-        } else {
-            return parent::layout_form();
-        }
-    }
-
-
-
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        if ($this->_layout_begin_template_file) {
-            return EEH_Template::locate_template(
-                $this->_layout_begin_template_file,
-                $this->template_args(),
-                true,
-                true
-            );
-        } else {
-            return parent::layout_form_begin();
-        }
-    }
-
-
-
-    /**
-     * If an input_template_file was provided upon construction, uses that to layout the input. Otherwise uses parent.
-     *
-     * @see EE_DIv_Per_Section_Layout::layout_input() for documentation
-     * @param EE_Form_Input_Base $input
-     * @return string
-     */
-    public function layout_input($input)
-    {
-        if ($this->_input_template_file) {
-            return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), true, true);
-        }
-        return parent::layout_input($input);
-    }
-
-
-
-    /**
-     * If a subsection_template_file was provided upon construction, uses that to layout the subsection. Otherwise uses parent.
-     *
-     * @see EE_Div_Per_Section_Layout::layout_subsection() for documentation
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        if ($this->_subsection_template_file) {
-            return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), true, true);
-        }
-        return parent::layout_subsection($form_section);
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        if ($this->_layout_end_template_file) {
-            return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), true, true);
-        } else {
-            return parent::layout_form_end();
-        }
-    }
-
-
-
-    /**
-     * @param array $template_args
-     */
-    public function set_template_args($template_args = array())
-    {
-        $this->_template_args = $template_args;
-    }
-
-
-
-    /**
-     * @param array $template_args
-     */
-    public function add_template_args($template_args = array())
-    {
-        $this->_template_args = array_merge_recursive($this->_template_args, $template_args);
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function template_args()
-    {
-        foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
-            $subsection_name = self::prep_form_subsection_key_name($subsection_name);
-            if (strpos($subsection_name, '[') !== false) {
-                $sub_name = explode('[', $subsection_name);
-                $this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
-            } else {
-                $this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
-            }
-        }
-        //      d( $this->_template_args );
-        return $this->_template_args;
-    }
-
-
-
-    /**
-     * prep_form_section_key_name
-     *
-     * @access public
-     * @param string $subsection_name
-     * @return string
-     */
-    public static function prep_form_subsection_key_name($subsection_name = '')
-    {
-        $subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
-        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
-    }
-
-
-
-    /**
-     * get_subform - just a wrapper for the above method
-     *
-     * @access public
-     * @param string $subsection_name
-     * @return string
-     */
-    public static function get_subform_name($subsection_name = '')
-    {
-        return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
-    }
+	protected $_layout_template_file       = null;
+
+	protected $_layout_begin_template_file = null;
+
+	protected $_input_template_file        = null;
+
+	protected $_subsection_template_file   = null;
+
+	protected $_layout_end_template_file   = null;
+
+	protected $_template_args              = array();
+
+
+
+	/**
+	 * @param array $template_options {
+	 * @type string $_layout_template_file
+	 * @type string $_begin_template_file
+	 * @type string $_input_template_file
+	 * @type string $_subsection_template_file
+	 * @type string $_end_template_file
+	 * @type array  $_template_args
+	 *                                }
+	 */
+	public function __construct($template_options = array())
+	{
+		// loop through incoming options
+		foreach ($template_options as $key => $value) {
+			// add underscore to $key to match property names
+			$_key = '_' . $key;
+			if (property_exists($this, $_key)) {
+				$this->{$_key} = $value;
+			}
+		}
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Also has the side effect of enqueuing any needed JS and CSS for
+	 * this form.
+	 * Creates all the HTML necessary for displaying this form, its inputs, and
+	 * proper subsections.
+	 * Returns the HTML
+	 *
+	 * @return string
+	 */
+	public function layout_form()
+	{
+		if ($this->_layout_template_file) {
+			return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), true, true);
+		} else {
+			return parent::layout_form();
+		}
+	}
+
+
+
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		if ($this->_layout_begin_template_file) {
+			return EEH_Template::locate_template(
+				$this->_layout_begin_template_file,
+				$this->template_args(),
+				true,
+				true
+			);
+		} else {
+			return parent::layout_form_begin();
+		}
+	}
+
+
+
+	/**
+	 * If an input_template_file was provided upon construction, uses that to layout the input. Otherwise uses parent.
+	 *
+	 * @see EE_DIv_Per_Section_Layout::layout_input() for documentation
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 */
+	public function layout_input($input)
+	{
+		if ($this->_input_template_file) {
+			return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), true, true);
+		}
+		return parent::layout_input($input);
+	}
+
+
+
+	/**
+	 * If a subsection_template_file was provided upon construction, uses that to layout the subsection. Otherwise uses parent.
+	 *
+	 * @see EE_Div_Per_Section_Layout::layout_subsection() for documentation
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		if ($this->_subsection_template_file) {
+			return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), true, true);
+		}
+		return parent::layout_subsection($form_section);
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		if ($this->_layout_end_template_file) {
+			return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), true, true);
+		} else {
+			return parent::layout_form_end();
+		}
+	}
+
+
+
+	/**
+	 * @param array $template_args
+	 */
+	public function set_template_args($template_args = array())
+	{
+		$this->_template_args = $template_args;
+	}
+
+
+
+	/**
+	 * @param array $template_args
+	 */
+	public function add_template_args($template_args = array())
+	{
+		$this->_template_args = array_merge_recursive($this->_template_args, $template_args);
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function template_args()
+	{
+		foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
+			$subsection_name = self::prep_form_subsection_key_name($subsection_name);
+			if (strpos($subsection_name, '[') !== false) {
+				$sub_name = explode('[', $subsection_name);
+				$this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
+			} else {
+				$this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
+			}
+		}
+		//      d( $this->_template_args );
+		return $this->_template_args;
+	}
+
+
+
+	/**
+	 * prep_form_section_key_name
+	 *
+	 * @access public
+	 * @param string $subsection_name
+	 * @return string
+	 */
+	public static function prep_form_subsection_key_name($subsection_name = '')
+	{
+		$subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
+		return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
+	}
+
+
+
+	/**
+	 * get_subform - just a wrapper for the above method
+	 *
+	 * @access public
+	 * @param string $subsection_name
+	 * @return string
+	 */
+	public static function get_subform_name($subsection_name = '')
+	{
+		return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Fieldset_Section_Layout.strategy.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct($options = array())
     {
         foreach ($options as $key => $value) {
-            $key = '_' . $key;
+            $key = '_'.$key;
             if (property_exists($this, $key)) {
                 $this->{$key} = $value;
             }
@@ -60,7 +60,7 @@ 
                 . '" style="'
                 . $this->_form_section->html_style()
                 . '">';
-        $html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
+        $html .= '<legend class="'.$this->legend_class().'">'.$this->legend_text().'</legend>';
         return $html;
     }
 
@@ -73,7 +73,7 @@ 
      */
     public function layout_form_end()
     {
-        return EEH_HTML::nl(-1) . '</fieldset>';
+        return EEH_HTML::nl(-1).'</fieldset>';
     }
 
 

Indentation +103 added lines, -103 removed lines

@@ -11,107 +11,107 @@
  */
 class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout
 {
-    /**
-     * legend_class
-     *
-     * @var string
-     */
-    protected $_legend_class;
-
-    /**
-     * legend_text
-     *
-     * @var string
-     */
-    protected $_legend_text;
-
-
-
-    /**
-     *    construct
-     *
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        foreach ($options as $key => $value) {
-            $key = '_' . $key;
-            if (property_exists($this, $key)) {
-                $this->{$key} = $value;
-            }
-        }
-    }
-
-
-
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        $html = EEH_HTML::nl(1)
-                . '<fieldset id="'
-                . $this->_form_section->html_id()
-                . '" class="'
-                . $this->_form_section->html_class()
-                . '" style="'
-                . $this->_form_section->html_style()
-                . '">';
-        $html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
-        return $html;
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::nl(-1) . '</fieldset>';
-    }
-
-
-
-    /**
-     * @param string $legend_class
-     */
-    public function set_legend_class($legend_class)
-    {
-        $this->_legend_class = $legend_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function legend_class()
-    {
-        return $this->_legend_class;
-    }
-
-
-
-    /**
-     * @param string $legend_text
-     */
-    public function set_legend_text($legend_text)
-    {
-        $this->_legend_text = $legend_text;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function legend_text()
-    {
-        return $this->_legend_text;
-    }
+	/**
+	 * legend_class
+	 *
+	 * @var string
+	 */
+	protected $_legend_class;
+
+	/**
+	 * legend_text
+	 *
+	 * @var string
+	 */
+	protected $_legend_text;
+
+
+
+	/**
+	 *    construct
+	 *
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		foreach ($options as $key => $value) {
+			$key = '_' . $key;
+			if (property_exists($this, $key)) {
+				$this->{$key} = $value;
+			}
+		}
+	}
+
+
+
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		$html = EEH_HTML::nl(1)
+				. '<fieldset id="'
+				. $this->_form_section->html_id()
+				. '" class="'
+				. $this->_form_section->html_class()
+				. '" style="'
+				. $this->_form_section->html_style()
+				. '">';
+		$html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
+		return $html;
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::nl(-1) . '</fieldset>';
+	}
+
+
+
+	/**
+	 * @param string $legend_class
+	 */
+	public function set_legend_class($legend_class)
+	{
+		$this->_legend_class = $legend_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function legend_class()
+	{
+		return $this->_legend_class;
+	}
+
+
+
+	/**
+	 * @param string $legend_text
+	 */
+	public function set_legend_text($legend_text)
+	{
+		$this->_legend_text = $legend_text;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function legend_text()
+	{
+		return $this->_legend_text;
+	}
 }