From: Michael Tremer Date: Wed, 29 Jan 2014 16:32:59 +0000 (+0100) Subject: Merge remote-tracking branch 'amarx/wlanap' into next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be;hp=8af8d5d127f91c19795fff9661615f7a0332e800 Merge remote-tracking branch 'amarx/wlanap' into next --- diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 58c6376fe..79bd0251b 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -35,9 +35,10 @@ require '/var/ipfire/header.pl'; my $debug = 0; my $status = ''; my $errormessage = ''; -my $status_started = "$Lang::tr{'running'}"; -my $status_stopped = "$Lang::tr{'stopped'}"; - +my $status_started = "$Lang::tr{'running'}"; +my $status_stopped = "$Lang::tr{'stopped'}"; +my $count=0; +my $col=''; # get rid of used only once warnings my @onlyonce = ( $Header::colourgreen, $Header::colourred ); undef @onlyonce; @@ -151,12 +152,9 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); $memory=0; -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ - system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); - pid(); } -&Header::openpage('Wireless LAN', 1, '', ''); +&Header::openpage('', 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ( $errormessage ){ @@ -260,7 +258,7 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) { $monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'}; } -my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`; +my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`; # get available channels my @temp; @@ -306,64 +304,48 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'"; # &Header::openbox('100%', 'center', "WLAN AP"); print < + END ; if ( $wlan_card_status ne '' ){ - print ""; - print ""; + print ""; + print ""; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print ""; + print""; + print ""; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + if ( ($memory != 0) && (@pid[0] ne "///") ){ + print ""; + print ""; + print ""; + print ""; + }else{ + print""; + print ""; + print ""; + } }else{ - print "
$Lang::tr{'wlanap wlan services'}
$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})
$Lang::tr{'service'}StatusPID$Lang::tr{'memory'}$Lang::tr{'action'}
$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})
$Lang::tr{'wlanap access point'}
$Lang::tr{'wlanap access point'}@pid[0]$memory KB
$message"; + print "
$message"; } print "
"; -if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ - print ""; - print ""; - print ""; - print ""; - print ""; +if ( $wlan_card_status eq '' ){ + print "
"; + print "
PID$Lang::tr{'memory'}
"; + print ""; + print ""; print ""; - print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; + print ""; print ""; print "
hostapd    @pid[0]$memory KB
 
"; } -if ( $wlan_card_status ne '' ){ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -}else{ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -} - if ( $wlan_card_status eq '' ){ &Header::closebox(); &Header::closebigbox(); @@ -371,13 +353,25 @@ if ( $wlan_card_status eq '' ){ exit 0; } print < +

- - +
$Lang::tr{'wlanap wlan settings'} -
SSID: 
+ + + + + + - - END ; @@ -417,18 +402,22 @@ END END ; } - -print < + + + END ; -foreach $country (@countrylist){ - print ""; -} - print < +" } print < - +
$Lang::tr{'wlanap wlan settings'}

SSID: 
SSID Broadcast: on | off
$Lang::tr{'wlanap country'}:  +
HW Mode: 
$Lang::tr{'wlanap encryption'}:  - -
$Lang::tr{'wlanap country'}:  -
$Lang::tr{'wlanap encryption'}:  + +
Passphrase: 

HT Caps: 
Tx Power:  END ; @@ -443,8 +432,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ print "
Passphrase: 
HT Caps: 
Loglevel (hostapd): 

END ; if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){ print < - +
+ + +
$Lang::tr{'mac filter'}
Mac Filter:  +
@@ -506,16 +497,47 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ } print < - - - - -
$Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+ + +END +; +foreach my $nr (@channellist_cmd){ + my ($chan,$freq) = split(':',$nr); + if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } + print""; + $count++; +} +if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } +if ($status){ + print""; + $count++; +} +for (my $i=0;$i<$#txpower_cmd;$i=$i+4){ + next if (@txpower_cmd[$i] =~ /mon/i); + if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } + print ""; + $count++; +} +print "
$Lang::tr{'wlanap wlan status'}
$chan:$freq
$status
@txpower_cmd[$i]@txpower_cmd[$i+1]@txpower_cmd[$i+2]

"; +print < - - +
WLan Clients
+ +
$Lang::tr{'wlan clients'}
 $Lang::tr{'wlanap link wireless'}
 $Lang::tr{'wlanap link dhcp'}

END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6fa813a9f..f3235ea4d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1361,6 +1361,7 @@ 'mac address saved txt' => 'Die MAC-Adresse wurde erfolgreich gespeichert. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.', 'mac address title' => 'MAC Adresse zuweisen', 'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.', +'mac filter' => 'MAC-Filter', 'mac new' => 'Neue MAC-Adresse:', 'mac1 new' => 'Neue MAC-Adresse 1 (vdsl-inet):', 'mac2 new' => 'Neue MAC-Adresse 2 (vdsl-iptv):', @@ -2480,6 +2481,7 @@ 'wireless config changed' => 'Wireless-Konfiguration geändert', 'wireless configuration' => 'Wireless-Konfiguration', 'wlan client' => 'WLAN-Client', +'wlan clients' => 'WLAN-Clients', 'wlan client advanced settings' => 'Erweiterte Einstellungen', 'wlan client and' => 'und', 'wlan client bssid' => 'BSSID', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 173b8f053..ce36fb357 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1390,6 +1390,7 @@ 'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.', 'mac address title' => 'Assign MAC Address', 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is
e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.', +'mac filter' => 'MAC filter', 'mac new' => 'new MAC address:', 'mac1 new' => 'new MAC address 1 (vdsl-inet):', 'mac2 new' => 'new MAC address 2 (vdsl-iptv):', @@ -2519,6 +2520,7 @@ 'wireless config changed' => 'Wireless config changed', 'wireless configuration' => 'Wireless Configuration', 'wlan client' => 'Wireless client', +'wlan clients' => 'Wireless clients', 'wlan client advanced settings' => 'Advanced settings', 'wlan client and' => 'and', 'wlan client bssid' => 'BSSID',