snort, correct line endings, finx cron loglimit code

1 files changed, 428 insertions, 439 deletions

diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php
index dc093015..d9652eb3 100644
--- a/config/snort/snort_download_rules.php
+++ b/config/snort/snort_download_rules.php
@@ -1,32 +1,32 @@
 <?php
 /* $Id$ */
 /*
-	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich
-	Copyright (C) 2009 Robert Zelaya
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
+ snort_rulesets.php
+ Copyright (C) 2006 Scott Ullrich
+ Copyright (C) 2009 Robert Zelaya
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
 
 /* Setup enviroment */
 
@@ -48,7 +48,7 @@ $pfsense_rules_filename = "pfsense_rules.tar.gz";
 
 $id_d = $_GET['id_d'];
 if (isset($_POST['id_d']))
-	$id_d = $_POST['id_d'];
+$id_d = $_POST['id_d'];
 
 /*  Time stamps define */
 $last_md5_download = $config['installedpackages']['snortglobal']['last_md5_download'];
@@ -59,26 +59,26 @@ $oinkid = $config['installedpackages']['snortglobal']['oinkmastercode'];
 $snortdownload = $config['installedpackages']['snortglobal']['snortdownload'];
 $emergingthreats = $config['installedpackages']['snortglobal']['emergingthreats'];
 
-	if ($snortdownload == 'off' && $emergingthreats != 'on')
-	{
-		$snort_emrging_info = 'stop';
-	}
+if ($snortdownload == 'off' && $emergingthreats != 'on')
+{
+	$snort_emrging_info = 'stop';
+}
 
-	if ($oinkid == "" && $snortdownload != 'off')
-	{
-		$snort_oinkid_info = 'stop';
-	}
+if ($oinkid == "" && $snortdownload != 'off')
+{
+	$snort_oinkid_info = 'stop';
+}
+
+
+/* check if main rule directory is empty */
+$if_mrule_dir = "/usr/local/etc/snort/rules";
+$mfolder_chk = (count(glob("$if_mrule_dir/*")) === 0) ? 'empty' : 'full';
 
-	
-	/* check if main rule directory is empty */
-	$if_mrule_dir = "/usr/local/etc/snort/rules";
-	$mfolder_chk = (count(glob("$if_mrule_dir/*")) === 0) ? 'empty' : 'full';
-	
 
 if (file_exists('/var/run/snort.conf.dirty')) {
 	$snort_dirty_d = 'stop';
 }
-	
+
 $pgtitle = "Services: Snort: Update Rules";
 
 include("/usr/local/pkg/snort/snort_head.inc");
@@ -92,81 +92,72 @@ include("/usr/local/pkg/snort/snort_head.inc");
 <?php //include("./snort_fbegin.inc"); ?>
 
 
-<div id="wrapper" style="top:200px">
-	<div id="content">
-		<div id="right" style="min-height:200px">
-
-<br>
-
-<!-- after fbegin -->
+<div id="wrapper" style="top: 200px">
+<div id="content">
+<div id="right" style="min-height: 200px"><br>
 
-<?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
+<!-- after fbegin --> <?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
 
 <form action="./snort_testing.php" method="post">
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr>
-    <td>
-
-</td>
-</tr>
-		<br>
-		<tr>
+	<tr>
+		<td></td>
+	</tr>
+	<br>
+	<tr>
 		<td>
-              <div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-                <tr>
-                  <td align="center" valign="top">
-                      <!-- progress bar -->
-                      <table id="progholder" width='420' style='border-collapse: collapse; border: 1px solid #000000;' cellpadding='2' cellspacing='2'>
-                  <tr>
-                    <td>
-                      <img border='0' src='../themes/<?= $g['theme']; ?>/images/misc/progress_bar.gif' width='280' height='23' name='progressbar' id='progressbar' alt='' />
-                    </td>
-                  </tr>
-                </table>
-                      <br />
-                      <!-- status box -->
-                      <textarea cols="60" rows="2" name="status" id="status" wrap="hard">
-                      <?=gettext("Initializing...");?>
-                      </textarea>
-                      <!-- command output box -->
-                      <textarea cols="60" rows="2" name="output" id="output" wrap="hard">
-                      </textarea>
-                  </td>
-                </tr>
-              </table>
-              </div>
-          </td>
-        </tr>
+		<div id="mainarea">
+		<table class="tabcont" width="100%" border="0" cellpadding="6"
+			cellspacing="0">
+			<tr>
+				<td align="center" valign="top"><!-- progress bar -->
+				<table id="progholder" width='420'
+					style='border-collapse: collapse; border: 1px solid #000000;'
+					cellpadding='2' cellspacing='2'>
+					<tr>
+						<td><img border='0'
+							src='../themes/<?= $g['theme']; ?>/images/misc/progress_bar.gif'
+							width='280' height='23' name='progressbar' id='progressbar'
+							alt='' /></td>
+					</tr>
+				</table>
+				<br />
+				<!-- status box --> <textarea cols="60" rows="2" name="status"
+					id="status" wrap="hard">
+					<?=gettext("Initializing...");?>
+                      </textarea> <!-- command output box --> <textarea
+					cols="60" rows="2" name="output" id="output" wrap="hard">
+                      </textarea></td>
+			</tr>
+		</table>
+		</div>
+		</td>
+	</tr>
 </table>
 <form>
 
 <style type="text/css">
-
 #footer {
