From 080fb922c15c959be4f0bd101d0cf3f529f0e866 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Mon, 13 May 2013 16:58:53 -0400
Subject: Snort Pkg 2.5.8 Update - bug fixes and new features

---
 config/snort/snort_interfaces_suppress_edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config/snort/snort_interfaces_suppress_edit.php')

diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 782b9784..1d2ad225 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -58,7 +58,7 @@ function is_validwhitelistname($name) {
 	if (!is_string($name))
 		return false;
 
-	if (!preg_match("/[^a-zA-Z0-9\.\/]/", $name))
+	if (!preg_match("/[^a-zA-Z0-9\_\.\/]/", $name))
 		return true;
 
 	return false;
@@ -88,7 +88,7 @@ if ($_POST['submit']) {
 		$input_errors[] = "Whitelist file names may not be named defaultwhitelist.";
 
 	if (is_validwhitelistname($_POST['name']) == false)
-		$input_errors[] = "Whitelist file name may only consist of the characters a-z, A-Z and 0-9 _. Note: No Spaces. Press Cancel to reset.";
+		$input_errors[] = "Whitelist file name may only consist of the characters \"a-z, A-Z, 0-9 and _\". Note: No Spaces or dashes. Press Cancel to reset.";
 
 	/* check for name conflicts */
 	foreach ($a_suppress as $s_list) {
@@ -151,8 +151,8 @@ if ($savemsg)
 	<td width="78%" class="vtable"><input name="name" type="text" id="name"
 		class="formfld unkown" size="40" value="<?=htmlspecialchars($pconfig['name']);?>" /> <br />
 	<span class="vexpl"> <?php echo gettext("The list name may only consist of the " .
-	"characters a-z, A-Z and 0-9."); ?> <span class="red"><?php echo gettext("Note:"); ?> </span>
-	<?php echo gettext("No Spaces."); ?> </span></td>
+	"characters \"a-z, A-Z, 0-9 and _\"."); ?>&nbsp;&nbsp;<span class="red"><?php echo gettext("Note:"); ?> </span>
+	<?php echo gettext("No Spaces or dashes."); ?> </span></td>
 </tr>
 <tr>
 	<td width="22%" valign="top" class="vncell"><?php echo gettext("Description"); ?></td>
-- 
cgit v1.2.3


From 1ef295d754f838935412ddefc8d5fa00c51bcc1c Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Tue, 14 May 2013 00:38:49 -0300
Subject: snort - (re)include two level menu and change start stop icons to
 toggle status as well show current snort status

---
 config/snort/snort_interfaces_suppress_edit.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'config/snort/snort_interfaces_suppress_edit.php')

diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 1d2ad225..0042863c 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -141,6 +141,20 @@ if ($savemsg)
 ?>
 <form action="/snort/snort_interfaces_suppress_edit.php" name="iform" id="iform" method="post">
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+<?php
+        $tab_array = array();
+        $tab_array[0] = array(gettext("Snort Interfaces"), false, "/snort/snort_interfaces.php");
+        $tab_array[1] = array(gettext("Global Settings"), false, "/snort/snort_interfaces_global.php");
+        $tab_array[2] = array(gettext("Updates"), false, "/snort/snort_download_updates.php");
+        $tab_array[3] = array(gettext("Alerts"), false, "/snort/snort_alerts.php");
+        $tab_array[4] = array(gettext("Blocked"), false, "/snort/snort_blocked.php");
+        $tab_array[5] = array(gettext("Whitelists"), false, "/snort/snort_interfaces_whitelist.php");
+        $tab_array[6] = array(gettext("Suppress"), true, "/snort/snort_interfaces_suppress.php");
+        $tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=/snort/snort_sync.xml");
+        display_top_tabs($tab_array);
+?>
+</td></tr>
 <tr><td class="tabcont">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
 <tr>
-- 
cgit v1.2.3


From e8f8b0ab273baa1d772ec914c51e242c3ff22f56 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Wed, 22 May 2013 12:20:35 -0400
Subject: Fix various HTML style issues to tidy up GUI.

---
 config/snort/snort_interfaces_suppress_edit.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'config/snort/snort_interfaces_suppress_edit.php')

diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 0042863c..5e12f656 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -155,8 +155,8 @@ if ($savemsg)
         display_top_tabs($tab_array);
 ?>
 </td></tr>
-<tr><td class="tabcont">
-<table width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr><td><div id="mainarea">
+<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
 <tr>
 	<td colspan="2" class="listtopic">Add the name and description of the file.</td>
 </tr>
@@ -219,6 +219,7 @@ if ($savemsg)
 	</td>
 </tr>
 </table>
+</div>
 </td></tr>
 </table>
 </form>
-- 
cgit v1.2.3