Changeset 660 for trunk/lib/DB.inc.php

Timestamp:

Jan 28, 2019 10:51:50 PM (5 years ago)

Author:

anonymous

Message:

Reduce timezone support to simply setting defaults for user, php, and mysql (all UTC), just to ensure consistency

File:

• trunk/lib/DB.inc.php (modified) (4 diffs)

trunk/lib/DB.inc.php

@@ -69 +69 @@
         'zero_date' => '0000-00-00',
         'infinity_date' => '9999-12-31',
+
+        // Timezone for MySQL.
+        'timezone' => 'UTC',
     );
 
@@ -189 +192 @@
         $this->_connected = true;
 
+        $init_sql = array();
+
         // Tell MySQL what character set we're using. Available only on MySQL versions > 4.01.01.
         if ('' != $app->getParam('character_set') && isset($this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))])) {
-            $this->query("/*!40101 SET NAMES '" . $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))] . "' */");
+            $init_sql[] = sprintf("SET NAMES '%s'", $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))]);
         } else {
             $app->logMsg(sprintf('%s is not a known character_set.', $app->getParam('character_set')), LOG_ERR, __FILE__, __LINE__);
@@ -201 +206 @@
         }
 
-        // Set timezone.
-        $tz = date_default_timezone_get();
-        // Check that PHP is configured with a valid timezone name, e.g., "UTC" or "America/Mexico_City" or "-6:00".
-        if ($app->getParam('timezone') && $app->getParam('timezone') == $tz && preg_match('!^([A-Z_/-]{3,}|[-+\d:]+)$!i', $tz)) {
+        // Set MySQL session timezone.
+        if ($this->getParam('timezone')) {
             // https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html
-            $this->query(sprintf("SET SESSION time_zone = '%s'", $tz));
+            $init_sql[] = sprintf("SET time_zone = '%s'", $this->getParam('timezone'));
+        }
+
+        // Run init query, if set.
+        if (!empty($init_sql)) {
+            $this->query(join('; ', $init_sql));
         }
 
@@ -506 +514 @@
     }
 
-
 } // End.