diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index e80e293bb..5d48e143f 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -2066,7 +2066,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule) $int = ""; $aline = array(); // initialize array with empty tags - foreach (array('schedlabel','divert','icmp-type','icmp6-type','tag','tagged','route','os','reply','prot','log', 'set-prio', 'set-prio-low', 'prio') as $tag) { + foreach (array('divert','icmp-type','icmp6-type','tag','tagged','route','os','reply','prot','log', 'set-prio', 'set-prio-low', 'prio') as $tag) { $aline[$tag] = ""; } @@ -2387,7 +2387,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule) $line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] . $aline['reply'] . $aline['route'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] . $aline['dst'] . $aline['divert'] . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] . - $aline['set-prio'] . $aline['prio'] . $aline['allowopts'] . $aline['flags'] . $aline['schedlabel']; + $aline['set-prio'] . $aline['prio'] . $aline['allowopts'] . $aline['flags']; unset($aline); diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php index bc7240077..7354ca24b 100644 --- a/src/www/firewall_schedule_edit.php +++ b/src/www/firewall_schedule_edit.php @@ -106,7 +106,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['name'] = $a_schedules[$configId]['name']; $pconfig['descr'] = $a_schedules[$configId]['descr']; $pconfig['timerange'] = isset($a_schedules[$configId]['timerange']) ? $a_schedules[$configId]['timerange'] : array(); - $pconfig['schedlabel'] = isset($a_schedules[$configId]['schedlabel']) ? $a_schedules[$configId]['schedlabel'] : uniqid(); } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['id']) && isset($a_schedules[$_POST['id']])) { $id = $_POST['id']; @@ -196,7 +195,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $schedule['name'] = $pconfig['name']; $schedule['descr'] = $pconfig['descr']; $schedule['timerange'] = $pconfig['timerange']; - $schedule['schedlabel'] = $pconfig['schedlabel']; if (isset($id)) { $a_schedules[$id] = $schedule; @@ -782,7 +780,6 @@ function removeRow(el) {
-