diff options
| -rwxr-xr-x | usr/local/www/fbegin.inc | 8 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_firewall.php | 13 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_misc.php | 19 |
3 files changed, 1 insertions, 39 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 9f8169d..89314aa 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -147,12 +147,6 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') { <?php echo return_ext_menu("Interfaces"); ?> </ul> </li> -<?php - if($config['system']['shapertype'] <> "m0n0") - $shaper = "firewall_shaper.php"; - else - $shaper = "m0n0/firewall_shaper.php"; -?> <li class="drop"> <div>Firewall</div> <ul class="subdrop"> @@ -173,7 +167,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') { deployments remove to reduce user confusion */ - output_menu_item("{$shaper}", "Traffic Shaper"); + output_menu_item("/firewall_saper.php", "Traffic Shaper"); } ?> <?=output_menu_item("/firewall_virtual_ip.php", "Virtual IPs");?> diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index 7eec0e6..7ad17d3 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -190,19 +190,6 @@ function update_description(itemnum) { <tr> <td colspan="2" valign="top" class="listtopic">Firewall Advanced</td> </tr> -<?php -/* - <tr> - <td width="22%" valign="top" class="vncell">Traffic shaper type</td> - <td width="78%" class="vtable"> - <select name="shapertype" class="formselect"> - <option value="pfSense"<?php if($pconfig['shapertype'] == 'pfSense') echo " selected"; ?>><?= $g['product_name'] ?> (ALTQ)</option> - <option value="m0n0"<?php if($pconfig['shapertype'] == 'm0n0') echo " selected"; ?>>M0n0wall (dummynet)</option> - </select> - </td> - </tr> -*/ -?> <tr> <td width="22%" valign="top" class="vncell">FTP server compatibility</td> <td width="78%" class="vtable"> diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index d9048d4..3de4de4 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -147,25 +147,6 @@ include("head.inc"); <tr> <td colspan="2" class="list" height="12"> </td> </tr> -<?php -/* - <tr> - <td colspan="2" valign="top" class="listtopic">Traffic Shaper</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell">Traffic shaper type</td> - <td width="78%" class="vtable"> - <select name="shapertype" class="formselect"> - <option value="pfSense"<?php if($pconfig['shapertype'] == 'pfSense') echo " selected"; ?>><?= $g['product_name'] ?> (ALTQ)</option> - <option value="m0n0"<?php if($pconfig['shapertype'] == 'm0n0') echo " selected"; ?>>M0n0wall (dummynet)</option> - </select> - </td> - </tr> - <tr> - <td colspan="2" class="list" height="12"> </td> - </tr> -*/ -?> <tr> <td colspan="2" valign="top" class="listtopic">IP Security</td> </tr> |
