From: Jan Paul Tuecking Date: Thu, 11 Mar 2010 12:45:56 +0000 (+0100) Subject: Insert the full revised and redesigned wlanap page. X-Git-Tag: v2.9-beta1~432^2 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=182a817a40a1aea8f924bd7f21961139f0b3672b Insert the full revised and redesigned wlanap page. --- diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi old mode 100644 new mode 100755 index f084fc664b..a0b7de4725 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -35,8 +35,8 @@ 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'}"; # get rid of used only once warnings my @onlyonce = ( $Header::colourgreen, $Header::colourred ); @@ -84,10 +84,48 @@ delete $wlanapsettings{'DENY_MACS'}; &Header::showhttpheaders(); +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 = ; + 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///gi; + @pid = split(/\s/,$string); + if (open(FILE, "/proc/$pid[0]/statm")){ + my $temp = ; + @memory = split(/ /,$temp); + close(FILE); + } + $memory+=$memory[0]; +} +pid(); + + + +if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){ + delete $wlanapsettings{'INTERFACE'}; + &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); +} + 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.
"; + # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc + if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2")){ + if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){ + $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; + } } if ( $errormessage eq '' ){ @@ -95,18 +133,22 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ &WriteConfig_hostapd(); system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){ +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); -}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){ +}elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){ system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){ + pid(); +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){ + $memory=0; +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -&Header::openpage('WLAN', 1, '', ''); +&Header::openpage('Wireless LAN', 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ( $errormessage ){ @@ -146,23 +188,23 @@ $selected{'INTERFACE'}{'blue0'} = ''; $selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'"; if ( ($wlanapsettings{'INTERFACE'} eq '') ){ - $message = "No WLan Interface selected."; + $message = $Lang::tr{'wlanap select interface'}; &Header::openbox('100%', 'center', "WLAN AP"); print <
-
- -
+

+
+ END ; &Header::closebox(); @@ -173,7 +215,7 @@ END my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`; if ( $cmd_out eq '' ){ - $message = "Interface is not a WLAN card."; + $message = "$Lang::tr{'wlanap no interface'}"; $wlan_card_status = ''; }else{ $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`; @@ -231,29 +273,63 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'"; &Header::openbox('100%', 'center', "WLAN AP"); print < -WLAN Services END ; + if ( $wlan_card_status ne '' ){ - print "WLAN card ($wlanapsettings{'DRIVER'})"; + print "$Lang::tr{'wlanap wlan services'}"; + print "$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})"; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print "Access Point"; + print "$Lang::tr{'wlanap access point'}"; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + }else{ - print "$message"; + print "$message"; +} + print ""; + +if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print "
PID$Lang::tr{'memory'}
hostapd    @pid[0]$memory KB
"; } -print ""; -print < - - - - -
-
-END -; +if ( $wlan_card_status ne '' ){ +print "
"; +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(); @@ -265,27 +341,27 @@ print <
- - - -
WLAN Settings +
$Lang::tr{'wlanap wlan settings'}
SSID: 
Disable SSID broadcast: on / +
SSID Broadcast: on | off
HW Mode: 
Encryption:  +
$Lang::tr{'wlanap encryption'}: 
Channel:  +
$Lang::tr{'wlanap channel'}:  Passphrase: 
Loglevel (hostapd):  Debuglevel (hostapd): 
@@ -347,10 +423,10 @@ END } print < - - +
- -
+
+
+
END @@ -365,10 +441,16 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ print < - +
WLAN Status
$Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+
+ + + + +
WLan Clients
 $Lang::tr{'wlanap link wireless'}
 $Lang::tr{'wlanap link dhcp'}
END ; &Header::closebox();