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 <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3148f621964fab631d6201b6f6075681f8e16e7b..83b2f3606c7ae41a9c483d33b9601d6d87f70b6f 100644 (file)
--- 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 407cff2690d755ef3924b8c31572d3eb041eff79..a3cde91665cfbe34cb2757b0064392f604ca9fe1 100644 (file)
--- 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 9acf434c78e4dea86d927fdb3e44ac6d5e6fd75e..c1e91d838c2d794acd4e2d761aaa313cce0b5764 100644 (file)
--- 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 b441cb171a079718689ee3e5b808f7486877e9ef..7384da5496075cd554b6b7d6126a646645793e4c 100644 (file)
--- 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 12d0c26c009bd046b3a52c830c79407c51c1a1b2..cec9cc4754b97d09356f25c16104d14b267da318 100644 (file)
--- 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 140de8649d8ece2559f573df9b48be0ecd3d122d..aa4d72d8ba54324999ffd906244ec416de475c68 100644 (file)
--- 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 9acf434c78e4dea86d927fdb3e44ac6d5e6fd75e..c1e91d838c2d794acd4e2d761aaa313cce0b5764 100644 (file)
--- 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 1c1c54f12e0e6feb208b884f25d693c8dafbde1e..d335c7c1cd183b5a8b1a9c19ae6ed78c62fad600 100644 (file)
--- 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 8453570883d6e2bc37bd4125443a3dd9eb13a5b9..1309727ac722f0585accfc3fbdb0d3df8d308883 100644 (file)
--- 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 453ae49a7be884240b2a101f179b98f7224790b0..7a3b1cc495ee8eb5aed7bdcf2b3bac1f45643c64 100755 (executable)
--- 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
-               <center><table class='tbl'>
-               <tr>
-                       <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='50%'><font size='1'>$Lang::tr{'Captive mac'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
-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" <tr>";
-                       $col="bgcolor='$color{'color20'}'";
-               }else{
-                       $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
-               }
-               print "<td $col><center>$clientshash{$key}[4]</td><td $col><center>$starttime ";
-               print "</center></td><td $col><center>$endtime ";
-               print "</td><td $col><center>$clientshash{$key}[0]</td><td $col><form method='post'><center><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><form method='post'><input type='hidden' name='ACTION' value='delete-client' /><input type='hidden' name='key' value='$clientshash{$key}[0]' /></form></tr>";
-               $count++;
-       }
-       
-       print "</table>";
-       &Header::closebox();
 }
 
 sub show_coupons() {