From 406485d95d07795651d43cb7fba5c430e2e1fc22 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Sun, 22 Jul 2012 15:09:49 +0000
Subject: If general rules are missing show configured rules

---
 config/snort/snort_rulesets.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index a3d41762..3d6de228 100644
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -177,7 +177,8 @@ if ($savemsg) {
 	<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php 
 	$isrulesfolderempty = glob("{$snortdir}/rules/*.rules");
-	if (empty($isrulesfolderempty)):
+	$iscfgdirempty = glob("{$snortdir}/snort_{$snort_uuid}_{$if_real}/rules/*.rules");
+	if (empty($isrulesfolderempty) && empty($iscfgdirempty)):
 ?>
 		<tr>
 			<td>
@@ -226,7 +227,10 @@ if ($savemsg) {
 				$emergingrules = array();
 				$snortsorules = array();
 				$snortrules = array();
-				$dh  = opendir("{$snortdir}/rules/");
+				if (empty($isrulesfolderempty))
+					$dh  = opendir("{$snortdir}/snort_{$snort_uuid}_{$if_real}/rules/");
+				else
+					$dh  = opendir("{$snortdir}/rules/");
 				while (false !== ($filename = readdir($dh))) {
 					$filename = basename($filename);
 					if (substr($filename, -5) != "rules")
-- 
cgit v1.2.3