-position: relative;
-background-color: transparent;
-background-repeat: no-repeat;
-background-attachment: scroll;
-background-position: 0% 0%;
-top: -18px;
-left: 0px;
-width: 810px;
-height: 75px;
-color: #ffffff;
-text-align: center;
-font-size: 0.9em;
-padding-top: 0px;
-margin-bottom: 0px;
-clear: both;
+	position: relative;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
+	background-position: 0% 0%;
+	top: -18px;
+	left: 0px;
+	width: 810px;
+	height: 75px;
+	color: #ffffff;
+	text-align: center;
+	font-size: 0.9em;
+	padding-top: 0px;
+	margin-bottom: 0px;
+	clear: both;
 }
-
 </style>
 
-<?php include("fend.inc");?>
-
-<?php
+<?php include("fend.inc");?> <?php
 
 /* Start of code */
 /* Begin main code */
@@ -196,8 +187,8 @@ conf_mount_rw();
 
 /*  remove old $tmpfname files */
 if (file_exists("{$tmpfname}")) {
-    update_status(gettext("Removing old tmp files..."));
-    exec("/bin/rm -r {$tmpfname}");
+	update_status(gettext("Removing old tmp files..."));
+	exec("/bin/rm -r {$tmpfname}");
 	apc_clear_cache();
 }
 
@@ -213,9 +204,9 @@ conf_mount_rw();
 
 /* If tmp dir does not exist create it */
 if (file_exists($tmpfname)) {
-    update_status(gettext("The directory tmp exists..."));
+	update_status(gettext("The directory tmp exists..."));
 } else {
-    mkdir("{$tmpfname}", 700);
+	mkdir("{$tmpfname}", 700);
 }
 
 /* unhide progress bar and lets end this party */
@@ -227,12 +218,12 @@ unhide_progress_bar_status();
 if ($snortdownload == 'on')
 {
 	if (file_exists("{$tmpfname}/{$snort_filename_md5}") &&
-	    filesize("{$tmpfname}/{$snort_filename_md5}") > 0) {
+	filesize("{$tmpfname}/{$snort_filename_md5}") > 0) {
 		update_status(gettext("snort.org md5 temp file exists..."));
 	} else {
 		update_status(gettext("Downloading snort.org md5 file..."));
 		ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-		
+
 		//$image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename_md5}");
 		$image = @file_get_contents("http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename_md5}");
 		$f = fopen("{$tmpfname}/{$snort_filename_md5}", 'w');
@@ -245,28 +236,28 @@ if ($snortdownload == 'on')
 /*  download md5 sig from emergingthreats.net */
 if ($emergingthreats == "on")
 {
-		update_status(gettext("Downloading emergingthreats md5 file..."));
-		ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-		// $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/version.txt");
-		$image = @file_get_contents("http://www.emergingthreats.net/version.txt");
-		$f = fopen("{$tmpfname}/version.txt", 'w');
-		fwrite($f, $image);
-		fclose($f);
-		update_status(gettext("Done downloading emergingthreats md5"));
+	update_status(gettext("Downloading emergingthreats md5 file..."));
+	ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
+	// $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/version.txt");
+	$image = @file_get_contents("http://www.emergingthreats.net/version.txt");
+	$f = fopen("{$tmpfname}/version.txt", 'w');
+	fwrite($f, $image);
+	fclose($f);
+	update_status(gettext("Done downloading emergingthreats md5"));
 }
 
 /*  download md5 sig from pfsense.org */
 if (file_exists("{$tmpfname}/{$pfsense_rules_filename_md5}")) {
-    update_status(gettext("pfsense md5 temp file exists..."));
+	update_status(gettext("pfsense md5 temp file exists..."));
 } else {
-    update_status(gettext("Downloading pfsense md5 file..."));
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
+	update_status(gettext("Downloading pfsense md5 file..."));
+	ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 	//$image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz.md5");
-    $image = @file_get_contents("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz.md5");
-    $f = fopen("{$tmpfname}/pfsense_rules.tar.gz.md5", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    update_status(gettext("Done downloading pfsense md5."));
+	$image = @file_get_contents("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz.md5");
+	$f = fopen("{$tmpfname}/pfsense_rules.tar.gz.md5", 'w');
+	fwrite($f, $image);
+	fclose($f);
+	update_status(gettext("Done downloading pfsense md5."));
 }
 
 /* If md5 file is empty wait 15min exit */
@@ -279,9 +270,9 @@ if ($snortdownload == 'on')
 		hide_progress_bar_status();
 		/* Display last time of sucsessful md5 check from cache */
 		echo "\n\n</body>\n</html>\n";
-echo "</body>";
-echo "</html>";
-conf_mount_ro();
+		echo "</body>";
+		echo "</html>";
+		conf_mount_ro();
 		exit(0);
 	}
 }
@@ -290,15 +281,15 @@ conf_mount_ro();
 
 /* If pfsense md5 file is empty wait 15min exit */
 if (0 == filesize("{$tmpfname}/$pfsense_rules_filename_md5")){
-    update_status(gettext("Please wait... You may only check for New Pfsense Rules every 15 minutes..."));
-    update_output_window(gettext("Rules are released to support Pfsense packages."));
-    hide_progress_bar_status();
-    /* Display last time of sucsessful md5 check from cache */
-    echo "\n\n</body>\n</html>\n";
-echo "</body>";
-echo "</html>";
-conf_mount_ro();
-    exit(0);
+	update_status(gettext("Please wait... You may only check for New Pfsense Rules every 15 minutes..."));
+	update_output_window(gettext("Rules are released to support Pfsense packages."));
+	hide_progress_bar_status();
+	/* Display last time of sucsessful md5 check from cache */
+	echo "\n\n</body>\n</html>\n";
+	echo "</body>";
+	echo "</html>";
+	conf_mount_ro();
+	exit(0);
 }
 
 /* Check if were up to date snort.org */
@@ -318,8 +309,8 @@ if ($snortdownload == 'on')
 			update_status(gettext("Your rules are up to date..."));
 			update_output_window(gettext("You may start Snort now, check update."));
 			hide_progress_bar_status();
-        echo "\n\n</body>\n</html>\n";
-        $snort_md5_check_ok = on;
+			echo "\n\n</body>\n</html>\n";
+			$snort_md5_check_ok = on;
 		}
 	}
 }
@@ -337,31 +328,31 @@ if ($emergingthreats == "on")
 		// Will cause switch back to read-only on nanobsd
 		write_config();
 		conf_mount_rw();
-		if ($emerg_md5_check_new == $emerg_md5_check_old) 
+		if ($emerg_md5_check_new == $emerg_md5_check_old)
 		{
-        hide_progress_bar_status();
-        $emerg_md5_check_ok = on;
+			hide_progress_bar_status();
+			$emerg_md5_check_ok = on;
 		}
 	}
 }
 
 /* Check if were up to date pfsense.org */
-	if (file_exists("{$snortdir}/pfsense_rules.tar.gz.md5"))
+if (file_exists("{$snortdir}/pfsense_rules.tar.gz.md5"))
+{
+	$pfsense_check_new_parse = file_get_contents("{$tmpfname}/pfsense_rules.tar.gz.md5");
+	$pfsense_md5_check_new = `/bin/echo "{$pfsense_md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
+	$pfsense_md5_check_old_parse = file_get_contents("{$snortdir}/pfsense_rules.tar.gz.md5");
+	$pfsense_md5_check_old = `/bin/echo "{$pfsense_md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
+	/* Write out time of last sucsessful md5 to cache */
+	// Will cause switch back to read-only on nanobsd
+	write_config();
+	conf_mount_rw();
+	if ($pfsense_md5_check_new == $pfsense_md5_check_old)
 	{
-		$pfsense_check_new_parse = file_get_contents("{$tmpfname}/pfsense_rules.tar.gz.md5");
-		$pfsense_md5_check_new = `/bin/echo "{$pfsense_md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
-		$pfsense_md5_check_old_parse = file_get_contents("{$snortdir}/pfsense_rules.tar.gz.md5");
-		$pfsense_md5_check_old = `/bin/echo "{$pfsense_md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-		/* Write out time of last sucsessful md5 to cache */
-		// Will cause switch back to read-only on nanobsd
-		write_config();
-		conf_mount_rw();
-		if ($pfsense_md5_check_new == $pfsense_md5_check_old) 
-		{
-        hide_progress_bar_status();
-        $pfsense_md5_check_ok = on;
-		}
+		hide_progress_bar_status();
+		$pfsense_md5_check_ok = on;
 	}
+}
 
 /* Check if were up to date is so, exit */
 /* WARNING This code needs constant checks */
@@ -369,12 +360,12 @@ if ($snortdownload == 'on' && $emergingthreats == 'on')
 {
 	if ($snort_md5_check_ok == 'on' && $emerg_md5_check_ok == 'on')
 	{
-			update_status(gettext("All your rules are up to date..."));
-			update_output_window(gettext("You may start Snort now..."));
-			echo "</body>";
-			echo "</html>";
-			conf_mount_ro();
-			exit(0);
+		update_status(gettext("All your rules are up to date..."));
+		update_output_window(gettext("You may start Snort now..."));
+		echo "</body>";
+		echo "</html>";
+		conf_mount_ro();
+		exit(0);
 	}
 }
 
@@ -382,12 +373,12 @@ if ($snortdownload == 'on' && $emergingthreats == 'off')
 {
 	if ($snort_md5_check_ok == 'on')
 	{
-			update_status(gettext("Your snort.org rules are up to date..."));
-			update_output_window(gettext("You may start Snort now..."));
-			echo "</body>";
-			echo "</html>";
-			conf_mount_ro();
-			exit(0);
+		update_status(gettext("Your snort.org rules are up to date..."));
+		update_output_window(gettext("You may start Snort now..."));
+		echo "</body>";
+		echo "</html>";
+		conf_mount_ro();
+		exit(0);
 	}
 }
 
@@ -395,15 +386,15 @@ if ($snortdownload == 'off' && $emergingthreats == 'on')
 {
 	if ($emerg_md5_check_ok == 'on')
 	{
-			update_status(gettext("Your Emergingthreats rules are up to date..."));
-			update_output_window(gettext("You may start Snort now..."));
-			echo "</body>";
-			echo "</html>";
-			conf_mount_ro();
-			exit(0);
+		update_status(gettext("Your Emergingthreats rules are up to date..."));
+		update_output_window(gettext("You may start Snort now..."));
+		echo "</body>";
+		echo "</html>";
+		conf_mount_ro();
+		exit(0);
 	}
 }
-		
+
 /* You are Not Up to date, always stop snort when updating rules for low end machines */;
 update_status(gettext("You are NOT up to date..."));
 update_output_window(gettext("Stopping Snort service..."));
