diff options
author | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
---|---|---|
committer | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
commit | 60e15be211c5de855ab3d9746c78eb7296c50cde (patch) | |
tree | 862af8eaa4a8ba95af792b3c98c484e33f2bc2ca /src/usr/local/www/firewall_shaper_queues.php | |
parent | 2e4cad90499f968474c4eca0852f352f1526b617 (diff) | |
parent | 8dccfb20643cfda6b55429177410e6c66fcf0bbd (diff) | |
download | pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.zip pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.tar.gz |
Merge remote-tracking branch 'upstream/master' into rfc4638, fix conflict with c399d0d
Diffstat (limited to 'src/usr/local/www/firewall_shaper_queues.php')
-rw-r--r-- | src/usr/local/www/firewall_shaper_queues.php | 58 |
1 files changed, 27 insertions, 31 deletions
diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 190ca28..7cd5b1f 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -1,15 +1,12 @@ <?php -/* $Id$ */ -/* NEW +/* firewall_shaper_queues.php */ /* ==================================================================== - * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. - * Copyright (c) 2004, 2005 Scott Ullrich - * Copyright (c) 2008 Ermal Luçi + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: + * 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. @@ -17,12 +14,12 @@ * 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. + * distribution. * - * 3. All advertising materials mentioning features or use of this software + * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgment: * "This product includes software developed by the pfSense Project - * for use in the pfSense software distribution. (http://www.pfsense.org/). + * for use in the pfSense software distribution. (http://www.pfsense.org/). * * 4. The names "pfSense" and "pfSense Project" must not be used to * endorse or promote products derived from this software without @@ -38,7 +35,7 @@ * * "This product includes software developed by the pfSense Project * for use in the pfSense software distribution (http://www.pfsense.org/). - * + * * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -55,14 +52,10 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall - pfSense_MODULE: shaper -*/ ##|+PRIV ##|*IDENT=page-firewall-trafficshaper-queues -##|*NAME=Firewall: Traffic Shaper: Queues page +##|*NAME=Firewall: Traffic Shaper: Queues ##|*DESCR=Allow access to the 'Firewall: Traffic Shaper: Queues' page. ##|*MATCH=firewall_shaper_queues.php* ##|-PRIV @@ -132,12 +125,12 @@ if ($_GET) { */ 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) { @@ -163,8 +156,9 @@ if ($_GET) { $config['shaper']['queue'][] = $newroot; } - if (write_config()) + if (write_config()) { mark_subsystem_dirty('shaper'); + } break; } @@ -180,17 +174,19 @@ if ($_GET) { if ($altq) { $qtmp =& $altq->find_queue("", $qname); - if ($qtmp) + if ($qtmp) { $output .= $qtmp->build_shortform(); - else + } else { $output .= build_iface_without_this_queue($if, $qname); - + } } else { - if (!is_altq_capable($ifdesc['if'])) + if (!is_altq_capable($ifdesc['if'])) { continue; + } - if (!isset($ifdesc['enable']) && $if != "lan" && $if != "wan") + if (!isset($ifdesc['enable']) && $if != "lan" && $if != "wan") { continue; + } $output .= build_iface_without_this_queue($if, $qname); } @@ -220,31 +216,31 @@ if ($_POST['apply']) { clear_subsystem_dirty('shaper'); } -$pgtitle = gettext("Firewall: Shaper: By Queues View"); +$pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("Queues")); $shortcut_section = "trafficshaper"; -$closehead = false; include("head.inc"); ?> -<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> <?php -if ($input_errors) +if ($input_errors) { print_input_errors($input_errors); +} -if ($savemsg) +if ($savemsg) { print_info_box($savemsg); +} -if (is_subsystem_dirty('shaper')) +if (is_subsystem_dirty('shaper')) { print_info_box_np(gettext("The traffic shaper configuration has been changed. You must apply the changes in order for them to take effect.")); +} $tab_array = array(); $tab_array[] = array(gettext("By Interface"), false, "firewall_shaper.php"); $tab_array[] = array(gettext("By Queue"), true, "firewall_shaper_queues.php"); $tab_array[] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php"); -$tab_array[] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php"); $tab_array[] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php"); display_top_tabs($tab_array); |