Changeset 656 for trunk/lib

Timestamp:

Jan 25, 2019 11:29:23 PM (5 years ago)

Author:

anonymous

Message:

minor

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -378 +378 @@
                 // tz cookie has a timezone offset, like "-6" (assume UTC).
                 $tz = timezone_name_from_abbr('', $_COOKIE['tz'] * 3600, 0);
-                if ($tz) {
+                if ($tz && preg_match('![A-Z]{3,}|\w+/\w+!', $tz)) {
                     // Valid.
                     $this->setParam(array('timezone' => $tz));
@@ -395 +395 @@
                 // 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__);
-            }
+                $this->logMsg(sprintf('Failed to set timezone: %s', $this->getParam('timezone')), LOG_NOTICE, __FILE__, __LINE__);
+            }
+        } else {
+            $this->logMsg(sprintf('Using server timezone: %s', date_default_timezone_get()), LOG_DEBUG, __FILE__, __LINE__);
         }