Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / html / cgi-bin / logs.cgi / ids.dat

diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index aa76202f388e00055fa001a64825d1b8630d1546..98176d6902f04e509dca55d9eb4434b059276625 100644 (file)
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -18,10 +18,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
@@ -276,9 +281,9 @@ END
 foreach $_ (@slice)
 {
        if ($lines % 2) {
-               print "<tr bgcolor='${Header::table1colour}'><td>\n"; }
+               print "<tr bgcolor='$color{'color20'}'><td>\n"; }
        else {
-               print "<tr bgcolor='${Header::table2colour}'><td>\n"; }
+               print "<tr bgcolor='$color{'color22'}'><td>\n"; }
        my ($datetime,$title,$priority,$classification,$srcip,$srcport,$destip,$destport,$sid,$refs) = split(/\|/);
        print <<END
 <table width='100%'>
@@ -331,7 +336,7 @@ print <<END
 END
        ;
        if ($sid ne "n/a") {
-               print "<a href='http://www.snort.org/pub-bin/sigs.cgi?sid=$sid' ";
+               print "<a href='https://www.snort.org/rule_docs/$sid' ";
                print "target='_blank'>$sid</a></td>\n";
        } else {
                print $sid;
@@ -382,7 +387,7 @@ sub processevent
                                }
                                ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport, $sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a");
                                @refs = ();
-                               $_ =~ m/:([0-9]{1,4})\] (.*) \[\*\*\]/;
+                               $_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/;
                                $title = &Header::cleanhtml($2,"y");
                        }
                        if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) {