diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-30 18:21:44 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-30 18:21:44 -0300 |
| commit | 60ff91f1b5dace563e1a6a62c3a90162782b3d8a (patch) | |
| tree | 89110ebb0ac6c8297da7736a98de4081838f7358 /src/usr | |
| parent | 9cffad03967f2f02a3d4632173ddfbfb0dbd21e7 (diff) | |
| download | pfsense-60ff91f1b5dace563e1a6a62c3a90162782b3d8a.zip pfsense-60ff91f1b5dace563e1a6a62c3a90162782b3d8a.tar.gz | |
Remove /usr/share/zoneinfo.tgz and use FreeBSD stock zoneinfo. It fixes #4726
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/system.php | 7 | ||||
| -rw-r--r-- | src/usr/local/www/wizard.php | 5 | ||||
| -rw-r--r-- | src/usr/share/zoneinfo.tgz | bin | 194726 -> 0 bytes |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index c848f52..4827d18 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -72,6 +72,7 @@ require("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +require_once("system.inc"); $pconfig['hostname'] = $config['system']['hostname']; $pconfig['domain'] = $config['system']['domain']; @@ -114,9 +115,7 @@ if ($pconfig['timezone'] <> $_POST['timezone']) { filter_pflog_start(true); } -exec('/usr/bin/tar -tzf /usr/share/zoneinfo.tgz', $timezonelist); -$timezonelist = array_filter($timezonelist, 'is_timezone'); -sort($timezonelist); +$timezonelist = system_get_timezone_list(); $multiwan = false; $interfaces = get_configured_interface_list(); @@ -456,4 +455,4 @@ $form->add($section); print $form; -include("foot.inc");
\ No newline at end of file +include("foot.inc"); diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php index 4273b76..90d60e5 100644 --- a/src/usr/local/www/wizard.php +++ b/src/usr/local/www/wizard.php @@ -68,6 +68,7 @@ require("functions.inc"); require_once("filter.inc"); require("shaper.inc"); require_once("rrd.inc"); +require_once("system.inc"); function gentitle_pkg($pgname) { global $config; @@ -822,9 +823,7 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") { break; case "timezone_select": - exec('/usr/bin/tar -tzf /usr/share/zoneinfo.tgz', $timezonelist); - $timezonelist = array_filter($timezonelist, 'is_timezone'); - sort($timezonelist); + $timezonelist = system_get_timezone_list(); /* kill carriage returns */ for ($x = 0; $x < count($timezonelist); $x++) { diff --git a/src/usr/share/zoneinfo.tgz b/src/usr/share/zoneinfo.tgz Binary files differdeleted file mode 100644 index 410a41f..0000000 --- a/src/usr/share/zoneinfo.tgz +++ /dev/null |
