Remove bandwidth items. We don't want to confuse the user with un-used items.

5 files changed, 0 insertions, 106 deletions

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) {
                   <td colspan="2" valign="top" height="16"></td>
                 </tr>
                 <tr>
-                  <td colspan="2" valign="top" class="listtopic">Bandwidth Management (Traffic Shaping)</td>
-                </tr>
-                <tr>
                   <td colspan="2" valign="top" class="listtopic">DHCP client configuration</td>
                 </tr>
                 <tr>
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();
 				?>
 
-                <tr>
-                  <td colspan="2" valign="top" height="16"></td>
-                </tr>
 
                 <tr>
-                  <td colspan="2" valign="top" class="vnsepcell">Bandwidth Management (Traffic Shaping)</td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncell">Interface Bandwidth Speed</td>
-                  <td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
-			<select name="bandwidthtype">
-				<option value="<?=htmlspecialchars($pconfig['bandwidthtype']);?>"><?=htmlspecialchars($pconfig['bandwidthtype']);?></option>
-				<option value="b">bit/s</option>
-				<option value="Kb">Kilobit/s</option>
-				<option value="Mb">Megabit/s</option>
-				<option value="Gb">Gigabit/s</option>
-				<option value=""></option>
-			</select>
-			<br> The bandwidth setting will define the speed of the interface for traffic shaping.  Do not enter your "Internet" bandwidth here, only the physical speed!
-		  </td>
-                </tr>
-                <tr>
                   <td colspan="2" valign="top" height="16"></td>
                 </tr>
                 <tr>
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) {
                 <tr>
                   <td colspan="2" valign="top" height="16"></td>
                 </tr>		
-                <tr>
-                  <td colspan="2" valign="top" class="vnsepcell">Bandwidth Management (Traffic Shaping)</td>
-                </tr>
-                <tr>
-                  <td valign="top" class="vncell">Interface Bandwidth Speed</td>
-                  <td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
-			<select name="bandwidthtype">
-				<option value="<?=htmlspecialchars($pconfig['bandwidthtype']);?>"><?=htmlspecialchars($pconfig['bandwidthtype']);?></option>
-				<option value="b">bit/s</option>
-				<option value="Kb">Kilobit/s</option>
-				<option value="Mb">Megabit/s</option>
-				<option value="Gb">Gigabit/s</option>
-				<option value=""></option>
-			</select>
-			<br> The bandwidth setting will define the speed of the interface for traffic shaping.  Do not enter your "Internet" bandwidth here, only the physical speed!
-		  </td>
-                </tr>
-
 		<tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
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) {
                   <td colspan="2" valign="top" height="16"></td>
                 </tr>
                 <tr>
-                  <td colspan="2" valign="top" class="listtopic">Bandwidth Management (Traffic Shaping)</td>
-                </tr>
-                <tr>
                   <td colspan="2" valign="top" class="listtopic">DHCP client configuration</td>
                 </tr>
                 <tr>
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 @@
 			<type>input</type>
 		</field>
 		<field>
-			<name>Bandwidth Management (Traffic Shaping)</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<combinefieldsbegin>true</combinefieldsbegin>
-			<donotdisable>true</donotdisable>
-			<name>Interface Bandwidth Speed</name>
-			<type>input</type>
-			<typehint> | </typehint>
-			<bindstofield>interfaces->wan->bandwidth</bindstofield>
-		</field>
-		<field>
-			<name>Speed Type</name>
-			<donotdisable>true</donotdisable>
-			<type>select</type>
-			<combinefieldsend>true</combinefieldsend>
-			<dontdisplayname>true</dontdisplayname>
-			<dontcombinecells>true</dontcombinecells>
-			<bindstofield>interfaces->wan->bandwidthtype</bindstofield>
-			<options>
-				<option>
-					<name>bit/s</name>
-				</option>
-				<option>
-					<name>Kilobit/s</name>
-				</option>
-				<option>
-					<name>Megabit/s</name>
-				</option>
-				<option>
-					<name>Gigabit/s</name>
-				</option>
-			</options>
-		</field>
-		<field>
 			<name>DHCP client configuration</name>
 			<type>listtopic</type>
 		</field>