@@ -418,62 +409,62 @@ if ($chk_if_snort_up != "") {
 if ($snortdownload == 'on')
 {
 	if ($snort_md5_check_ok != on) {
-	if (file_exists("{$tmpfname}/{$snort_filename}")) {
-		update_status(gettext("Snortrule tar file exists..."));
-	} else {
-		unhide_progress_bar_status();
-		update_status(gettext("There is a new set of Snort.org rules posted. Downloading..."));
-		update_output_window(gettext("May take 4 to 10 min..."));
-		conf_mount_rw();
-		//snort_download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}", $tmpfname . "/{$snort_filename}", "read_body_firmware");
-		snort_download_file_with_progress_bar("http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}", $tmpfname . "/{$snort_filename}", "read_body_firmware");
-		update_all_status($static_output);
-		update_status(gettext("Done downloading rules file."));
-		if (150000 > filesize("{$tmpfname}/$snort_filename")){
-			update_status(gettext("Error with the snort rules download..."));
-
-			update_output_window(gettext("Snort rules file downloaded failed..."));
-echo "</body>";
-echo "</html>";
-conf_mount_ro();
-			exit(0);
-			}		  
+		if (file_exists("{$tmpfname}/{$snort_filename}")) {
+			update_status(gettext("Snortrule tar file exists..."));
+		} else {
+			unhide_progress_bar_status();
+			update_status(gettext("There is a new set of Snort.org rules posted. Downloading..."));
+			update_output_window(gettext("May take 4 to 10 min..."));
+			conf_mount_rw();
+			//snort_download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}", $tmpfname . "/{$snort_filename}", "read_body_firmware");
+			snort_download_file_with_progress_bar("http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}", $tmpfname . "/{$snort_filename}", "read_body_firmware");
+			update_all_status($static_output);
+			update_status(gettext("Done downloading rules file."));
+			if (150000 > filesize("{$tmpfname}/$snort_filename")){
+				update_status(gettext("Error with the snort rules download..."));
+
+				update_output_window(gettext("Snort rules file downloaded failed..."));
+				echo "</body>";
+				echo "</html>";
+				conf_mount_ro();
+				exit(0);
+			}
 		}
 	}
 }
-	
+
 /* download emergingthreats rules file */
-if ($emergingthreats == "on") 
+if ($emergingthreats == "on")
 {
 	if ($emerg_md5_check_ok != on)
 	{
-	if (file_exists("{$tmpfname}/{$emergingthreats_filename}"))
-	{
-		update_status(gettext("Emergingthreats tar file exists..."));
-	}else{
-		update_status(gettext("There is a new set of Emergingthreats rules posted. Downloading..."));
-		update_output_window(gettext("May take 4 to 10 min..."));		
-		// download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/emerging.rules.tar.gz", $tmpfname . "/{$emergingthreats_filename}", "read_body_firmware");
-		download_file_with_progress_bar("http://www.emergingthreats.net/rules/emerging.rules.tar.gz", $tmpfname . "/{$emergingthreats_filename}", "read_body_firmware");
-		update_all_status($static_output);
-		update_status(gettext("Done downloading Emergingthreats rules file."));
+		if (file_exists("{$tmpfname}/{$emergingthreats_filename}"))
+		{
+			update_status(gettext("Emergingthreats tar file exists..."));
+		}else{
+			update_status(gettext("There is a new set of Emergingthreats rules posted. Downloading..."));
+			update_output_window(gettext("May take 4 to 10 min..."));
+			// download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/emerging.rules.tar.gz", $tmpfname . "/{$emergingthreats_filename}", "read_body_firmware");
+			download_file_with_progress_bar("http://www.emergingthreats.net/rules/emerging.rules.tar.gz", $tmpfname . "/{$emergingthreats_filename}", "read_body_firmware");
+			update_all_status($static_output);
+			update_status(gettext("Done downloading Emergingthreats rules file."));
 		}
 	}
 }
 
 /* download pfsense rules file */
 if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
-    update_status(gettext("Snortrule tar file exists..."));
-} else {
-	unhide_progress_bar_status();
-    update_status(gettext("There is a new set of Pfsense rules posted. Downloading..."));
-    update_output_window(gettext("May take 4 to 10 min..."));
-	// download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz", $tmpfname . "/{$pfsense_rules_filename}", "read_body_firmware");
-    download_file_with_progress_bar("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz", $tmpfname . "/{$pfsense_rules_filename}", "read_body_firmware");
-    update_all_status($static_output);
-    update_status(gettext("Done downloading rules file."));
- }
+	if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
+		update_status(gettext("Snortrule tar file exists..."));
+	} else {
+		unhide_progress_bar_status();
+		update_status(gettext("There is a new set of Pfsense rules posted. Downloading..."));
+		update_output_window(gettext("May take 4 to 10 min..."));
+		// download_file_with_progress_bar("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz", $tmpfname . "/{$pfsense_rules_filename}", "read_body_firmware");
+		download_file_with_progress_bar("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz", $tmpfname . "/{$pfsense_rules_filename}", "read_body_firmware");
+		update_all_status($static_output);
+		update_status(gettext("Done downloading rules file."));
+	}
 }
 
 /* Compair md5 sig to file sig */
