Am Pakfire weitergearbeitet.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / logs.cgi / log.dat

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 854bad4688a2c649a4e746520efe850ce1239380..5a2ef9b5271cb0412b8ac6c5d5a67f94e02e0f64 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -15,10 +15,15 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
 use POSIX();
 
 #workaround to suppress a warning when a variable is used only once
@@ -57,10 +62,9 @@ my %sections = (
         'ssh' => '(sshd(?:\(.*\))?\[.*\])',
         'auth' => '(\w+\(pam_unix\)\[.*\])',
         'kernel' => '(kernel)',
-        'ipsec' => '(ipsec_[\w_]+|pluto\[.*\])',
+        'ipsec' => '(ipsec_[\w_]+|pluto\[.*\]|vpnwatch)',
         'snort' => '(snort)',
-        'openvpn' => '(openvpnserver)\[.*\]',
-        'installpackage' => '(installpackage\[.*\])'
+        'openvpn' => '(openvpnserver)\[.*\]'
         );
 
 # Translations for the %sections array.
@@ -76,8 +80,7 @@ my %trsections = (
         'kernel' => "$Lang::tr{'kernel'}",
         'ipsec' => 'IPSec',
         'openvpn' => 'OpenVPN',
-        'snort' => 'Snort',
-        'installpackage' => "$Lang::tr{'update transcript'}"   
+        'snort' => 'Snort'
        );
 
 
@@ -250,7 +253,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 
 &Header::showhttpheaders();
 
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'system logs'}, 1, '');
 
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -381,9 +384,9 @@ foreach $_ (@log)
 
 
        if ($lines % 2) {
-               print "<tr bgcolor='${Header::table1colour}'>"; }
+               print "<tr bgcolor='$color{'color20'}'>"; }
        else {
-               print "<tr bgcolor='${Header::table2colour}'>"; }
+               print "<tr bgcolor='$color{'color22'}'>"; }
        print "<td>$time<td>$sec<td>" .&Header::cleanhtml ("$d", 'y') . "</td></tr>\n";
        $lines++;
 }