queues: remove firewall_shaper_queues.php

src/etc/inc/shaper.inc

@@ -542,30 +542,6 @@ class altq_root_queue {
 		return $javascript;
 	}
 
-	function build_shortform() {
-		global $g;
-
-		$altq =& $this;
-		if ($altq)
-			$scheduler = ": " . $altq->GetScheduler();
-		$form = "<tr><td width=\"20%\" class=\"vtable\">";
-		$form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&amp;queue=". $this->GetInterface()."&amp;action=show\">". $shaperIFlist[$this->GetInterface()] .": ".$scheduler."</a>";
-		$form .= "</td></tr>";
-		$form .= "<tr>";
-		$form .= "<td width=\"50%\" class=\"vncellreq\">";
-		$form .= "Bandwidth: " . $this->GetBandwidth().$this->GetBwscale();
-		$form .= "</td><td width=\"50%\"></td></tr>";
-		$form .= "<tr><td width=\"20%\" class=\"vncellreq\">";
-		$form .= "<a href=\"firewall_shaper_queues.php?interface=";
-		$form .= $this->GetInterface() . "&amp;queue=";
-		$form .= $this->GetQname() . "&amp;action=delete\" class=\"btn btn-default btn-xs\"";
-
-		$form .= "  title=\"Disable shaper on interface\"><span class=\"glyphicon glyphicon-remove\"></span></a>";
-		$form .= "</td></tr>";
-
-		return $form;
-
-	}
 	/*
 	 * For requesting the parameters of the root queues
 	 * to the user like the traffic wizard does.
@@ -1168,44 +1144,7 @@ class priq_queue {
 		return $form;
 	}
 
-	function build_shortform() {
-		/* XXX: Hacks in site. Mostly layer violations!  */
-		global $g, $altq_list_queues;
-		global $shaperIFlist;
-
-		$altq =& $altq_list_queues[$this->GetInterface()];
-		if ($altq)
-			$scheduler = ": " . $altq->GetScheduler();
-		$form = "<tr><td width=\"20%\" class=\"vtable\">";
-		$form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&amp;queue=" . $this->GetQname()."&amp;action=show\">". $shaperIFlist[$this->GetInterface()] .$scheduler."</a>";
-		$form .= "</td></tr>";
-		/*
-		 * XXX: Hack in sight maybe fix with a class that wraps all
-		 * of this layer violations
-		 */
-		$form .= "<tr>";
-		$form .= "<td width=\"50%\" class=\"vncellreq\">";
-		$form .= gettext("Bandwidth:") . " " . $this->GetBandwidth().$this->GetBwscale();
-		$form .= "</td><td width=\"50%\"></td></tr>";
-		$tmpvalue = $this->GetQpriority();
-		if (!empty($tmpvalue))
-			$form .= "<tr><td width=\"20%\" class=\"vncellreq\">" .gettext("Priority: on") . " </td></tr>";
-		$tmpvalue = $this->GetDefault();
-		if (!empty($tmpvalue))
-			$form .= "<tr><td class=\"vncellreq\">" . gettext("Default: on") . " </td></tr>";
-		$form .= "<tr><td width=\"20%\" class=\"vncellreq\">";
-		$form .= "<a href=\"firewall_shaper_queues.php?interface=";
-		$form .= $this->GetInterface() . "&amp;queue=";
-		$form .= $this->GetQname() . "&amp;action=delete\" class=\"btn btn-default btn-xs\"";
-
-		$form .= "  title=\"" . gettext("Delete queue from interface") . "\"  >";
-		$form .= "<span class=\"glyphicon glyphicon-remove\"></span></a></td></tr>";
-
-		return $form;
-
-	}
-
-		function update_altq_queue_data(&$q) {
+	function update_altq_queue_data(&$q) {
 		$this->ReadConfig($q);
 	}
 
@@ -2829,27 +2768,6 @@ function filter_generate_altq_queues() {
 	return $altq_rules;
 }
 
-function build_iface_without_this_queue($iface, $qname) {
-	global $g, $altq_list_queues;
-	global $shaperIFlist;
-
-	$altq =& $altq_list_queues[$iface];
-	if ($altq)
-		$scheduler = ": " . $altq->GetScheduler();
-	$form = "<tr><td width=\"20%\" >";
-	$form .= "<a href=\"firewall_shaper.php?interface=" . $iface . "&amp;queue=" . $iface."&amp;action=show\">". $shaperIFlist[$iface] . $scheduler."</a>";
-	$form .= "</td></tr>";
-	$form .= "<tr><td width=\"100%\" class=\"vncellreq\">";
-	$form .= "<a href=\"firewall_shaper_queues.php?interface=";
-	$form .= $iface . "&amp;queue=". $qname . "&amp;action=add\" class='btn btn-default btn-xs'>";
-	$form .= " <span class='glyphicon glyphicon-plus' title=\"Clone shaper/queue on this interface\" ></span></a></td></tr>";
-	//$form .= gettext(" Clone shaper/queue on this interface") . "</a></td></tr>";
-
-	return $form;
-
-}
-
-
 $default_shaper_msg =  "<tr><td align=\"left\" width=\"80%\">";
 $default_shaper_msg .= "<span class=\"vexpl\"><strong><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
 $default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues <br />"
@@ -2863,5 +2781,3 @@ $dn_default_shaper_msg .= gettext("The tree on the left helps you navigate throu
 	.  "buttons at the bottom represent queue actions and are activated accordingly.");
 $dn_default_shaper_msg .= "</strong></span>";
 $dn_default_shaper_msg .= "</td></tr>";
-
-?>

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -71,9 +71,7 @@
         </Rules>
         <Schedules url="/firewall_schedule.php"/>
         <TrafficShaper url="/ui/trafficshaper/" VisibleName="Traffic Shaper"/>
-        <Queues VisibleName="Queues" url="/firewall_shaper.php">
-            <ByQueue VisibleName="By Queue" url="/firewall_shaper_queues.php"/>
-        </Queues>
+        <Queues VisibleName="Queues" url="/firewall_shaper.php"/>
         <VirtualIPs VisibleName="Virtual IPs" url="/firewall_virtual_ip.php"/>
     </Firewall>
 

src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json

@@ -449,13 +449,6 @@
             "api/trafficshaper/*"
         ]
     },
