diff options
-rwxr-xr-x | usr/local/www/fbegin.inc | 1 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules.php | 3 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 18 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper.php | 1 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_edit.php | 29 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_queues.php | 13 |
6 files changed, 8 insertions, 57 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 23f091d..23a4623 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -88,6 +88,7 @@ function showhide(tspan, tri) { <a href="/firewall_rules.php" class="navlnk">Rules</a><br> <a href="/firewall_nat.php" class="navlnk">NAT</a><br> <a href="/firewall_aliases.php" class="navlnk">Aliases</a><br> + <a href="/firewall_shaper.php" class="navlnk">Traffic Shaper</a><br> <?php echo return_ext_menu("Firewall"); ?> <strong>Services</strong><br> <a href="/services_dnsmasq.php" class="navlnk">DNS forwarder</a><br> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 9aa6fee..7d1d99e 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -170,9 +170,6 @@ if (isset($_POST['del_x'])) { <?php endif; ?> <?php endforeach; ?> </ul> - <ul id="tabnav"> - <li class="tabinact"><a href="firewall_shaper_queues.php">Queues</a></li> - </ul> </td></tr> <tr> <td class="tabcont"> diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index c5fef40..6247f5a 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -775,6 +775,7 @@ function dst_rep_change() { (see the <a href="diag_logs_settings.php">Diagnostics: System logs: Settings</a> page).</span></td> </tr> + <tr> <td width="22%" valign="top" class="vncell">Description</td> <td width="78%" class="vtable"> @@ -783,23 +784,6 @@ function dst_rep_change() { for your reference (not parsed).</span></td> </tr> - - <tr> - <td width="22%" valign="top" class="vncell">Traffic Queuing / Shaping</td> - <td width="78%" class="vtable"> - Direction: <select name="direction"> - <?php if($pconfig['direction'] <> "") - echo "<option value=\"" . htmlspecialchars($pconfig['direction']) . "\">" . htmlspecialchars($pconfig['direction']) . "</option>"; - ?> - <option value="">DONT CARE</option> - <option value="in">IN</option> - <option value="out">OUT</option> - </select> - <br> <span class="vexpl">If you need fine grained control on direction, select an option here. - <p><span class="vexpl"><input type="checkbox" name="autocreatequeue"> Automatically create a new queue for this rule.</span> - </td> - </tr> - <tr> <td width="22%" valign="top" class="vncell">Advanced Options</td> <td width="78%" class="vtable"> diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 5324705..60e8963 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -130,7 +130,6 @@ if ($_GET['act'] == "del") { <tr><td> <ul id="tabnav"> <li class="tabact">Rules</li> - <li class="tabinact"><a href="firewall_shaper_pipes.php">Pipes</a></li> <li class="tabinact"><a href="firewall_shaper_queues.php">Queues</a></li> <li class="tabinact"><a href="firewall_shaper_magic.php">Magic shaper wizard</a></li> </ul> diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php index 5b8a6df..0ff2781 100755 --- a/usr/local/www/firewall_shaper_edit.php +++ b/usr/local/www/firewall_shaper_edit.php @@ -459,7 +459,7 @@ function dst_rep_change() { <?php include("fbegin.inc"); ?> <p class="pgtitle">Firewall: Traffic shaper: Edit rule</p> <?php if ($input_errors) print_input_errors($input_errors); ?> -<?php if (is_array($config['shaper']['pipe']) && (count($config['shaper']['pipe']) > 0)): ?> + <form action="firewall_shaper_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> @@ -694,28 +694,8 @@ function dst_rep_change() { on the interface specified above (as seen from the firewall's perspective). </td> </tr> - <tr> - <td width="22%" valign="top" class="vncell">IP Type of Service (TOS)</td> - <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> - <?php - $iniptos = explode(",", $pconfig['iptos']); - foreach ($iptos as $tos): $dontcare = true; ?> - <tr> - <td width="80" nowrap><strong> - <?echo $tos;?> - </strong></td> - <td nowrap> <input type="radio" name="iptos_<?=$tos;?>" value="on" <?php if (array_search($tos, $iniptos) !== false) { echo "checked"; $dontcare = false; }?>> - yes </td> - <td nowrap> <input type="radio" name="iptos_<?=$tos;?>" value="off" <?php if (array_search("!" . $tos, $iniptos) !== false) { echo "checked"; $dontcare = false; }?>> - no </td> - <td nowrap> <input type="radio" name="iptos_<?=$tos;?>" value="" <?php if ($dontcare) echo "checked";?>> - don't care</td> - </tr> - <?php endforeach; ?> - </table> - <span class="vexpl">Use this to match packets according to their IP TOS values. - </span></td> - </tr> + + <tr> <td width="22%" valign="top" class="vncell">IP packet length</td> <td width="78%" class="vtable"><input name="iplen" type="text" id="iplen" size="10" value="<?=htmlspecialchars($pconfig['iplen']);?>"> @@ -770,9 +750,6 @@ typesel_change(); proto_change(); //--> </script> -<?php else: ?> -<p><strong>You need to create a pipe or queue before you can add a new rule.</strong></p> -<?php endif; ?> <?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index ea9ff79..f7b7c19 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -101,16 +101,9 @@ if ($_GET['act'] == "del") { <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> -<?php foreach ($iflist as $ifent => $ifname): - if ($ifent == $if): ?> - <li class="tabinact"><?=htmlspecialchars($ifname);?></li> -<?php else: ?> - <li class="tabinact"><a href="firewall_rules.php?if=<?=$ifent;?>"><?=htmlspecialchars($ifname);?></a></li> -<?php endif; ?> -<?php endforeach; ?> - </ul> - <ul id="tabnav"> - <li class="tabact"><a href="firewall_shaper_queues.php">Queues</a></li> + <li class="tabinact"><a href="firewall_shaper.php">Rules</a></li> + <li class="tabact">Queues</a></li> + <li class="tabinact"><a href="firewall_shaper_magic.php">Magic shaper wizard</a></li> </ul> </td></tr> <tr> |