Firewall: The maximum of definable services in a servicegroup is limited to 13 per...

[people/teissler/ipfire-2.x.git] / html / cgi-bin / wlanap.cgi

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5eb480007b2542048256399a98bc67a911639303..58c6376feac996a2bdb018370bdc0e63ce9cf48e 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -124,11 +124,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 }
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
-       # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
+       # verify WPA Passphrase - only with enabled enc
        if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+               # must be 8 .. 63 characters
                if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
                        $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
                }
+               # only ASCII alowed
+               if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){
+                       $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
+               }
        }
 
        if ( $errormessage eq '' ){
@@ -251,7 +256,7 @@ $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
 my $monwlaninterface = $wlanapsettings{'INTERFACE'};
-if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
        $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
 }
 
@@ -394,8 +399,6 @@ print <<END
 END
 ;
 
-#
-# If channel's found use a select dropdown if not a text inputfield.
 if ( scalar @channellist > 0 ){
        print <<END
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
@@ -526,10 +529,12 @@ sub WriteConfig_hostapd{
 
        open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
        print CONFIGFILE <<END
+driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
 #
 interface=$wlanapsettings{'INTERFACE'}
-driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+country_code=$wlanapsettings{'COUNTRY'}
+ieee80211d=1
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;