-    "page-firewall-trafficshaper-queues": {
-        "name": "WebCfg - Firewall: Traffic Shaper: Queues page",
-        "descr": "Allow access to the 'Firewall: Traffic Shaper: Queues' page.",
-        "match": [
-            "firewall_shaper_queues.php*"
-        ]
-    },
     "page-firewall-virtualipaddress-edit": {
         "name": "WebCfg - Firewall: Virtual IP Address: Edit page",
         "descr": "Allow access to the 'Firewall: Virtual IP Address: Edit' page.",

src/www/firewall_rules.php

@@ -752,20 +752,7 @@ include("head.inc");
 											<span class="<?=$textse;?>"><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else  echo htmlspecialchars(pprint_port($filterent['gateway'])); ?></span>
 										</td>
 										<td class="listr" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-										<span class="<?=$textse;?>">
-										<?php
-											if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {
-												$desc = $filterent['ackqueue'] ;
-												echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['ackqueue']}&amp;action=show\">{$desc}</a>";
-												$desc = $filterent['defaultqueue'];
-												echo "/<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&amp;action=show\">{$desc}</a>";
-											} else if (isset($filterent['defaultqueue'])) {
-												$desc = $filterent['defaultqueue'];
-												echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&amp;action=show\">{$desc}</a>";
-											} else
-												echo gettext("none");
-										?>
-										</span>
+										<span class="<?=$textse;?>"><?=gettext('none');?></span>
 										</td>
 										<td class="listr" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><font color="black">
 											<?php if ($printicon) { ?><span class="glyphicon <?php echo $image; ?>" title="<?php echo $alttext;?>"></span><?php } ?><span class="<?=$textse;?>"><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?>&nbsp;<?php echo $schedule_span_end; ?></span>

src/www/firewall_shaper.php

@@ -407,7 +407,6 @@ include("fbegin.inc");
 					<?php
 							$tab_array = array();
 							$tab_array[0] = array(gettext("By Interface"), true, "firewall_shaper.php");
-							$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
 							display_top_tabs($tab_array);
 						?>
 

src/www/firewall_shaper_queues.php

