Commit 27ed7eb3 authored by Franco Fichtner's avatar Franco Fichtner

queues: a few more renmants zapped

parent 22e0e257
...@@ -447,10 +447,6 @@ function firewall_check_for_advanced_options(&$item) { ...@@ -447,10 +447,6 @@ function firewall_check_for_advanced_options(&$item) {
$item_set .= "max-src-conn-rates {$item['max-src-conn-rates']} "; $item_set .= "max-src-conn-rates {$item['max-src-conn-rates']} ";
if($item['gateway']) if($item['gateway'])
$item_set .= "gateway {$item['gateway']} "; $item_set .= "gateway {$item['gateway']} ";
if($item['ackqueue'])
$item_set .= "ackqueue {$item['ackqueue']} ";
if($item['defaultqueue'])
$item_set .= "defaultqueue {$item['defaultqueue']} ";
if($item['tag']) if($item['tag'])
$item_set .= "tag {$item['tag']} "; $item_set .= "tag {$item['tag']} ";
if($item['tagged']) if($item['tagged'])
......
...@@ -164,12 +164,6 @@ function show_advanced_sourceos() { ...@@ -164,12 +164,6 @@ function show_advanced_sourceos() {
aodiv.style.display = "block"; aodiv.style.display = "block";
} }
function show_advanced_ackqueue() {
document.getElementById("showadvackqueuebox").innerHTML='';
aodiv = document.getElementById('showackqueueadv');
aodiv.style.display = "block";
}
function show_advanced_inout() { function show_advanced_inout() {
document.getElementById("showadvinoutbox").innerHTML=''; document.getElementById("showadvinoutbox").innerHTML='';
aodiv = document.getElementById('showinoutadv'); aodiv = document.getElementById('showinoutadv');
......
...@@ -74,12 +74,6 @@ if ($_GET['option']) { ...@@ -74,12 +74,6 @@ if ($_GET['option']) {
case "system": case "system":
$curoption = "processor"; $curoption = "processor";
break; break;
case "queues":
$curoption = "queues";
break;
case "queuedrops":
$curoption = "queuedrops";
break;
case "quality": case "quality":
foreach($databases as $database) { foreach($databases as $database) {
if(preg_match("/[-]quality\.rrd/i", $database)) { if(preg_match("/[-]quality\.rrd/i", $database)) {
...@@ -212,9 +206,6 @@ foreach($databases as $database) { ...@@ -212,9 +206,6 @@ foreach($databases as $database) {
if(stristr($database, "-wireless")) { if(stristr($database, "-wireless")) {
$wireless = true; $wireless = true;
} }
if(stristr($database, "-queues")) {
$queues = true;
}
if(stristr($database, "-cellular") && !empty($config['ppps'])) { if(stristr($database, "-cellular") && !empty($config['ppps'])) {
$cellular = true; $cellular = true;
} }
......
...@@ -40,7 +40,6 @@ $categories = array('system' => gettext("System"), ...@@ -40,7 +40,6 @@ $categories = array('system' => gettext("System"),
'traffic' => gettext("Traffic"), 'traffic' => gettext("Traffic"),
'packets' => gettext("Packets"), 'packets' => gettext("Packets"),
'quality' => gettext("Quality"), 'quality' => gettext("Quality"),
'queues' => gettext("Queues"),
'captiveportal' => gettext("Captive Portal")); 'captiveportal' => gettext("Captive Portal"));
if(isset($config['ntpd']['statsgraph'])) { if(isset($config['ntpd']['statsgraph'])) {
...@@ -88,9 +87,6 @@ foreach($databases as $database) { ...@@ -88,9 +87,6 @@ foreach($databases as $database) {
if(stristr($database, "wireless")) { if(stristr($database, "wireless")) {
$wireless = true; $wireless = true;
} }
if(stristr($database, "queues")) {
$queues = true;
}
if(stristr($database, "-cellular") && !empty($config['ppps'])) { if(stristr($database, "-cellular") && !empty($config['ppps'])) {
$cellular = true; $cellular = true;
} }
......
...@@ -8,12 +8,6 @@ ...@@ -8,12 +8,6 @@
$tab_array[] = array(gettext("Packets"), $tabactive, "status_rrd_graph.php?cat=packets"); $tab_array[] = array(gettext("Packets"), $tabactive, "status_rrd_graph.php?cat=packets");
if($curcat == "quality") { $tabactive = True; } else { $tabactive = False; } if($curcat == "quality") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array(gettext("Quality"), $tabactive, "status_rrd_graph.php?cat=quality"); $tab_array[] = array(gettext("Quality"), $tabactive, "status_rrd_graph.php?cat=quality");
if($queues) {
if($curcat == "queues") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array(gettext("Queues"), $tabactive, "status_rrd_graph.php?cat=queues");
if($curcat == "queuedrops") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array(gettext("QueueDrops"), $tabactive, "status_rrd_graph.php?cat=queuedrops");
}
if($wireless) { if($wireless) {
if($curcat == "wireless") { $tabactive = True; } else { $tabactive = False; } if($curcat == "wireless") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array(gettext("Wireless"), $tabactive, "status_rrd_graph.php?cat=wireless"); $tab_array[] = array(gettext("Wireless"), $tabactive, "status_rrd_graph.php?cat=wireless");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment