snort-dev, more GUI fixes, update help and info page

author: robiscool <robrob2626@yahoo.com> 2010-03-11 02:00:07 -0800
committer: robiscool <robrob2626@yahoo.com> 2010-03-11 02:00:48 -0800
commit: e1dbec3e87eeef66c616653f7226ab2276ff6c16 (patch)
tree: e787fbf8b5b5af0ac5f9436f0043fb980cd99746
parent: c9fcb262f2cd4a5a123fa33f3932d10f020f3735 (diff)
download: pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.tar.gz
pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.tar.bz2
pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.zip
20 files changed, 467 insertions, 76 deletions
diff --git a/config/snort-dev/css/style2.css b/config/snort-dev/css/style2.css
new file mode 100644
index 00000000..cd253de1
--- /dev/null
+++ b/config/snort-dev/css/style2.css
@@ -0,0 +1,111 @@
+/* -----------------------------------
+general
+----------------------------------- */
+
+body
+{
+	margin: 0px;
+	padding: 0px;
+	font: 100%/1.4 helvetica, arial, sans-serif;
+	color: #444;
+	background: #fff;
+}
+
+h1, h2, h3, h4, h5, h6
+{
+	margin: 0 0 1em;
+	line-height: 1.1;
+}
+
+h2, h3 { color: #003d5d; }
+h2 { font-size: 218.75%; }
+
+
+p 
+{
+margin-top: 35pt;
+margin-right: 0pt;
+margin-bottom: -25px;
+margin-left: 0pt;
+text-indent: 25px; 
+}
+
+img { border: none; }
+a:link { color: #035389; }
+a:visited { color: #09619C; }
+
+/* -----------------------------------
+Play Hide the tab
+----------------------------------- */
+
+div.items p:not(:target) {display: none}
+div.items p:target {display: block}
+
+
+/* -----------------------------------
+layout
+----------------------------------- */
+
+#container
+{
+	margin: 0 0px;
+	background: #fff;
+}
+
+#header
+{
+	background: #fff;
+}
+
+#header h1 { margin: 0; }
+
+#navigation
+{
+	float: left;
+	width: 100%;
+	background: #333;
+}
+
+#navigation ul
+{
+	margin: 0;
+	padding: 0;
+}
+
+#navigation ul li
+{
+	list-style-type: none;
+	display: inline;
+}
+
+#navigation li a
+{
+	display: block;
+	float: left;
+	padding: 5px 10px;
+	color: #fff;
+	text-decoration: none;
+	border-right: 1px solid #fff;
+}
+
+#navigation li a:hover 
+{
+	background-color: #3366cc;
+	background-image: none;
+	background-repeat: repeat;
+	background-attachment: scroll;
+	background-position: 0% 0%;
+}
+
+#content
+{
+	clear: left;
+	padding: 20px;
+}
+
+#content h2
+{
+	color: #000;
+	font-size: 160%;
+	margin: 0 0 .5em;
+}
+\ No newline at end of file
diff --git a/config/snort-dev/help_and_info.html b/config/snort-dev/help_and_info.html
index d3875940..1f790257 100644
--- a/config/snort-dev/help_and_info.html
+++ b/config/snort-dev/help_and_info.html
@@ -4,47 +4,86 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Help & Info</title>
 <base target="main">
-<link href="/snort/css/style.css" rel="stylesheet" type="text/css" />
+<script src="./javascript/tabs.js" type="text/javascript"></script>
+<link href="./css/style2.css" rel="stylesheet" type="text/css" />
 </head>
 
-<body class="textstyle">
-<p>&nbsp;About</p>
-<p2>&nbsp;Pfsense <strong>Snort Package</strong> adds network protection from both internal and external threats <br>
-&nbsp;without the expense of proprietary software. The <strong>Snort Package</strong> includes alert monitoring, <br>
-&nbsp;blocked hosts monitoring, whitelists, rule editing/selecting, and auto rule downloads from multiple sources.<br><br>
-
-<strong>&nbsp;* Why should I care about my Network Security</strong><br>
-
-<blockquote>&nbsp;Corporate network attacks have a 50% success rate.&nbsp;</blockquote>
-<blockquote>&nbsp;More than 25% of Home PC's are infected with some spyware.</blockquote><br>
-
-<strong>&nbsp;Snort 2.8.4.1_5 pkg v. 1.8 alpha was code by:</strong><br><br>
-Roberto Zelaya (robiscool)<br><br>
-<strong>&nbsp;Special thanks to:</strong><br><br>
-Scott Ullrich (sullrich) for providing the basic snort code.
-</p2>
-
-<p>&nbsp;Help</p>
-<p2><strong>&nbsp;* Where to ask your questions for the Snort Package</strong><br><br>
-<blockquote>&nbsp;<a href="http://forum.pfsense.org">Pfsense forums</a>&nbsp;</blockquote>
-<blockquote>&nbsp;<a href="http://www.pfsense.org/index.php?option=com_content&task=view&id=66&Itemid=71">Mailing Lists</a>&nbsp;</blockquote>
-<blockquote>&nbsp;<a href="http://forum.pfsense.org/index.php/topic,16847.0.html">Pfsense Snort FAQ</a>&nbsp;</blockquote></p2>
-
-<p>&nbsp;Credits</p>
-<p2>
-
-Pfsense Team for the Core GUI and networking.<br>
-<br>
-
-pfSense is brought to you by a dedicated group of developers who are security and network professionals by trade. The following people are active developers of the pfSense project. Username is listed in parenthesis (generally also the person's forum username, IRC nickname, etc.).<br><br>
-
-Founders<br>
+<body>
+
+<style type="text/css">
+</style>
+
+<div id="container">
+	<div id="header">
+	<IMG SRC="./images/logo.jpg" width="780px" height="76" ALT="Snort Package">
+	</div>
+	<div class="navigation" id="navigation">
+		<ul>
+			<li><a href="#item1" target="_self">Home</a></li>
+			<li><a href="#item2" target="_self">About Me</a></li>
+			<li><a href="#item3" target="_self">Services</a></li>
+			<li><a href="#item4" target="_self">Change Log</a></li>
+			<li><a href="#item7" target="_self">Faq</a></li>
+			<li><a href="#item6" target="_self">Heros</a></li>
+			<li><a href="#item5" target="_self">Developers</a></li>
+		</ul>
+	</div>
+	<br>
+<div class="content" id="item1">
+	<p>
+	<font size="5"><strong>Snort Package</strong></font> is a GUI based front-end for Sourcefire's Snort ® IDS/IPS software. The Snort Package goal is to be
+	the best open-source GUI to manage multiple snort sensors and multiple rule snapshots. The project other goal is to be a highly competitive GUI for
+	network monitoring for both private and enterprise use. Lastly, this project software development should bring programmers and users together to create 
+	software.
+	</p>
+	<p>
+	<font size="5"><strong>What is Snort ?</strong></font> Used by fortune 500 companies and goverments Snort is the most widely deployed IDS/IPS technology worldwide. It features rules based logging and
+    can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port
+    scans, CGI attacks, SMB probes, and much more.
+	</p>
+	<p>
+	<font size="5"><strong>Requirements :</strong></font><br>
+	Minimum requirement 256 mb ram, 500 MHz CPU.<br>
+	Recommended 500 mb ram, 1 Ghz CPU.<br>
+    The more rules you run the more memory you need.<br>
+    The more interfaces you select the more memory you need.<br><br>
+    Development is done on a Alix 2D3 system (500 MHz AMD Geode LX800 CPU 256MB DDR DRAM).
+	</p>
+</div>
+<div class="content" id="item2">
+    <p>
+About Me<br><br>
+Coming soon............
+
+</p>
+</div>
+<div class="content" id="item3">
+    <p>
+Services<br><br>
+Coming soon............
+</p>
+</div>
+<div class="content" id="item4">
+<p>
+Change Log<br><br>
+Coming soon............
+</p>
+</div>
+<div class="content" id="item5">
+<p>
+<font size="5"><strong>PfSense</strong></font> is brought to you by a dedicated group of developers who are security and network professionals by trade. The following people are active developers of the pfSense project. 
+Username is listed in parenthesis (generally also the person's forum username, IRC nickname, etc.).<br><br>
+
+<font size="5"><strong>Main Snort-dev Package Developer</strong></font><br>
+Robert Zelaya<br><br>
+
+<font size="5"><strong>Founders</strong></font><br>
 In alphabetical order<br><br>
 
 Chris Buechler (cmb)<br>
 Scott Ullrich (sullrich)<br><br>
 
-Active Developers<br>
+<font size="5"><strong>Active Developers</strong></font><br>
 Listed in order of seniority along with date of first contribution.<br><br>
 
 Bill Marquette (billm) - February 2005<br>
@@ -60,7 +99,7 @@ Jim Pingle (jim-p) - February 2009<br>
 Rob Zelaya (robiscool) - March 2009<br>
 Renato Botelho (rbgarga) - May 2009<br><br>
 
-FreeBSD Developer Assistance<br>
+<font size="5"><strong>FreeBSD Developer Assistance</strong></font><br>
 We would like to thank the following FreeBSD developers for their assistance.<br><br>
 
 Max Laier (mlaier)<br>
@@ -70,7 +109,7 @@ Bjoern A. Zeeb (bz)<br><br>
 
 among many others who help us directly, and everyone who contributes to FreeBSD.<br><br>
 
-Inactive Developers<br>
+<font size="5"><strong>Inactive Developers</strong></font><br>
 The following individuals are no longer active contributors, having moved on because of other commitments, or employers forbidding contributions. We thank them for their past contributions.<br><br>
 
 Daniel Berlin (dberlin)<br>
@@ -80,10 +119,71 @@ Scott Kamp (dingo)<br>
 Bachman Kharazmi (bkw)<br>
 Fernando Tarlá Cardoso Lemos (fernando)<br>
 Kyle Mott (kyle)<br>
-Colin Smith (colin)<br></p2>
+Colin Smith (colin)<br>
+</p>
+</div>
+<div class="content" id="item6">
+<p>
+Heros<br><br>
+Coming soon............
+</p>
+</div>
+<div class="content" id="item7">
+<p>
+=========================<br>
+
+Q: Do you have a quick install tutorial and tabs explanation.<br>
+
+A: Yes.<br>
+    
+    http://doc.pfsense.org/index.php/Setup_Snort_Package<br>
+
+=========================<br>
+
+Q: What interfaces can snort listen on ?<br>
+
+A: Right now all WAN interfaces and LAN interfaces. But if you select a LAN interface you may need to adjust the snort rules to use the LAN interface.<br>
+    
+==========================<br>
+
+Q: What logs does the snort package keep. ?<br>
+
+A: Most of the snort logs are keept in the /var/log/snort.<br>
+    Snorts syslogs' are saved to the /var/log/snort/snort_sys_0ng0.<br>
+    
+==========================<br>
+
+Q: What is the best Performance setting ? or Snort is using 90% cpu and all my memory.<br>
+
+A: Depends how much memory you have and how many rules you want to run.; lowmem for systems with less than 256 mb memory, ac-bnfa for systems<br>
+   with over 256 mb of memory. The other options are; ac high memory, best performance, ac-std moderate memory, high performance,acs small<br>
+   memory, moderate performance,ac-banded small memory,moderate performance,ac-sparsebands small memory, high performance.<br>
+
+   Short version: For most people ac-bnfa is the best setting.<br>
+
+=========================<br>
+
+Q: What is the Oinkmaster code ? How do I get the code ?<br>
+
+A: The Oinkmaster code is your personal password in order to download snort rules.<br>
+    You get a Oinkmaster code when you register with snort.org. It is free to register.<br>
+    Goto https://www.snort.org/signup to get your personal code.<br>
+    
+=========================<br>
+
+Q: What is the Snort.org subscriber option? How do I become a  Snort.org subscriber?<br>
 
-<p>&nbsp;Thank Yous</p>
+A: Snort.org subscribers get the the latest rule updates 30 days faster than registered users.<br>
+    Goto http://www.snort.org/vrt/buy-a-subscription/.
+    It is highly suggested that you get a paid subscription so that you can always have the latest rules.<br>
+    
+=========================<br>
 
+Q: When did you start working on the snort package.<br>
 
+A: I started working on the snort package in May 2009.<br>
+</p>
+</div>
+</div>
 </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/config/snort-dev/images/footer.jpg b/config/snort-dev/images/footer.jpg
new file mode 100644
index 00000000..0cf9675a
--- /dev/null
+++ b/config/snort-dev/images/footer.jpg
diff --git a/config/snort-dev/images/logo.jpg b/config/snort-dev/images/logo.jpg
new file mode 100644
index 00000000..75abf478
--- /dev/null
+++ b/config/snort-dev/images/logo.jpg
diff --git a/config/snort-dev/javascript/tabs.js b/config/snort-dev/javascript/tabs.js
new file mode 100644
index 00000000..c042d74d
--- /dev/null
+++ b/config/snort-dev/javascript/tabs.js
@@ -0,0 +1,123 @@
+// CSS helper functions
+CSS = {
+    // Adds a class to an element.
+    AddClass: function (e, c) {
+        if (!e.className.match(new RegExp("\\b" + c + "\\b", "i")))
+            e.className += (e.className ? " " : "") + c;
+    },
+
+    // Removes a class from an element.
+    RemoveClass: function (e, c) {
+        e.className = e.className.replace(new RegExp(" \\b" + c + "\\b|\\b" + c + "\\b ?", "gi"), "");
+    }
+};
+
+// Functions for handling tabs.
+Tabs = {
+    // Changes to the tab with the specified ID.
+    GoTo: function (contentId, skipReplace) {
+        // This variable will be true if a tab for the specified
+        // content ID was found.
+        var foundTab = false;
+
+        // Get the TOC element.
+        var toc = document.getElementById("toc");
+        if (toc) {
+            var lis = toc.getElementsByTagName("li");
+            for (var j = 0; j < lis.length; j++) {
+                var li = lis[j];
+
+                // Give the current tab link the class "current" and
+                // remove the class from any other TOC links.
+                var anchors = li.getElementsByTagName("a");
+                for (var k = 0; k < anchors.length; k++) {
+                    if (anchors[k].hash == "#" + contentId) {
+                        CSS.AddClass(li, "current");
+                        foundTab = true;
+                        break;
+                    } else {
+                        CSS.RemoveClass(li, "current");
+                    }
+                }
+            }
+        }
+
+        // Show the content with the specified ID.
+        var divsToHide = [];
+        var divs = document.getElementsByTagName("div");
+        for (var i = 0; i < divs.length; i++) {
+            var div = divs[i];
+
+            if (div.className.match(/\bcontent\b/i)) {
+                if (div.id == "_" + contentId)
+                    div.style.display = "block";
+                else
+                    divsToHide.push(div);
+            }
+        }
+
+        // Hide the other content boxes.
+        for (var i = 0; i < divsToHide.length; i++)
+            divsToHide[i].style.display = "none";
+
+        // Change the address bar.
+        if (!skipReplace) window.location.replace("#" + contentId);
+    },
+
+    OnClickHandler: function (e) {
+        // Stop the event (to stop it from scrolling or
+        // making an entry in the history).
+        if (!e) e = window.event;
+        if (e.preventDefault) e.preventDefault(); else e.returnValue = false;
+
+        // Get the name of the anchor of the link that was clicked.
+        Tabs.GoTo(this.hash.substring(1));
+    },
+
+    Init: function () {
+        if (!document.getElementsByTagName) return;
+
+        // Attach an onclick event to all the anchor links on the page.
+        var anchors = document.getElementsByTagName("a");
+        for (var i = 0; i < anchors.length; i++) {
+            var a = anchors[i];
+            if (a.hash) a.onclick = Tabs.OnClickHandler;
+        }
+
+        var contentId;
+        if (window.location.hash) contentId = window.location.hash.substring(1);
+
+        var divs = document.getElementsByTagName("div");
+        for (var i = 0; i < divs.length; i++) {
+            var div = divs[i];
+
+            if (div.className.match(/\bcontent\b/i)) {
+                if (!contentId) contentId = div.id;
+                div.id = "_" + div.id;
+            }
+        }
+
+        if (contentId) Tabs.GoTo(contentId, true);
+    }
+};
+
+// Hook up the OnLoad event to the tab initialization function.
+window.onload = Tabs.Init;
+
+// Hide the content while waiting for the onload event to trigger.
+var contentId = window.location.hash || "#Introduction";
+
+if (document.createStyleSheet) {
+    var style = document.createStyleSheet();
+    style.addRule("div.content", "display: none;");
+    style.addRule("div" + contentId, "display: block;");
+} else {
+    var head = document.getElementsByTagName("head")[0];
+    if (head) {
+        var style = document.createElement("style");
+        style.setAttribute("type", "text/css");
+        style.appendChild(document.createTextNode("div.content { display: none; }"));
+		style.appendChild(document.createTextNode("div" + contentId + " { display: block; }"));
+        head.appendChild(style);
+    }
+}
+\ No newline at end of file
diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc
index 0bc1223a..4294966f 100644
--- a/config/snort-dev/snort.inc
+++ b/config/snort-dev/snort.inc
@@ -155,6 +155,7 @@ function snort_postinstall()
 	
 	chdir ("/usr/local/www/snort/css/");
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/css/style.css');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/css/style2.css');
 	chdir ("/usr/local/www/snort/images/");
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/alert.jpg');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/down.gif');
@@ -164,11 +165,14 @@ function snort_postinstall()
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/icon-table-sort-desc.png');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/up.gif');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/up2.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/logo.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/footer.jpg');
 	chdir ("/usr/local/www/snort/javascript/");
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/jquery.blockUI.js');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/jquery-1.3.2.js');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/mootools.js');
 	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/sortableTable.js');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/tabs.js');
 	
 	/* back to default */
 	chdir ("/root/");