@@ -508,33 +499,33 @@ if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
 if ($snortdownload == 'on')
 {
 	if ($snort_md5_check_ok != on) {
-	if (file_exists("{$tmpfname}/{$snort_filename}")) {
-		
-		if ($pfsense_stable == 'yes')
-		{
-			$freebsd_version_so = 'FreeBSD-7-2';
-		}else{
-			$freebsd_version_so = 'FreeBSD-8-0';	
-		}
-		
-		update_status(gettext("Extracting Snort.org rules..."));
-		update_output_window(gettext("May take a while..."));
-		/* extract snort.org rules and  add prefix to all snort.org files*/
-		exec("/bin/rm -r {$snortdir}/rules");
-		sleep(2);
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} rules/");
-		chdir ("/usr/local/etc/snort/rules");
-		sleep(2);
-		exec('/usr/local/bin/perl /usr/local/bin/snort_rename.pl s/^/snort_/ *.rules');
-		
-		/* extract so rules on for x86 for now */
-		/* TODO: ask snort.org to build x64 version of so rules for Freebsd 8.1 Sept 05,2010 */
-		if($snort_arch == 'x86'){
-			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/precompiled/$freebsd_version_so/i386/2.8.6.1/");
-			exec('/bin/mkdir -p /usr/local/lib/snort/dynamicrules/');
-			exec("/bin/mv -f {$snortdir}/so_rules/precompiled/$freebsd_version_so/i386/2.8.6.1/* /usr/local/lib/snort/dynamicrules/");
-			/* extract so rules none bin and rename */
-			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/bad-traffic.rules/" .
+		if (file_exists("{$tmpfname}/{$snort_filename}")) {
+
+			if ($pfsense_stable == 'yes')
+			{
+				$freebsd_version_so = 'FreeBSD-7-2';
+			}else{
+				$freebsd_version_so = 'FreeBSD-8-0';
+			}
+
+			update_status(gettext("Extracting Snort.org rules..."));
+			update_output_window(gettext("May take a while..."));
+			/* extract snort.org rules and  add prefix to all snort.org files*/
+			exec("/bin/rm -r {$snortdir}/rules");
+			sleep(2);
+			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} rules/");
+			chdir ("/usr/local/etc/snort/rules");
+			sleep(2);
+			exec('/usr/local/bin/perl /usr/local/bin/snort_rename.pl s/^/snort_/ *.rules');
+
+			/* extract so rules on for x86 for now */
+			/* TODO: ask snort.org to build x64 version of so rules for Freebsd 8.1 Sept 05,2010 */
+			if($snort_arch == 'x86'){
+				exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/precompiled/$freebsd_version_so/i386/2.8.6.1/");
+				exec('/bin/mkdir -p /usr/local/lib/snort/dynamicrules/');
+				exec("/bin/mv -f {$snortdir}/so_rules/precompiled/$freebsd_version_so/i386/2.8.6.1/* /usr/local/lib/snort/dynamicrules/");
+				/* extract so rules none bin and rename */
+				exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/bad-traffic.rules/" .
 			" so_rules/chat.rules/" .
 			" so_rules/dos.rules/" .
 			" so_rules/exploit.rules/" .
@@ -551,40 +542,40 @@ if ($snortdownload == 'on')
 			" so_rules/web-client.rules/" .
 			" so_rules/web-iis.rules/" .
 			" so_rules/web-misc.rules/");
-		
-			exec("/bin/mv -f {$snortdir}/so_rules/bad-traffic.rules {$snortdir}/rules/snort_bad-traffic.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/chat.rules {$snortdir}/rules/snort_chat.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/dos.rules {$snortdir}/rules/snort_dos.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/exploit.rules {$snortdir}/rules/snort_exploit.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/icmp.rules {$snortdir}/rules/snort_icmp.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/imap.rules {$snortdir}/rules/snort_imap.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/misc.rules {$snortdir}/rules/snort_misc.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/multimedia.rules {$snortdir}/rules/snort_multimedia.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/netbios.rules {$snortdir}/rules/snort_netbios.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/nntp.rules {$snortdir}/rules/snort_nntp.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/p2p.rules {$snortdir}/rules/snort_p2p.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/smtp.rules {$snortdir}/rules/snort_smtp.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/sql.rules {$snortdir}/rules/snort_sql.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/web-activex.rules {$snortdir}/rules/snort_web-activex.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/web-client.rules {$snortdir}/rules/snort_web-client.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/web-iis.rules {$snortdir}/rules/snort_web-iis.so.rules");
-			exec("/bin/mv -f {$snortdir}/so_rules/web-misc.rules {$snortdir}/rules/snort_web-misc.so.rules");
-			exec("/bin/rm -r {$snortdir}/so_rules");
-		}
-		
-		/* extract base etc files */
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} etc/");
-		exec("/bin/mv -f {$snortdir}/etc/* {$snortdir}");
-		exec("/bin/rm -r {$snortdir}/etc");		
-
-		update_status(gettext("Done extracting Snort.org Rules."));
-	}else{
-		update_status(gettext("Error extracting Snort.org Rules..."));
-		update_output_window(gettext("Error Line 755"));
-echo "</body>";
-echo "</html>";
-conf_mount_ro();
-		exit(0);
+
+				exec("/bin/mv -f {$snortdir}/so_rules/bad-traffic.rules {$snortdir}/rules/snort_bad-traffic.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/chat.rules {$snortdir}/rules/snort_chat.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/dos.rules {$snortdir}/rules/snort_dos.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/exploit.rules {$snortdir}/rules/snort_exploit.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/icmp.rules {$snortdir}/rules/snort_icmp.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/imap.rules {$snortdir}/rules/snort_imap.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/misc.rules {$snortdir}/rules/snort_misc.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/multimedia.rules {$snortdir}/rules/snort_multimedia.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/netbios.rules {$snortdir}/rules/snort_netbios.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/nntp.rules {$snortdir}/rules/snort_nntp.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/p2p.rules {$snortdir}/rules/snort_p2p.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/smtp.rules {$snortdir}/rules/snort_smtp.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/sql.rules {$snortdir}/rules/snort_sql.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/web-activex.rules {$snortdir}/rules/snort_web-activex.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/web-client.rules {$snortdir}/rules/snort_web-client.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/web-iis.rules {$snortdir}/rules/snort_web-iis.so.rules");
+				exec("/bin/mv -f {$snortdir}/so_rules/web-misc.rules {$snortdir}/rules/snort_web-misc.so.rules");
+				exec("/bin/rm -r {$snortdir}/so_rules");
+			}
+
+			/* extract base etc files */
+			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} etc/");
+			exec("/bin/mv -f {$snortdir}/etc/* {$snortdir}");
+			exec("/bin/rm -r {$snortdir}/etc");
+
+			update_status(gettext("Done extracting Snort.org Rules."));
+		}else{
+			update_status(gettext("Error extracting Snort.org Rules..."));
+			update_output_window(gettext("Error Line 755"));
+			echo "</body>";
+			echo "</html>";
+			conf_mount_ro();
+			exit(0);
 		}
 	}
 }
