mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-11 11:35:54 +02:00
Merge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next
This commit is contained in:
@@ -285,7 +285,8 @@ END
|
||||
&Header::openbox('100%', 'left', $Lang::tr{'log'});
|
||||
print "<p><b>$Lang::tr{'firewall hits'} $date: $lines</b></p>";
|
||||
|
||||
$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize});
|
||||
my $lastPageIndex = $lines - ${Header::viewsize};
|
||||
$start = $lastPageIndex if ($start >= $lastPageIndex);
|
||||
$start = 0 if ($start < 0);
|
||||
|
||||
my $prev;
|
||||
@@ -297,7 +298,7 @@ my $prev;
|
||||
}
|
||||
|
||||
my $next;
|
||||
if ($start == $lines - ${Header::viewsize}) {
|
||||
if ($start == $lastPageIndex) {
|
||||
$next = -1;
|
||||
} else {
|
||||
$next = $start + ${Header::viewsize};
|
||||
@@ -402,16 +403,18 @@ END
|
||||
|
||||
print "<td align='center' width='50%'>";
|
||||
if ($prev != -1) {
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> ";
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
|
||||
else {
|
||||
print "$Lang::tr{'older'}"; }
|
||||
print "$Lang::tr{'first'} $Lang::tr{'older'}"; }
|
||||
print "</td>\n";
|
||||
|
||||
print "<td align='center' width='50%'>";
|
||||
if ($next >= 0) {
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a>"; }
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a> ";
|
||||
print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>"; }
|
||||
else {
|
||||
print "$Lang::tr{'newer'}"; }
|
||||
print "$Lang::tr{'newer'} $Lang::tr{'last'} "; }
|
||||
print "</td>\n";
|
||||
|
||||
print <<END
|
||||
|
||||
@@ -891,6 +891,7 @@
|
||||
'firewall rules' => 'Firewallregeln',
|
||||
'firewallhits' => 'Firewalltreffer',
|
||||
'firmware' => 'Firmware',
|
||||
'first' => 'Erste',
|
||||
'firmware upload' => 'Hochladen der Firmware/Treiber',
|
||||
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
|
||||
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
|
||||
@@ -1300,6 +1301,7 @@
|
||||
'lan' => 'LAN',
|
||||
'lang' => 'de',
|
||||
'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
|
||||
'last' => 'Letzte',
|
||||
'last activity' => 'Letzte Aktivität',
|
||||
'lateprompting' => 'Late prompting',
|
||||
'lease expires' => 'Zuordnung verfällt',
|
||||
|
||||
@@ -918,6 +918,7 @@
|
||||
'firewallhits' => 'firewallhits',
|
||||
'firmware' => 'Firmware',
|
||||
'firmware upload' => 'Upload Firmware/Drivers',
|
||||
'first' => 'First',
|
||||
'fixed ip lease added' => 'Fixed IP lease added',
|
||||
'fixed ip lease modified' => 'Fixed IP lease modified',
|
||||
'fixed ip lease removed' => 'Fixed IP lease removed',
|
||||
@@ -1329,6 +1330,7 @@
|
||||
'lan' => 'LAN',
|
||||
'lang' => 'en',
|
||||
'languagepurpose' => 'Select the language you wish IPFire to display in:',
|
||||
'last' => 'Last',
|
||||
'last activity' => 'Last Activity',
|
||||
'lateprompting' => 'Lateprompting',
|
||||
'lease expires' => 'Lease expires',
|
||||
|
||||
Reference in New Issue
Block a user