diff --git a/config/snort-dev/snort.xml b/config/snort-dev/snort.xml
index 39adcf25..6ab6ee7a 100644
--- a/config/snort-dev/snort.xml
+++ b/config/snort-dev/snort.xml
@@ -46,7 +46,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
-	<version>2.8.5.2</version>
+	<version>2.8.5.3</version>
 	<title>Services: Snort 2.8.5.2 pkg v. 1.9</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
diff --git a/config/snort-dev/snort_alerts.php b/config/snort-dev/snort_alerts.php
index 4194f769..453fc765 100644
--- a/config/snort-dev/snort_alerts.php
+++ b/config/snort-dev/snort_alerts.php
@@ -36,6 +36,7 @@
 
 require("globals.inc");
 require("guiconfig.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 $snortalertlogt = $config['installedpackages']['snortglobal']['snortalertlogtype'];
 $snort_logfile = '/var/log/snort/alert';
@@ -312,6 +313,10 @@ include("head.inc");
 
 include("fbegin.inc");
 
+echo "<p class=\"pgtitle\">";
+if($pfsense_stable == 'yes'){echo $pgtitle;}
+echo "</p>\n";
+
 /* refresh every 60 secs */
 if ($pconfig['arefresh'] == 'on' || $pconfig['arefresh'] == '')
 {
@@ -333,7 +338,6 @@ if ($pconfig['arefresh'] == 'on' || $pconfig['arefresh'] == '')
 ?>
 </td>
 </tr>
-	<br>
 	<tr>
 	<td>
 	<div id="mainarea">
diff --git a/config/snort-dev/snort_barnyard.php b/config/snort-dev/snort_barnyard.php
index 0e0bbf33..10afa183 100644
--- a/config/snort-dev/snort_barnyard.php
+++ b/config/snort-dev/snort_barnyard.php
@@ -39,6 +39,7 @@ Important add error checking
 */
 
 require("guiconfig.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
 	$config['installedpackages']['snortglobal']['rule'] = array();
@@ -229,6 +230,7 @@ include("head.inc");
 <?php 
 include("fbegin.inc");
 ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <style type="text/css">
 .alert {
  position:absolute;
@@ -288,7 +290,6 @@ if($id != "")
 ?>
 </td>
 </tr>
-				<br>
 				<tr>
 				<td class="tabcont">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/config/snort-dev/snort_blocked.php b/config/snort-dev/snort_blocked.php
index 6f3b9521..005e8033 100644
--- a/config/snort-dev/snort_blocked.php
+++ b/config/snort-dev/snort_blocked.php
@@ -31,6 +31,7 @@
 */
 
 require("guiconfig.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 $pconfig['brefresh'] = $config['installedpackages']['snortglobal']['alertsblocks']['brefresh'];
 $pconfig['blertnumber'] = $config['installedpackages']['snortglobal']['alertsblocks']['blertnumber'];
@@ -233,6 +234,10 @@ include("head.inc");
 
 include("fbegin.inc");
 
+echo "<p class=\"pgtitle\">";
+if($pfsense_stable == 'yes'){echo $pgtitle;}
+echo "</p>\n";
+
 /* refresh every 60 secs */
 if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '')
 {
@@ -259,7 +264,6 @@ if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '')
 ?>
 	</td>
 	</tr>
-		<br>
 		<tr>
 		<td>
 		<div id="mainarea">
diff --git a/config/snort-dev/snort_define_servers.php b/config/snort-dev/snort_define_servers.php
index 5b32f554..a2cafc05 100644
--- a/config/snort-dev/snort_define_servers.php
+++ b/config/snort-dev/snort_define_servers.php
@@ -39,6 +39,7 @@ Important add error checking
 */
 
 require("guiconfig.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
 	$config['installedpackages']['snortglobal']['rule'] = array();
@@ -219,6 +220,7 @@ include("head.inc");
 <?php 
 include("fbegin.inc");
 ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <style type="text/css">
 .alert {
  position:absolute;
@@ -258,7 +260,6 @@ if($id != "")
 ?>
 </td>
 </tr>
-				<br>
 				<tr>
 				<td class="tabcont">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/config/snort-dev/snort_download_rules.php b/config/snort-dev/snort_download_rules.php
index 4086f2d3..9eca60be 100644
--- a/config/snort-dev/snort_download_rules.php
+++ b/config/snort-dev/snort_download_rules.php
@@ -77,11 +77,13 @@ $emergingthreats = $config['installedpackages']['snortglobal']['emergingthreats'
 /* If no id show the user a button */	
 if ($id_d == "" || $snort_emrging_info == "stop" || $snort_oinkid_info == "stop") {
 
-$pgtitle = "Services: Snort: Update Rules";
+$pgtitle = "Services: Snort: Rule Updates";
 
 include("head.inc");
 include("fbegin.inc");
-
+echo "<p class=\"pgtitle\">";
+if($pfsense_stable == 'yes'){echo $pgtitle;}
+echo "</p>\n";
 /* make sure user has javascript on */
 echo "<style type=\"text/css\">
 .alert {
@@ -218,8 +220,7 @@ setTimeout($.unblockUI, 2000);
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("/usr/local/www/fbegin.inc"); ?>
-
-
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 
 <form action="snort_download_rules.php" method="post">
 <div id="inputerrors"></div>
diff --git a/config/snort-dev/snort_help_info.php b/config/snort-dev/snort_help_info.php
index 754a82e3..ce3d1948 100644
--- a/config/snort-dev/snort_help_info.php
+++ b/config/snort-dev/snort_help_info.php
@@ -34,14 +34,38 @@
 
 require("guiconfig.inc");
 
-
 header("snort_help_info.php");
+header( "Expires: Mon, 20 Dec 1998 01:00:00 GMT" );
+header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" );
+header( "Cache-Control: no-cache, must-revalidate" );
+header( "Pragma: no-cache" );
 
 $pgtitle = "Snort: Services: Help and Info";
 include('head.inc');
 ?>
+<style type="text/css">
+iframe
+{
+	border: 0;
+}
+
+#footer2
+{
+	position: relative;
+	top: -2px;
+	background-color: #cccccc;
+	background-image: none;
+	background-repeat: repeat;
+	background-attachment: scroll;
+	background-position: 0% 0%;
+	padding-top: 0px;
+	padding-right: 0px;
+	padding-bottom: 0px;
+	padding-left: 0px;
+}
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+</style>
+<body>
 <?php include("fbegin.inc"); ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -60,12 +84,24 @@ include('head.inc');
 ?>
     </td>
 </tr>
-	<td>
-	<iFrame src='/snort/help_and_info.html' frameborder=0 width=780px height=600px name='name' marginheight=0 marginwidth=0 scrolling=on></iFrame>
-	</td>
-
 </table>
+<div>
+	<iframe style="width: 780px; height: 600px; overflow-x: hidden;" src='/snort/help_and_info.html'></iframe>
+</div>
+</div>
+	<div id="footer2">
+		<IMG SRC="./images/footer.jpg" width="780px" height="63" ALT="Apps">
+			<font size="1">Snort� is a registered trademark of Sourcefire, Inc., Barnyard2� is a registered trademark of securixlive.com., Orion� copyright Robert Zelaya., 
+			Emergingthreats is a registered trademark of emergingthreats.net., Mysql� is a registered trademark of Mysql.com.</font>
+	</div>
+</div>
+        <div id="footer">
+			<a target="_blank" href="http://www.pfsense.org/?gui12" class="redlnk">pfSense</a> is &copy;
+			 2004 - 2009 by <a href="http://www.bsdperimeter.com" class="tblnk">BSD Perimeter LLC</a>. All Rights Reserved.
+			<a href="/license.php" class="tblnk">view license</a>]
+			<br/>
 
-<?php include("fend.inc"); ?>
+			<a target="_blank" href="https://portal.pfsense.org/?guilead=true" class="tblnk">Commercial Support Available</a>
+		</div> <!-- Footer DIV -->
 </body>
 </html>
diff --git a/config/snort-dev/snort_interfaces.php b/config/snort-dev/snort_interfaces.php
index 04627064..e5b42e4d 100644
--- a/config/snort-dev/snort_interfaces.php
+++ b/config/snort-dev/snort_interfaces.php
@@ -31,7 +31,7 @@
 
 require("guiconfig.inc");
 require("/usr/local/pkg/snort/snort_gui.inc");
-include_once("/usr/local/pkg/snort/snort.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 $id = $_GET['id'];
 if (isset($_POST['id']))
@@ -178,12 +178,13 @@ if ($_GET['act'] == "toggle" && $_GET['id'] != "")
 	header("Location: snort_interfaces.php");
 }	
 
-$pgtitle = "Services: Snort 2.8.5.2 pkg v. 1.9";
+$pgtitle = "Services: Snort 2.8.5.3 pkg v. 1.10 Alpha";
 include("head.inc");
 
 ?>
 <body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <style type="text/css">
 .alert {
  position:absolute;
@@ -218,12 +219,6 @@ padding: 15px 10px 50% 50px;
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
-.listt4 {
-
-font-size: 11px;
-padding-right :15px;
-padding-left :15px;
-}
 </style> 
 <noscript><div class="alert" ALIGN=CENTER><img src="../themes/nervecenter/images/icons/icon_alert.gif"/><strong>Please enable JavaScript to view this content</CENTER></div></noscript>
 
@@ -252,7 +247,6 @@ padding-left :15px;
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
-	<br>
 	<tr>
 	<td>
 	<div id="mainarea">
diff --git a/config/snort-dev/snort_interfaces_edit.php b/config/snort-dev/snort_interfaces_edit.php
index 1a02715c..9d2301f0 100644
--- a/config/snort-dev/snort_interfaces_edit.php
+++ b/config/snort-dev/snort_interfaces_edit.php
@@ -300,7 +300,7 @@ if ($_POST["Submit"]) {
 		}
 
 $ifname = strtoupper($pconfig['interface']);
-$pgtitle = "Snort: Interface: {$ifname} Settings Edit";
+$pgtitle = "Snort: Interface: $id$if_real Settings Edit";
 include("head.inc");
 
 ?>
@@ -308,6 +308,7 @@ include("head.inc");
 <?php 
 include("fbegin.inc");
 ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <style type="text/css">
 .alert {
  position:absolute;
@@ -409,7 +410,6 @@ if($id != "")
 ?>
 </td>
 </tr>
-				<br>
 				<tr>
 				<td class="tabcont">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/config/snort-dev/snort_interfaces_global.php b/config/snort-dev/snort_interfaces_global.php
index 36a56015..2611e5c5 100644
--- a/config/snort-dev/snort_interfaces_global.php
+++ b/config/snort-dev/snort_interfaces_global.php
@@ -32,7 +32,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = "Services:[Snort][Global Settings]";
+$pgtitle = "Services: Snort: Global Settings";
 require("guiconfig.inc");
 require("/usr/local/pkg/snort/snort.inc");
 
@@ -139,6 +139,7 @@ if ($_POST) {
 include("head.inc");
 ?>
 <?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
@@ -157,7 +158,6 @@ include("head.inc");
 	$tab_array[] = array("Help & Info", false, "/snort/snort_help_info.php");
 	display_top_tabs($tab_array);
 ?>    </td></tr>
-<br>
 <tr>
 <td class="tabcont">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/config/snort-dev/snort_preprocessors.php b/config/snort-dev/snort_preprocessors.php
index f4462499..0227735c 100644
--- a/config/snort-dev/snort_preprocessors.php
+++ b/config/snort-dev/snort_preprocessors.php
@@ -39,6 +39,7 @@ Important add error checking
 */
 
 require("guiconfig.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
 	$config['installedpackages']['snortglobal']['rule'] = array();
@@ -221,6 +222,7 @@ include("head.inc");
 <?php 
 include("fbegin.inc");
 ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <style type="text/css">
 .alert {
  position:absolute;
@@ -260,7 +262,6 @@ if($id != "")
 ?>
 </td>
 </tr>
-				<br>
 				<tr>
 				<td class="tabcont">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/config/snort-dev/snort_rules.php b/config/snort-dev/snort_rules.php
index c08aea50..7a5a0cce 100644
--- a/config/snort-dev/snort_rules.php
+++ b/config/snort-dev/snort_rules.php
@@ -30,6 +30,7 @@
 require("guiconfig.inc");
 require("config.inc");
 require("/usr/local/pkg/snort/snort_gui.inc");
+require("/usr/local/pkg/snort/snort.inc");
 
 if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
 	$config['installedpackages']['snortglobal']['rule'] = array();
@@ -399,13 +400,18 @@ if ($_GET['saved'] == 'yes')
 $currentruleset = basename($rulefile);
 
 $ifname = strtoupper($pconfig['interface']);
-$pgtitle = "Snort: Interface $ifname Rule File $currentruleset";
+
 require("guiconfig.inc");
 include("head.inc");
+
+$pgtitle = "Snort: Interface $id$if_real Rule Category: $currentruleset";
+
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
+
 <?php
 echo "<form action=\"snort_rules.php?id={$id}\" method=\"post\" name=\"iform\" id=\"iform\">";
 ?>
@@ -463,7 +469,6 @@ function popup(url)
 ?>
 	</td>
 	</tr>
-	<br>
 	<tr>
 	<td>
         <div id="mainarea">
diff --git a/config/snort-dev/snort_rulesets.php b/config/snort-dev/snort_rulesets.php
index 2edfdde4..3c99e608 100644
--- a/config/snort-dev/snort_rulesets.php
+++ b/config/snort-dev/snort_rulesets.php
@@ -31,6 +31,9 @@
 require("guiconfig.inc");
 require_once("filter.inc");
 require_once("service-utils.inc");
+include_once("/usr/local/pkg/snort/snort.inc");
+
+$pgtitle = "Snort: Interface $id$if_real Categories";
 
 if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
 	$config['installedpackages']['snortglobal']['rule'] = array();
@@ -65,6 +68,10 @@ if ($isrulesfolderempty == "") {
 include("head.inc");
 include("fbegin.inc");
 
+echo "<p class=\"pgtitle\">";
+if($pfsense_stable == 'yes'){echo $pgtitle;}
+echo "</p>\n";
+
 echo "<body link=\"#000000\" vlink=\"#000000\" alink=\"#000000\">";
 
 echo "<script src=\"/row_toggle.js\" type=\"text/javascript\"></script>\n
@@ -140,13 +147,13 @@ $enabled_rulesets = $a_nat[$id]['rulesets'];
 if($enabled_rulesets)
 	$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
 
-$pgtitle = "Snort: Interface $id$if_real Categories";
 include("head.inc");
 
 ?>
 
 <body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?if($pfsense_stable == 'yes'){echo $pgtitle;}?></p>
 <?php
 
 echo "<form action=\"snort_rulesets.php?id={$id}\" method=\"post\" name=\"iform\" id=\"iform\">";
@@ -172,7 +179,6 @@ echo "<form action=\"snort_rulesets.php?id={$id}\" method=\"post\" name=\"iform\
 ?>
 	</td>
 	</tr>
-		<br>
 		<tr>
 		<td>
 		<div id="mainarea">
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 34189224..0dd05974 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -339,7 +339,7 @@
       <name>snort-dev</name>
 	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
       <website>http://www.snort.org</website>
-      <descr>WARNING: This is the Snort-dev branch and is unstable. Please post package version on the forums. Revert back to alpha.</descr>
+      <descr>WARNING: This is the Snort-dev branch and maybe broken while in development. Please post package version and Pfsense Version on the forums when posting bugs.</descr>
       <category>Security</category>
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort-dev/bin/7.2.x86/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.00.tbz</depends_on_package>
@@ -347,11 +347,11 @@
       <depends_on_package>mysql-client-5.1.44_1.tbz</depends_on_package>
 	  <depends_on_package>snort-2.8.5.3.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file>
-      <version>2.8.5.3 pkg v. 1.9</version>
+      <version>2.8.5.3 pkg v. 1.10</version>
       <required_version>1.2.3</required_version>
       <status>alpha</status>
       <configurationfile>/snort.xml</configurationfile>
-	  <after_install_info>This is the Snort-dev branch and is stable as of RC3.</after_install_info>
+	  <after_install_info>This is the Snort-dev branch and is stable as of Alpha.</after_install_info>
     </package>
     <package>
       <name>siproxd</name>
author	robiscool <robrob2626@yahoo.com>	2010-03-11 02:00:07 -0800
committer	robiscool <robrob2626@yahoo.com>	2010-03-11 02:00:48 -0800
commit	e1dbec3e87eeef66c616653f7226ab2276ff6c16 (patch)
tree	e787fbf8b5b5af0ac5f9436f0043fb980cd99746
parent	c9fcb262f2cd4a5a123fa33f3932d10f020f3735 (diff)
download	pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.tar.gz pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.tar.bz2 pfsense-packages-e1dbec3e87eeef66c616653f7226ab2276ff6c16.zip