@@ -605,48 +596,48 @@ if ($emergingthreats == "on")
 
 /* Untar Pfsense rules to tmp */
 if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
-    update_status(gettext("Extracting Pfsense rules..."));
-    update_output_window(gettext("May take a while..."));
-    exec("/usr/bin/tar xzf {$tmpfname}/{$pfsense_rules_filename} -C {$snortdir} rules/");
- }
+	if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
+		update_status(gettext("Extracting Pfsense rules..."));
+		update_output_window(gettext("May take a while..."));
+		exec("/usr/bin/tar xzf {$tmpfname}/{$pfsense_rules_filename} -C {$snortdir} rules/");
+	}
 }
 
 /* Untar snort signatures */
 if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$snort_filename}")) {
-$signature_info_chk = $config['installedpackages']['snortglobal']['signatureinfo'];
-if ($premium_url_chk == on) {
-	update_status(gettext("Extracting Signatures..."));
-	update_output_window(gettext("May take a while..."));
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} doc/signatures/");
-	update_status(gettext("Done extracting Signatures."));
-  }
- }
+	if (file_exists("{$tmpfname}/{$snort_filename}")) {
+		$signature_info_chk = $config['installedpackages']['snortglobal']['signatureinfo'];
+		if ($premium_url_chk == on) {
+			update_status(gettext("Extracting Signatures..."));
+			update_output_window(gettext("May take a while..."));
+			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} doc/signatures/");
+			update_status(gettext("Done extracting Signatures."));
+		}
+	}
 }
 
 /*  Copy md5 sig to snort dir */
 if ($snortdownload == 'on')
 {
 	if ($snort_md5_check_ok != on) {
-	if (file_exists("{$tmpfname}/$snort_filename_md5")) {
-		update_status(gettext("Copying md5 sig to snort directory..."));
-		exec("/bin/cp {$tmpfname}/$snort_filename_md5 {$snortdir}/$snort_filename_md5");
-	}else{
-		update_status(gettext("The md5 file does not exist..."));
-		update_output_window(gettext("Error copying config..."));
-		echo "</body>";
-		echo "</html>";
-		conf_mount_ro();
-		exit(0);
+		if (file_exists("{$tmpfname}/$snort_filename_md5")) {
+			update_status(gettext("Copying md5 sig to snort directory..."));
+			exec("/bin/cp {$tmpfname}/$snort_filename_md5 {$snortdir}/$snort_filename_md5");
+		}else{
+			update_status(gettext("The md5 file does not exist..."));
+			update_output_window(gettext("Error copying config..."));
+			echo "</body>";
+			echo "</html>";
+			conf_mount_ro();
+			exit(0);
 		}
 	}
-}	
-	
+}
+
 /*  Copy emergingthreats md5 sig to snort dir */
 if ($emergingthreats == "on")
 {
-	if ($emerg_md5_check_ok != on) 
+	if ($emerg_md5_check_ok != on)
 	{
 		if (file_exists("{$tmpfname}/$emergingthreats_filename_md5"))
 		{
@@ -659,25 +650,25 @@ if ($emergingthreats == "on")
 			echo "</html>";
 			conf_mount_ro();
 			exit(0);
-			}
+		}
 	}
 }
 
 /*  Copy Pfsense md5 sig to snort dir */
 if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/$pfsense_rules_filename_md5")) {
-    update_status(gettext("Copying Pfsense md5 sig to snort directory..."));
-    exec("/bin/cp {$tmpfname}/$pfsense_rules_filename_md5 {$snortdir}/$pfsense_rules_filename_md5");
-} else {
-    update_status(gettext("The Pfsense md5 file does not exist..."));
-    update_output_window(gettext("Error copying config..."));
+	if (file_exists("{$tmpfname}/$pfsense_rules_filename_md5")) {
+		update_status(gettext("Copying Pfsense md5 sig to snort directory..."));
+		exec("/bin/cp {$tmpfname}/$pfsense_rules_filename_md5 {$snortdir}/$pfsense_rules_filename_md5");
+	} else {
+		update_status(gettext("The Pfsense md5 file does not exist..."));
+		update_output_window(gettext("Error copying config..."));
 		echo "</body>";
 		echo "</html>";
 		conf_mount_ro();
 		exit(0);
- }
+	}
 }
- 
+
 /*  Copy signatures dir to snort dir */
 if ($snortdownload == 'on')
 {
@@ -687,18 +678,18 @@ if ($snortdownload == 'on')
 		if ($premium_url_chk == on)
 		{
 			if (file_exists("{$snortdir}/doc/signatures")) {
-			update_status(gettext("Copying signatures..."));
-			update_output_window(gettext("May take a while..."));
-			exec("/bin/mv -f {$snortdir}/doc/signatures {$snortdir}/signatures");
-			exec("/bin/rm -r {$snortdir}/doc/signatures");
-			update_status(gettext("Done copying signatures."));
-		}else{
-			update_status(gettext("Directory signatures exist..."));
-			update_output_window(gettext("Error copying signature..."));
-echo "</body>";
-echo "</html>";
-conf_mount_ro();
-			exit(0);
+				update_status(gettext("Copying signatures..."));
+				update_output_window(gettext("May take a while..."));
+				exec("/bin/mv -f {$snortdir}/doc/signatures {$snortdir}/signatures");
+				exec("/bin/rm -r {$snortdir}/doc/signatures");
+				update_status(gettext("Done copying signatures."));
+			}else{
+				update_status(gettext("Directory signatures exist..."));
+				update_output_window(gettext("Error copying signature..."));
+				echo "</body>";
+				echo "</html>";
+				conf_mount_ro();
+				exit(0);
 			}
 		}
 	}
