webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alfh/feature_firewalllog_first_last' into next

Browse Source
This commit is contained in:
Michael Tremer
2014-02-17 16:24:41 +01:00
parent b631481bc5 44bd254c67
commit bd4db47085
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -285,7 +285,8 @@ END
&Header::openbox('100%', 'left', $Lang::tr{'log'}); &Header::openbox('100%', 'left', $Lang::tr{'log'});
print "<p><b>$Lang::tr{'firewall hits'} $date: $lines</b></p>"; 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); $start = 0 if ($start < 0);
my $prev; my $prev;
@@ -297,7 +298,7 @@ my $prev;
} }
my $next; my $next;
if ($start == $lines - ${Header::viewsize}) { if ($start == $lastPageIndex) {
$next = -1; $next = -1;
} else { } else {
$next = $start + ${Header::viewsize}; $next = $start + ${Header::viewsize};
@@ -402,16 +403,18 @@ END
print "<td align='center' width='50%'>"; print "<td align='center' width='50%'>";
if ($prev != -1) { 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>"; } print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
else { else {
print "$Lang::tr{'older'}"; } print "$Lang::tr{'first'} $Lang::tr{'older'}"; }
print "</td>\n"; print "</td>\n";
print "<td align='center' width='50%'>"; print "<td align='center' width='50%'>";
if ($next >= 0) { 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 { else {
print "$Lang::tr{'newer'}"; } print "$Lang::tr{'newer'} $Lang::tr{'last'} "; }
print "</td>\n"; print "</td>\n";
print <<END print <<END

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

@@ -891,6 +891,7 @@
'firewall rules' => 'Firewallregeln', 'firewall rules' => 'Firewallregeln',
'firewallhits' => 'Firewalltreffer', 'firewallhits' => 'Firewalltreffer',
'firmware' => 'Firmware', 'firmware' => 'Firmware',
'first' => 'Erste',
'firmware upload' => 'Hochladen der Firmware/Treiber', 'firmware upload' => 'Hochladen der Firmware/Treiber',
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
@@ -1300,6 +1301,7 @@
'lan' => 'LAN', 'lan' => 'LAN',
'lang' => 'de', 'lang' => 'de',
'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:', 'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
'last' => 'Letzte',
'last activity' => 'Letzte Aktivität', 'last activity' => 'Letzte Aktivität',
'lateprompting' => 'Late prompting', 'lateprompting' => 'Late prompting',
'lease expires' => 'Zuordnung verfällt', 'lease expires' => 'Zuordnung verfällt',

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

@@ -918,6 +918,7 @@
'firewallhits' => 'firewallhits', 'firewallhits' => 'firewallhits',
'firmware' => 'Firmware', 'firmware' => 'Firmware',
'firmware upload' => 'Upload Firmware/Drivers', 'firmware upload' => 'Upload Firmware/Drivers',
'first' => 'First',
'fixed ip lease added' => 'Fixed IP lease added', 'fixed ip lease added' => 'Fixed IP lease added',
'fixed ip lease modified' => 'Fixed IP lease modified', 'fixed ip lease modified' => 'Fixed IP lease modified',
'fixed ip lease removed' => 'Fixed IP lease removed', 'fixed ip lease removed' => 'Fixed IP lease removed',
@@ -1329,6 +1330,7 @@
'lan' => 'LAN', 'lan' => 'LAN',
'lang' => 'en', 'lang' => 'en',
'languagepurpose' => 'Select the language you wish IPFire to display in:', 'languagepurpose' => 'Select the language you wish IPFire to display in:',
'last' => 'Last',
'last activity' => 'Last Activity', 'last activity' => 'Last Activity',
'lateprompting' => 'Lateprompting', 'lateprompting' => 'Lateprompting',
'lease expires' => 'Lease expires', 'lease expires' => 'Lease expires',