X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fwlanap.cgi;h=ca11d043e2e88480a15d593b9d6c417ee4d6775b;hp=fb613de56401acfd47ce1d166970dabf73be73dc;hb=e099ab40083308028fa58d0da692e55fbdfcf07f;hpb=891b6138c4f98b37885d1a2074494855f8c1f3e0
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index fb613de56..ca11d043e 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -56,66 +56,58 @@ my $txpower = '';
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
$wlanapsettings{'APMODE'} = 'on';
-$wlanapsettings{'INTERFACE'} = $netsettings{'BLUE_DEV'};
+$wlanapsettings{'ACTION'} = '';
+$wlanapsettings{'MACMODE'} = '0';
+$wlanapsettings{'INTERFACE'} = '';
$wlanapsettings{'SSID'} = 'IPFire';
$wlanapsettings{'HIDESSID'} = 'off';
-$wlanapsettings{'ENC'} = 'wpa'; # none / wpa1 /wpa2
+$wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2
$wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHAN'} = '05';
+$wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'HW_MODE'} = 'g';
$wlanapsettings{'PWD'} = 'IPFire-2.x';
$wlanapsettings{'SYSLOGLEVEL'} = '0';
$wlanapsettings{'DEBUG'} = '4';
$wlanapsettings{'DRIVER'} = 'MADWIFI';
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+&Header::getcgihash(\%wlanapsettings);
-my %cgiparams=();
-$cgiparams{'ACTION'} = '';
-$cgiparams{'APMODE'} = 'on';
-$cgiparams{'SSID'} = 'IPFire';
-$cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa'; # none / wep / wpa / wep+wpa
-$cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHAN'} = '05';
-$cgiparams{'PWD'} = 'IPFire-2.x';
-$cgiparams{'SYSLOGLEVEL'} = '0';
-$cgiparams{'DEBUG'} = '4';
-&Header::getcgihash(\%cgiparams);
+my @macs = $wlanapsettings{'MACS'};
+delete $wlanapsettings{'__CGI__'};
+delete $wlanapsettings{'x'};
+delete $wlanapsettings{'y'};
+delete $wlanapsettings{'MACS'};
+delete $wlanapsettings{'ACCEPT_MACS'};
+delete $wlanapsettings{'DENY_MACS'};
&Header::showhttpheaders();
-if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
- $wlanapsettings{'SSID'} = $cgiparams{'SSID'};
- $wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
- $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
- $wlanapsettings{'CHAN'} = $cgiparams{'CHAN'};
- $wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
-
- $wlanapsettings{'PWD'} = $cgiparams{'PWD'};
- $wlanapsettings{'SYSLOGLEVEL'}= $cgiparams{'SYSLOGLEVEL'};
- $wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
-
+if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
# verify WPA Passphrase, must be 8 .. 63 characters
if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63) ){
$errormessage .= "Invalid length in WPA Passphrase. Must be between 8 and 63 characters.
";
}
if ( $errormessage eq '' ){
- &WriteConfig();
+ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
&WriteConfig_hostapd();
- system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1")
+ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
-}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){
+ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){
system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
-}elsif ( $cgiparams{'ACTION'} eq 'Stop' ){
+}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){
system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
+}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){
+ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
&Header::openpage('WLAN', 1, '', '');
&Header::openbigbox('100%', 'left', '', $errormessage);
-print "
+ | + | + |