Merge pull request #7 from LordWilbur/htmlencode

Add optional parameter to encode html entities
JackieDo · Apr 12, 2020 · b9629de · b9629de
2 parents 2b787fd + d8a864e
commit b9629de
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/Jackiedo/Timezonelist/Timezonelist.php b/src/Jackiedo/Timezonelist/Timezonelist.php
@@ -52,12 +52,14 @@ class Timezonelist
      *
      * @return string
      */
-    protected function formatTimezone($timezone, $continent)
+    protected function formatTimezone($timezone, $continent, $htmlencode=true)
     {
         $time = new DateTime(null, new DateTimeZone($timezone));
         $offset = $time->format('P');
-        $offset = str_replace('-', ' &minus; ', $offset);
-        $offset = str_replace('+', ' &plus; ', $offset);
+		if ($htmlencode) {
+			$offset = str_replace('-', ' &minus; ', $offset);
+			$offset = str_replace('+', ' &plus; ', $offset);
+		}
 
         $timezone = substr($timezone, strlen($continent) + 1);
         $timezone = str_replace('St_', 'St. ', $timezone);
@@ -75,7 +77,7 @@ protected function formatTimezone($timezone, $continent)
      * @param mixed $attr
      * @return string
      **/
-    public function create($name, $selected='', $attr='')
+    public function create($name, $selected='', $attr='', $htmlencode=true)
     {
 
         // Attributes for select element
@@ -113,7 +115,7 @@ public function create($name, $selected='', $attr='')
                 $selected_attr = ($selected == $timezone) ? ' selected="selected"' : '';
 
                 $listbox .= '<option value="' .$timezone. '"' .$selected_attr. '>';
-                $listbox .= $this->formatTimezone($timezone, $continent);
+                $listbox .= $this->formatTimezone($timezone, $continent, $htmlencode);
                 $listbox .= '</option>';
             }
 
@@ -132,7 +134,7 @@ public function create($name, $selected='', $attr='')
      *
      * @return mixed
      **/
-    public function toArray()
+    public function toArray($htmlencode=true)
     {
         $list = [];
 
@@ -145,7 +147,7 @@ public function toArray()
         foreach ($this->continents as $continent => $mask) {
             $timezones = DateTimeZone::listIdentifiers($mask);
             foreach ($timezones as $timezone) {
-                $list[$continent][$timezone] = $this->formatTimezone($timezone, $continent);
+                $list[$continent][$timezone] = $this->formatTimezone($timezone, $continent, $htmlencode);
             }
         }