From: Michael Tremer Date: Mon, 1 May 2017 10:41:51 +0000 (+0100) Subject: captive: Drop duplicate function to list active clients X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=792f1a3bdf47eba051a752f27e30a92d53a523b3;p=people%2Fms%2Fipfire-2.x.git captive: Drop duplicate function to list active clients There was a function with different name but essentially same functionality which is already existant in &show_clients(). Therefore this patch drops the old function without any functional changes. Signed-off-by: Michael Tremer --- diff --git a/doc/language_issues.de b/doc/language_issues.de index 3148f62196..83b2f3606c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -6,6 +6,7 @@ WARNING: translation string unused: Captive activate WARNING: translation string unused: Captive auth_lic WARNING: translation string unused: Captive auth_vou WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire WARNING: translation string unused: Captive genvoucher WARNING: translation string unused: Captive invalid logosize WARNING: translation string unused: Captive invalid_voucher @@ -15,6 +16,7 @@ WARNING: translation string unused: Captive logo_upload WARNING: translation string unused: Captive logo_upload1 WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive WARNING: translation string unused: Captive voucher WARNING: translation string unused: Captive vout WARNING: translation string unused: ConnSched scheduler diff --git a/doc/language_issues.en b/doc/language_issues.en index 407cff2690..a3cde91665 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -6,6 +6,7 @@ WARNING: translation string unused: Captive activate WARNING: translation string unused: Captive auth_lic WARNING: translation string unused: Captive auth_vou WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire WARNING: translation string unused: Captive heading terms WARNING: translation string unused: Captive heading voucher WARNING: translation string unused: Captive invalid logosize @@ -14,6 +15,7 @@ WARNING: translation string unused: Captive ip WARNING: translation string unused: Captive logo_set WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive WARNING: translation string unused: Captive voucher WARNING: translation string unused: Captive vout WARNING: translation string unused: ConnSched scheduler diff --git a/doc/language_issues.es b/doc/language_issues.es index 9acf434c78..c1e91d838c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -631,7 +631,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -645,7 +644,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: ConnSched dial diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b441cb171a..7384da5496 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -641,7 +641,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -655,7 +654,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: ConnSched dial diff --git a/doc/language_issues.it b/doc/language_issues.it index 12d0c26c00..cec9cc4754 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -708,7 +708,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -722,7 +721,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: MTU settings diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 140de8649d..aa4d72d8ba 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -704,7 +704,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -718,7 +717,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: MTU settings diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9acf434c78..c1e91d838c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -631,7 +631,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -645,7 +644,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: ConnSched dial diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 1c1c54f12e..d335c7c1cd 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -633,7 +633,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -647,7 +646,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: ConnSched dial diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8453570883..1309727ac7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -716,7 +716,6 @@ 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 WARNING: untranslated string: Captive expiry time WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive issued coupons @@ -730,7 +729,6 @@ WARNING: untranslated string: Captive terms short WARNING: untranslated string: Captive title WARNING: untranslated string: Captive upload logo WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: Scan for Songs diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 453ae49a7b..7a3b1cc495 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -370,11 +370,11 @@ END #if settings is set to use coupons, the coupon part has to be displayed if ($settings{'AUTH'} eq 'COUPON') { &coupons(); -} else { - #otherwise we show the licensepart - &show_license_connections(); } +# Show active clients +&show_clients(); + sub getterms() { my @ret; @@ -517,50 +517,6 @@ END if (! -z $coupons) { &show_coupons(); } - - if (! -z $clients) { - &show_clients(); - } -} - -sub show_license_connections(){ - #if there are active clients, show the box with active connections - return if ( -z $clients || ! -f $clients ); - my $count=0; - my $col; - &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'}); -print< - - -END -; - #read all clients from hash and show table - &General::readhasharray($clients, \%clientshash) if (-e $clients); - foreach my $key (keys %clientshash){ - my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2])); - my $endtime; - if ($clientshash{$key}[3] eq '0'){ - $endtime=$Lang::tr{'Captive nolimit'}; - }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" "; - } - print ""; - $count++; - } - - print "
$Lang::tr{'Captive coupon'}$Lang::tr{'Captive activated'}$Lang::tr{'Captive expire'}$Lang::tr{'Captive mac'}$Lang::tr{'delete'}
$clientshash{$key}[4]
$starttime "; - print "
$endtime "; - print "
$clientshash{$key}[0]
"; - &Header::closebox(); } sub show_coupons() {