captive: Redesign generated coupons table

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index f448c34befc7cf8af483f674f02665c0203d6a54..0577afe2809e62b3de113f96b3819ab04a43d917 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -235,7 +235,13 @@ sub writehashpart
 sub age {
        my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
                $atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0];
-       my $totalsecs = time() - $mtime;
+       my $t = time() - $mtime;
+
+       return &format_time($t);
+}
+
+sub format_time($) {
+       my $totalsecs = shift;
        my @s = ();
 
        my $secs = $totalsecs % 60;

diff --git a/doc/language_issues.de b/doc/language_issues.de
index c6de3919553157b368a0ec2dbe11d2d27ad10812..ab08359d5b3a548a9fe543c72834ff656ef61023 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -5,6 +5,7 @@ WARNING: translation string unused: Captive 1week
 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 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_upload1
 WARNING: translation string unused: Captive nr
 WARNING: translation string unused: Captive time
 WARNING: translation string unused: Captive voucher
+WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -686,6 +688,8 @@ 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 expiry time
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive terms
 WARNING: untranslated string: Captive upload logo

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 02ab1714abb94f1627870aa8bcafc7bc74af47bb..84337cf818fb71cb4e5b6f4acd79875ed8b9b8c7 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -5,6 +5,7 @@ WARNING: translation string unused: Captive 1week
 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 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 logo_set
 WARNING: translation string unused: Captive nr
 WARNING: translation string unused: Captive time
 WARNING: translation string unused: Captive voucher
+WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 307e09b3eadc57219412763b1c026b5221b0b232..f4d93af6306b59299f7b99546fa2b9e9bd304646 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -630,9 +630,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -644,7 +645,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index b0cd0f3caafc7674b5e3ee62bff1273929416e7d..5c156d13315dd330ae61e60b3199fc42c097870b 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -640,9 +640,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -654,7 +655,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup

diff --git a/doc/language_issues.it b/doc/language_issues.it
index b517978165eee996e78a23db76a4e17005702e17..c34b0e2e28f1034c0c369c5a83600079cfc668c8 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -707,9 +707,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -721,7 +722,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: MTU settings
 WARNING: untranslated string: Number of Countries for the pie chart

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 101b6eb6dc8545d099bba7ee932fe188fb82214b..35469204cfe75ad31e62fb7dfe9e90a0c9cf1e90 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -703,9 +703,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -717,7 +718,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: MTU settings
 WARNING: untranslated string: Number of Countries for the pie chart

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 307e09b3eadc57219412763b1c026b5221b0b232..f4d93af6306b59299f7b99546fa2b9e9bd304646 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -630,9 +630,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -644,7 +645,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 30973d0b7c99f22a00ca3c6d0545375eae97c438..b44edab25341dc92bf43726bab25dc7c3feab6f5 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -632,9 +632,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -646,7 +647,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 3654219baa137f08f188d6944567758d12d594ab..0878db5e7737628888548c5185bd85bc80fbc41d 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -715,9 +715,10 @@ WARNING: untranslated string: Captive branding
 WARNING: untranslated string: Captive client session expiry time
 WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
-WARNING: untranslated string: Captive err doublevoucher
 WARNING: untranslated string: Captive expire
+WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
@@ -729,7 +730,6 @@ 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 vout
 WARNING: untranslated string: Captive wrong ext
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: application layer gateways

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index b5a7072f3b5af79a5bfa9653945243695674b6ac..4d2564afe79760616211b67a5b9fa8f89b5dfa53 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -564,44 +564,59 @@ END
 }
 
 sub show_coupons() {
+       &General::readhasharray($coupons, \%couponhash) if (-e $coupons);
+
        #if there are already generated but unsused coupons, print a table
-       my $count=0;
-       my $col;
-       &Header::openbox('100%', 'left', $Lang::tr{'Captive vout'});
-       print<<END
-               <center><table class='tbl' border='0'>
-               <tr>
-                       <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th align='center' width='15%'>$Lang::tr{'date'}</th><th th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='60%'>$Lang::tr{'remark'}</th><th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
+       &Header::openbox('100%', 'left', $Lang::tr{'Captive issued coupons'});
+
+       print <<END;
+               <table class='tbl' border='0'>
+                       <tr>
+                               <th align='center' width='15%'>
+                                       $Lang::tr{'Captive coupon'}
+                               </th>
+                               <th align='center' width='15%'>$Lang::tr{'Captive expiry time'}</th>
+                               <th align='center' width='65%'>$Lang::tr{'remark'}</th>
+                               <th align='center' width='5%'>$Lang::tr{'delete'}</th>
+                       </tr>
 END
-;
-       &General::readhasharray($coupons, \%couponhash) if (-e $coupons);
-       foreach my $key (keys %couponhash)
-       {
-               my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime($couponhash{$key}[0]));
-               my $endtime;
-               if ($couponhash{$key}[2] eq '0'){
-                       $endtime=$Lang::tr{'Captive nolimit'};
-               }else{
-                       $endtime=sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1]  }->(localtime(time()+$couponhash{$key}[2]));
+
+       foreach my $key (keys %couponhash) {
+               my $expirytime = $Lang::tr{'Captive nolimit'};
+               if ($couponhash{$key}[2] > 0) {
+                       $expirytime = &General::format_time($couponhash{$key}[2]);
                }
 
-               if ($count % 2){
-                       print" <tr>";
+               if ($count++ % 2) {
                        $col="bgcolor='$color{'color20'}'";
-               }else{
+               } else {
                        $col="bgcolor='$color{'color22'}'";
-                       print" <tr>";
                }
 
-               print "<td $col><center><b>$couponhash{$key}[1]</b></td>";
-               print "<td $col><center>$starttime</td>";
-               print "<td $col><center>$endtime</td>";
-               print "<td $col align='center'>$couponhash{$key}[3]</td>";
-               print "<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-coupon' /><input type='hidden' name='key' value='$couponhash{$key}[0]' /></form></tr>";
-               $count++;
+               print <<END;
+                       <tr>
+                               <td $col align="center">
+                                       <b>$couponhash{$key}[1]</b>
+                               </td>
+                               <td $col align="center">
+                                       $expirytime
+                               </td>
+                               <td $col align="center">
+                                       $couponhash{$key}[3]
+                               </td>
+                               <td $col align="center">
+                                       <form method='post'>
+                                               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />
+                                               <input type='hidden' name='ACTION' value='delete-coupon' />
+                                               <input type='hidden' name='key' value='$couponhash{$key}[0]' />
+                                       </form>
+                               </td>
+                       </tr>
+END
        }
 
        print "</table>";
+
        &Header::closebox();
 }
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 55ebe55904320a0c0511ab99d4a7edddd1fbcde9..cfa6af84a0e9234f18a8d3accbfabe4e31a09172 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -27,12 +27,14 @@
 'Captive coupon' => 'Coupon',
 'Captive err doublevoucher' => 'A voucher with this code already exists',
 'Captive expire' => 'Expire',
+'Captive expiry time' => 'Expiry Time',
 'Captive generate coupon' => 'Generate Coupon',
 'Captive heading terms' => 'Terms & Conditions',
 'Captive heading voucher' => 'Voucher or Access Code',
 'Captive invalid logosize' => 'The uploaded image file does not meet the required resolution of at least 1280x400 but not larger than 1920x800 pixels',
 'Captive invalid_voucher' => 'Invalid code. Please try again',
 'Captive ip' => 'IP Address',
+'Captive issued coupons' => 'Issued Coupons',
 'Captive logo uploaded' => 'Logo uploaded',
 'Captive logo_set' => 'Current Logo',
 'Captive mac' => 'MAC Address',