]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/wlanap.cgi
WLANAP: layout changes for WUI
[people/teissler/ipfire-2.x.git] / html / cgi-bin / wlanap.cgi
old mode 100755 (executable)
new mode 100644 (file)
index aca9e35..e18afd6
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -35,9 +35,10 @@ require '/var/ipfire/header.pl';
 my $debug = 0;
 my $status = '';
 my $errormessage = '';
-my $status_started = "<td align='center' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td></tr>";
-my $status_stopped = "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td></tr>";
-
+my $status_started = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td>";
+my $status_stopped = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td>";
+my $count=0;
+my $col='';
 # get rid of used only once warnings
 my @onlyonce = ( $Header::colourgreen, $Header::colourred );
 undef @onlyonce;
@@ -49,6 +50,7 @@ my %mainsettings = ();
 my %netsettings=();
 my %wlanapsettings=();
 my $channel = '';
+my $country = '';
 my $txpower = '';
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -56,66 +58,104 @@ 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{'COUNTRY'} = '00';
+$wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'MADWIFI';
+$wlanapsettings{'HTCAPS'} = '';
 
 &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'};
+my $string=();
+my $status=();
+my $errormessage = '';
+my $memory = 0;
+my @memory=();
+my @pid=();
+my @hostapd=();
+sub pid
+{
+# for pid and memory
+       open(FILE, '/usr/local/bin/addonctrl hostapd status | ');
+       @hostapd = <FILE>;
+       close(FILE);
+       $string = join("", @hostapd);
+       $string =~ s/[a-z_]//gi;
+       $string =~ s/\[[0-1]\;[0-9]+//gi;
+       $string =~ s/[\(\)\.]//gi;
+       $string =~ s/  //gi;
+       $string =~ s/\e//gi;
+       @pid = split(/\s/,$string);
+       if (open(FILE, "/proc/$pid[0]/statm")){
+               my $temp = <FILE>;
+               @memory = split(/ /,$temp);
+               close(FILE);
+               }
+       $memory+=$memory[0];
+}
+pid();
+
+
 
-       $wlanapsettings{'PWD'}        = $cgiparams{'PWD'};
-       $wlanapsettings{'SYSLOGLEVEL'}= $cgiparams{'SYSLOGLEVEL'};
-       $wlanapsettings{'DEBUG'}      = $cgiparams{'DEBUG'};
+if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
+       delete $wlanapsettings{'INTERFACE'};
+       &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+}
 
-       # 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.<br />";
+if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
+       # 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 '' ){
-               &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");
+               pid();
        }
-}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){
+       &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+}elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){
        system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
-}elsif ( $cgiparams{'ACTION'} eq 'Stop' ){
+       pid();
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){
        system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
+       $memory=0;
 }
 
