From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 31 Mar 2021 10:02:27 +0000 (+0200)
Subject: ids.cgi: Use get_used_rulesfiles function from ids-functions.pl.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1016a05ed5ee2e235981cdd9e5537d8b851c55f0;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Use get_used_rulesfiles function from ids-functions.pl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 159b1c9574..c630297d95 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -282,41 +282,16 @@ if ($cgiparams{'RULESET'}) {
 	closedir(DIR);
 
 	# Gather used rulefiles.
-	#
-	# Check if the file for activated rulefiles is not empty.
-	if(-f $IDS::used_rulefiles_file) {
-		# Open the file for used rulefile and read-in content.
-		open(FILE, $IDS::used_rulefiles_file) or die "Could not open $IDS::used_rulefiles_file. $!\n";
-
-		# Read-in content.
-		my @lines = <FILE>;
-
-		# Close file.
-		close(FILE);
-
-		# Loop through the array.
-		foreach my $line (@lines) {
-			# Remove newlines.
-			chomp($line);
-
-			# Skip comments.
-			next if ($line =~ /\#/);
-
-			# Skip blank  lines.
-			next if ($line =~ /^\s*$/);
-
-			# Gather rule sid and message from the ruleline.
-			if ($line =~ /.*- (.*)/) {
-				my $rulefile = $1;
-
-				# Check if the current rulefile exists in the %idsrules hash.
-				# If not, the file probably does not exist anymore or contains
-				# no rules.
-				if($idsrules{$rulefile}) {
-					# Add the rulefile state to the %idsrules hash.
-					$idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
-				}
-			}
+	my @used_rulesfiles = &IDS::get_used_rulesfiles();
+
+	# Loop through the array of used rulesfiles.
+	foreach my $rulesfile (@used_rulesfiles) {
+		# Check if the current rulefile exists in the %idsrules hash.
+		# If not, the file probably does not exist anymore or contains
+		# no rules.
+		if($idsrules{$rulefile}) {
+			# Add the rulefile state to the %idsrules hash.
+			$idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
 		}
 	}
 }