summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-06-03 20:44:23 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-06-03 20:44:23 +0000
commit8bb295317ffa5049c65bca32807ac7da134fbfeb (patch)
treee2b95bcef7c34f5a57cb8fc1a56134e819357e25 /usr
parent2901afebfdf54e98efd1dbb7c89aa5be978696a2 (diff)
downloadpfsense-8bb295317ffa5049c65bca32807ac7da134fbfeb.zip
pfsense-8bb295317ffa5049c65bca32807ac7da134fbfeb.tar.gz
make a copy of $optcfg since the wireless code depenes on $optcfg
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/interfaces.php1
-rwxr-xr-xusr/local/www/interfaces_wan.php1
-rwxr-xr-xusr/local/www/interfaces_wlan.inc6
3 files changed, 6 insertions, 2 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 303b96e..a338a88 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -33,6 +33,7 @@
require("guiconfig.inc");
$wancfg = &$config['interfaces']['wan'];
+$optcfg = &$config['interfaces']['wan'];
$pconfig['username'] = $config['pppoe']['username'];
$pconfig['password'] = $config['pppoe']['password'];
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 303b96e..a338a88 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -33,6 +33,7 @@
require("guiconfig.inc");
$wancfg = &$config['interfaces']['wan'];
+$optcfg = &$config['interfaces']['wan'];
$pconfig['username'] = $config['pppoe']['username'];
$pconfig['password'] = $config['pppoe']['password'];
diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc
index ec69596..c5c1c45 100755
--- a/usr/local/www/interfaces_wlan.inc
+++ b/usr/local/www/interfaces_wlan.inc
@@ -105,7 +105,8 @@ function wireless_config_print() {
<tr>
<td colspan="2" valign="top" class="listtopic">Wireless configuration</td>
</tr>
- <?php if (strstr($optcfg['if'], "ath")): ?>
+
+ <?php if (stristr($optcfg['if'], "ath") == true): ?>
<tr>
<td valign="top" class="vncellreq">Standard</td>
<td class="vtable"><select name="standard" class="formfld" id="standard">
@@ -124,7 +125,8 @@ function wireless_config_print() {
<td class="vtable"><select name="mode" class="formfld" id="mode">
<?php
$opts = array();
- if (strstr($optcfg['if'], "wi") || strstr($optcfg['if'], "ath"))
+ if (stristr($optcfg['if'], "wi" == true) ||
+ stristr($optcfg['if'], "ath") == true)
$opts[] = "hostap";
$opts[] = "BSS";
$opts[] = "IBSS";
OpenPOWER on IntegriCloud