@@ -738,28 +729,28 @@ exec("/usr/local/bin/perl /usr/local/bin/create-sidmap.pl /usr/local/etc/snort/r
 function oinkmaster_conf($id, $if_real, $iface_uuid)
 {
 
-        global $config, $g, $id, $if_real, $snortdir_wan, $snortdir, $snort_md5_check_ok, $emerg_md5_check_ok, $pfsense_md5_check_ok;
-        conf_mount_rw();
-		
-/*  enable disable setting will carry over with updates */
-/*  TODO carry signature changes with the updates */
-if ($snort_md5_check_ok != on || $emerg_md5_check_ok != on || $pfsense_md5_check_ok != on) {
-
-if (!empty($config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_on'])) {
-$enabled_sid_on = $config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_on'];
-$enabled_sid_on_array = split('\|\|', $enabled_sid_on);
-foreach($enabled_sid_on_array as $enabled_item_on)
-$selected_sid_on_sections .= "$enabled_item_on\n";
-	}
+	global $config, $g, $id, $if_real, $snortdir_wan, $snortdir, $snort_md5_check_ok, $emerg_md5_check_ok, $pfsense_md5_check_ok;
+	conf_mount_rw();
 
-if (!empty($config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_off'])) {
-$enabled_sid_off = $config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_off'];
-$enabled_sid_off_array = split('\|\|', $enabled_sid_off);
-foreach($enabled_sid_off_array as $enabled_item_off)
-$selected_sid_off_sections .= "$enabled_item_off\n";
-	}
+	/*  enable disable setting will carry over with updates */
+	/*  TODO carry signature changes with the updates */
+	if ($snort_md5_check_ok != on || $emerg_md5_check_ok != on || $pfsense_md5_check_ok != on) {
 
-$snort_sid_text = <<<EOD
+		if (!empty($config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_on'])) {
+			$enabled_sid_on = $config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_on'];
+			$enabled_sid_on_array = split('\|\|', $enabled_sid_on);
+			foreach($enabled_sid_on_array as $enabled_item_on)
+			$selected_sid_on_sections .= "$enabled_item_on\n";
+		}
+
+		if (!empty($config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_off'])) {
+			$enabled_sid_off = $config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_off'];
+			$enabled_sid_off_array = split('\|\|', $enabled_sid_off);
+			foreach($enabled_sid_off_array as $enabled_item_off)
+			$selected_sid_off_sections .= "$enabled_item_off\n";
+		}
+
+		$snort_sid_text = <<<EOD
 
 ###########################################
 #                                         #
@@ -779,13 +770,13 @@ $selected_sid_off_sections
 
 EOD;
 
-     /* open snort's oinkmaster.conf for writing */
-     $oinkmasterlist = fopen("/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/oinkmaster_{$iface_uuid}_{$if_real}.conf", "w");
+/* open snort's oinkmaster.conf for writing */
+$oinkmasterlist = fopen("/usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/oinkmaster_{$iface_uuid}_{$if_real}.conf", "w");
 
-     fwrite($oinkmasterlist, "$snort_sid_text");
+fwrite($oinkmasterlist, "$snort_sid_text");
 
-     /* close snort's oinkmaster.conf file */
-     fclose($oinkmasterlist);
+/* close snort's oinkmaster.conf file */
+fclose($oinkmasterlist);
 
 	}
 }
@@ -796,44 +787,44 @@ EOD;
 function oinkmaster_run($id, $if_real, $iface_uuid)
 {
 
-        global $config, $g, $id, $if_real, $snortdir_wan, $snortdir, $snort_md5_check_ok, $emerg_md5_check_ok, $pfsense_md5_check_ok;
-        conf_mount_rw();
+	global $config, $g, $id, $if_real, $snortdir_wan, $snortdir, $snort_md5_check_ok, $emerg_md5_check_ok, $pfsense_md5_check_ok;
+	conf_mount_rw();
 
 	if ($snort_md5_check_ok != on || $emerg_md5_check_ok != on || $pfsense_md5_check_ok != on)
 	{
 
 		if ($config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_on'] == '' && $config['installedpackages']['snortglobal']['rule'][$id]['rule_sid_off'] == '')
 		{
-		update_status(gettext("Your first set of rules are being copied..."));
-		update_output_window(gettext("May take a while..."));
-		exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}/rules/");
-		exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/generators {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/sid {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			update_status(gettext("Your first set of rules are being copied..."));
+			update_output_window(gettext("May take a while..."));
+			exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}/rules/");
+			exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/generators {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/sid {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
 		}else{
-		update_status(gettext("Your enable and disable changes are being applied to your fresh set of rules..."));
-		update_output_window(gettext("May take a while..."));
-		exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}/rules/");
-		exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/generators {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/sid {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-		exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
-
-		/*  might have to add a sleep for 3sec for flash drives or old drives */
-		exec("/usr/local/bin/perl /usr/local/bin/oinkmaster.pl -C /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/oinkmaster_{$iface_uuid}_{$if_real}.conf -o /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules > /usr/local/etc/snort/oinkmaster_{$iface_uuid}_{$if_real}.log");
+			update_status(gettext("Your enable and disable changes are being applied to your fresh set of rules..."));
+			update_output_window(gettext("May take a while..."));
+			exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}/rules/");
+			exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/generators {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/sid {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+			exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}/snort_{$iface_uuid}_{$if_real}");
+
+			/*  might have to add a sleep for 3sec for flash drives or old drives */
+			exec("/usr/local/bin/perl /usr/local/bin/oinkmaster.pl -C /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/oinkmaster_{$iface_uuid}_{$if_real}.conf -o /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules > /usr/local/etc/snort/oinkmaster_{$iface_uuid}_{$if_real}.log");
 
 			/* TODO: Remove this code when x64 so rules are ready */
 			if($snort_arch == 'x64'){
 				exec("/bin/rm -r /usr/local/etc/snort/snort_{$iface_uuid}_{$if_real}/rules/*.so.rules");
 			}
-		
+
 		}
 	}
 }
@@ -848,17 +839,17 @@ if (!empty($config['installedpackages']['snortglobal']['rule']))
 	$id = -1;
 	foreach ($rule_array as $value) {
 
-	$id += 1;
+		$id += 1;
+
+		$result_lan = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
+		$if_real = convert_friendly_interface_to_real_interface_name2($result_lan);
+		$iface_uuid = $config['installedpackages']['snortglobal']['rule'][$id]['uuid'];
 
-	$result_lan = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
-	$if_real = convert_friendly_interface_to_real_interface_name2($result_lan);
-	$iface_uuid = $config['installedpackages']['snortglobal']['rule'][$id]['uuid'];
+		/* make oinkmaster.conf for each interface rule */
+		oinkmaster_conf($id, $if_real, $iface_uuid);
 
-	/* make oinkmaster.conf for each interface rule */
-	oinkmaster_conf($id, $if_real, $iface_uuid);
-	
-	/* run oinkmaster for each interface rule */
-	oinkmaster_run($id, $if_real, $iface_uuid);
+		/* run oinkmaster for each interface rule */
+		oinkmaster_run($id, $if_real, $iface_uuid);
 
 	}
 }
@@ -899,69 +890,67 @@ if (file_exists("/tmp/snort_download_halt.pid")) {
 	update_output_window(gettext("Snort has restarted with your new set of rules..."));
 	exec("/bin/rm /tmp/snort_download_halt.pid");
 } else {
-		update_status(gettext("The Rules update finished..."));
-		update_output_window(gettext("You may start snort now..."));
+	update_status(gettext("The Rules update finished..."));
+	update_output_window(gettext("You may start snort now..."));
 }
 
 /* hide progress bar and lets end this party */
 hide_progress_bar_status();
 conf_mount_ro();
-?>
-
-<?php
+?> <?php
 
 function read_body_firmware($ch, $string) {
-        global $fout, $file_size, $downloaded, $counter, $version, $latest_version, $current_installed_pfsense_version;
-        $length = strlen($string);
-        $downloaded += intval($length);
-        $downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
-        $downloadProgress = 100 - $downloadProgress;
-        $a = $file_size;
-        $b = $downloaded;
-        $c = $downloadProgress;
-        $text  = "  Snort download in progress\\n";
-        $text .= "----------------------------------------------------\\n";
-        $text .= "  Downloaded      : {$b}\\n";
-        $text .= "----------------------------------------------------\\n";
-        $counter++;
-        if($counter > 150) {
-                update_output_window($text);
-                update_progress_bar($downloadProgress);
-                flush();
-                $counter = 0;
-        }
-        fwrite($fout, $string);
-        return $length;
+	global $fout, $file_size, $downloaded, $counter, $version, $latest_version, $current_installed_pfsense_version;
+	$length = strlen($string);
+	$downloaded += intval($length);
+	$downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
+	$downloadProgress = 100 - $downloadProgress;
+	$a = $file_size;
+	$b = $downloaded;
+	$c = $downloadProgress;
+	$text  = "  Snort download in progress\\n";
+	$text .= "----------------------------------------------------\\n";
+	$text .= "  Downloaded      : {$b}\\n";
+	$text .= "----------------------------------------------------\\n";
+	$counter++;
+	if($counter > 150) {
+		update_output_window($text);
+		update_progress_bar($downloadProgress);
+		flush();
+		$counter = 0;
+	}
+	fwrite($fout, $string);
+	return $length;
 }
 
 function snort_download_file_with_progress_bar($url_file, $destination_file, $readbody = 'read_body') {
-        global $ch, $fout, $file_size, $downloaded;
-        $file_size  = 1;
-        $downloaded = 1;
-        /* open destination file */
-        $fout = fopen($destination_file, "wb");
-
-        /*
-         *      Originally by Author: Keyvan Minoukadeh
-         *      Modified by Scott Ullrich to return Content-Length size
-         */
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url_file);
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_WRITEFUNCTION, $readbody);
-        curl_setopt($ch, CURLOPT_NOPROGRESS, '1');
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, '5');
-        curl_setopt($ch, CURLOPT_TIMEOUT, 0);
-
-        curl_exec($ch);
-        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        if($fout)
-                fclose($fout);
-        curl_close($ch);
-        return ($http_code == 200) ? true : $http_code;
+	global $ch, $fout, $file_size, $downloaded;
+	$file_size  = 1;
+	$downloaded = 1;
+	/* open destination file */
+	$fout = fopen($destination_file, "wb");
+
+	/*
+	 *      Originally by Author: Keyvan Minoukadeh
+	 *      Modified by Scott Ullrich to return Content-Length size
+	 */
+
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $url_file);
+	curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
+	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_WRITEFUNCTION, $readbody);
+	curl_setopt($ch, CURLOPT_NOPROGRESS, '1');
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, '5');
+	curl_setopt($ch, CURLOPT_TIMEOUT, 0);
+
+	curl_exec($ch);
+	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	if($fout)
+	fclose($fout);
+	curl_close($ch);
+	return ($http_code == 200) ? true : $http_code;
 }
 ?>