Try to use default timezone from globals.inc when possible. Stop setting timezone on pkg_mgr_installed.php

5 files changed, 25 insertions, 14 deletions

diff --git a/src/etc/inc/config.gui.inc b/src/etc/inc/config.gui.inc
index 56b5555..175a811 100644
--- a/src/etc/inc/config.gui.inc
+++ b/src/etc/inc/config.gui.inc
@@ -80,8 +80,12 @@ if (file_exists("/debugging")) {
 $config = parse_config();
 
 /* set timezone */
-$timezone = $config['system']['timezone'];
-if (!$timezone) {
+if (isset($config['system']['timezone']) &&
+    !empty($config['system']['timezone'])) {
+	$timezone = $config['system']['timezone'];
+} elseif (isset($g['default_timezone']) && !empty($g['default_timezone'])) {
+	$timezone = $g['default_timezone'];
+} else {
 	$timezone = "Etc/UTC";
 }
 date_default_timezone_set("$timezone");
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index 4792ac3..10d9137 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -210,8 +210,12 @@ if (platform_booting(true)) {
 $config = parse_config();
 
 /* set timezone */
-$timezone = $config['system']['timezone'];
-if (!$timezone) {
+if (isset($config['system']['timezone']) &&
+    !empty($config['system']['timezone'])) {
+	$timezone = $config['system']['timezone'];
+} elseif (isset($g['default_timezone']) && !empty($g['default_timezone'])) {
+	$timezone = $g['default_timezone'];
+} else {
 	$timezone = "Etc/UTC";
 }
 date_default_timezone_set("$timezone");
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 4e9e16b..2d29550 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -1231,8 +1231,13 @@ var_dump($content);die;
 <?php
 }
 
-$timezone = $config['system']['timezone'];
-if (!$timezone) {
+/* set timezone */
+if (isset($config['system']['timezone']) &&
+    !empty($config['system']['timezone'])) {
+	$timezone = $config['system']['timezone'];
+} elseif (isset($g['default_timezone']) && !empty($g['default_timezone'])) {
+	$timezone = $g['default_timezone'];
+} else {
 	$timezone = "Etc/UTC";
 }
 
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index 66f52ff..4acc253 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -66,13 +66,6 @@
 require_once("guiconfig.inc");
 require_once("pkg-utils.inc");
 
-$timezone = $config['system']['timezone'];
-if (!$timezone) {
-	$timezone = "Etc/UTC";
-}
-
-date_default_timezone_set($timezone);
-
 /* if upgrade in progress, alert user */
 if (is_subsystem_dirty('packagelock')) {
 	$pgtitle = array(gettext("System"), gettext("Package Manager"));
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 31371ba..dd10ba5 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -96,8 +96,13 @@ if (!isset($pconfig['timeupdateinterval'])) {
 	$pconfig['timeupdateinterval'] = 300;
 }
 if (!$pconfig['timezone']) {
-	$pconfig['timezone'] = "Etc/UTC";
+	if (isset($g['default_timezone']) && !empty($g['default_timezone'])) {
+		$pconfig['timezone'] = $g['default_timezone'];
+	} else {
+		$pconfig['timezone'] = "Etc/UTC";
+	}
 }
+
 if (!$pconfig['timeservers']) {
 	$pconfig['timeservers'] = "pool.ntp.org";
 }