remote.cgi: Fix splitting output from ssh-keygen.

[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 fd7e9a679873031c6387e396f10d6f2446c68b70..eba5fe774e14e04b40461dd03d46b35bf566bbba 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -54,7 +54,7 @@ my $country = '';
 my $txpower = '';
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
 
 $wlanapsettings{'APMODE'} = 'on';
@@ -81,6 +81,9 @@ $wlanapsettings{'IEEE80211W'} = 'off';
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
 
+# Find the selected interface
+my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
+
 my @macs = $wlanapsettings{'MACS'};
 
 delete $wlanapsettings{'__CGI__'};
@@ -145,16 +148,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
                &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
                &WriteConfig_hostapd();
 
-               system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
+               &General::system("/usr/local/bin/wlanapctrl", "restart");
                pid();
        }
 }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");
+       &General::system("/usr/local/bin/wlanapctrl", "start");
        pid();
 }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){
-       system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
+       &General::system("/usr/local/bin/wlanapctrl", "stop");
        $memory=0;
 }
 
@@ -193,8 +196,11 @@ my $wlan_card_status = 'dummy';
 my $wlan_ap_status = '';
 my $message = "";
 
-$selected{'INTERFACE'}{'green0'} = '';
-$selected{'INTERFACE'}{'blue0'} = '';
+my %INTERFACES = &Network::list_wireless_interfaces();
+
+foreach my $intf (keys %INTERFACES) {
+       $selected{'INTERFACE'}{$intf} = '';
+}
 $selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'";
 
 if ( ($wlanapsettings{'INTERFACE'} eq '') ){
@@ -206,11 +212,12 @@ $message<br />
 <select name='INTERFACE'>
 END
 ;
-       if ( $netsettings{'BLUE_DEV'} ne ''){
-               print "<option value='blue0' $selected{'INTERFACE'}{'blue0'}>blue0</option>";
+
+       foreach my $intf (sort keys %INTERFACES) {
+               print "<option value='${intf}' $selected{'INTERFACE'}{$intf}>$INTERFACES{$intf}</option>";
        }
+
 print <<END
-               <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option>
 </select>
 <br /><br />
 <hr size='1'>
@@ -222,18 +229,18 @@ END
        &Header::closepage();
        exit;
 }else{
-       my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`;
+       my $cmd_out = `/usr/sbin/iwconfig $INTF 2>/dev/null`;
 
        if ( $cmd_out eq '' ){
                $message = "$Lang::tr{'wlanap no interface'}";
                $wlan_card_status = '';
        }else{
-               $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`;
+               $cmd_out = `/sbin/ifconfig $INTF`;
                if ( $cmd_out eq '' ){
                        $wlan_card_status = 'down';
                }else{
                        $wlan_card_status = 'up';
-                       $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} | /bin/grep "Mode:Master"`;
+                       $cmd_out = `/usr/sbin/iwconfig $INTF | /bin/grep "Mode:Master"`;
                        if ( $cmd_out ne '' ){
                                $wlan_ap_status = 'up';
                        }
@@ -270,16 +277,16 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my $monwlaninterface = $wlanapsettings{'INTERFACE'};
-if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
-       $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
+my $monwlaninterface = $INTF;
+if ( -d '/sys/class/net/mon.' . $INTF) {
+       $monwlaninterface =  'mon.' . $INTF;
 }
 
 my @channellist_cmd;
 my @channellist = (0);
 
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`;
+my $wiphy = `iw dev $INTF info | grep wiphy | cut -d" " -f2`;
 chomp $wiphy;
 
 @channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "no IR" | grep -v "passive scanning" 2>/dev/null`;
@@ -318,7 +325,7 @@ 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
+       # There is a bug with NL80211 only all devices can displaye
        @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`;
 }
 # get available power
@@ -488,7 +495,7 @@ print <<END
 </table>
 END
 ;
-if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
+if ( $INTF =~ /green0/ ){
        print <<END
 <br />
 <table width='80%' cellspacing='0' class='tbl' border='1'>
@@ -516,15 +523,14 @@ print <<END
 <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>
+       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td>
 </tr>
 </table>
 END
 ;
 my @status;
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-        @status =  `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`;
+        @status =  `iw dev $INTF info && iw dev $INTF station dump && echo ""`;
 }
 print <<END
 <br />
@@ -565,17 +571,7 @@ for (my $i=0;$i<$#txpower_cmd;$i=$i+2){
        print "<tr><td $col>@txpower_cmd[$i]</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
-;
+print "</table>";
 &Header::closebox();
 print "</form>";
 &Header::closebigbox();
@@ -589,7 +585,6 @@ sub WriteConfig_hostapd{
 driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
 #
-interface=$wlanapsettings{'INTERFACE'}
 country_code=$wlanapsettings{'COUNTRY'}
 ieee80211d=1
 ieee80211h=1