From a83351369a232a8d24d0eebcd2e5ed65a3a26029 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 23 Jan 2006 05:34:39 +0000 Subject: Remove bandwidth items. We don't want to confuse the user with un-used items. --- usr/local/www/interfaces.php | 3 --- usr/local/www/interfaces_lan.php | 33 -------------------------------- usr/local/www/interfaces_opt.php | 32 ------------------------------- usr/local/www/interfaces_wan.php | 3 --- usr/local/www/wizards/setup_wizard.xml | 35 ---------------------------------- 5 files changed, 106 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 49057ff..9c96c63 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -513,9 +513,6 @@ function type_change(enable_change,enable_change_pptp) { - Bandwidth Management (Traffic Shaping) - - DHCP client configuration diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index 77e3a92..119ff9e 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -37,8 +37,6 @@ $optcfg = &$config['interfaces']['lan']; $pconfig['ipaddr'] = $lancfg['ipaddr']; $pconfig['subnet'] = $lancfg['subnet']; $pconfig['bridge'] = $lancfg['bridge']; -$pconfig['bandwidth'] = $lancfg['bandwidth']; -$pconfig['bandwidthtype'] = $lancfg['bandwidthtype']; $pconfig['disableftpproxy'] = isset($lancfg['disableftpproxy']); @@ -92,9 +90,6 @@ if ($_POST) { if (($_POST['subnet'] && !is_numeric($_POST['subnet']))) { $input_errors[] = "A valid subnet bit count must be specified."; } - if($_POST['bandwidth'] <> "" && !is_numeric($_POST['bandwidth'])) { - $input_errors[] = "A valid bandwidth value is required 1-999999."; - } /* Wireless interface? */ if (isset($lancfg['wireless'])) { @@ -128,14 +123,6 @@ if ($_POST) { update_if_changed("subnet", &$lancfg['subnet'], $_POST['subnet']); } - if($_POST['bandwidth'] <> "" and $_POST['bandwidthtype'] <> "") { - update_if_changed("bandwidth", &$lancfg['bandwidth'], $_POST['bandwidth']); - update_if_changed("bandwidth type", &$lancfg['bandwidthtype'], $_POST['bandwidthtype']); - } else { - unset($lancfg['bandwidth']); - unset($lancfg['bandwidthtype']); - } - write_config($changedesc); touch($d_landirty_path); @@ -234,28 +221,8 @@ function enable_change(enable_over) { wireless_config_print(); ?> - - - - Bandwidth Management (Traffic Shaping) - - - Interface Bandwidth Speed - - -
The bandwidth setting will define the speed of the interface for traffic shaping. Do not enter your "Internet" bandwidth here, only the physical speed! - - - diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index 46bfc1b..7934224 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -50,9 +50,6 @@ $optcfg['descr'] = remove_bad_chars($optcfg['descr']); $pconfig['descr'] = $optcfg['descr']; $pconfig['bridge'] = $optcfg['bridge']; -$pconfig['bandwidth'] = $optcfg['bandwidth']; -$pconfig['bandwidthtype'] = $optcfg['bandwidthtype']; - $pconfig['enable'] = isset($optcfg['enable']); $pconfig['blockpriv'] = isset($optcfg['blockpriv']); @@ -142,9 +139,6 @@ if ($_POST) { if ($_POST['mtu'] && (($_POST['mtu'] < 576) || ($_POST['mtu'] > 1500))) { $input_errors[] = "The MTU must be between 576 and 1500 bytes."; } - if($_POST['bandwidth'] <> "" && !is_numeric($_POST['bandwidth'])) { - $input_errors[] = "A valid bandwidth value is required 1-999999."; - } if (($_POST['spoofmac'] && !is_macaddr($_POST['spoofmac']))) { $input_errors[] = "A valid MAC address must be specified."; } @@ -184,14 +178,6 @@ if ($_POST) { $optcfg['descr'] = remove_bad_chars($_POST['descr']); $optcfg['bridge'] = $_POST['bridge']; $optcfg['enable'] = $_POST['enable'] ? true : false; - - if($_POST['bandwidth'] <> "" and $_POST['bandwidthtype'] <> "") { - $optcfg['bandwidth'] = $_POST['bandwidth']; - $optcfg['bandwidthtype'] = $_POST['bandwidthtype']; - } else { - unset($optcfg['bandwidth']); - unset($optcfg['bandwidthtype']); - } if ($_POST['type'] == "Static") { $optcfg['ipaddr'] = $_POST['ipaddr']; @@ -409,24 +395,6 @@ function type_change(enable_change,enable_change_pptp) { - - Bandwidth Management (Traffic Shaping) - - - Interface Bandwidth Speed - - -
The bandwidth setting will define the speed of the interface for traffic shaping. Do not enter your "Internet" bandwidth here, only the physical speed! - - -   diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index 49057ff..9c96c63 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -513,9 +513,6 @@ function type_change(enable_change,enable_change_pptp) { - Bandwidth Management (Traffic Shaping) - - DHCP client configuration diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index 1d2caa3..be80e5c 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -213,41 +213,6 @@ input - Bandwidth Management (Traffic Shaping) - listtopic - - - true - true - Interface Bandwidth Speed - input - | - interfaces->wan->bandwidth - - - Speed Type - true - select - true - true - true - interfaces->wan->bandwidthtype - - - - - - - - DHCP client configuration listtopic -- cgit v1.1