Mostly code cleanup
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
12 files changed:
WARNING: untranslated string: Captive agree tac
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive agree tac
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
+WARNING: untranslated string: Captive clients
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 expiry time
WARNING: untranslated string: Captive issued coupons
WARNING: untranslated string: Captive logo uploaded
WARNING: untranslated string: Captive terms
+WARNING: untranslated string: Captive terms short
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Scan for Songs
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Captive clients
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: captive
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: captive
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
WARNING: untranslated string: Captive client session expiry time
WARNING: untranslated string: Captive brand color
WARNING: untranslated string: Captive branding
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 config
WARNING: untranslated string: Captive coupon
WARNING: untranslated string: Captive expire
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
WARNING: untranslated string: Captive noexpiretime
WARNING: untranslated string: Captive nolimit
WARNING: untranslated string: Captive terms
+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 title
WARNING: untranslated string: Captive upload logo
WARNING: untranslated string: Captive upload logo recommendations
- #if there are active clients which use coupons show table
+ # if there are active clients which use coupons show table
return if ( -z $clients || ! -f $clients );
return if ( -z $clients || ! -f $clients );
- &Header::openbox('100%', 'left', $Lang::tr{'Captive voactive'});
-print<<END
- <center><table class='tbl' width='100%'>
- <tr>
- <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th><th th align='center' width='15%'>$Lang::tr{'Captive activated'}</th><th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='10%'>$Lang::tr{'Captive mac'}</th><th align='center' width='43%'>$Lang::tr{'remark'}</th><th th align='center' width='5%'>$Lang::tr{'delete'}</th></tr>
+
+ &Header::openbox('100%', 'left', $Lang::tr{'Captive clients'});
+
+ print <<END;
+ <table class='tbl' width='100%'>
+ <tr>
+ <th align='center' width='15%'>$Lang::tr{'Captive coupon'}</th>
+ <th align='center' width='15%'>$Lang::tr{'Captive activated'}</th>
+ <th align='center' width='15%'>$Lang::tr{'Captive expiry time'}</th>
+ <th align='center' width='10%'>$Lang::tr{'Captive mac'}</th>
+ <th align='center' width='43%'>$Lang::tr{'remark'}</th>
+ <th align='center' width='5%'>$Lang::tr{'delete'}</th>
+ </tr>
&General::readhasharray($clients, \%clientshash) if (-e $clients);
&General::readhasharray($clients, \%clientshash) if (-e $clients);
- foreach my $key (keys %clientshash)
- {
+ foreach my $key (keys %clientshash) {
#calculate time from clientshash (starttime)
my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]));
#calculate time from clientshash (starttime)
my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]));
#calculate endtime from clientshash
my $endtime;
if ($clientshash{$key}[3] eq '0'){
$endtime=$Lang::tr{'Captive nolimit'};
#calculate endtime from clientshash
my $endtime;
if ($clientshash{$key}[3] eq '0'){
$endtime=$Lang::tr{'Captive nolimit'};
$endtime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2]+$clientshash{$key}[3]));
}
$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>";
- }
+ if ($count++ % 2) {
+ $col="bgcolor='$color{'color20'}'";
+ } else {
+ $col="bgcolor='$color{'color22'}'";
+ }
+
+ my $coupon = ($clientshash{$key}[4] eq "LICENSE") ? $Lang::tr{'Captive terms short'} : $clientshash{$key}[4];
- print "<td $col><center><b>$clientshash{$key}[4]</b></td><td $col><center>$starttime ";
- print "</center></td><td $col><center>$endtime</center></td><td $col><center>$clientshash{$key}[0]</td><td $col><center>$clientshash{$key}[5]</center>";
- print "</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 <<END;
+ <tr>
+ <td $col align="center"><b>$coupon</b></td>
+ <td $col align="center">$starttime</td>
+ <td $col align="center">$endtime</td>
+ <td $col align="center">$clientshash{$key}[0]</td>
+ <td $col align="center">$clientshash{$key}[5]</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-client' />
+ <input type='hidden' name='key' value='$clientshash{$key}[0]' />
+ </form>
+ </td>
+ </tr>
+END
$clientshash{$key}[3] = $settings{'SESSION_TIME'} || "0";
# No coupon code
$clientshash{$key}[3] = $settings{'SESSION_TIME'} || "0";
# No coupon code
- $clientshash{$key}[4] = "LICENSE";
+ $clientshash{$key}[4] = "TERMS";
&General::log("Captive", "Internet access granted via license agreement for $ip_address until $clientshash{$key}[3]");
}
&General::log("Captive", "Internet access granted via license agreement for $ip_address until $clientshash{$key}[3]");
}
'Captive nolimit' => 'unlimited',
'Captive nr' => 'Number',
'Captive terms' => 'Terms & Conditions',
'Captive nolimit' => 'unlimited',
'Captive nr' => 'Number',
'Captive terms' => 'Terms & Conditions',
+'Captive terms short' => 'T&Cs',
'Captive time' => 'Access time post activation (hours)',
'Captive title' => 'Title of Login Page',
'Captive upload logo' => 'Upload Logo',
'Captive time' => 'Access time post activation (hours)',
'Captive title' => 'Title of Login Page',
'Captive upload logo' => 'Upload Logo',