Fixed hostapd wlanap.cgi

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

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index fb21c4cb518924e7fcf31e7b9aadde0d84136b77..123ca792c7e48cf9203940947a4f5e1a8b13c203 100755 (executable)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  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,6 +56,7 @@ my $txpower = '';
 &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
 
 $wlanapsettings{'APMODE'} = 'on';
+$wlanapsettings{'ACTION'} = '';
 $wlanapsettings{'MACMODE'} = '0';
 $wlanapsettings{'INTERFACE'} = '';
 $wlanapsettings{'SSID'} = 'IPFire';
@@ -69,37 +70,20 @@ $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'MADWIFI';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+&Header::getcgihash(\%wlanapsettings);
 
-my %cgiparams=();
-$cgiparams{'ACTION'} = '';
-$cgiparams{'APMODE'} = 'on';
-$cgiparams{'MACMODE'} = '0';
-$cgiparams{'SSID'} = 'IPFire';
-$cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa2';               # none / wep / wpa / wep+wpa
-$cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHANNEL'} = '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{'MACMODE'}      = $cgiparams{'MACMODE'};
-       $wlanapsettings{'MACS'}         = $cgiparams{'MACS'};
-       $wlanapsettings{'HIDESSID'}     = $cgiparams{'HIDESSID'};
-       $wlanapsettings{'ENC'}          = $cgiparams{'ENC'};
-       $wlanapsettings{'CHANNEL'}      = $cgiparams{'CHANNEL'};
-       $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.<br />";
@@ -111,20 +95,18 @@ if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
 
                system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
        }
-}elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'interface'}" ){
-       $wlanapsettings{'INTERFACE'}      = $cgiparams{'INTERFACE'};
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){
        &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
+}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 ( $cgiparams{'ACTION'} eq 'Restart' ){
+}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 "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
 if ( $errormessage ){
        &Header::openbox('100%', 'center', $Lang::tr{'error messages'});
@@ -141,8 +123,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";
@@ -249,24 +231,27 @@ print <<END
 <tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Services</b></td></tr>
 END
 ;
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 if ( $wlan_card_status ne '' ){
        print "<tr><td class='base'>WLAN card ($wlanapsettings{'DRIVER'})</td>";
        print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
        print "<tr><td class='base'>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' />";
-               print "<input type='submit' name='ACTION' value='Restart' /></td></tr>";
-       }else{
-               print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Start' /></td></tr>";
-       }
 }else{
        print "<tr><td colspan='2' class='base'><b>$message</b></td></tr>";
 }
-print "</form>";
 print "</table>";
 
+print <<END
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td align='left' width='40%' />
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Start' /><input type='image' alt='Start' title='Start' src='/images/go-up.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Stop' /><input type='image' alt='Stop' title='Stop' src='/images/go-down.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Restart' /><input type='image' alt='Restart' title='Restart' src='/images/view-refresh.png' /></form></td></tr>
+</table>
+END
+;
+
 if ( $wlan_card_status eq '' ){
        &Header::closebox();
        &Header::closebigbox();
@@ -275,6 +260,7 @@ if ( $wlan_card_status eq '' ){
 }
 print <<END
 <br />
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <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>
@@ -432,12 +418,11 @@ END
  }
        close CONFIGFILE;
 
-$wlanapsettings{'MACS'} =~ s/\r//gi;
-chomp($wlanapsettings{'MACS'});
        open (MACFILE, ">/var/ipfire/wlanap/macfile");
-       print MACFILE <<END
-$wlanapsettings{'MACS'}
-END
-;
+       foreach(@macs){
+               $_ =~ s/\r//gi;
+               chomp($_);
+               if ( $_ ne "" ){print MACFILE $_;}
+       }
        close MACFILE;
 }