diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-09 11:48:41 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-09 11:48:41 -0200 |
commit | ecaca7529d26970e1cc09a2e8c1b783c70fab23a (patch) | |
tree | 5267b3125b014335b05d0d71e189e557588f7a91 /src/usr/local | |
parent | f8ae35862e05b1d5b43678144071a6e03ab8c3c5 (diff) | |
download | pfsense-ecaca7529d26970e1cc09a2e8c1b783c70fab23a.zip pfsense-ecaca7529d26970e1cc09a2e8c1b783c70fab23a.tar.gz |
Try to use default timezone from globals.inc when possible. Stop setting timezone on pkg_mgr_installed.php
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 9 | ||||
-rw-r--r-- | src/usr/local/www/pkg_mgr_installed.php | 7 | ||||
-rw-r--r-- | src/usr/local/www/system.php | 7 |
3 files changed, 13 insertions, 10 deletions
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"; } |