-&Header::openpage('WLAN', 1, '', '');
+&Header::openpage('', 1, '', '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
 if ( $errormessage ){
        &Header::openbox('100%', 'center', $Lang::tr{'error messages'});
@@ -132,8 +172,8 @@ if ( $errormessage ){
 if ( $debug ){
        &Header::openbox('100%', 'center', 'DEBUG');
        my $debugCount = 0;
-       foreach my $line (sort keys %cgiparams) {
-               print "$line = '$cgiparams{$line}'<br />\n";
+       foreach my $line (sort keys %wlanapsettings) {
+               print "$line = '$wlanapsettings{$line}'<br />\n";
                $debugCount++;
        }
        print "&nbsp;Count: $debugCount\n";
@@ -147,22 +187,49 @@ if ( $debug ){
 #
 my $wlan_card_status = 'dummy';
 my $wlan_ap_status = '';
-my $blue_message = "";
+my $message = "";
+
+$selected{'INTERFACE'}{'green0'} = '';
+$selected{'INTERFACE'}{'blue0'} = '';
+$selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'";
 
-if ( ($netsettings{'BLUE_DEV'} eq '') || ($netsettings{'BLUE_DRIVER'} eq '') ){
-       $blue_message = "No BLUE Interface.";
+if ( ($wlanapsettings{'INTERFACE'} eq '') ){
+       $message = $Lang::tr{'wlanap select interface'};
+       &Header::openbox('100%', 'center', "WLAN AP");
+print <<END
+$message<br />
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<select name='INTERFACE'>
+END
+;
+       if ( $netsettings{'BLUE_DEV'} ne ''){
+               print "<option value='blue0' $selected{'INTERFACE'}{'blue0'}>blue0</option>";
+       }
+print <<END
+               <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option>
+</select>
+<br /><br />
+<hr size='1'>
+       <input type='submit' name='ACTION' value='$Lang::tr{'wlanap interface'}' /></form>
+END
+;
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit;
 }else{
-       my $cmd_out = `/usr/sbin/iwconfig $netsettings{'BLUE_DEV'} 2>/dev/null`;
+       my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`;
 
        if ( $cmd_out eq '' ){
-               $blue_message = "BLUE Interface is not a WLAN card.";
+               $message = "$Lang::tr{'wlanap no interface'}";
+               $wlan_card_status = '';
        }else{
-               $cmd_out = `/sbin/ifconfig | /bin/grep $netsettings{'BLUE_DEV'}`;
+               $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`;
                if ( $cmd_out eq '' ){
                        $wlan_card_status = 'down';
                }else{
                        $wlan_card_status = 'up';
-                       $cmd_out = `/usr/sbin/iwconfig $netsettings{'BLUE_DEV'} | /bin/grep "Mode:Master"`;
+                       $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} | /bin/grep "Mode:Master"`;
                        if ( $cmd_out ne '' ){
                                $wlan_ap_status = 'up';
                        }
@@ -170,17 +237,28 @@ if ( ($netsettings{'BLUE_DEV'} eq '') || ($netsettings{'BLUE_DRIVER'} eq '') ){
        }
 }
 
-my $checked_hidessid = '';
-$checked_hidessid = "checked='checked'" if ( $wlanapsettings{'HIDESSID'} eq 'on' );
+# Change old "n" to "gn"
+if ( $wlanapsettings{'HW_MODE'} eq 'n' ) {
+       $wlanapsettings{'HW_MODE'}='gn';
+}
+
+$checked{'HIDESSID'}{'off'} = '';
+$checked{'HIDESSID'}{'on'} = '';
+$checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
-$selected{'ENC'}{'none'} = '';
-$selected{'ENC'}{'wpa1'} = '';
-$selected{'ENC'}{'wpa2'} = '';
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
-$selected{'CHAN'}{$wlanapsettings{'CHAN'}} = "selected='selected'";
+$selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
+$selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
 $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
+$selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
+$selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my @channellist_cmd = `iwlist $netsettings{'BLUE_DEV'} channel`;
+my $monwlaninterface = $wlanapsettings{'INTERFACE'};
+if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
+       $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
+}
+
+my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -191,8 +269,23 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 }
 my @channellist = @temp;
 
-my @txpower_cmd = `iwlist $netsettings{'BLUE_DEV'} txpower`;
-# get available channels
+my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
+# get available country codes
+
+my @temp;
+foreach (@countrylist_cmd){
+$_ =~ /country (.*):/;
+$country = $1;chomp $country;
+if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);}
+}
+my @countrylist = @temp;
+
+my @txpower_cmd = `iwlist $monwlaninterface txpower 2>/dev/null`;
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+       # There is a bug with NL80211 only all devices can displayed
+       @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`;
+}
+# get available power
 
 my @temp;
 foreach (@txpower_cmd){
@@ -203,18 +296,7 @@ if ( $txpower =~ /\d+/ ){push(@temp,$txpower."mW");}
 my @txpower = @temp;
 push(@txpower,"auto");
 
-$selected{'SYSLOGLEVEL'}{'0'} = '';
-$selected{'SYSLOGLEVEL'}{'1'} = '';
-$selected{'SYSLOGLEVEL'}{'2'} = '';
-$selected{'SYSLOGLEVEL'}{'3'} = '';
-$selected{'SYSLOGLEVEL'}{'4'} = '';
 $selected{'SYSLOGLEVEL'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
-
-$selected{'DEBUG'}{'0'} = '';
-$selected{'DEBUG'}{'1'} = '';
-$selected{'DEBUG'}{'2'} = '';
-$selected{'DEBUG'}{'3'} = '';
-$selected{'DEBUG'}{'4'} = '';
 $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
 
 #
@@ -222,101 +304,239 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
 #
 &Header::openbox('100%', 'center', "WLAN AP");
 print <<END
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Services</b></td></tr>
+<table width='80%' cellspacing='1' class='tbl'>
 END
 ;
+
 if ( $wlan_card_status ne '' ){
-       print "<tr><td class='base'>WLAN card ($wlanapsettings{'DRIVER'})</td>";
+       print "<tr><th align='left' width='50%'><strong>$Lang::tr{'service'}</strong></th><th width='22%'>Status</th><th width='10%'>PID</th><th width='15%'>$Lang::tr{'memory'}</th><th colspan='2'width='5%'>$Lang::tr{'action'}</th></tr>";
+       print "<tr><td class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>";
        print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
-       print "<tr><td class='base'>Access Point</td>";
+       print"<td colspan='4'></td></tr>";
+       print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap access point'}</td>";
        print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
-       if ( $wlan_card_status eq 'up' ){
-               print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Stop' /><input type='hidden' name='RUNNING' value='on' /></td></tr>";
+       if ( ($memory != 0) && (@pid[0] ne "///") ){
+               print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
+               print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td>";
+               print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>";
+               print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>";
        }else{
-               print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Start' /></td></tr>";
+               print"<td colspan='2' bgcolor='$color{'color22'}'></td>";
+               print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>";
+               print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>";
        }
+
 }else{
-       print "<tr><td colspan='2' class='base'><b>$blue_message</b></td></tr>";
+       print "<tr><td class='base'>$message";
+}
+       print "</table>";
+
+if ( $wlan_card_status eq '' ){
+       print "<br />";
+       print "<table width='80%' cellspacing='0' border='0'>";
+       print "<tr align='center'>";
+       print "<td colspan='4'></td>";
+       print "</tr>";
+       print "<tr align='center'>";
+       print "<td width='40%'>&nbsp;</td>";
+       print "<td width='20%'><form method='post' action='/cgi-bin/wlanap.cgi'><input type='submit' name='ACTION' value='$Lang::tr{'wlanap del interface'}' /></form></td>";
+       print "<td width='20%'></td>";
+       print "<td width='20%'></td>";
+       print "</tr>";
+       print "</table>";
 }
-print "</table>";
 
 if ( $wlan_card_status eq '' ){
-       print "</form>";
+       &Header::closebox();
        &Header::closebigbox();
        &Header::closepage();
        exit 0;
 }
 print <<END
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><b>WLAN Settings</b>
-<tr><td width='25%' class='base'>SSID:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr>
-<tr><td width='25%' class='base'>Disable SSID broadcast:&nbsp;</td><td class='base' colspan='3'><input type='checkbox' name='HIDESSID' $checked_hidessid /></td></tr>
-<tr><td width='25%' class='base'>Encryption:&nbsp;</td><td class='base' colspan='3'>
-       <select name='ENC'>
-               <option value='none' $selected{'ENC'}{'none'}>none</option>
-               <option value='wpa1' $selected{'ENC'}{'wpa1'}>wpa1</option>
-               <option value='wpa2' $selected{'ENC'}{'wpa2'}>wpa2</option>
+<br><br>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='80%' cellspacing='0' class='tbl' border='0'>
+<tr><th bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong></th></tr>
+<tr><td colspan='4'><br></td></tr>
+<tr><td width='25%' class='base'>SSID:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
+<!--SSID Broadcast: on => HIDESSID: off -->
+<tr><td width='25%' class='base'>SSID Broadcast:&nbsp;</td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr>
+
+
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
+       <select name='COUNTRY'>
+END
+;
+foreach $country (@countrylist){
+       print "<option $selected{'COUNTRY'}{$country}>$country</option>";
+}
+print<<END
+</select></td></tr>
+<tr><td width='25%' class='base'>HW Mode:&nbsp;</td><td class='base' colspan='3'>
+       <select name='HW_MODE'>
+               <option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option>
+               <option value='b' $selected{'HW_MODE'}{'b'}>802.11b</option>
+               <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
+               <option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
+               <option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
        </select>
 </td></tr>
-<tr><td width='25%' class='base'>Channel:&nbsp;</td><td class='base' colspan='3'>
-       <select name='CHAN'>
 END
 ;
-foreach $channel (@channellist){
-       print "<option $selected{'CHAN'}{$channel}>$channel</option>";
-}
 
+if ( scalar @channellist > 0 ){
+       print <<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
+       <select name='CHANNEL'>
+END
+;
+       foreach $channel (@channellist){
+               print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+       }
+       print "</select></td></tr>"
+} else {
+       print <<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
+<input type='text' name='CHANNEL' size='10' value='$wlanapsettings{'CHANNEL'}' />
+</td></tr>
+END
+;
+}
+print<<END
+<tr><td colspan='4'><br></td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}:&nbsp;</td><td class='base' colspan='3'>
+       <select name='ENC'>
+               <option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option>
+               <option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
+               <option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+               <option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
+       </select>
+</td></tr>
+<tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
+<tr><td colspan='4'><br></td></tr>
+END
+;
 print <<END
-</select></td></tr>
-<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><select name='TXPOWER'>
+<tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
+<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>
 END
 ;
-foreach $txpower (@txpower){
-       print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
+
+if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
+       print "<select name='TXPOWER'>";
+       foreach $txpower (@txpower){
+               print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
+       }
+       print " </select></td></tr>";
+} else {
+       print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
 }
 print <<END
-       </select></td></tr>
-<tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
        <select name='SYSLOGLEVEL'>
-               <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 (verbose)</option>
-               <option value='1' $selected{'SYSLOGLEVEL'}{'1'}>1 (debugging)</option>
-               <option value='2' $selected{'SYSLOGLEVEL'}{'2'}>2 (informations)</option>
-               <option value='3' $selected{'SYSLOGLEVEL'}{'3'}>3 (notifications)</option>
-               <option value='4' $selected{'SYSLOGLEVEL'}{'4'}>4 (warnings)</option>
+               <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
+               <option value='1' $selected{'SYSLOGLEVEL'}{'1'}>1 ($Lang::tr{'wlanap debugging'})</option>
+               <option value='2' $selected{'SYSLOGLEVEL'}{'2'}>2 ($Lang::tr{'wlanap informations'})</option>
+               <option value='3' $selected{'SYSLOGLEVEL'}{'3'}>3 ($Lang::tr{'wlanap notifications'})</option>
+               <option value='4' $selected{'SYSLOGLEVEL'}{'4'}>4 ($Lang::tr{'wlanap warnings'})</option>
        </select>
 </td>
 <td width='25%' class='base'>Debuglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
        <select name='DEBUG'>
-               <option value='0' $selected{'DEBUG'}{'0'}>0 (verbose)</option>
-               <option value='1' $selected{'DEBUG'}{'1'}>1 (debugging)</option>
-               <option value='2' $selected{'DEBUG'}{'2'}>2 (informations)</option>
-               <option value='3' $selected{'DEBUG'}{'3'}>3 (notifications)</option>
-               <option value='4' $selected{'DEBUG'}{'4'}>4 (warnings)</option>
+               <option value='0' $selected{'DEBUG'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
+               <option value='1' $selected{'DEBUG'}{'1'}>1 ($Lang::tr{'wlanap debugging'})</option>
+               <option value='2' $selected{'DEBUG'}{'2'}>2 ($Lang::tr{'wlanap informations'})</option>
+               <option value='3' $selected{'DEBUG'}{'3'}>3 ($Lang::tr{'wlanap notifications'})</option>
+               <option value='4' $selected{'DEBUG'}{'4'}>4 ($Lang::tr{'wlanap warnings'})</option>
        </select>
 </td></tr>
+<tr><td colspan='4'><br></td></tr>
 </table>
+END
+;
+if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
+       print <<END
+<br />
+<table width='80%' cellspacing='0' class='tbl' border='1'>
+<tr>
+       <th colspan='3' align='left'>$Lang::tr{'mac filter'}</th>
+</tr>
+<td width='25%' class='base'>Mac Filter:&nbsp;</td><td class='base' width='25%'>
+       <select name='MACMODE'>
+               <option value='0' $selected{'MACMODE'}{'0'}>0 (off)</option>
+               <option value='1' $selected{'MACMODE'}{'1'}>1 (Accept MACs)</option>
+               <option value='2' $selected{'MACMODE'}{'2'}>2 (Deny MACs)</option>
+       </select>
+</td><td colspan='2'>Mac Adress List (one per line)<br /><textarea name='MACS' cols='20' rows='5' wrap='off'>
+END
+;
+       print `cat /var/ipfire/wlanap/macfile`;
+print <<END
+</textarea></td>
+</table>
+END
+;
+}
+print <<END
 <br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                                                               <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-                                                                                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
+<table width='80%' cellspacing='0'>
+<tr><td align='center'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
+       <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
 </tr>
 </table>
 END
 ;
 
 if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-        $status =  `cat /proc/net/madwifi/$netsettings{'BLUE_DEV'}/associated_sta`;
+        $status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
+}
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+        $status =  `iw dev $wlanapsettings{'INTERFACE'} station dump`;
 }
 print <<END
 <br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Status</b></td></tr>
-<tr><td><pre>@channellist_cmd</pre></td><td><pre>@txpower_cmd</pre></td></tr>
-<tr><td colspan='2'><pre>Connected Stations<br />$status</pre></td></tr>
+<table width='80%' cellspacing='0' class='tbl'>
+<tr><th colspan='3' bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></th></tr>
+END
+;
+foreach my $nr (@channellist_cmd){
+       my ($chan,$freq) = split(':',$nr);
+       if ($count % 2){
+               $col="bgcolor='$color{'color20'}'";
+       }else{
+               $col="bgcolor='$color{'color22'}'";
+       }
+       print"<tr><td $col>$chan</td><td $col>:</td><td $col>$freq</td></tr>";
+       $count++;
+}
+if ($count % 2){
+               $col="bgcolor='$color{'color20'}'";
+       }else{
+               $col="bgcolor='$color{'color22'}'";
+       }
+if ($status){
+       print"<tr><td colspan='3' $col><pre>$status</pre></td></tr>";
+       $count++;
+}
+for (my $i=0;$i<$#txpower_cmd;$i=$i+4){
+       if ($count % 2){
+               $col="bgcolor='$color{'color20'}'";
+       }else{
+               $col="bgcolor='$color{'color22'}'";
+       }
+       print "<tr><td $col>@txpower_cmd[$i]</td><td $col>@txpower_cmd[$i+1]</td><td $col>@txpower_cmd[$i+2]</td></tr>";
+       $count++;
+}
+print "</table><br>";
+print <<END
+<br />
+<table width='80%' cellspacing='0' class='tbl' border='0'>
+<tr><td bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlan clients'}</strong></td></tr>
+<tr><td>&nbsp;<a href="/cgi-bin/wireless.cgi">$Lang::tr{'wlanap link wireless'}</a></td></tr>
+<tr><td>&nbsp;<a href="/cgi-bin/dhcp.cgi">$Lang::tr{'wlanap link dhcp'}</a></td></tr>
+<tr><td><br></td></tr>
 </table>
 END
 ;
@@ -325,32 +545,55 @@ print "</form>";
 &Header::closebigbox();
 &Header::closepage();
 
-sub WriteConfig{
-       &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-}
-
 sub WriteConfig_hostapd{
        $wlanapsettings{'DRIVER_HOSTAPD'} = lc($wlanapsettings{'DRIVER'});
 
        open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
        print CONFIGFILE <<END
+driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
+#
+interface=$wlanapsettings{'INTERFACE'}
+country_code=$wlanapsettings{'COUNTRY'}
+ieee80211d=1
+channel=$wlanapsettings{'CHANNEL'}
+END
+;
+ if ( $wlanapsettings{'HW_MODE'} eq 'an' ){
+       print CONFIGFILE <<END
+hw_mode=a
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+END
+;
 
-interface=$netsettings{'BLUE_DEV'}
-driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'gn' ){
+       print CONFIGFILE <<END
+hw_mode=g
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+END
+;
+
+ }else{
+       print CONFIGFILE <<END
+hw_mode=$wlanapsettings{'HW_MODE'}
+END
+;
+
+ }
+
+print CONFIGFILE <<END
 logger_syslog=-1
 logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
 logger_stdout=-1
 logger_stdout_level=$wlanapsettings{'DEBUG'}
 dump_file=/tmp/hostapd.dump
-ignore_broadcast_ssid=0
-eapol_key_index_workaround=0
-eap_server=0
-own_ip_addr=127.0.0.1
-auth_algs=3
+auth_algs=1
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
-macaddr_acl=0
 END
 ;
  if ( $wlanapsettings{'HIDESSID'} eq 'on' ){
@@ -368,27 +611,46 @@ END
 ;
 
  }
+
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
-
+#
 wpa=1
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK WPA-EAP
-wpa_pairwise=CCMP TKIP
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=TKIP
 END
 ;
  }elsif ( $wlanapsettings{'ENC'} eq 'wpa2'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
-
+#
 wpa=2
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK WPA-EAP
-wpa_pairwise=CCMP TKIP
+wpa_key_mgmt=WPA-PSK
+rsn_pairwise=CCMP
+END
+;
+ } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
+       print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=3
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=TKIP
+rsn_pairwise=CCMP
 END
 ;
  }
        close CONFIGFILE;
+
+       open (MACFILE, ">/var/ipfire/wlanap/macfile");
+       foreach(@macs){
+               $_ =~ s/\r//gi;
+               chomp($_);
+               if ( $_ ne "" ){print MACFILE $_;}
+       }
+       close MACFILE;
 }