use POSIX();
-#workaround to suppress a warning when a variable is used only once
-my @dummy = ( ${Header::table2colour} );
-undef (@dummy);
-
my %cgiparams=();
my %logsettings=();
my $errormessage = '';
$cgiparams{'DAY'} = $now[3];
$cgiparams{'MONTH'} = $now[4];
$cgiparams{'ACTION'} = '';
-$cgiparams{'SECTION'} = 'kernel';
+$cgiparams{'SECTION'} = 'ipfire';
my %sections = (
'ipfire' => '(ipfire: )',
'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
+ 'ddns' => '(ddns\[\d+\]:)',
'dns' => '(dnsmasq\[.*\]: )',
'dhcp' => '(dhcpd: )',
+ 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )',
+ 'collectd' => '(collectd\[.*\]: )',
'cron' => '(fcron\[.*\]: )',
'ntp' => '(ntpd(?:ate)?\[.*\]: )',
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
- 'kernel' => '(kernel: (?!DROP-))',
- 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )',
- 'openvpn' => '(openvpnserver)\[.*\]: '
+ 'kernel' => '(kernel: (?!DROP_))',
+ 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
+ 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
+ 'pakfire' => '(pakfire:) ',
+ 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
);
# Translations for the %sections array.
my %trsections = (
'ipfire' => 'IPFire',
'red' => 'RED',
+ 'ddns' => $Lang::tr{'dynamic dns'},
'dns' => 'DNS',
'dhcp' => "$Lang::tr{'dhcp server'}",
'cron' => 'Cron',
+ 'collectd' => 'Collectd',
+ 'clamav' => 'ClamAV',
'ntp' => 'NTP',
'ssh' => 'SSH',
'auth' => "$Lang::tr{'loginlogout'}",
'kernel' => "$Lang::tr{'kernel'}",
'ipsec' => 'IPSec',
'openvpn' => 'OpenVPN',
+ 'pakfire' => 'Pakfire',
+ 'wireless' => 'Wireless'
);
{
my $xday;
-
+
# Calculate time. If future date, calculate for past year !!!
if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
( $cgiparams{'MONTH'} > $now[4] ) ) {
# calculate end of active week (saturday 23H59)
my @then = ();
@then = localtime(time());
- my $sunday = POSIX::mktime( 0, 0, 0, @then[3], @then[4], @then[5]);
+ my $sunday = POSIX::mktime( 0, 0, 0, $then[3], $then[4], $then[5]);
$sunday += (6-$then[6]) * 86400;
# Convert delta in second to full weeks
$gzindex = int (($sunday-$xday)/604800 );
}
-
+
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
my $daystr = $cgiparams{'DAY'} == 0 ? '..' : $cgiparams{'DAY'} <= 9 ? " $cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
my $section = $sections{$cgiparams{'SECTION'}};
my $filestr = 0;
my $lastdatetime; # for debug
my $search_for_end = 0;
-
+
while ($gzindex >=0 && $loop) {
# calculate file name
if ($gzindex == 0) {
END
;
print "<option value='0'>$Lang::tr{'all'}</option>\n";
-for (my $day = 1; $day <= 31; $day++)
+for (my $day = 1; $day <= 31; $day++)
{
print "\t<option ";
if ($day == $cgiparams{'DAY'}) {
$prev = $start - ${Header::viewsize};
$prev = 0 if ( $prev < 0);
}
-
+
my $next;
if ($start == $lines - ${Header::viewsize}) {
$next = -1;
if ($lines != 0) { &oldernewer(); }
print <<END
-<table width='100%'>
+<table width='100%' class='tbl'>
<tr>
- <td width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
- <td width='10%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></td>
- <td width='80%'> </td>
+ <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th>
+ <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th>
+ <th width='80%'> </th>
</tr>
END
;
$data = substr ($data,80); #permit correct display in table cell
$d .= ' ' . substr ($data,0,80);
}
-
+ my $col="";
if ($lines % 2) {
- print "<tr bgcolor='$color{'color20'}'>"; }
+ print "<tr>";
+ $col="bgcolor='$color{'color20'}'"; }
else {
- print "<tr bgcolor='$color{'color22'}'>"; }
- print "<td>$time<td>$sec<td>" .&Header::cleanhtml ("$d", 'y') . "</td></tr>\n";
+ print "<tr>";
+ $col="bgcolor='$color{'color22'}'"; }
+ print "<td $col>$time<td $col>$sec<td $col>" .&Header::cleanhtml ("$d", 'y') . "</td></tr>\n";
$lines++;
}
#print '</tt>';