eventespresso / event-espresso-core

core/helpers/EEH_Maps.helper.php

Spacing +22 added lines, -22 removed lines

@@ -51,7 +51,7 @@ 
             ? esc_url_raw($ee_gmaps_opts['ee_static_url'])
             : false;
 
-        if (! empty($ee_gmaps_opts['ee_map_align'])) {
+        if ( ! empty($ee_gmaps_opts['ee_map_align'])) {
             switch ($ee_gmaps_opts['ee_map_align']) {
                 case "left":
                     $map_align = 'ee-gmap-align-left left';
@@ -75,18 +75,18 @@ 
         // if so display a Google static iframe map else run V3 api
         if ($static_url) {
             $html = '
-            <div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">
-                <iframe src="' . $static_url . '&output=embed"
-                        style="width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;"
+            <div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align.'">
+                <iframe src="' . $static_url.'&output=embed"
+                        style="width: ' . $ee_map_width.'px; height: '.$ee_map_height.'px;"
                         frameborder="0" 
                         scrolling="no"
                     >
                 </iframe>
-                <a href="' . $static_url . '">' . esc_html__('View Large map', 'event_espresso') . '</a>
+                <a href="' . $static_url.'">'.esc_html__('View Large map', 'event_espresso').'</a>
             </div>
 ';
         } else {
-            EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = [
+            EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = [
                 'map_ID'              => $ee_gmaps_opts['map_ID'],
                 'ee_map_zoom'         => $ee_map_zoom,
                 'ee_map_nav_display'  => $ee_map_nav_display,
@@ -95,12 +95,12 @@ 
                 'location'            => $ee_gmaps_opts['location'],
             ];
 
-            $style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
+            $style = 'width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;';
             $html  = '
-            <div class="ee-gmap-wrapper ' . esc_attr($map_align) . '">
+            <div class="ee-gmap-wrapper ' . esc_attr($map_align).'">
                 <div class="ee-gmap" 
-                     id="map_canvas_' . esc_attr($ee_gmaps_opts['map_ID']) . '"
-                     style="' . esc_attr($style) . '"
+                     id="map_canvas_' . esc_attr($ee_gmaps_opts['map_ID']).'"
+                     style="' . esc_attr($style).'"
                  ></div>
             </div>';
 
@@ -144,7 +144,7 @@ 
         );
         wp_register_script(
             'ee_gmap',
-            plugin_dir_url(__FILE__) . 'assets/ee_gmap.js',
+            plugin_dir_url(__FILE__).'assets/ee_gmap.js',
             ['gmap_api'],
             '1.0',
             true
@@ -180,12 +180,12 @@ 
         $map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
         $address_string = ($address != '' ? $address : '')
-                          . ($city != '' ? ',' . $city : '')
-                          . ($state != '' ? ',' . $state : '')
-                          . ($zip != '' ? ',' . $zip : '')
-                          . ($country != '' ? ',' . $country : '');
+                          . ($city != '' ? ','.$city : '')
+                          . ($state != '' ? ','.$state : '')
+                          . ($zip != '' ? ','.$zip : '')
+                          . ($country != '' ? ','.$country : '');
 
-        $google_map = htmlentities2('https://maps.google.com/maps?q=' . urlencode($address_string));
+        $google_map = htmlentities2('https://maps.google.com/maps?q='.urlencode($address_string));
 
         switch ($type) {
             case 'text':
@@ -208,31 +208,31 @@ 
 
                 return '
                 <a class="a_map_image_link" 
-                   href="' . esc_url_raw($google_map) . '" 
+                   href="' . esc_url_raw($google_map).'" 
                    target="_blank" 
                    rel="noopener noreferrer"
                 >
-                    <img alt="' . esc_html__('Map and Directions', 'event_espresso') . '"
+                    <img alt="' . esc_html__('Map and Directions', 'event_espresso').'"
                          class="map_image_link" 
-                         id="venue_map_' . $id . '" ' . $map_image_class . ' 
+                         id="venue_map_' . $id.'" '.$map_image_class.' 
                          src="'
                        . htmlentities2(
                            $scheme
                            . 'maps.googleapis.com/maps/api/staticmap?center='
                            . urlencode($address_string)
                            . '&amp;zoom=14&amp;size='
-                           . $map_w . 'x' . $map_h
+                           . $map_w.'x'.$map_h
                            . '&amp;markers=color:green|label:|'
                            . urlencode($address_string)
                            . '&amp;sensor=false&amp;key='
                            . $api_key
-                       ) . '"
+                       ).'"
                      />
                  </a>';
         }
 
         return $type === 'url_only'
             ? $text
-            : '<a href="' . esc_url_raw($google_map) . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
+            : '<a href="'.esc_url_raw($google_map).'" target="_blank" rel="noopener noreferrer">'.$text.'</a>';
     }
 }

Indentation +194 added lines, -194 removed lines

@@ -11,69 +11,69 @@ 
  */
 class EEH_Maps
 {
-    // array of map settings
-    public static $gmap_vars = [];
-
-
-    /**
-     * google_map - creates a Google Map Link
-     *
-     * @param array $ee_gmaps_opts array of attributes required for the map link generation
-     * @return string (link to map!)
-     */
-    public static function google_map($ee_gmaps_opts)
-    {
-
-        $ee_map_width = ! empty($ee_gmaps_opts['ee_map_width'])
-            ? absint($ee_gmaps_opts['ee_map_width'])
-            : 300;
-
-        $ee_map_height = ! empty($ee_gmaps_opts['ee_map_height'])
-            ? absint($ee_gmaps_opts['ee_map_height'])
-            : 185;
-
-        $ee_map_zoom = ! empty($ee_gmaps_opts['ee_map_zoom'])
-            ? absint($ee_gmaps_opts['ee_map_zoom'])
-            : 12;
-
-        $ee_map_nav_display = ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
-
-        $ee_map_nav_size = ! empty($ee_gmaps_opts['ee_map_nav_size'])
-            ? sanitize_text_field($ee_gmaps_opts['ee_map_nav_size'])
-            : 'default';
-
-        $ee_map_type_control = ! empty($ee_gmaps_opts['ee_map_type_control'])
-            ? sanitize_text_field($ee_gmaps_opts['ee_map_type_control'])
-            : 'default';
-
-        $static_url = ! empty($ee_gmaps_opts['ee_static_url'])
-            ? esc_url_raw($ee_gmaps_opts['ee_static_url'])
-            : false;
-
-        if (! empty($ee_gmaps_opts['ee_map_align'])) {
-            switch ($ee_gmaps_opts['ee_map_align']) {
-                case "left":
-                    $map_align = 'ee-gmap-align-left left';
-                    break;
-                case "right":
-                    $map_align = 'ee-gmap-align-right right';
-                    break;
-                case "center":
-                    $map_align = 'ee-gmap-align-center center';
-                    break;
-                case "none":
-                default:
-                    $map_align = 'ee-gmap-align-none';
-            }
-        } else {
-            $map_align = 'ee-gmap-align-none';
-        }
-
-
-        // Determine whether user has set a hardcoded url to use and
-        // if so display a Google static iframe map else run V3 api
-        if ($static_url) {
-            $html = '
+	// array of map settings
+	public static $gmap_vars = [];
+
+
+	/**
+	 * google_map - creates a Google Map Link
+	 *
+	 * @param array $ee_gmaps_opts array of attributes required for the map link generation
+	 * @return string (link to map!)
+	 */
+	public static function google_map($ee_gmaps_opts)
+	{
+
+		$ee_map_width = ! empty($ee_gmaps_opts['ee_map_width'])
+			? absint($ee_gmaps_opts['ee_map_width'])
+			: 300;
+
+		$ee_map_height = ! empty($ee_gmaps_opts['ee_map_height'])
+			? absint($ee_gmaps_opts['ee_map_height'])
+			: 185;
+
+		$ee_map_zoom = ! empty($ee_gmaps_opts['ee_map_zoom'])
+			? absint($ee_gmaps_opts['ee_map_zoom'])
+			: 12;
+
+		$ee_map_nav_display = ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+
+		$ee_map_nav_size = ! empty($ee_gmaps_opts['ee_map_nav_size'])
+			? sanitize_text_field($ee_gmaps_opts['ee_map_nav_size'])
+			: 'default';
+
+		$ee_map_type_control = ! empty($ee_gmaps_opts['ee_map_type_control'])
+			? sanitize_text_field($ee_gmaps_opts['ee_map_type_control'])
+			: 'default';
+
+		$static_url = ! empty($ee_gmaps_opts['ee_static_url'])
+			? esc_url_raw($ee_gmaps_opts['ee_static_url'])
+			: false;
+
+		if (! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
+				case "left":
+					$map_align = 'ee-gmap-align-left left';
+					break;
+				case "right":
+					$map_align = 'ee-gmap-align-right right';
+					break;
+				case "center":
+					$map_align = 'ee-gmap-align-center center';
+					break;
+				case "none":
+				default:
+					$map_align = 'ee-gmap-align-none';
+			}
+		} else {
+			$map_align = 'ee-gmap-align-none';
+		}
+
+
+		// Determine whether user has set a hardcoded url to use and
+		// if so display a Google static iframe map else run V3 api
+		if ($static_url) {
+			$html = '
             <div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">
                 <iframe src="' . $static_url . '&output=embed"
                         style="width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;"
@@ -84,18 +84,18 @@ 
                 <a href="' . $static_url . '">' . esc_html__('View Large map', 'event_espresso') . '</a>
             </div>
 ';
-        } else {
-            EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = [
-                'map_ID'              => $ee_gmaps_opts['map_ID'],
-                'ee_map_zoom'         => $ee_map_zoom,
-                'ee_map_nav_display'  => $ee_map_nav_display,
-                'ee_map_nav_size'     => $ee_map_nav_size,
-                'ee_map_type_control' => $ee_map_type_control,
-                'location'            => $ee_gmaps_opts['location'],
-            ];
-
-            $style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
-            $html  = '
+		} else {
+			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = [
+				'map_ID'              => $ee_gmaps_opts['map_ID'],
+				'ee_map_zoom'         => $ee_map_zoom,
+				'ee_map_nav_display'  => $ee_map_nav_display,
+				'ee_map_nav_size'     => $ee_map_nav_size,
+				'ee_map_type_control' => $ee_map_type_control,
+				'location'            => $ee_gmaps_opts['location'],
+			];
+
+			$style = 'width: ' . $ee_map_width . 'px; height: ' . $ee_map_height . 'px;';
+			$html  = '
             <div class="ee-gmap-wrapper ' . esc_attr($map_align) . '">
                 <div class="ee-gmap" 
                      id="map_canvas_' . esc_attr($ee_gmaps_opts['map_ID']) . '"
@@ -103,109 +103,109 @@ 
                  ></div>
             </div>';
 
-            wp_enqueue_script('gmap_api');
-            wp_enqueue_script('ee_gmap');
-            add_action('wp_footer', ['EEH_Maps', 'footer_enqueue_script']);
-        }
-        return $html; // end auto map or static url map check
-    }
-
-
-    /**
-     * enqueue_script
-     *
-     * @return void
-     */
-    public static function footer_enqueue_script()
-    {
-        wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
-    }
-
-
-    /**
-     * registers scripts for maps
-     */
-    public static function espresso_google_map_js()
-    {
-        $api_url = sprintf(
-            "https://maps.googleapis.com/maps/api/js?key=%s",
-            apply_filters(
-                'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
-                EE_Registry::instance()->CFG->map_settings->google_map_api_key
-            )
-        );
-        wp_register_script(
-            'gmap_api',
-            esc_url_raw($api_url),
-            ['jquery'],
-            null,
-            true
-        );
-        wp_register_script(
-            'ee_gmap',
-            plugin_dir_url(__FILE__) . 'assets/ee_gmap.js',
-            ['gmap_api'],
-            '1.0',
-            true
-        );
-    }
-
-
-    /**
-     * creates a Google Map Link
-     *
-     * @param array $atts array of attributes required for the map link generation
-     * @return string (link to map!)
-     */
-    public static function google_map_link($atts)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        extract($atts);
-        /** @var string $address */
-        /** @var string $city */
-        /** @var string $state */
-        /** @var string $zip */
-        /** @var string $country */
-        $address         = "{$address}";
-        $city            = "{$city}";
-        $state           = "{$state}";
-        $zip             = "{$zip}";
-        $country         = "{$country}";
-        $text            = isset($text) ? "{$text}" : "";
-        $type            = isset($type) ? "{$type}" : "";
-        $map_w           = isset($map_w) ? "{$map_w}" : 400;
-        $map_h           = isset($map_h) ? "{$map_h}" : 400;
-        $id              = isset($id) ? $id : 'not_set';
-        $map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
-
-        $address_string = ($address != '' ? $address : '')
-                          . ($city != '' ? ',' . $city : '')
-                          . ($state != '' ? ',' . $state : '')
-                          . ($zip != '' ? ',' . $zip : '')
-                          . ($country != '' ? ',' . $country : '');
-
-        $google_map = htmlentities2('https://maps.google.com/maps?q=' . urlencode($address_string));
-
-        switch ($type) {
-            case 'text':
-            default:
-                $text = $text == '' ? esc_html__('Map and Directions', 'event_espresso') : $text;
-                break;
-
-            case 'url_only':
-            case 'url':
-                $text = $google_map;
-                break;
-
-            case 'map':
-                $scheme = is_ssl() ? 'https://' : 'http://';
-
-                $api_key = apply_filters(
-                    'FHEE__EEH_Maps__espresso_google_maps_link__api_key',
-                    EE_Registry::instance()->CFG->map_settings->google_map_api_key
-                );
-
-                return '
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', ['EEH_Maps', 'footer_enqueue_script']);
+		}
+		return $html; // end auto map or static url map check
+	}
+
+
+	/**
+	 * enqueue_script
+	 *
+	 * @return void
+	 */
+	public static function footer_enqueue_script()
+	{
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
+	}
+
+
+	/**
+	 * registers scripts for maps
+	 */
+	public static function espresso_google_map_js()
+	{
+		$api_url = sprintf(
+			"https://maps.googleapis.com/maps/api/js?key=%s",
+			apply_filters(
+				'FHEE__EEH_Maps__espresso_google_maps_js__api_key',
+				EE_Registry::instance()->CFG->map_settings->google_map_api_key
+			)
+		);
+		wp_register_script(
+			'gmap_api',
+			esc_url_raw($api_url),
+			['jquery'],
+			null,
+			true
+		);
+		wp_register_script(
+			'ee_gmap',
+			plugin_dir_url(__FILE__) . 'assets/ee_gmap.js',
+			['gmap_api'],
+			'1.0',
+			true
+		);
+	}
+
+
+	/**
+	 * creates a Google Map Link
+	 *
+	 * @param array $atts array of attributes required for the map link generation
+	 * @return string (link to map!)
+	 */
+	public static function google_map_link($atts)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		extract($atts);
+		/** @var string $address */
+		/** @var string $city */
+		/** @var string $state */
+		/** @var string $zip */
+		/** @var string $country */
+		$address         = "{$address}";
+		$city            = "{$city}";
+		$state           = "{$state}";
+		$zip             = "{$zip}";
+		$country         = "{$country}";
+		$text            = isset($text) ? "{$text}" : "";
+		$type            = isset($type) ? "{$type}" : "";
+		$map_w           = isset($map_w) ? "{$map_w}" : 400;
+		$map_h           = isset($map_h) ? "{$map_h}" : 400;
+		$id              = isset($id) ? $id : 'not_set';
+		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
+
+		$address_string = ($address != '' ? $address : '')
+						  . ($city != '' ? ',' . $city : '')
+						  . ($state != '' ? ',' . $state : '')
+						  . ($zip != '' ? ',' . $zip : '')
+						  . ($country != '' ? ',' . $country : '');
+
+		$google_map = htmlentities2('https://maps.google.com/maps?q=' . urlencode($address_string));
+
+		switch ($type) {
+			case 'text':
+			default:
+				$text = $text == '' ? esc_html__('Map and Directions', 'event_espresso') : $text;
+				break;
+
+			case 'url_only':
+			case 'url':
+				$text = $google_map;
+				break;
+
+			case 'map':
+				$scheme = is_ssl() ? 'https://' : 'http://';
+
+				$api_key = apply_filters(
+					'FHEE__EEH_Maps__espresso_google_maps_link__api_key',
+					EE_Registry::instance()->CFG->map_settings->google_map_api_key
+				);
+
+				return '
                 <a class="a_map_image_link" 
                    href="' . esc_url_raw($google_map) . '" 
                    target="_blank" 
@@ -215,23 +215,23 @@ 
                          class="map_image_link" 
                          id="venue_map_' . $id . '" ' . $map_image_class . ' 
                          src="'
-                       . htmlentities2(
-                           $scheme
-                           . 'maps.googleapis.com/maps/api/staticmap?center='
-                           . urlencode($address_string)
-                           . '&amp;zoom=14&amp;size='
-                           . $map_w . 'x' . $map_h
-                           . '&amp;markers=color:green|label:|'
-                           . urlencode($address_string)
-                           . '&amp;sensor=false&amp;key='
-                           . $api_key
-                       ) . '"
+					   . htmlentities2(
+						   $scheme
+						   . 'maps.googleapis.com/maps/api/staticmap?center='
+						   . urlencode($address_string)
+						   . '&amp;zoom=14&amp;size='
+						   . $map_w . 'x' . $map_h
+						   . '&amp;markers=color:green|label:|'
+						   . urlencode($address_string)
+						   . '&amp;sensor=false&amp;key='
+						   . $api_key
+					   ) . '"
                      />
                  </a>';
-        }
+		}
 
-        return $type === 'url_only'
-            ? $text
-            : '<a href="' . esc_url_raw($google_map) . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
-    }
+		return $type === 'url_only'
+			? $text
+			: '<a href="' . esc_url_raw($google_map) . '" target="_blank" rel="noopener noreferrer">' . $text . '</a>';
+	}
 }

