From 41964aba093a6b37f7534c0990b25c29e38ea371 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 1 May 2017 11:40:06 +0100 Subject: [PATCH] captive: Redesign clients list box Mostly code cleanup Signed-off-by: Michael Tremer --- doc/language_issues.de | 2 ++ doc/language_issues.en | 1 + doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ html/cgi-bin/captive.cgi | 64 +++++++++++++++++++++++----------- html/cgi-bin/captive/index.cgi | 2 +- langs/en/cgi-bin/en.pl | 1 + 12 files changed, 62 insertions(+), 22 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index ab08359d5b..3148f62196 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -688,10 +688,12 @@ WARNING: untranslated string: Captive GAIN ACCESS WARNING: untranslated string: Captive agree tac WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Scan for Songs diff --git a/doc/language_issues.en b/doc/language_issues.en index 84337cf818..407cff2690 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -718,6 +718,7 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: Captive clients WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: captive diff --git a/doc/language_issues.es b/doc/language_issues.es index f4d93af630..9acf434c78 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -628,6 +628,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -640,6 +641,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 5c156d1331..b441cb171a 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -638,6 +638,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -650,6 +651,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.it b/doc/language_issues.it index c34b0e2e28..12d0c26c00 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -705,6 +705,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -717,6 +718,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 35469204cf..140de8649d 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -701,6 +701,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -713,6 +714,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f4d93af630..9acf434c78 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -628,6 +628,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -640,6 +641,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b44edab253..1c1c54f12e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -630,6 +630,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -642,6 +643,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0878db5e77..8453570883 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -713,6 +713,7 @@ WARNING: untranslated string: Captive authentication WARNING: untranslated string: Captive brand color WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time +WARNING: untranslated string: Captive clients WARNING: untranslated string: Captive config WARNING: untranslated string: Captive coupon WARNING: untranslated string: Captive expire @@ -725,6 +726,7 @@ WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 4d2564afe7..453ae49a7b 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -621,45 +621,67 @@ END } sub show_clients() { - #if there are active clients which use coupons show table + # if there are active clients which use coupons show table return if ( -z $clients || ! -f $clients ); + my $count=0; my $col; - &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'}); -print< - - + + &Header::openbox('100%', 'left', $Lang::tr{'Captive clients'}); + + print < + + + + + + + + END -; + &General::readhasharray($clients, \%clientshash) if (-e $clients); - foreach my $key (keys %clientshash) - { + foreach my $key (keys %clientshash) { #calculate time from clientshash (starttime) my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2])); + #calculate endtime from clientshash my $endtime; if ($clientshash{$key}[3] eq '0'){ $endtime=$Lang::tr{'Captive nolimit'}; - }else{ + } else { $endtime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3])); } - if ($count % 2){ - print" "; - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - print" "; - } + if ($count++ % 2) { + $col="bgcolor='$color{'color20'}'"; + } else { + $col="bgcolor='$color{'color22'}'"; + } + + my $coupon = ($clientshash{$key}[4] eq "LICENSE") ? $Lang::tr{'Captive terms short'} : $clientshash{$key}[4]; - print ""; - $count++; + print < + + + + + + + +END } print "
$Lang::tr{'Captive coupon'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$Lang::tr{'Captive coupon'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expiry time'}$Lang::tr{'Captive mac'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$clientshash{$key}[4]
$starttime "; - print "
$endtime
$clientshash{$key}[0]
$clientshash{$key}[5]
"; - print "
$coupon$starttime$endtime$clientshash{$key}[0]$clientshash{$key}[5] +
+ + + +
+
"; + &Header::closebox(); } diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi index 698384b6a5..597d530144 100755 --- a/html/cgi-bin/captive/index.cgi +++ b/html/cgi-bin/captive/index.cgi @@ -116,7 +116,7 @@ if ($cgiparams{'ACTION'} eq "SUBMIT") { $clientshash{$key}[3] = $settings{'SESSION_TIME'} || "0"; # No coupon code - $clientshash{$key}[4] = "LICENSE"; + $clientshash{$key}[4] = "TERMS"; &General::log("Captive", "Internet access granted via license agreement for $ip_address until $clientshash{$key}[3]"); } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index cfa6af84a0..e243f6bcb0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -43,6 +43,7 @@ 'Captive nolimit' => 'unlimited', 'Captive nr' => 'Number', 'Captive terms' => 'Terms & Conditions', +'Captive terms short' => 'T&Cs', 'Captive time' => 'Access time post activation (hours)', 'Captive title' => 'Title of Login Page', 'Captive upload logo' => 'Upload Logo', -- 2.39.2