-<?php
-/*
-	Copyright (C) 2014-2015 Deciso B.V.
-	Copyright (C) 2004, 2005 Scott Ullrich
-	Copyright (C) 2008 Ermal Luçi
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("shaper.inc");
-require_once("rrd.inc");
-
-if($_GET['reset'] <> "") {
-	mwexec("killall -9 pfctl");
-	exit;
-}
-
-$shaperIFlist = get_configured_interface_with_descr();
-read_altq_config();
-$qlist =& get_unique_queue_list();
-
-if (!is_array($qlist))
-	$qlist = array();
-
-$tree = "<ul class=\"tree\" >";
-foreach ($qlist as $queue => $qkey) {
-	$tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&amp;action=show\" >";
-	if (isset($shaperIFlist[$queue]))
-		$tree .= $shaperIFlist[$queue] . "</a></li>";
-	else
-		$tree .= $queue . "</a></li>";
-}
-$tree .= "</ul>";
-
-if ($_GET) {
-	if ($_GET['queue'])
-		$qname = htmlspecialchars(trim($_GET['queue']));
-        if ($_GET['interface'])
-                $interface = htmlspecialchars(trim($_GET['interface']));
-        if ($_GET['action'])
-                $action = htmlspecialchars($_GET['action']);
-
-	switch ($action) {
-	case "delete":
-			$altq =& $altq_list_queues[$interface];
-			$qtmp =& $altq->find_queue("", $qname);
-			if ($qtmp) {
-				$qtmp->delete_queue();
-				if (write_config())
-					mark_subsystem_dirty('shaper');
-			}
-			header("Location: firewall_shaper_queues.php");
-			exit;
-		break;
-	case "add":
-			/*
-			 * XXX: WARNING: This returns the first it finds.
-			 * Maybe the user expects something else?!
-			 */
-                        foreach ($altq_list_queues as $altq) {
-                                $qtmp =& $altq->find_queue("", $qname);
-                                if ($qtmp) {
-                                        $copycfg = array();
-                                        $qtmp->copy_queue($interface, $copycfg);
-                                        $aq =& $altq_list_queues[$interface];
-					if ($qname == $qtmp->GetInterface()) {
-                                                $config['shaper']['queue'][] = $copycfg;
-                                        } else if ($aq) {
-                                                $tmp1 =& $qtmp->find_parentqueue($interface, $qname);
-                                                if ($tmp1)
-                                                        $tmp =& $aq->find_queue($interface, $tmp1->GetQname());
-
-                                                if ($tmp)
-                                                        $link =& get_reference_to_me_in_config($tmp->GetLink());
-                                                else
-                                                        $link =& get_reference_to_me_in_config($aq->GetLink());
-                                                $link['queue'][] = $copycfg;
-                                        } else {
-                                                $newroot = array();
-                                                $newroot['name'] = $interface;
-                                                $newroot['interface'] = $interface;
-                                                $newroot['scheduler'] = $altq->GetScheduler();
-                                                $newroot['queue'] = array();
-                                                $newroot['queue'][] = $copycfg;
-                                                $config['shaper']['queue'][] = $newroot;
-                                        }
-					if (write_config())
-						mark_subsystem_dirty('shaper');
-                                        break;
-                                }
-                        }
-
-			header("Location: firewall_shaper_queues.php?queue=".$qname."&action=show");
-			exit;
-		break;
-	case "show":
-                        foreach ($config['interfaces'] as $if => $ifdesc) {
-                                $altq = $altq_list_queues[$if];
-                                if ($altq) {
-                                        $qtmp =& $altq->find_queue("", $qname);
-                                        if ($qtmp)
-                                                $output .= $qtmp->build_shortform();
-                                        else
-                                                $output .= build_iface_without_this_queue($if, $qname);
-                                } else {
-                                        if (!is_altq_capable($ifdesc['if']))
-                                                continue;
-                                        if (!isset($ifdesc['enable']) && $if != "lan" && $if != "wan")
-                                                continue;
-                                        $output .= build_iface_without_this_queue($if, $qname);
-                                }
-                        }
-		break;
-	}
-}
-
-if ($_POST['apply']) {
-          write_config();
-
-	$retval = 0;
-        /* Setup pf rules since the user may have changed the optimization value */
-	$retval = filter_configure();
-	$savemsg = get_std_save_message($retval);
-                        if (stristr($retval, "error") <> true)
-                                $savemsg = get_std_save_message($retval);
-                        else
-                                $savemsg = $retval;
-
-		/* reset rrd queues */
-                system("rm -f /var/db/rrd/*queuedrops.rrd");
-                system("rm -f /var/db/rrd/*queues.rrd");
-			enable_rrd_graphing();
-
-		clear_subsystem_dirty('shaper');
-}
-
-$pgtitle = gettext("Firewall: Queues: By Queues View");
-$shortcut_section = "trafficshaper";
-$closehead = false;
-include("head.inc");
-?>
-
-<body>
-
-<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
-<script type="text/javascript" src="./tree/tree.js"></script>
-
-<?php include("fbegin.inc"); ?>
-
-
-	<section class="page-content-main">
-		<div class="container-fluid">
-			<div class="row">
-
-				<div id="inputerrors"></div>
-				<?php if ($input_errors) print_input_errors($input_errors); ?>
-
-				<?php if ($savemsg) print_info_box($savemsg); ?>
-				<?php if (is_subsystem_dirty('shaper')): ?><p>
-				<?php print_info_box_np(gettext("The traffic shaper configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /></p>
-				<?php endif; ?>
-
-			    <section class="col-xs-12">
-
-
-					<?php
-							$tab_array = array();
-							$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
-							$tab_array[1] = array(gettext("By Queue"), true, "firewall_shaper_queues.php");
-							display_top_tabs($tab_array);
-						?>
-
-
-						<div class="tab-content content-box col-xs-12">
-
-		                        <form action="firewall_shaper_queues.php" method="post" name="iform" id="iform">
-
-
-		                        <div class="table-responsive">
-			                        <table class="table table-striped table-sort">
-				                        <tr>
-											<td width="30%" valign="top" align="left">
-									                <?php      echo $tree; ?>
-											</td>
-											<td width="70%" valign="top" align="center">
-												<?php
-													if ($qname)
-														echo "<p class=\"pgtitle\">" . $qname . "</p><br />";
-													echo "<table align=\"center\" class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"output form\">";
-													echo $output;
-													echo "<tr><td>&nbsp;</td></tr>";
-													echo "</table>";
-												?>
-												</td></tr>
-									</table><!-- table:main area -->
-								</div><!-- div:main area -->
-		                        </form>
-						</div>
-			    </section>
-			</div>
-		</div>
-	</section>
-
-
-<?php include("foot.inc"); ?>