webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

captive: Redesign generated coupons table

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-05-01 11:26:04 +01:00
parent 733932de74
commit a0b271e474
12 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cfgroot/general-functions.pl
View File

@@ -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;

4
doc/language_issues.de
View File

@@ -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

2
doc/language_issues.en
View File

@@ -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

4
doc/language_issues.es
View File

@@ -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

4
doc/language_issues.fr
View File

@@ -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

4
doc/language_issues.it
View File

@@ -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

4
doc/language_issues.nl
View File

@@ -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

4
doc/language_issues.pl
View File

@@ -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

4
doc/language_issues.ru
View File

@@ -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

4
doc/language_issues.tr
View File

@@ -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

71
html/cgi-bin/captive.cgi
View File

@@ -564,44 +564,59 @@ END
}
sub show_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>
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]));
#if there are already generated but unsused coupons, print a table
&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
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();
}

2
langs/en/cgi-bin/en.pl
View File

@@ -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 &amp; 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',