diff options
| -rw-r--r-- | etc/inc/system.inc | 2 | ||||
| -rw-r--r-- | usr/local/www/services_ntpd.php | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index c807c0e..357f47a 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1267,7 +1267,7 @@ function system_ntp_configure($start_ntpd=true) { $ntpcfg .= "driftfile {$driftfile}\n"; if (empty($config['ntpd']['interface'])) - if (empty($config['openntpd']['config']['interface'])) + if (!empty($config['installedpackages']['openntpd']['config'][0]['interface'])) $interfaces = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']); else $interfaces = array(); diff --git a/usr/local/www/services_ntpd.php b/usr/local/www/services_ntpd.php index 86d4fb4..9948a1d 100644 --- a/usr/local/www/services_ntpd.php +++ b/usr/local/www/services_ntpd.php @@ -40,8 +40,8 @@ require("guiconfig.inc"); if (empty($config['ntpd']['interface'])) - if (empty($config['openntpd']['config']['interface'])) { - $pconfig['interface'] = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']); + if (!empty($config['installedpackages']['openntpd']['config'][0]['interface'])) + $interfaces = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']); unset($config['installedpackages']['openntpd']); } else $pconfig['interface'] = array(); @@ -53,14 +53,11 @@ if ($_POST) { unset($input_errors); $pconfig = $_POST; - /* input validation */ - $reqdfields = explode(" ", "interface"); - $reqdfieldsn = array(gettext("Interface")); - - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - if (!$input_errors) { - $config['ntpd']['interface'] = implode(",", $_POST['interface']); + if (is_array($_POST['interface'])) + $config['ntpd']['interface'] = implode(",", $_POST['interface']); + elseif (isset($config['ntpd']['interface'])) + unset($config['ntpd']['interface']); write_config("Updated NTP Server Settings"); |
