diff options
| -rwxr-xr-x | usr/local/www/interfaces.php | 6 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_lan.php | 7 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_wan.php | 6 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_wlan.inc | 12 |
4 files changed, 15 insertions, 16 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 35d3af3..53befbc 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -183,7 +183,7 @@ $pconfig['mtu'] = $wancfg['mtu']; /* Wireless interface? */ if (isset($wancfg['wireless'])) { require("interfaces_wlan.inc"); - wireless_config_init(); + wireless_config_init($wancfg); } if ($_POST) { @@ -340,7 +340,7 @@ n already exists."; /* Wireless interface? */ if (isset($wancfg['wireless'])) { - $wi_input_errors = wireless_config_post(); + $wi_input_errors = wireless_config_post($wancfg); if ($wi_input_errors) { $input_errors = array_merge($input_errors, $wi_input_errors); } @@ -1017,7 +1017,7 @@ seconds<br>If no qualifying outgoing packets are transmitted for the specified n <?php /* Wireless interface? */ if (isset($wancfg['wireless'])) - wireless_config_print(); + wireless_config_print($wancfg); ?> <tr> <td height="16" colspan="2" valign="top"></td> diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index f31e367..838440f 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -40,7 +40,6 @@ require("guiconfig.inc"); $lancfg = &$config['interfaces']['lan']; -$optcfg = &$config['interfaces']['lan']; $pconfig['ipaddr'] = $lancfg['ipaddr']; $pconfig['subnet'] = $lancfg['subnet']; @@ -50,7 +49,7 @@ $pconfig['disableftpproxy'] = isset($lancfg['disableftpproxy']); /* Wireless interface? */ if (isset($lancfg['wireless'])) { require("interfaces_wlan.inc"); - wireless_config_init(); + wireless_config_init($lancfg); } if ($_POST) { @@ -74,7 +73,7 @@ if ($_POST) { /* Wireless interface? */ if (isset($lancfg['wireless'])) { - $wi_input_errors = wireless_config_post(); + $wi_input_errors = wireless_config_post($lancfg); if ($wi_input_errors) { $input_errors = array_merge($input_errors, $wi_input_errors); } @@ -177,7 +176,7 @@ function enable_change(enable_over) { </tr> <?php /* Wireless interface? */ if (isset($lancfg['wireless'])) - wireless_config_print(); + wireless_config_print($lancfg); ?> diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index 35d3af3..53befbc 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -183,7 +183,7 @@ $pconfig['mtu'] = $wancfg['mtu']; /* Wireless interface? */ if (isset($wancfg['wireless'])) { require("interfaces_wlan.inc"); - wireless_config_init(); + wireless_config_init($wancfg); } if ($_POST) { @@ -340,7 +340,7 @@ n already exists."; /* Wireless interface? */ if (isset($wancfg['wireless'])) { - $wi_input_errors = wireless_config_post(); + $wi_input_errors = wireless_config_post($wancfg); if ($wi_input_errors) { $input_errors = array_merge($input_errors, $wi_input_errors); } @@ -1017,7 +1017,7 @@ seconds<br>If no qualifying outgoing packets are transmitted for the specified n <?php /* Wireless interface? */ if (isset($wancfg['wireless'])) - wireless_config_print(); + wireless_config_print($wancfg); ?> <tr> <td height="16" colspan="2" valign="top"></td> diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc index 5515eeb..38b6baf 100755 --- a/usr/local/www/interfaces_wlan.inc +++ b/usr/local/www/interfaces_wlan.inc @@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -function wireless_config_init() { - global $optcfg, $pconfig; +function wireless_config_init(&$optcfg) { + global $pconfig; $pconfig['standard'] = $optcfg['wireless']['standard']; $pconfig['mode'] = $optcfg['wireless']['mode']; @@ -74,8 +74,8 @@ function wireless_config_init() { } } -function wireless_config_post() { - global $optcfg, $pconfig; +function wireless_config_post(&$optcfg) { + global $pconfig; $input_errors = ""; unset($input_errors); @@ -219,8 +219,8 @@ function wireless_config_post() { $curif = convert_friendly_interface_to_real_interface_name($if); $wl_modes = get_wireless_modes($curif); -function wireless_config_print() { - global $optcfg, $pconfig, $wl_modes, $g; +function wireless_config_print(&$optcfg) { + global $pconfig, $wl_modes, $g; ?> <script language="JavaScript"> |
