Fix browser timezone information being lost

Author: raviks789

library/Icinga/Util/TimezoneDetect.php

@@ -15,13 +15,6 @@ class TimezoneDetect
      */
     private static $success;
 
-    /**
-     * Timezone offset in minutes
-     *
-     * @var int
-     */
-    private static $offset = 0;
-
     /**
      * @var string
      */
@@ -34,13 +27,6 @@ class TimezoneDetect
      */
     public static $cookieName = 'icingaweb2-tzo';
 
-    /**
-     * Timezone name
-     *
-     * @var string
-     */
-    private static $timezone;
-
     /**
      * Create new object and try to identify the timezone
      */
@@ -51,30 +37,11 @@ public function __construct()
         }
 
         if (array_key_exists(self::$cookieName, $_COOKIE)) {
-            $matches = array();
-            if (preg_match('/\A(-?\d+)[\-,](\d+)\z/', $_COOKIE[self::$cookieName], $matches)) {
-                $offset = $matches[1];
-                $timezoneName = timezone_name_from_abbr('', (int) $offset, (int) $matches[2]);
-
-                self::$success = (bool) $timezoneName;
-                if (self::$success) {
-                    self::$offset = $offset;
-                    self::$timezoneName = $timezoneName;
-                }
-            }
+            self::$timezoneName = $_COOKIE[self::$cookieName];
+            self::$success = true;
         }
     }
 
-    /**
-     * Get offset
-     *
-     * @return int
-     */
-    public function getOffset()
-    {
-        return self::$offset;
-    }
-
     /**
      * Get timezone name
      *
@@ -102,6 +69,5 @@ public function reset()
     {
         self::$success = null;
         self::$timezoneName = null;
-        self::$offset = 0;
     }
 }

public/js/icinga/timezone.js

@@ -51,15 +51,11 @@
          * Write timezone information into cookie
          */
         writeTimezone: function() {
-            var date = new Date();
-            var timezoneOffset = (date.getTimezoneOffset()*60) * -1;
-            var dst = date.isDst();
-
             if (this.readCookie(this.cookieName)) {
                 return;
             }
 
-            this.writeCookie(this.cookieName, timezoneOffset + '-' + Number(dst), 1);
+            this.writeCookie(this.cookieName, Intl.DateTimeFormat().resolvedOptions().timeZone);
         },
 
         /**