From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 30 Aug 2018 16:18:26 +0000 (+0200)
Subject: ids.cgi: Hide rules config section if no rules a present
X-Git-Tag: suricata-beta3~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80bcd4dd1a424e1353aa0839e873ce9292cea3db;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Hide rules config section if no rules a present

Do not show the rules config section anymore if there is not
ruleset available.

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

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 979dcbcb70..641a88da88 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -625,100 +625,103 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
-	print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
+# Only show the section for configuring the ruleset if one is present.
+if (%idsrules) {
+	&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
 
-	# Output display table for rule files
-	print "<table width='100%'>\n";
+		print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-	# Local variable required for java script to show/hide
-	# rules of a rulefile.
-	my $rulesetcount = 1;
+		# Output display table for rule files
+		print "<table width='100%'>\n";
 
-	# Loop over each rule file
-	foreach my $rulefile (sort keys(%idsrules)) {
-		my $rulechecked = '';
+		# Local variable required for java script to show/hide
+		# rules of a rulefile.
+		my $rulesetcount = 1;
 
-		# Check if rule file is enabled
-		if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
-			$rulechecked = 'CHECKED';
-		}
+		# Loop over each rule file
+		foreach my $rulefile (sort keys(%idsrules)) {
+			my $rulechecked = '';
 
-		# Table and rows for the rule files.
-		print"<tr>\n";
-		print"<td class='base' width='5%'>\n";
-		print"<input type='checkbox' name='$rulefile' $rulechecked>\n";
-		print"</td>\n";
-		print"<td class='base' width='90%'><b>$rulefile</b></td>\n";
-		print"<td class='base' width='5%' align='right'>\n";
-		print"<a href=\"javascript:showhide('ruleset$rulesetcount')\">SHOW</a>\n";
-		print"</td>\n";
-		print"</tr>\n";
-
-		# Rows which will be hidden per default and will contain the single rules.
-		print"<tr  style='display:none' id='ruleset$rulesetcount'>\n";
-		print"<td colspan='3'>\n";
-
-		# Local vars
-		my $lines;
-		my $rows;
-		my $col;
-
-		# New table for the single rules.
-		print "<table width='100%'>\n";
+			# Check if rule file is enabled
+			if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
+				$rulechecked = 'CHECKED';
+			}
+
+			# Table and rows for the rule files.
+			print"<tr>\n";
+			print"<td class='base' width='5%'>\n";
+			print"<input type='checkbox' name='$rulefile' $rulechecked>\n";
+			print"</td>\n";
+			print"<td class='base' width='90%'><b>$rulefile</b></td>\n";
+			print"<td class='base' width='5%' align='right'>\n";
+			print"<a href=\"javascript:showhide('ruleset$rulesetcount')\">SHOW</a>\n";
+			print"</td>\n";
+			print"</tr>\n";
+
+			# Rows which will be hidden per default and will contain the single rules.
+			print"<tr  style='display:none' id='ruleset$rulesetcount'>\n";
+			print"<td colspan='3'>\n";
 
-		# Loop over rule file rules
-		foreach my $sid (sort {$a <=> $b} keys(%{$idsrules{$rulefile}})) {
 			# Local vars
-			my $ruledefchecked = '';
+			my $lines;
+			my $rows;
+			my $col;
 
-			# Skip rulefile itself.
-			next if ($sid eq "Rulefile");
+			# New table for the single rules.
+			print "<table width='100%'>\n";
 
-			# If 2 rules have been displayed, start a new row
-			if (($lines % 2) == 0) {
-				print "</tr><tr>\n";
+			# Loop over rule file rules
+			foreach my $sid (sort {$a <=> $b} keys(%{$idsrules{$rulefile}})) {
+				# Local vars
+				my $ruledefchecked = '';
 
-				# Increase rows by once.
-				$rows++;
-			}
+				# Skip rulefile itself.
+				next if ($sid eq "Rulefile");
 
-			# Colour lines.
-			if ($rows % 2) {
-				$col="bgcolor='$color{'color20'}'";
-			} else {
-				$col="bgcolor='$color{'color22'}'";
-			}
+				# If 2 rules have been displayed, start a new row
+				if (($lines % 2) == 0) {
+					print "</tr><tr>\n";
+
+					# Increase rows by once.
+					$rows++;
+				}
+
+				# Colour lines.
+				if ($rows % 2) {
+					$col="bgcolor='$color{'color20'}'";
+				} else {
+					$col="bgcolor='$color{'color22'}'";
+				}
 
-			# Set rule state
-			if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
-				$ruledefchecked = 'CHECKED';
+				# Set rule state
+				if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
+					$ruledefchecked = 'CHECKED';
+				}
+
+				# Create rule checkbox and display rule description
+				print "<td class='base' width='5%' align='right' $col>\n";
+				print "<input type='checkbox' NAME='$sid' $ruledefchecked>\n";
+				print "</td>\n";
+				print "<td class='base' width='45%' $col>$idsrules{$rulefile}{$sid}{'Description'}</td>";
+
+				# Increment rule count
+				$lines++;
 			}
 
-			# Create rule checkbox and display rule description
-			print "<td class='base' width='5%' align='right' $col>\n";
-			print "<input type='checkbox' NAME='$sid' $ruledefchecked>\n";
-			print "</td>\n";
-			print "<td class='base' width='45%' $col>$idsrules{$rulefile}{$sid}{'Description'}</td>";
+			# If do not have a second rule for row, create empty cell
+			if (($lines % 2) != 0) {
+				print "<td class='base'></td>";
+			}
 
-			# Increment rule count
-			$lines++;
-		}
+			# Close display table
+			print "</tr></table></td></tr>";
 
-		# If do not have a second rule for row, create empty cell
-		if (($lines % 2) != 0) {
-			print "<td class='base'></td>";
+			# Finished whith the rule file, increase count.
+			$rulesetcount++;
 		}
 
 		# Close display table
-		print "</tr></table></td></tr>";
-
-		# Finished whith the rule file, increase count.
-		$rulesetcount++;
-	}
-
-	# Close display table
-	print "</table>";
+		print "</table>";
 
 print <<END
 <table width='100%'>
@@ -731,7 +734,9 @@ print <<END
 </form>
 END
 ;
-&Header::closebox();
+	&Header::closebox();
+}
+
 &Header::closebigbox();
 &Header::closepage();