From a0b271e4745dafb7daade5dcf4d18406daaddee9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 1 May 2017 11:26:04 +0100 Subject: [PATCH] captive: Redesign generated coupons table Signed-off-by: Michael Tremer --- config/cfgroot/general-functions.pl | 8 +++- doc/language_issues.de | 4 ++ doc/language_issues.en | 2 + doc/language_issues.es | 4 +- doc/language_issues.fr | 4 +- doc/language_issues.it | 4 +- doc/language_issues.nl | 4 +- doc/language_issues.pl | 4 +- doc/language_issues.ru | 4 +- doc/language_issues.tr | 4 +- html/cgi-bin/captive.cgi | 69 ++++++++++++++++++----------- langs/en/cgi-bin/en.pl | 2 + 12 files changed, 71 insertions(+), 42 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f448c34bef..0577afe280 100644 --- 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 c6de391955..ab08359d5b 100644 --- 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 02ab1714ab..84337cf818 100644 --- 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 307e09b3ea..f4d93af630 100644 --- 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 b0cd0f3caa..5c156d1331 100644 --- 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 b517978165..c34b0e2e28 100644 --- 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 101b6eb6dc..35469204cf 100644 --- 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 307e09b3ea..f4d93af630 100644 --- 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 30973d0b7c..b44edab253 100644 --- 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 3654219baa..0878db5e77 100644 --- 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 b5a7072f3b..4d2564afe7 100755 --- 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< - - + &Header::openbox('100%', 'left', $Lang::tr{'Captive issued coupons'}); + + print < + + + + + + 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" "; + if ($count++ % 2) { $col="bgcolor='$color{'color20'}'"; - }else{ + } else { $col="bgcolor='$color{'color22'}'"; - print" "; } - print ""; - print ""; - print ""; - print ""; - print ""; - $count++; + print < + + + + + +END } print "
$Lang::tr{'Captive coupon'}$Lang::tr{'date'}$Lang::tr{'Captive expire'}$Lang::tr{'remark'}$Lang::tr{'delete'}
+ $Lang::tr{'Captive coupon'} + $Lang::tr{'Captive expiry time'}$Lang::tr{'remark'}$Lang::tr{'delete'}
$couponhash{$key}[1]
$starttime
$endtime
$couponhash{$key}[3]
+ $couponhash{$key}[1] + + $expirytime + + $couponhash{$key}[3] + +
+ + + +
+
"; + &Header::closebox(); } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 55ebe55904..cfa6af84a0 100644 --- 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', -- 2.39.2