core/services/progress_steps/ProgressStep.php

Spacing +5 added lines, -5 removed lines

@@ -121,7 +121,7 @@ 
      */
     protected function setId($id = '')
     {
-        if (! is_string($id)) {
+        if ( ! is_string($id)) {
             throw new InvalidDataTypeException('$id', $id, 'string');
         }
         $this->id = $id;
@@ -144,7 +144,7 @@ 
      */
     protected function setOrder($order = 0)
     {
-        if (! is_int($order)) {
+        if ( ! is_int($order)) {
             throw new InvalidDataTypeException('$order', $order, 'integer');
         }
         $this->order = absint($order);
@@ -173,11 +173,11 @@ 
      */
     protected function setHtmlClass($html_class)
     {
-        if (! is_string($html_class)) {
+        if ( ! is_string($html_class)) {
             throw new InvalidDataTypeException('$html_class', $html_class, 'string');
         }
         if (strpos($html_class, 'progress-step-') === false) {
-            $html_class = 'progress-step-' . $html_class;
+            $html_class = 'progress-step-'.$html_class;
         }
         $this->html_class = $html_class;
     }
@@ -199,7 +199,7 @@ 
      */
     protected function setText($text)
     {
-        if (! is_string($text)) {
+        if ( ! is_string($text)) {
             throw new InvalidDataTypeException('$text', $text, 'string');
         }
         $this->text = sanitize_text_field($text);

Indentation +186 added lines, -186 removed lines

@@ -16,190 +16,190 @@
  */
 class ProgressStep implements ProgressStepInterface
 {
-    /**
-     * @var boolean $current
-     */
-    private $current = false;
-
-
-    /**
-     * @var boolean $completed
-     */
-    private $completed = false;
-
-
-    /**
-     * @var string $html_class
-     */
-    private $html_class;
-
-    /**
-     * @var string $id
-     */
-    private $id = '';
-
-    /**
-     * @var int $order
-     */
-    private $order = 0;
-
-    /**
-     * @var string $text
-     */
-    private $text = '';
-
-
-    /**
-     * ProgressStep constructor
-     *
-     * @param int    $order
-     * @param string $id
-     * @param string $html_class
-     * @param string $text
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($order, $id, $html_class, $text)
-    {
-        $this->setOrder($order);
-        $this->setId($id);
-        $this->setHtmlClass($html_class);
-        $this->setText($text);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function isCurrent()
-    {
-        return $this->current;
-    }
-
-
-    /**
-     * @param boolean $current
-     */
-    public function setIsCurrent($current = true)
-    {
-        $this->current = filter_var($current, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function isCompleted()
-    {
-        return $this->completed;
-    }
-
-
-    /**
-     * @param boolean $completed
-     */
-    public function setIsCompleted($completed = true)
-    {
-        $this->completed = filter_var($completed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function id()
-    {
-        return $this->id;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $id
-     * @throws InvalidDataTypeException
-     */
-    protected function setId($id = '')
-    {
-        if (! is_string($id)) {
-            throw new InvalidDataTypeException('$id', $id, 'string');
-        }
-        $this->id = $id;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function order()
-    {
-        return $this->order;
-    }
-
-
-    /**
-     * @access protected
-     * @param int $order
-     * @throws InvalidDataTypeException
-     */
-    protected function setOrder($order = 0)
-    {
-        if (! is_int($order)) {
-            throw new InvalidDataTypeException('$order', $order, 'integer');
-        }
-        $this->order = absint($order);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function htmlClass()
-    {
-        $html_class = $this->html_class;
-        if ($this->isCurrent()) {
-            $html_class .= ' progress-step-active';
-        } elseif ($this->isCompleted()) {
-            $html_class .= ' progress-step-completed';
-        }
-        return $html_class;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $html_class
-     * @throws InvalidDataTypeException
-     */
-    protected function setHtmlClass($html_class)
-    {
-        if (! is_string($html_class)) {
-            throw new InvalidDataTypeException('$html_class', $html_class, 'string');
-        }
-        if (strpos($html_class, 'progress-step-') === false) {
-            $html_class = 'progress-step-' . $html_class;
-        }
-        $this->html_class = $html_class;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function text()
-    {
-        return $this->text;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $text
-     * @throws InvalidDataTypeException
-     */
-    protected function setText($text)
-    {
-        if (! is_string($text)) {
-            throw new InvalidDataTypeException('$text', $text, 'string');
-        }
-        $this->text = sanitize_text_field($text);
-    }
+	/**
+	 * @var boolean $current
+	 */
+	private $current = false;
+
+
+	/**
+	 * @var boolean $completed
+	 */
+	private $completed = false;
+
+
+	/**
+	 * @var string $html_class
+	 */
+	private $html_class;
+
+	/**
+	 * @var string $id
+	 */
+	private $id = '';
+
+	/**
+	 * @var int $order
+	 */
+	private $order = 0;
+
+	/**
+	 * @var string $text
+	 */
+	private $text = '';
+
+
+	/**
+	 * ProgressStep constructor
+	 *
+	 * @param int    $order
+	 * @param string $id
+	 * @param string $html_class
+	 * @param string $text
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($order, $id, $html_class, $text)
+	{
+		$this->setOrder($order);
+		$this->setId($id);
+		$this->setHtmlClass($html_class);
+		$this->setText($text);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function isCurrent()
+	{
+		return $this->current;
+	}
+
+
+	/**
+	 * @param boolean $current
+	 */
+	public function setIsCurrent($current = true)
+	{
+		$this->current = filter_var($current, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function isCompleted()
+	{
+		return $this->completed;
+	}
+
+
+	/**
+	 * @param boolean $completed
+	 */
+	public function setIsCompleted($completed = true)
+	{
+		$this->completed = filter_var($completed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function id()
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $id
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setId($id = '')
+	{
+		if (! is_string($id)) {
+			throw new InvalidDataTypeException('$id', $id, 'string');
+		}
+		$this->id = $id;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function order()
+	{
+		return $this->order;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param int $order
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setOrder($order = 0)
+	{
+		if (! is_int($order)) {
+			throw new InvalidDataTypeException('$order', $order, 'integer');
+		}
+		$this->order = absint($order);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function htmlClass()
+	{
+		$html_class = $this->html_class;
+		if ($this->isCurrent()) {
+			$html_class .= ' progress-step-active';
+		} elseif ($this->isCompleted()) {
+			$html_class .= ' progress-step-completed';
+		}
+		return $html_class;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $html_class
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setHtmlClass($html_class)
+	{
+		if (! is_string($html_class)) {
+			throw new InvalidDataTypeException('$html_class', $html_class, 'string');
+		}
+		if (strpos($html_class, 'progress-step-') === false) {
+			$html_class = 'progress-step-' . $html_class;
+		}
+		$this->html_class = $html_class;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function text()
+	{
+		return $this->text;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $text
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setText($text)
+	{
+		if (! is_string($text)) {
+			throw new InvalidDataTypeException('$text', $text, 'string');
+		}
+		$this->text = sanitize_text_field($text);
+	}
 }

core/libraries/shortcodes/EE_Shortcodes.lib.php

Spacing +13 added lines, -13 removed lines

@@ -146,7 +146,7 @@ 
 
     public function get_shortcode_helper()
     {
-        if (! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
+        if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
             $this->_set_shortcode_helper();
         }
         return $this->_shortcode_helper;
@@ -170,17 +170,17 @@ 
 
         // we need to setup any dynamic shortcodes so that they work with the array_key_exists
         preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
-        $sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
+        $sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
         // first we want to make sure this is a valid shortcode
-        if (! array_key_exists($sc_to_verify, $this->_shortcodes)) {
+        if ( ! array_key_exists($sc_to_verify, $this->_shortcodes)) {
             return false;
         } //get out, this parser doesn't handle the incoming shortcode.
         $this->_data = $data;
         $this->_extra_data = $extra_data;
         $this->_set_messages_properties();
         $parsed = apply_filters(
-            'FHEE__' . get_class($this) . '__parser_after',
+            'FHEE__'.get_class($this).'__parser_after',
             $this->_parser($shortcode),
             $shortcode,
             $data,
@@ -201,7 +201,7 @@ 
      */
     public function get_shortcodes()
     {
-        $this->_shortcodes = apply_filters('FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this);
+        $this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this);
 
         // note the below filter applies to ALL shortcode parsers... be careful!
         $this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
@@ -248,7 +248,7 @@ 
     {
 
         // first test to make sure we've got an array!
-        if (! is_array($this->_data)) {
+        if ( ! is_array($this->_data)) {
             throw new EE_Error(
                 sprintf(
                     esc_html__(
@@ -262,7 +262,7 @@ 
         }
 
         // next test to make sure we've got the required template in the index!
-        if (! isset($this->_data['template'])) {
+        if ( ! isset($this->_data['template'])) {
             throw new EE_Error(
                 sprintf(
                     esc_html__(
@@ -274,7 +274,7 @@ 
         }
 
         // next test to make sure we've got got a data index in the incoming data array
-        if (! isset($this->_data['data'])) {
+        if ( ! isset($this->_data['data'])) {
             throw new EE_Error(
                 esc_html__(
                     'The incoming data does not have the required data index in its array',
@@ -303,8 +303,8 @@ 
     {
         // make sure the required wp helper function is present
         // require the shortcode file if necessary
-        if (! function_exists('shortcode_parse_atts')) {
-            require_once(ABSPATH . WPINC . '/shortcodes.php');
+        if ( ! function_exists('shortcode_parse_atts')) {
+            require_once(ABSPATH.WPINC.'/shortcodes.php');
         }
 
         // let's get any attributes that may be present and set the defaults.
@@ -329,15 +329,15 @@ 
     protected function _mutate_conditional_block_in_template($shortcode, $show = true)
     {
         // first let's get all the matches in the template for this particular shortcode.
-        preg_match_all('~' . $this->_get_conditional_block_regex($shortcode) . '~', $this->_data['template'], $matches);
+        preg_match_all('~'.$this->_get_conditional_block_regex($shortcode).'~', $this->_data['template'], $matches);
 
         if ($matches && is_array($matches[0]) && ! empty($matches[0])) {
             // we need to hide all instances of the matches
             foreach ($matches[0] as $index => $content_to_show_or_hide) {
                 $content_to_show_or_hide = preg_quote($content_to_show_or_hide);
-                $replacement = $show ? $matches[4][ $index ] : '';
+                $replacement = $show ? $matches[4][$index] : '';
                 $this->_data['template'] = preg_replace(
-                    '~' . $content_to_show_or_hide . '~',
+                    '~'.$content_to_show_or_hide.'~',
                     $replacement,
                     $this->_data['template']
                 );

Indentation +452 added lines, -452 removed lines

@@ -16,456 +16,456 @@
  */
 abstract class EE_Shortcodes extends EE_Base
 {
-    /**
-     * holds label for library
-     * This is used for referencing the library label
-     *
-     * @access public
-     * @var string
-     */
-    public $label;
-
-
-    /**
-     * This property is used for referencing a short description of the library
-     *
-     * @access public
-     * @var string
-     */
-    public $description;
-
-
-    /**
-     * This will hold an array of shortcodes with the key as the shortcode ([shortcode]) and the value as a
-     * label/description for the shortcode.
-     *
-     * @access protected
-     * @var array
-     */
-    protected $_shortcodes;
-
-
-    /**
-     * This will hold the incoming data item sent to the parser method
-     *
-     * @access protected
-     * @var mixed (array|object)
-     */
-    protected $_data;
-
-
-    /**
-     * some shortcodes may require extra data to parse.  This property is provided for that.
-     *
-     * @var array
-     */
-    protected $_extra_data;
-
-
-    /**
-     * EE_messenger used to generate the template being parsed.
-     *
-     * @since 4.5.0
-     * @var EE_messenger
-     */
-    protected $_messenger;
-
-
-    /**
-     * message type used to generate the template being parsed.
-     *
-     * @since 4.5.0
-     * @var EE_message_type
-     */
-    protected $_message_type;
-
-
-    /**
-     * context used for the template being parsed
-     *
-     * @since 4.5.0
-     * @var string
-     */
-    protected $_context;
-
-
-    /**
-     * Specific Message Template Group ID
-     *
-     * @since 4.5.0
-     * @var int
-     */
-    protected $_GRP_ID;
-
-
-    /**
-     * @since 4.9.0
-     * @type EE_Message
-     */
-    protected $_message;
-
-
-    /**
-     * This will hold an instance of the EEH_Parse_Shortcodes helper that will be used when handling list type
-     * shortcodes
-     *
-     * @var EEH_Parse_Shortcodes
-     */
-    protected $_shortcode_helper;
-
-
-    public function __construct()
-    {
-        $this->_set_defaults();
-        $this->_init_props();
-    }
-
-
-    /**
-     * This sets the defaults for the properties.  Child classes will override these properties in their _init_props
-     * method
-     */
-    private function _set_defaults()
-    {
-        $this->name = $this->description = '';
-        $this->_shortcodes = array();
-        $this->_set_shortcode_helper();
-    }
-
-
-    /**
-     * loads an instance of the EE_Shortcode_Parser helper when requested
-     */
-    protected function _set_shortcode_helper()
-    {
-        // get shortcode_replace instance- set when _get_messages is called in child...
-        $this->_shortcode_helper = new EEH_Parse_Shortcodes();
-    }
-
-
-    public function get_shortcode_helper()
-    {
-        if (! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
-            $this->_set_shortcode_helper();
-        }
-        return $this->_shortcode_helper;
-    }
-
-
-    /**
-     * This is the public method for kicking of the parser included with each child.  It can be overridden by child
-     * classes if necessary (see EE_Questions_Answers for example)
-     *
-     * @param  string $shortcode incoming shortcode to be parsed
-     * @param  mixed (object|array) $data       incoming data to be be used for parsing
-     * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
-     * @return string            parsed shortcode.
-     */
-    public function parser($shortcode, $data, $extra_data = array())
-    {
-
-        // filter setup shortcodes
-        $this->_shortcodes = $this->get_shortcodes();
-
-        // we need to setup any dynamic shortcodes so that they work with the array_key_exists
-        preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
-        $sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
-
-        // first we want to make sure this is a valid shortcode
-        if (! array_key_exists($sc_to_verify, $this->_shortcodes)) {
-            return false;
-        } //get out, this parser doesn't handle the incoming shortcode.
-        $this->_data = $data;
-        $this->_extra_data = $extra_data;
-        $this->_set_messages_properties();
-        $parsed = apply_filters(
-            'FHEE__' . get_class($this) . '__parser_after',
-            $this->_parser($shortcode),
-            $shortcode,
-            $data,
-            $extra_data,
-            $this
-        );
-
-        // note the below filter applies to ALL shortcode parsers... be careful!
-        return apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
-    }
-
-
-    /**
-     * This method just returns the shortcodes in the $_shortcodes array property.
-     *
-     * @access public
-     * @return array array of shortcodes => description pairs
-     */
-    public function get_shortcodes()
-    {
-        $this->_shortcodes = apply_filters('FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this);
-
-        // note the below filter applies to ALL shortcode parsers... be careful!
-        $this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
-
-        return $this->_shortcodes;
-    }
-
-
-    /**
-     * Child classes use this method to set the $name, $description, and $_shortcodes properties.
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _init_props();
-
-
-    /**
-     * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
-     * will have to take care of handling.
-     *
-     * @abstract
-     * @access protected
-     * @param string $shortcode    the shortcode to be parsed.
-     * @param mixed (object|array) $data      incoming data for the parser.  The data could be either an object or
-     *                             array because there are some shortcodes that might be replaced by prepared data that
-     *                             has multiple items in a list (i.e. list of attendees in an event and we're showing
-     *                             fname/lname for each attendee).  In this case data will be in an array.  Otherwise
-     *                             the data shoudl be in a properly formatted object.  The
-     *                             EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
-     * @return string parsed shortcode
-     */
-    abstract protected function _parser($shortcode);
-
-
-    /**
-     * This just validates incoming data for list type shortcode parsers (and they call this method) to make sure it
-     * meets their requirements
-     *
-     * @return mixed (void|exception) If validation fails we'll throw an exception.
-     */
-    protected function _validate_list_requirements()
-    {
-
-        // first test to make sure we've got an array!
-        if (! is_array($this->_data)) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        'Expecting an array for the data sent to %s. Instead it was %s',
-                        'event_espresso'
-                    ),
-                    get_class($this),
-                    gettype($this->_data)
-                )
-            );
-        }
-
-        // next test to make sure we've got the required template in the index!
-        if (! isset($this->_data['template'])) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        'The incoming data does not have the required template index in its array',
-                        'event_espresso'
-                    )
-                )
-            );
-        }
-
-        // next test to make sure we've got got a data index in the incoming data array
-        if (! isset($this->_data['data'])) {
-            throw new EE_Error(
-                esc_html__(
-                    'The incoming data does not have the required data index in its array',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // all is well let's make sure _extra_data always has the values needed.
-        // let's make sure that extra_data includes all templates (for later parsing if necessary)
-        if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
-            $this->_extra_data['data'] = $this->_data['data'];
-            $this->_extra_data['template'] = $this->_data['template'];
-        }
-    }
-
-
-    /**
-     * This returns any attributes that may be existing on an EE_Shortcode
-     *
-     * @since 4.5.0
-     * @param string $shortcode incoming shortcode
-     * @return array An array with the attributes
-     */
-    protected function _get_shortcode_attrs($shortcode)
-    {
-        // make sure the required wp helper function is present
-        // require the shortcode file if necessary
-        if (! function_exists('shortcode_parse_atts')) {
-            require_once(ABSPATH . WPINC . '/shortcodes.php');
-        }
-
-        // let's get any attributes that may be present and set the defaults.
-        $shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
-        return shortcode_parse_atts($shortcode_to_parse);
-    }
-
-
-    /**
-     * Conditional blocks are shortcode patterns with an opening conditional tag `[IF_*]` and a corresponding
-     * closing tag (eg `[/IF_*]`).  The content within the tags will be displayed/hidden depending on whatever
-     * conditions existed in the opening tag.  This method handles parsing the actual template to show/hide this
-     * conditional content.
-     *
-     * @since 4.9.32
-     *
-     * @param string $shortcode This should be original shortcode as used in the template and passed to the parser.
-     * @param bool   $show      true means the opening and closing tags are removed and the content is left showing,
-     *                          false means the opening and closing tags and the contained content are removed.
-     * @return string     The template for the shortcode is returned.
-     */
-    protected function _mutate_conditional_block_in_template($shortcode, $show = true)
-    {
-        // first let's get all the matches in the template for this particular shortcode.
-        preg_match_all('~' . $this->_get_conditional_block_regex($shortcode) . '~', $this->_data['template'], $matches);
-
-        if ($matches && is_array($matches[0]) && ! empty($matches[0])) {
-            // we need to hide all instances of the matches
-            foreach ($matches[0] as $index => $content_to_show_or_hide) {
-                $content_to_show_or_hide = preg_quote($content_to_show_or_hide);
-                $replacement = $show ? $matches[4][ $index ] : '';
-                $this->_data['template'] = preg_replace(
-                    '~' . $content_to_show_or_hide . '~',
-                    $replacement,
-                    $this->_data['template']
-                );
-            }
-        }
-        // return $template
-        return $this->_data['template'];
-    }
-
-
-    /**
-     * This returns the regex pattern to use for conditional shortcodes parsing.
-     *
-     * Note: regex comes in part from the WP `get_shortcode_regex` expression in \wp-includes\shortcodes.php
-     *
-     * @param $shortcode
-     * @since 4.9.32
-     * @return string
-     */
-    private function _get_conditional_block_regex($shortcode)
-    {
-        // get just the shortcode tag for the match
-        preg_match('@\[([^<>&/\[\]\x00-\x20=]++)@', $shortcode, $shortcode_tag_matches);
-        if (empty($shortcode_tag_matches[1])) {
-            return $this->_data['template'];
-        }
-
-        $shortcode_tag = $shortcode_tag_matches[1];
-        // get attributes_part_of_tag
-        $attributes_part = preg_quote(str_replace(array($shortcode_tag, '[', ']'), '', $shortcode));
-        // escape
-        $shortcode_tag = preg_quote($shortcode_tag);
-
-        return
-            '\['                                  // Opening Bracket
-            . "($shortcode_tag)$attributes_part"    // 1: Shortcode Name
-            . '(?![\w-])'                           // Not followed by word character or hyphen
-            . '('                                   // 2: Unroll the loop: Inside the opening shortcode tag
-            . '[^\]\/]*'                          // Not a closing bracket or forward slash
-            . '(?:'
-            . '\/(?!\])'                      // A forward slash not followed by a closing bracket
-            . '[^\]\/]*'                      // Not a closing bracket or forward slash.
-            . ')*?'
-            . ')'
-            . '(?:'
-            . '(\/)'                              // 3. Self closing tag ...
-            . '\]'                                // ... and closing bracket
-            . '|'
-            . '\]'                                // Closing bracket
-            . '(?:'
-            . '('                             // 4: Unroll the loop: Optionally, anything between the opening and closing brackets
-            . '[^\[]*+'                   // Not an opening bracket
-            . '(?:'
-            . '\[(?!\/\1\])'          // An opening bracket not followed by the closing shortcode tag.
-            . '[^\[]*+'               // Not an opening bracket
-            . ')*+'
-            . ')'
-            . '\[\/\1\]'                      // Closing shortcode tag
-            . ')?'
-            . ')';
-    }
-
-
-    /**
-     * This sets the properties related to the messages system
-     *
-     * @since 4.5.0
-     * @return void
-     */
-    protected function _set_messages_properties()
-    {
-        // should be in _extra_data
-        if (isset($this->_extra_data['messenger'])) {
-            $this->_messenger = $this->_extra_data['messenger'];
-            $this->_message_type = $this->_extra_data['message_type'];
-            $this->_context = $this->_extra_data['message'] instanceof EE_Message
-                ? $this->_extra_data['message']->context() : '';
-            $this->_GRP_ID = $this->_extra_data['message'] instanceof EE_Message
-                ? $this->_extra_data['message']->GRP_ID() : 0;
-            $this->_message = $this->_extra_data['message'] instanceof EE_Message ? $this->_extra_data['message']
-                : null;
-        }
-    }
-
-
-    /**
-     * This returns whatever the set message type object is that was set on this shortcode parser.
-     *
-     * @since 4.5.0
-     * @return EE_message_type
-     */
-    public function get_set_message_type()
-    {
-        return $this->_message_type;
-    }
-
-
-    /**
-     * This returns whatever the set messenger object is that was set on this shortcode parser
-     *
-     * @since 4.5.0
-     * @return EE_messenger
-     */
-    public function get_set_messenger()
-    {
-        return $this->_messenger;
-    }
-
-
-    /**
-     * This returns whatever the set context string is on this shortcode parser.
-     *
-     * @since 4.5.0
-     * @return string
-     */
-    public function get_set_context()
-    {
-        return $this->_context;
-    }
-
-
-    /**
-     * This returns whatever the set EE_Message object is on this shortcode.
-     *
-     * @since 4.9.0
-     * @return EE_Message
-     */
-    public function get_set_message()
-    {
-        return $this->_message;
-    }
+	/**
+	 * holds label for library
+	 * This is used for referencing the library label
+	 *
+	 * @access public
+	 * @var string
+	 */
+	public $label;
+
+
+	/**
+	 * This property is used for referencing a short description of the library
+	 *
+	 * @access public
+	 * @var string
+	 */
+	public $description;
+
+
+	/**
+	 * This will hold an array of shortcodes with the key as the shortcode ([shortcode]) and the value as a
+	 * label/description for the shortcode.
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	protected $_shortcodes;
+
+
+	/**
+	 * This will hold the incoming data item sent to the parser method
+	 *
+	 * @access protected
+	 * @var mixed (array|object)
+	 */
+	protected $_data;
+
+
+	/**
+	 * some shortcodes may require extra data to parse.  This property is provided for that.
+	 *
+	 * @var array
+	 */
+	protected $_extra_data;
+
+
+	/**
+	 * EE_messenger used to generate the template being parsed.
+	 *
+	 * @since 4.5.0
+	 * @var EE_messenger
+	 */
+	protected $_messenger;
+
+
+	/**
+	 * message type used to generate the template being parsed.
+	 *
+	 * @since 4.5.0
+	 * @var EE_message_type
+	 */
+	protected $_message_type;
+
+
+	/**
+	 * context used for the template being parsed
+	 *
+	 * @since 4.5.0
+	 * @var string
+	 */
+	protected $_context;
+
+
+	/**
+	 * Specific Message Template Group ID
+	 *
+	 * @since 4.5.0
+	 * @var int
+	 */
+	protected $_GRP_ID;
+
+
+	/**
+	 * @since 4.9.0
+	 * @type EE_Message
+	 */
+	protected $_message;
+
+
+	/**
+	 * This will hold an instance of the EEH_Parse_Shortcodes helper that will be used when handling list type
+	 * shortcodes
+	 *
+	 * @var EEH_Parse_Shortcodes
+	 */
+	protected $_shortcode_helper;
+
+
+	public function __construct()
+	{
+		$this->_set_defaults();
+		$this->_init_props();
+	}
+
+
+	/**
+	 * This sets the defaults for the properties.  Child classes will override these properties in their _init_props
+	 * method
+	 */
+	private function _set_defaults()
+	{
+		$this->name = $this->description = '';
+		$this->_shortcodes = array();
+		$this->_set_shortcode_helper();
+	}
+
+
+	/**
+	 * loads an instance of the EE_Shortcode_Parser helper when requested
+	 */
+	protected function _set_shortcode_helper()
+	{
+		// get shortcode_replace instance- set when _get_messages is called in child...
+		$this->_shortcode_helper = new EEH_Parse_Shortcodes();
+	}
+
+
+	public function get_shortcode_helper()
+	{
+		if (! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
+			$this->_set_shortcode_helper();
+		}
+		return $this->_shortcode_helper;
+	}
+
+
+	/**
+	 * This is the public method for kicking of the parser included with each child.  It can be overridden by child
+	 * classes if necessary (see EE_Questions_Answers for example)
+	 *
+	 * @param  string $shortcode incoming shortcode to be parsed
+	 * @param  mixed (object|array) $data       incoming data to be be used for parsing
+	 * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
+	 * @return string            parsed shortcode.
+	 */
+	public function parser($shortcode, $data, $extra_data = array())
+	{
+
+		// filter setup shortcodes
+		$this->_shortcodes = $this->get_shortcodes();
+
+		// we need to setup any dynamic shortcodes so that they work with the array_key_exists
+		preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+		$sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
+
+		// first we want to make sure this is a valid shortcode
+		if (! array_key_exists($sc_to_verify, $this->_shortcodes)) {
+			return false;
+		} //get out, this parser doesn't handle the incoming shortcode.
+		$this->_data = $data;
+		$this->_extra_data = $extra_data;
+		$this->_set_messages_properties();
+		$parsed = apply_filters(
+			'FHEE__' . get_class($this) . '__parser_after',
+			$this->_parser($shortcode),
+			$shortcode,
+			$data,
+			$extra_data,
+			$this
+		);
+
+		// note the below filter applies to ALL shortcode parsers... be careful!
+		return apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
+	}
+
+
+	/**
+	 * This method just returns the shortcodes in the $_shortcodes array property.
+	 *
+	 * @access public
+	 * @return array array of shortcodes => description pairs
+	 */
+	public function get_shortcodes()
+	{
+		$this->_shortcodes = apply_filters('FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this);
+
+		// note the below filter applies to ALL shortcode parsers... be careful!
+		$this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
+
+		return $this->_shortcodes;
+	}
+
+
+	/**
+	 * Child classes use this method to set the $name, $description, and $_shortcodes properties.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _init_props();
+
+
+	/**
+	 * This method will give parsing instructions for each shortcode defined in the _shortcodes array.  Child methods
+	 * will have to take care of handling.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @param string $shortcode    the shortcode to be parsed.
+	 * @param mixed (object|array) $data      incoming data for the parser.  The data could be either an object or
+	 *                             array because there are some shortcodes that might be replaced by prepared data that
+	 *                             has multiple items in a list (i.e. list of attendees in an event and we're showing
+	 *                             fname/lname for each attendee).  In this case data will be in an array.  Otherwise
+	 *                             the data shoudl be in a properly formatted object.  The
+	 *                             EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
+	 * @return string parsed shortcode
+	 */
+	abstract protected function _parser($shortcode);
+
+
+	/**
+	 * This just validates incoming data for list type shortcode parsers (and they call this method) to make sure it
+	 * meets their requirements
+	 *
+	 * @return mixed (void|exception) If validation fails we'll throw an exception.
+	 */
+	protected function _validate_list_requirements()
+	{
+
+		// first test to make sure we've got an array!
+		if (! is_array($this->_data)) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						'Expecting an array for the data sent to %s. Instead it was %s',
+						'event_espresso'
+					),
+					get_class($this),
+					gettype($this->_data)
+				)
+			);
+		}
+
+		// next test to make sure we've got the required template in the index!
+		if (! isset($this->_data['template'])) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						'The incoming data does not have the required template index in its array',
+						'event_espresso'
+					)
+				)
+			);
+		}
+
+		// next test to make sure we've got got a data index in the incoming data array
+		if (! isset($this->_data['data'])) {
+			throw new EE_Error(
+				esc_html__(
+					'The incoming data does not have the required data index in its array',
+					'event_espresso'
+				)
+			);
+		}
+
+		// all is well let's make sure _extra_data always has the values needed.
+		// let's make sure that extra_data includes all templates (for later parsing if necessary)
+		if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
+			$this->_extra_data['data'] = $this->_data['data'];
+			$this->_extra_data['template'] = $this->_data['template'];
+		}
+	}
+
+
+	/**
+	 * This returns any attributes that may be existing on an EE_Shortcode
+	 *
+	 * @since 4.5.0
+	 * @param string $shortcode incoming shortcode
+	 * @return array An array with the attributes
+	 */
+	protected function _get_shortcode_attrs($shortcode)
+	{
+		// make sure the required wp helper function is present
+		// require the shortcode file if necessary
+		if (! function_exists('shortcode_parse_atts')) {
+			require_once(ABSPATH . WPINC . '/shortcodes.php');
+		}
+
+		// let's get any attributes that may be present and set the defaults.
+		$shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
+		return shortcode_parse_atts($shortcode_to_parse);
+	}
+
+
+	/**
+	 * Conditional blocks are shortcode patterns with an opening conditional tag `[IF_*]` and a corresponding
+	 * closing tag (eg `[/IF_*]`).  The content within the tags will be displayed/hidden depending on whatever
+	 * conditions existed in the opening tag.  This method handles parsing the actual template to show/hide this
+	 * conditional content.
+	 *
+	 * @since 4.9.32
+	 *
+	 * @param string $shortcode This should be original shortcode as used in the template and passed to the parser.
+	 * @param bool   $show      true means the opening and closing tags are removed and the content is left showing,
+	 *                          false means the opening and closing tags and the contained content are removed.
+	 * @return string     The template for the shortcode is returned.
+	 */
+	protected function _mutate_conditional_block_in_template($shortcode, $show = true)
+	{
+		// first let's get all the matches in the template for this particular shortcode.
+		preg_match_all('~' . $this->_get_conditional_block_regex($shortcode) . '~', $this->_data['template'], $matches);
+
+		if ($matches && is_array($matches[0]) && ! empty($matches[0])) {
+			// we need to hide all instances of the matches
+			foreach ($matches[0] as $index => $content_to_show_or_hide) {
+				$content_to_show_or_hide = preg_quote($content_to_show_or_hide);
+				$replacement = $show ? $matches[4][ $index ] : '';
+				$this->_data['template'] = preg_replace(
+					'~' . $content_to_show_or_hide . '~',
+					$replacement,
+					$this->_data['template']
+				);
+			}
+		}
+		// return $template
+		return $this->_data['template'];
+	}
+
+
+	/**
+	 * This returns the regex pattern to use for conditional shortcodes parsing.
+	 *
+	 * Note: regex comes in part from the WP `get_shortcode_regex` expression in \wp-includes\shortcodes.php
+	 *
+	 * @param $shortcode
+	 * @since 4.9.32
+	 * @return string
+	 */
+	private function _get_conditional_block_regex($shortcode)
+	{
+		// get just the shortcode tag for the match
+		preg_match('@\[([^<>&/\[\]\x00-\x20=]++)@', $shortcode, $shortcode_tag_matches);
+		if (empty($shortcode_tag_matches[1])) {
+			return $this->_data['template'];
+		}
+
+		$shortcode_tag = $shortcode_tag_matches[1];
+		// get attributes_part_of_tag
+		$attributes_part = preg_quote(str_replace(array($shortcode_tag, '[', ']'), '', $shortcode));
+		// escape
+		$shortcode_tag = preg_quote($shortcode_tag);
+
+		return
+			'\['                                  // Opening Bracket
+			. "($shortcode_tag)$attributes_part"    // 1: Shortcode Name
+			. '(?![\w-])'                           // Not followed by word character or hyphen
+			. '('                                   // 2: Unroll the loop: Inside the opening shortcode tag
+			. '[^\]\/]*'                          // Not a closing bracket or forward slash
+			. '(?:'
+			. '\/(?!\])'                      // A forward slash not followed by a closing bracket
+			. '[^\]\/]*'                      // Not a closing bracket or forward slash.
+			. ')*?'
+			. ')'
+			. '(?:'
+			. '(\/)'                              // 3. Self closing tag ...
+			. '\]'                                // ... and closing bracket
+			. '|'
+			. '\]'                                // Closing bracket
+			. '(?:'
+			. '('                             // 4: Unroll the loop: Optionally, anything between the opening and closing brackets
+			. '[^\[]*+'                   // Not an opening bracket
+			. '(?:'
+			. '\[(?!\/\1\])'          // An opening bracket not followed by the closing shortcode tag.
+			. '[^\[]*+'               // Not an opening bracket
+			. ')*+'
+			. ')'
+			. '\[\/\1\]'                      // Closing shortcode tag
+			. ')?'
+			. ')';
+	}
+
+
+	/**
+	 * This sets the properties related to the messages system
+	 *
+	 * @since 4.5.0
+	 * @return void
+	 */
+	protected function _set_messages_properties()
+	{
+		// should be in _extra_data
+		if (isset($this->_extra_data['messenger'])) {
+			$this->_messenger = $this->_extra_data['messenger'];
+			$this->_message_type = $this->_extra_data['message_type'];
+			$this->_context = $this->_extra_data['message'] instanceof EE_Message
+				? $this->_extra_data['message']->context() : '';
+			$this->_GRP_ID = $this->_extra_data['message'] instanceof EE_Message
+				? $this->_extra_data['message']->GRP_ID() : 0;
+			$this->_message = $this->_extra_data['message'] instanceof EE_Message ? $this->_extra_data['message']
+				: null;
+		}
+	}
+
+
+	/**
+	 * This returns whatever the set message type object is that was set on this shortcode parser.
+	 *
+	 * @since 4.5.0
+	 * @return EE_message_type
+	 */
+	public function get_set_message_type()
+	{
+		return $this->_message_type;
+	}
+
+
+	/**
+	 * This returns whatever the set messenger object is that was set on this shortcode parser
+	 *
+	 * @since 4.5.0
+	 * @return EE_messenger
+	 */
+	public function get_set_messenger()
+	{
+		return $this->_messenger;
+	}
+
+
+	/**
+	 * This returns whatever the set context string is on this shortcode parser.
+	 *
+	 * @since 4.5.0
+	 * @return string
+	 */
+	public function get_set_context()
+	{
+		return $this->_context;
+	}
+
+
+	/**
+	 * This returns whatever the set EE_Message object is on this shortcode.
+	 *
+	 * @since 4.9.0
+	 * @return EE_Message
+	 */
+	public function get_set_message()
+	{
+		return $this->_message;
+	}
 }

core/libraries/iframe_display/iframe_wrapper.template.php

Braces +5 added lines, -2 removed lines

@@ -24,9 +24,12 @@
     <title><?php echo wp_strip_all_tags($title); ?></title>
     <?php if ($enqueue_wp_assets) : ?>
         <?php wp_head(); ?>
-    <?php else : ?>
+    <?php else {
+	: ?>
         <?php foreach ($css as $url) :?>
-    <link rel="stylesheet" type="text/css" href="<?php echo esc_url_raw($url); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo esc_url_raw($url);
+}
+?>">
         <?php endforeach; ?>
             <script type="text/javascript">
                 <?php echo $eei18n; ?>

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
                 <?php echo $eei18n; ?>
             </script>
         <?php foreach ($header_js as $key => $url) :?>
-            <?php $header_attributes = isset($header_js_attributes[ $key ]) ? $header_js_attributes[ $key ] : ''; ?>
+            <?php $header_attributes = isset($header_js_attributes[$key]) ? $header_js_attributes[$key] : ''; ?>
         <script type="text/javascript" src="<?php echo esc_url_raw($url); ?>" <?php echo AttributesSanitizer::clean($header_attributes, AllowedTags::getAllowedTags(), 'script'); ?>></script>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -47,7 +47,7 @@ 
     <?php echo wp_kses($content, AllowedTags::getWithFormTags()); ?>
 </div>
 <?php foreach ($footer_js as $key => $url) : ?>
-    <?php $footer_attributes = isset($footer_js_attributes[ $key ]) ? $footer_js_attributes[ $key ] : ''; ?>
+    <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[$key] : ''; ?>
     <script type="text/javascript" src="<?php echo esc_url_raw($url); ?>" <?php echo AttributesSanitizer::clean($footer_attributes, AllowedTags::getAllowedTags(), 'script'); ?>></script>
 <?php endforeach; ?>
 <?php if ($enqueue_wp_assets) : ?>

core/libraries/payment_methods/templates/payment_details_content.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /**
  * payment_details_content
@@ -11,5 +11,5 @@ 
  */
 $gateway_response = $payment->gateway_response();
 if (! empty($gateway_response)) {
-    echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
+	echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /**
@@ -10,6 +10,6 @@ 
  * @var EE_Payment_Method $payment_method
  */
 $gateway_response = $payment->gateway_response();
-if (! empty($gateway_response)) {
-    echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
+if ( ! empty($gateway_response)) {
+    echo '<span class="error payment-problem">'.esc_html($gateway_response).'</span>';
 }

core/libraries/messages/EE_Message_Type_Collection.lib.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
             $this->rewind();
             while ($this->valid()) {
                 echo '<h5 style="color:#2EA2CC;">
-                    ' . __CLASS__ . ' class : <span style="color:#E76700">' . esc_html($this->getInfo()) . '</span>
+                    ' . __CLASS__.' class : <span style="color:#E76700">'.esc_html($this->getInfo()).'</span>
                     </h5>';
                 $this->next();
             }

Indentation +164 added lines, -164 removed lines

@@ -13,170 +13,170 @@
  */
 class EE_Message_Type_Collection extends EE_Object_Collection
 {
-    /**
-     * EE_Message_Type_Collection constructor.
-     */
-    public function __construct()
-    {
-        $this->interface = 'EE_message_type';
-    }
-
-
-
-    /**
-     * add
-     *
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_info()
-     *
-     * @access public
-     * @param object $object
-     * @param mixed  $info
-     * @return bool
-     */
-    public function add($object, $info = null)
-    {
-        $info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
-        return parent::add($object, $info);
-    }
-
-
-
-    /**
-     * set_info
-     *
-     * Sets the data associated with an object in the Collection
-     * if no $info is supplied, then the spl_object_hash() is used
-     *
-     * @access public
-     * @param object $object
-     * @param mixed  $info
-     * @return bool
-     */
-    public function set_info($object, $info = null)
-    {
-        $info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
-        return parent::set_info($object, $info);
-    }
-
-
-
-    /**
-     * get_by_info
-     *
-     * finds and returns an object in the Collection based on the info that was set using addObject()
-     * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
-     *
-     * @access public
-     * @param mixed
-     * @return null | object
-     */
-    public function get_by_info($info)
-    {
-        return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
-    }
-
-
-
-    /**
-     * has
-     *
-     * returns TRUE or FALSE depending on whether the supplied object is within the Collection
-     *
-     * @access public
-     * @param object $object
-     * @return bool
-     */
-    public function has($object)
-    {
-        return parent::has($object);
-    }
-
-
-
-    /**
-     * has_by_name
-     *
-     * returns TRUE or FALSE depending on whether the supplied message_type classname is within the Collection
-     *
-     * @access public
-     * @param string $message_type_name
-     * @return bool
-     */
-    public function has_by_name($message_type_name)
-    {
-        return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
-    }
-
-
-
-    /**
-     * remove
-     *
-     * detaches an object from the Collection
-     *
-     * @access public
-     * @param $object
-     * @return bool
-     */
-    public function remove($object)
-    {
-        return parent::remove($object);
-    }
-
-
-
-    /**
-     * set_current
-     *
-     * advances pointer to the provided object
-     *
-     * @access public
-     * @param $object
-     * @return void
-     */
-    public function set_current($object)
-    {
-        parent::set_current($object);
-    }
-
-
-
-    /**
-     * set_current_by_info
-     *
-     * advances pointer to the object whose info matches that which was provided
-     *
-     * @access public
-     * @param $info
-     * @return void
-     */
-    public function set_current_by_info($info)
-    {
-        parent::set_current_by_info($info);
-    }
-
-
-
-    /**
-     * show_collection_classes
-     *
-     * displays list of collection classes if WP_DEBUG is on
-     *
-     * @access public
-     * @return void
-     */
-    public function show_collection_classes()
-    {
-        if (WP_DEBUG) {
-            $this->rewind();
-            while ($this->valid()) {
-                echo '<h5 style="color:#2EA2CC;">
+	/**
+	 * EE_Message_Type_Collection constructor.
+	 */
+	public function __construct()
+	{
+		$this->interface = 'EE_message_type';
+	}
+
+
+
+	/**
+	 * add
+	 *
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_info()
+	 *
+	 * @access public
+	 * @param object $object
+	 * @param mixed  $info
+	 * @return bool
+	 */
+	public function add($object, $info = null)
+	{
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
+	}
+
+
+
+	/**
+	 * set_info
+	 *
+	 * Sets the data associated with an object in the Collection
+	 * if no $info is supplied, then the spl_object_hash() is used
+	 *
+	 * @access public
+	 * @param object $object
+	 * @param mixed  $info
+	 * @return bool
+	 */
+	public function set_info($object, $info = null)
+	{
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
+	}
+
+
+
+	/**
+	 * get_by_info
+	 *
+	 * finds and returns an object in the Collection based on the info that was set using addObject()
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
+	 *
+	 * @access public
+	 * @param mixed
+	 * @return null | object
+	 */
+	public function get_by_info($info)
+	{
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
+	}
+
+
+
+	/**
+	 * has
+	 *
+	 * returns TRUE or FALSE depending on whether the supplied object is within the Collection
+	 *
+	 * @access public
+	 * @param object $object
+	 * @return bool
+	 */
+	public function has($object)
+	{
+		return parent::has($object);
+	}
+
+
+
+	/**
+	 * has_by_name
+	 *
+	 * returns TRUE or FALSE depending on whether the supplied message_type classname is within the Collection
+	 *
+	 * @access public
+	 * @param string $message_type_name
+	 * @return bool
+	 */
+	public function has_by_name($message_type_name)
+	{
+		return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
+	}
+
+
+
+	/**
+	 * remove
+	 *
+	 * detaches an object from the Collection
+	 *
+	 * @access public
+	 * @param $object
+	 * @return bool
+	 */
+	public function remove($object)
+	{
+		return parent::remove($object);
+	}
+
+
+
+	/**
+	 * set_current
+	 *
+	 * advances pointer to the provided object
+	 *
+	 * @access public
+	 * @param $object
+	 * @return void
+	 */
+	public function set_current($object)
+	{
+		parent::set_current($object);
+	}
+
+
+
+	/**
+	 * set_current_by_info
+	 *
+	 * advances pointer to the object whose info matches that which was provided
+	 *
+	 * @access public
+	 * @param $info
+	 * @return void
+	 */
+	public function set_current_by_info($info)
+	{
+		parent::set_current_by_info($info);
+	}
+
+
+
+	/**
+	 * show_collection_classes
+	 *
+	 * displays list of collection classes if WP_DEBUG is on
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function show_collection_classes()
+	{
+		if (WP_DEBUG) {
+			$this->rewind();
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">
                     ' . __CLASS__ . ' class : <span style="color:#E76700">' . esc_html($this->getInfo()) . '</span>
                     </h5>';
-                $this->next();
-            }
-        }
-    }
+				$this->next();
+			}
+		}
+	}
 }

core/libraries/messages/defaults/default/html_receipt_ticket_list.template.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
         <div class="ticket-time-and-place-details">
             <div class="ticket-time-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'clock-16x16.png'); ?>">
+                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'clock-16x16.png'); ?>">
                     <?php esc_html_e('Date/Time:', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-dates">[DATETIME_LIST]</ul>
             </div>
             <div class="ticket-place-details">
                 <h4 class="sub-section-title no-bottom-margin">
-                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'location-pin-16x16.png'); ?>">
+                    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'location-pin-16x16.png'); ?>">
                     <?php esc_html_e('Venue', 'event_espresso'); ?>
                 </h4>
                 <ul class="event-venues">
@@ -45,7 +45,7 @@ 
         </div>
         <div class="ticket-registrations-area">
             <h4 class="sub-section-title">
-                <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'users-16x16.png'); ?>">
+                <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'users-16x16.png'); ?>">
                 <?php esc_html_e("Registration Details", "event_espresso"); ?>
                 <span class="small-text link">
                     ( <a class="print_button noPrint" href="[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]">

core/libraries/messages/defaults/default/html_receipt_event_list.template.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 ?>
 <h3 class="section-title event-name">
-    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL . 'calendar_year-24x24.png'); ?>">
+    <img class="icon" src="<?php echo esc_url_raw(EE_IMAGES_URL.'calendar_year-24x24.png'); ?>">
     <?php esc_html_e("Event Name:", "event_espresso") ?>
     <span class="plain-text">[EVENT_NAME]</span>
     <span class="small-text link">

core/libraries/messages/defaults/default/html_receipt_attendee_list.template.php

Spacing +2 added lines, -2 removed lines

@@ -8,11 +8,11 @@
 <li class="ticket-registration">
     <table class="registration-details">
         <tr class="odd">
-            <th><?php	_e('Attendee', 'event_espresso');?></th>
+            <th><?php	_e('Attendee', 'event_espresso'); ?></th>
             <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
         </tr>
         <tr>
-            <th><?php esc_html_e("Registration Code:", "event_espresso");?></th>
+            <th><?php esc_html_e("Registration Code:", "event_espresso"); ?></th>
             <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
         </tr>
     </table>