variable cleanup

3 files changed, 9 insertions, 12 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 7d93de9..a0cbd17 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -32,7 +32,6 @@
 require("guiconfig.inc");
 
 $wancfg = &$config['interfaces']['wan'];
-$optcfg = &$config['interfaces']['wan'];
 
 $pconfig['username'] = $config['pppoe']['username'];
 $pconfig['password'] = $config['pppoe']['password'];
@@ -78,7 +77,7 @@ $pconfig['spoofmac'] = $wancfg['spoofmac'];
 $pconfig['mtu'] = $wancfg['mtu'];
 
 /* Wireless interface? */
-if (isset($optcfg['wireless'])) {
+if (isset($wancfg['wireless'])) {
 	require("interfaces_wlan.inc");
 	wireless_config_init();
 }
@@ -164,7 +163,7 @@ if ($_POST) {
 	}
 
 	/* Wireless interface? */
-	if (isset($optcfg['wireless'])) {
+	if (isset($wancfg['wireless'])) {
 		$wi_input_errors = wireless_config_post();
 		if ($wi_input_errors) {
 			$input_errors = array_merge($input_errors, $wi_input_errors);
@@ -650,7 +649,7 @@ function type_change(enable_change,enable_change_pptp) {
     Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. </td>
                 </tr>
                 <?php /* Wireless interface? */
-				if (isset($optcfg['wireless']))
+				if (isset($wancfg['wireless']))
 					wireless_config_print();
 				?>
                 <tr>
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index 631f4f5..8390c3a 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -32,7 +32,6 @@
 require("guiconfig.inc");
 
 $lancfg = &$config['interfaces']['lan'];
-$optcfg = &$config['interfaces']['lan'];
 $pconfig['ipaddr'] = $config['interfaces']['lan']['ipaddr'];
 $pconfig['subnet'] = $config['interfaces']['lan']['subnet'];
 
@@ -40,7 +39,7 @@ $pconfig['bandwidth'] = $config['interfaces']['lan']['bandwidth'];
 $pconfig['bandwidthtype'] = $config['interfaces']['lan']['bandwidthtype'];
 
 /* Wireless interface? */
-if (isset($optcfg['wireless'])) {
+if (isset($lancfg['wireless'])) {
 	require("interfaces_wlan.inc");
 	wireless_config_init();
 }
@@ -64,7 +63,7 @@ if ($_POST) {
 	}
 
 	/* Wireless interface? */
-	if (isset($optcfg['wireless'])) {
+	if (isset($lancfg['wireless'])) {
 		$wi_input_errors = wireless_config_post();
 		if ($wi_input_errors) {
 			$input_errors = array_merge($input_errors, $wi_input_errors);
@@ -153,7 +152,7 @@ function ipaddr_change() {
                     </select></td>
                 </tr>
 				<?php /* Wireless interface? */
-				if (isset($optcfg['wireless']))
+				if (isset($lancfg['wireless']))
 					wireless_config_print();
 				?>
 
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 7d93de9..a0cbd17 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -32,7 +32,6 @@
 require("guiconfig.inc");
 
 $wancfg = &$config['interfaces']['wan'];
-$optcfg = &$config['interfaces']['wan'];
 
 $pconfig['username'] = $config['pppoe']['username'];
 $pconfig['password'] = $config['pppoe']['password'];
@@ -78,7 +77,7 @@ $pconfig['spoofmac'] = $wancfg['spoofmac'];
 $pconfig['mtu'] = $wancfg['mtu'];
 
 /* Wireless interface? */
-if (isset($optcfg['wireless'])) {
+if (isset($wancfg['wireless'])) {
 	require("interfaces_wlan.inc");
 	wireless_config_init();
 }
@@ -164,7 +163,7 @@ if ($_POST) {
 	}
 
 	/* Wireless interface? */
-	if (isset($optcfg['wireless'])) {
+	if (isset($wancfg['wireless'])) {
 		$wi_input_errors = wireless_config_post();
 		if ($wi_input_errors) {
 			$input_errors = array_merge($input_errors, $wi_input_errors);
@@ -650,7 +649,7 @@ function type_change(enable_change,enable_change_pptp) {
     Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. </td>
                 </tr>
                 <?php /* Wireless interface? */
-				if (isset($optcfg['wireless']))
+				if (isset($wancfg['wireless']))
 					wireless_config_print();
 				?>
                 <tr>