Changeset 654 for trunk/lib

Timestamp:

Jan 24, 2019 7:13:52 PM (5 years ago)

Author:

anonymous

Message:

Add timezone support

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• DB.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -368 +368 @@
             mb_language('en');
             break;
+        }
+
+        // If the 'timezone' parameter is not set, check for a tz cookie.
+        if (!$this->getParam('timezone') && isset($_COOKIE['tz']) && '' != $_COOKIE['tz']) {
+            if (preg_match('![A-Z]{3,}|\w+/\w+!', $_COOKIE['tz'])) {
+                // Valid: tz cookie has a timezone name, like "UTC" or "America/Mexico_City".
+                $this->setParam(array('timezone' => $_COOKIE['tz']));
+            } else if (is_numeric($_COOKIE['tz']) && $_COOKIE['tz'] > -12 && $_COOKIE['tz'] < 14) { // https://en.wikipedia.org/wiki/List_of_UTC_time_offsets#UTC+14:00,_M%E2%80%A0
+                // tz cookie has a timezone offset, like "-6" (assume UTC).
+                $tz = timezone_name_from_abbr('', $_COOKIE['tz'] * 3600, 0);
+                if ($tz) {
+                    // Valid.
+                    $this->setParam(array('timezone' => $tz));
+                } else {
+                    $this->logMsg(sprintf('Failed to convert UTC offset to timezone: %s', $_COOKIE['tz']), LOG_NOTICE, __FILE__, __LINE__);
+                }
+            } else {
+                $this->logMsg(sprintf('Invalid timezone cookie value: %s', $_COOKIE['tz']), LOG_NOTICE, __FILE__, __LINE__);
+            }
+        }
+        if ($this->getParam('timezone')) {
+            // Set timezone of the user.
+            if (date_default_timezone_set($this->getParam('timezone'))) {
+                $this->logMsg(sprintf('Using timezone: %s', $this->getParam('timezone')), LOG_DEBUG, __FILE__, __LINE__);
+            } else {
+                // Failed: unset the timezone parameter so it isn't used to set the database timezone.
+                $this->setParam(array('timezone' => null));
+                $this->logMsg(sprintf('Failed to use timezone: %s', $this->getParam('timezone')), LOG_NOTICE, __FILE__, __LINE__);
+            }
         }
 

trunk/lib/DB.inc.php

@@ -201 +201 @@
         }
 
+        // Set timezone.
+        $tz = date_default_timezone_get();
+        // Check that PHP is configured with a valid timezone name, e.g., "UTC" or "America/Chicago".
+        if ($app->getParam('timezone') && $app->getParam('timezone') == $tz && preg_match('![A-Z]{3,}|\w+/\w+!', $tz)) {
+            $this->query(sprintf("SET SESSION time_zone = '%s'", $tz));
+        }
+
         return true;
     }