From e88d8c9a13c12769dc2420a02de073f3f4627214 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Thu, 24 Apr 2014 15:07:08 -0400
Subject: Implement blocking function support in Suricata pkg GUI.

---
 config/suricata/suricata_global.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/suricata/suricata_global.php')

diff --git a/config/suricata/suricata_global.php b/config/suricata/suricata_global.php
index 938d6a97..07638b97 100644
--- a/config/suricata/suricata_global.php
+++ b/config/suricata/suricata_global.php
@@ -168,10 +168,12 @@ if ($input_errors)
         $tab_array[] = array(gettext("Global Settings"), true, "/suricata/suricata_global.php");
 	$tab_array[] = array(gettext("Update Rules"), false, "/suricata/suricata_download_updates.php");
 	$tab_array[] = array(gettext("Alerts"), false, "/suricata/suricata_alerts.php");
+	$tab_array[] = array(gettext("Blocked"), false, "/suricata/suricata_blocked.php");
+	$tab_array[] = array(gettext("Pass Lists"), false, "/suricata/suricata_passlist.php");
 	$tab_array[] = array(gettext("Suppress"), false, "/suricata/suricata_suppress.php");
 	$tab_array[] = array(gettext("Logs Browser"), false, "/suricata/suricata_logs_browser.php");
 	$tab_array[] = array(gettext("Logs Mgmt"), false, "/suricata/suricata_logs_mgmt.php");
-        display_top_tabs($tab_array);
+        display_top_tabs($tab_array, true);
 ?>
 </td></tr>
 <tr>
-- 
cgit v1.2.3


From 1ecb4c1fcc9ec6c125817e689e2b14076391b4af Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Sun, 27 Apr 2014 12:10:39 -0400
Subject: Enabled "rm_blocked" cron job to clear blocked hosts.

---
 config/suricata/suricata_global.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'config/suricata/suricata_global.php')

diff --git a/config/suricata/suricata_global.php b/config/suricata/suricata_global.php
index 07638b97..a780cb89 100644
--- a/config/suricata/suricata_global.php
+++ b/config/suricata/suricata_global.php
@@ -124,7 +124,7 @@ if (!$input_errors) {
 
 		$retval = 0;
 
-		/* create whitelist and homenet file, then sync files */
+		/* create passlist and homenet file, then sync files */
 		sync_suricata_package_config();
 
 		write_config();
@@ -306,18 +306,18 @@ if ($input_errors)
 <tr>
 	<td colspan="2" valign="top" class="listtopic"><?php echo gettext("General Settings"); ?></td>
 </tr>
-<tr style="display:none;">
+<tr>
 	<td width="22%" valign="top" class="vncell"><?php echo gettext("Remove Blocked Hosts Interval"); ?></td>
 	<td width="78%" class="vtable">
 		<select name="rm_blocked" class="formselect" id="rm_blocked">
 		<?php
 		$interfaces3 = array('never_b' => gettext('NEVER'), '15m_b' => gettext('15 MINS'), '30m_b' => gettext('30 MINS'), '1h_b' => gettext('1 HOUR'), '3h_b' => gettext('3 HOURS'), '6h_b' => gettext('6 HOURS'), '12h_b' => gettext('12 HOURS'), '1d_b' => gettext('1 DAY'), '4d_b' => gettext('4 DAYS'), '7d_b' => gettext('7 DAYS'), '28d_b' => gettext('28 DAYS'));
 		foreach ($interfaces3 as $iface3 => $ifacename3): ?>
-		<option value="<?=$iface3;?>"
-		<?php if ($iface3 == $pconfig['rm_blocked']) echo "selected"; ?>>
-			<?=htmlspecialchars($ifacename3);?></option>
-			<?php endforeach; ?>
-	</select>&nbsp;
+			<option value="<?=$iface3;?>"
+			<?php if ($iface3 == $pconfig['rm_blocked']) echo "selected"; ?>>
+				<?=htmlspecialchars($ifacename3);?></option>
+		<?php endforeach; ?>
+		</select>&nbsp;
 	<?php echo gettext("Please select the amount of time you would like hosts to be blocked."); ?><br/><br/>
 	<?php echo "<span class=\"red\"><strong>" . gettext("Hint:") . "</strong></span>" . gettext(" in most cases, 1 hour is a good choice.");?></td>
 </tr>
-- 
cgit v1.2.3