Update snort-dev to 2.8.5.2

21 files changed, 239 insertions, 6202 deletions

diff --git a/config/snort-dev/bkup/snort.inc b/config/snort-dev/bkup/snort.inc
deleted file mode 100644
index 575192b9..00000000
--- a/config/snort-dev/bkup/snort.inc
+++ /dev/null
@@ -1,1620 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort.inc
-	Copyright (C) 2006 Scott Ullrich
-	part of pfSense
-	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.
-*/
-
-require_once("pfsense-utils.inc");
-
-// Needed on 2.0 because of get_vpns_list()
-require_once("filter.inc"); 
-
-/* Allow additional execution time 0 = no limit. */
-ini_set('max_execution_time', '9999');
-ini_set('max_input_time', '9999');
-
-/* define oinkid */
-if($config['installedpackages']['snort'])
-	$oinkid = $config['installedpackages']['snort']['config'][0]['oinkmastercode'];
-
-function sync_package_snort_reinstall() 
-{
-	global $config;
-	if(!$config['installedpackages']['snort'])
-		return;
-    
-	/* create snort configuration file */
-	create_snort_conf();
-  
-	/* start snort service */
-	start_service("snort");
-}
-function sync_package_snort()
-{
-	global $config, $g;
-
-	mwexec("mkdir -p /var/log/snort/");
-
-	if(!file_exists("/var/log/snort/alert"))
-		touch("/var/log/snort/alert");
-
-	/* snort -> advanced features */
-	$bpfbufsize = $config['installedpackages']['snortadvanced']['config'][0]['bpfbufsize'];
-	$bpfmaxbufsize = $config['installedpackages']['snortadvanced']['config'][0]['bpfmaxbufsize'];
-	$bpfmaxinsns = $config['installedpackages']['snortadvanced']['config'][0]['bpfmaxinsns'];
-
-	/* set the snort performance model */
-	if($config['installedpackages']['snort']['config'][0]['performance'])
-		$snort_performance = $config['installedpackages']['snort']['config'][0]['performance'];
-	else
-		$snort_performance = "ac-bnfa";
-
-	conf_mount_rw();
-	/* create a few directories and ensure the sample files are in place */
-	exec("/bin/mkdir -p /usr/local/etc/snort");
-	exec("/bin/mkdir -p /var/log/snort");
-	exec("/bin/mkdir -p /usr/local/etc/snort/rules");
-	exec("/bin/rm /usr/local/etc/snort/snort.conf-sample");
-	exec("/bin/rm /usr/local/etc/snort/threshold.conf-sample");
-	exec("/bin/rm /usr/local/etc/snort/sid-msg.map-sample");
-	exec("/bin/rm /usr/local/etc/snort/unicode.map-sample");
-	exec("/bin/rm /usr/local/etc/snort/classification.config-sample");
-	exec("/bin/rm /usr/local/etc/snort/generators-sample");
-	exec("/bin/rm /usr/local/etc/snort/reference.config-sample");
-	exec("/bin/rm /usr/local/etc/snort/gen-msg.map-sample");
-	exec("/bin/rm /usr/local/etc/snort/sid");
-	exec("/bin/rm -f /usr/local/etc/rc.d/snort");
-	
-	$first = 0;
-	$snortInterfaces = array(); /* -gtm  */
-	
-	$if_list = $config['installedpackages']['snort']['config'][0]['iface_array'];
-	$if_array = split(',', $if_list);
-	//print_r($if_array);
-	if($if_array) {
-		foreach($if_array as $iface) {
-			$if = convert_friendly_interface_to_real_interface_name($iface);
-			
-			if($config['interfaces'][$iface]['ipaddr'] == "pppoe") {
-				$if = "ng0";
-			}
-	      
-			/* build a list of user specified interfaces -gtm */      
-			if($if){      
-			  array_push($snortInterfaces, $if);
-			  $first = 1;
-			}
-		}	
-	    
-		if (count($snortInterfaces) < 1) {
-			log_error("Snort will not start.  You must select an interface for it to listen on.");
-			return;
-		}
-	}
-	//print_r($snortInterfaces);
-	
-	/* create log directory */
-	$start  = "/bin/mkdir -p /var/log/snort\n";
-
-	/* snort advanced features - bpf tuning */
-	if($bpfbufsize)
-		$start .= "sysctl net.bpf.bufsize={$bpfbufsize}\n";
-	if($bpfmaxbufsize)
-		$start .= "sysctl net.bpf.maxbufsize={$bpfmaxbufsize}\n";
-	if($bpfmaxinsns)
-		$start .= "sysctl net.bpf.maxinsns={$bpfmaxinsns}\n";
-
-	/* go ahead and issue bpf changes */
-	if($bpfbufsize)
-		mwexec_bg("sysctl net.bpf.bufsize={$bpfbufsize}");
-	if($bpfmaxbufsize)
-		mwexec_bg("sysctl net.bpf.maxbufsize={$bpfmaxbufsize}");
-	if($bpfmaxinsns)
-		mwexec_bg("sysctl net.bpf.maxinsns={$bpfmaxinsns}");
-
-	/* always stop barnyard2 before starting snort -gtm */
-	$start .= "/usr/bin/killall barnyard2\n";
-
-	/* start a snort process for each interface -gtm */
-	/* Note the sleep delay.  Seems to help getting mult interfaces to start -gtm */
-	/* snort start options are; config file, log file, demon, interface, packet flow, alert type, quiet */
-	/* TODO; get snort to start under nologin shell */
-	foreach($snortInterfaces as $snortIf)
-	{
-		$start .= "sleep 4\n";
-		$start .= "snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -q\n";
-		/* define snortbarnyardlog_chk */
-        $snortbarnyardlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog'];
-        if ($snortbarnyardlog_info_chk == on)
-                $start .= "\nsleep 4;barnyard2 -c /usr/local/etc/barnyard2.conf -d /var/log/snort -f snort.u2 -w /usr/local/etc/snort/barnyard2.waldo -D -q\n";	
-	}    
-    $check_if_snort_runs = "\n\tif [ \"`ls -A /usr/local/etc/snort/rules`\" ] ; then\n\techo \"rules exist\"\n\telse\n\techo \"rules DONT exist\"\n\texit 2\n\tfi \n\n\tif [ \"`pgrep -x snort`\" = \"\" ] ; then\n\t/bin/rm /tmp/snort.sh.pid\n\tfi \n\n\tif [ \"`pgrep -x snort`\" != \"\" ] ; then\n\tlogger -p daemon.info -i -t SnortStartup \"Snort already running...\"\n\t/usr/local/bin/php -f /usr/local/pkg/pf/snort_dynamic_ip_reload.php\n\texit 1\n\tfi\n\n";
-    $if_snort_pid = "\nif ls /tmp/snort.sh.pid > /dev/null\nthen\n    echo \"snort.sh is running\"\n    exit 0\nelse\n    echo \"snort.sh is not running\"\nfi\n";        
-    $echo_snort_sh_pid = "\necho \"snort.sh run\" > /tmp/snort.sh.pid\n";
-    $echo_snort_sh_startup_log = "\necho \"snort.sh run\" >> /tmp/snort.sh_startup.log\n";
-	$del_old_pids = "\nrm -f /var/run/snort_*\n";
-	$sample_before = "BEFORE_MEM=`top | grep Wired | awk '{print \$12}'`\n";
-	$sample_after = "\n\tAFTER_MEM=`top | grep Wired | awk '{print \$12}'`\n";
-	if ($snort_performance == "ac-bnfa")
-		$sleep_before_final = "\necho \"Sleeping before final memory sampling...\"\nWAITSECURE=60\n";
-	else
-		$sleep_before_final = "\necho \"Sleeping before final memory sampling...\"\nWAITSECURE=300\n";
-	$sleep_before_final .= "while [ \"\$MYSNORTLOG\" = \"\" -a \$WAITSECURE -gt 0 ] ; do\n\tsleep 2\n\tMYSNORTLOG=`/usr/sbin/clog /var/log/system.log | grep snort | tail | grep 'Snort initialization completed successfully'`\n\tWAITSECURE=`expr \$WAITSECURE - 1`\ndone\n";
-	$total_used_after = "TOTAL_USAGE=`top | grep snort | grep -v grep | awk '{ print \$6 }'`\n";
-	$echo_usage .= $sample_after . "\t" . $total_used_after . "\techo \"Ram free BEFORE starting Snort: \$BEFORE_MEM -- Ram free AFTER starting Snort: \$AFTER_MEM -- Mode " . $snort_performance . " -- Snort memory usage: \$TOTAL_USAGE\" | logger -p daemon.info -i -t SnortStartup\n\n";
-		
-	/* write out rc.d start/stop file */
-	write_rcfile(array(
-			"file" => "snort.sh",
-			"start" => "{$check_if_snort_runs}{$if_snort_pid}{$echo_snort_sh_pid}{$echo_snort_sh_startup_log}{$del_old_pids}{$sample_before}{$start}{$sleep_before_final}{$echo_usage}",
-			"stop" => "/usr/bin/killall snort; killall barnyard2"
-		)
-	);
-
-	/* create snort configuration file */
-	create_snort_conf();
-
-/* create barnyard2 configuration file */
-$snortbarnyardlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog'];
-if ($snortbarnyardlog_info_chk == on)
-       create_barnyard2_conf();
-
-	   /* snort will not start on install untill setting are set */
-if ($config['installedpackages']['snort']['config'][0]['autorulesupdate7'] != "") {
-	/* start snort service */
-	conf_mount_ro();
-	start_service("snort");
-	}
-}
-
-/* open barnyard2.conf for writing */
-function create_barnyard2_conf() {
-        global $bconfig, $bg;
-        /* write out barnyard2_conf */
-        $barnyard2_conf_text = generate_barnyard2_conf();
-        $bconf = fopen("/usr/local/etc/barnyard2.conf", "w");
-        if(!$bconf) {
-                log_error("Could not open /usr/local/etc/barnyard2.conf for writing.");
-                exit;
-        }
-        fwrite($bconf, $barnyard2_conf_text);
-        fclose($bconf);
-}
-/* open barnyard2.conf for writing" */
-function generate_barnyard2_conf() {
-
-        global $config, $g;
-        conf_mount_rw();
-
-/* define snortbarnyardlog */
-/* TODO add support for the other 5 output plugins */
-
-$snortbarnyardlog_database_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog_database'];
-$snortbarnyardlog_hostname_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog_hostname'];
-$snortbarnyardlog_interface_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog_interface'];
-
-$barnyard2_conf_text = <<<EOD
-
-#	barnyard2.conf
-#   barnyard2 can be found at http://www.securixlive.com/barnyard2/index.php
-
-#	Copyright (C) 2006 Robert Zelaya
-#	part of pfSense
-#	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.
-
-# set the appropriate paths to the file(s) your Snort process is using
-config reference-map:   /usr/local/etc/snort/reference.config
-config class-map:       /usr/local/etc/snort/classification.config
-config gen-msg-map:     /usr/local/etc/snort/gen-msg.map
-config sid-msg-map:     /usr/local/etc/snort/sid-msg.map
-
-config hostname:       $snortbarnyardlog_hostname_info_chk
-config interface:      $snortbarnyardlog_interface_info_chk
-
-# Step 2: setup the input plugins
-input unified2
-
-# database: log to a variety of databases
-# output database: log, mysql, user=xxxx password=xxxxxx dbname=xxxx host=xxx.xxx.xxx.xxxx
-
-$snortbarnyardlog_database_info_chk
-
-EOD;
-
-        return $barnyard2_conf_text;
-
-}
-
-function create_snort_conf() {
-	global $config, $g;
-	/* write out snort.conf */
-	$snort_conf_text = generate_snort_conf();
-	conf_mount_rw();
-	$conf = fopen("/usr/local/etc/snort/snort.conf", "w");
-	if(!$conf) {
-		log_error("Could not open /usr/local/etc/snort/snort.conf for writing.");
-		exit;
-	}
-	fwrite($conf, $snort_conf_text);
-	fclose($conf);
-	conf_mount_ro();
-}
-
-function snort_deinstall() {
-
-	global $config, $g;
-
-	/* remove custom sysctl */
-	remove_text_from_file("/etc/sysctl.conf", "sysctl net.bpf.bufsize=20480");
-	/* decrease bpf buffers back to 4096, from 20480 */
-	exec("/sbin/sysctl net.bpf.bufsize=4096");
-	exec("/usr/bin/killall snort");
-	sleep(5);
-	exec("/usr/bin/killall -9 snort");
-	exec("rm -f /usr/local/etc/rc.d/snort*");
-	exec("rm -rf /usr/local/etc/snort*");
-	exec("cd /var/db/pkg && pkg_delete `ls | grep snort`");
-	exec("cd /var/db/pkg && pkg_delete `ls | grep mysql-client`");
-	exec("cd /var/db/pkg && pkg_delete `ls | grep libdnet`");
-	exec("/usr/bin/killall -9 snort");
-	exec("/usr/bin/killall snort");
-
-	/* Remove snort cron entries Ugly code needs smoothness*/
-	
-	function snort_rm_blocked_deinstall_cron($should_install) {
-        global $config, $g;
-
-        $is_installed = false;
-
-        if(!$config['cron']['item'])
-                return;
-
-        $x=0;
-        foreach($config['cron']['item'] as $item) {
-                if (strstr($item['command'], "snort2c")) {
-                        $is_installed = true;
-                        break;
-                }
-                $x++;
-			}
-                      if($is_installed == true) {
-                         if($x > 0) {
-                                unset($config['cron']['item'][$x]);
-                                write_config();
-                         }
-                  configure_cron();
-			}
-		}
-
-	function snort_rules_up_deinstall_cron($should_install) {
-        global $config, $g;
-
-        $is_installed = false;
-
-        if(!$config['cron']['item'])
-                return;
-
-        $x=0;
-        foreach($config['cron']['item'] as $item) {
-                if (strstr($item['command'], "snort_check_for_rule_updates.php")) {
-                        $is_installed = true;
-                        break;
-                }
-                $x++;
-			}
-                      if($is_installed == true) {
-                         if($x > 0) {
-                                unset($config['cron']['item'][$x]);
-                                write_config();
-                         }
-                  configure_cron();
-			}
-		}
-
-snort_rm_blocked_deinstall_cron("");
-snort_rules_up_deinstall_cron("");
-
-		
-	/* Unset snort registers in conf.xml IMPORTANT snort will not start with out this */
-	/* Keep this as a last step */
-	unset($config['installedpackages']['snort']['config'][0]['autorulesupdate7']);
-    unset($config['installedpackages']['snort']['config'][0]['rm_blocked']);
-    write_config();
-	
-}
-
-function generate_snort_conf() {
-
-	global $config, $g;
-	conf_mount_rw();
-	/* obtain external interface */
-	/* XXX: make multi wan friendly */
-	$snort_ext_int = $config['installedpackages']['snort']['config'][0]['iface_array'][0];
-
-	$snort_config_pass_thru = $config['installedpackages']['snortadvanced']['config'][0]['configpassthru'];
-	
-/* define snortalertlogtype */
-$snortalertlogtype = $config['installedpackages']['snortadvanced']['config'][0]['snortalertlogtype'];
-if ($snortalertlogtype == fast)
-    $snortalertlogtype_type = "output alert_fast: alert";
-else
-	$snortalertlogtype_type = "output alert_full: alert"; 
-
-/* define alertsystemlog */
-$alertsystemlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['alertsystemlog'];
-if ($alertsystemlog_info_chk == on)
-    $alertsystemlog_type = "output alert_syslog: log_alert";
-
-/* define tcpdumplog */
-$tcpdumplog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['tcpdumplog'];
-if ($tcpdumplog_info_chk == on)
-    $tcpdumplog_type = "output log_tcpdump: snorttcpd.log";
-
-/* define snortbarnyardlog_chk */
-$snortbarnyardlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog'];
-if ($snortbarnyardlog_info_chk == on)
-    $snortbarnyardlog_type = "barnyard2 -c /usr/local/etc/barnyard2.conf -d /var/log/snort -f snort.u2 -w /usr/local/etc/snort/barnyard2.waldo -D";
-
-/* define snortunifiedlog */
-$snortunifiedlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortunifiedlog'];
-if ($snortunifiedlog_info_chk == on)
-    $snortunifiedlog_type = "output unified2: filename snort.u2, limit 128";
-
-/* define spoink */
-$spoink_info_chk = $config['installedpackages']['snort']['config'][0]['blockoffenders7'];
-if ($spoink_info_chk == on)
-    $spoink_type = "output alert_pf: /var/db/whitelist,snort2c";
-
-	/* define servers and ports snortdefservers */
-
-/* def DNS_SERVSERS */
-$def_dns_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_dns_servers'];
-if ($def_dns_servers_info_chk == "")
-	$def_dns_servers_type = "\$HOME_NET";
-else 
-	$def_dns_servers_type = "$def_dns_servers_info_chk";
-
-/* def DNS_PORTS */
-$def_dns_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_dns_ports'];
-if ($def_dns_ports_info_chk == "")
-	$def_dns_ports_type = "53";
-else 
-	$def_dns_ports_type = "$def_dns_ports_info_chk";
-
-/* def SMTP_SERVSERS */
-$def_smtp_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_smtp_servers'];
-if ($def_smtp_servers_info_chk == "")
-	$def_smtp_servers_type = "\$HOME_NET";
-else 
-	$def_smtp_servers_type = "$def_smtp_servers_info_chk";
-
-/* def SMTP_PORTS */
-$def_smtp_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_smtp_ports'];
-if ($def_smtp_ports_info_chk == "")
-	$def_smtp_ports_type = "25";
-else 
-	$def_smtp_ports_type = "$def_smtp_ports_info_chk";
-
-/* def MAIL_PORTS */
-$def_mail_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_mail_ports'];
-if ($def_mail_ports_info_chk == "")
-	$def_mail_ports_type = "25,143,465,691";
-else 
-	$def_mail_ports_type = "$def_mail_ports_info_chk";
-	
-/* def HTTP_SERVSERS */
-$def_http_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_http_servers'];
-if ($def_http_servers_info_chk == "")
-	$def_http_servers_type = "\$HOME_NET";
-else 
-	$def_http_servers_type = "$def_http_servers_info_chk";
-
-/* def WWW_SERVSERS */
-$def_www_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_www_servers'];
-if ($def_www_servers_info_chk == "")
-	$def_www_servers_type = "\$HOME_NET";
-else 
-	$def_www_servers_type = "$def_www_servers_info_chk";
-
-/* def HTTP_PORTS */
-$def_http_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_http_ports'];
-if ($def_http_ports_info_chk == "")
-	$def_http_ports_type = "80";
-else 
-	$def_http_ports_type = "$def_http_ports_info_chk";
-	
-/* def SQL_SERVSERS */
-$def_sql_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_sql_servers'];
-if ($def_sql_servers_info_chk == "")
-	$def_sql_servers_type = "\$HOME_NET";
-else 
-	$def_sql_servers_type = "$def_sql_servers_info_chk";
-
-/* def ORACLE_PORTS */
-$def_oracle_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_oracle_ports'];
-if ($def_oracle_ports_info_chk == "")
-	$def_oracle_ports_type = "1521";
-else 
-	$def_oracle_ports_type = "$def_oracle_ports_info_chk";
-
-/* def MSSQL_PORTS */
-$def_mssql_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_mssql_ports'];
-if ($def_mssql_ports_info_chk == "")
-	$def_mssql_ports_type = "1433";
-else 
-	$def_mssql_ports_type = "$def_mssql_ports_info_chk";
-
-/* def TELNET_SERVSERS */
-$def_telnet_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_telnet_servers'];
-if ($def_telnet_servers_info_chk == "")
-	$def_telnet_servers_type = "\$HOME_NET";
-else 
-	$def_telnet_servers_type = "$def_telnet_servers_info_chk";
-	
-/* def TELNET_PORTS */
-$def_telnet_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_telnet_ports'];
-if ($def_telnet_ports_info_chk == "")
-	$def_telnet_ports_type = "23";
-else 
-	$def_telnet_ports_type = "$def_telnet_ports_info_chk";
-	
-/* def SNMP_SERVSERS */
-$def_snmp_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_snmp_servers'];
-if ($def_snmp_servers_info_chk == "")
-	$def_snmp_servers_type = "\$HOME_NET";
-else 
-	$def_snmp_servers_type = "$def_snmp_servers_info_chk";
-	
-/* def SNMP_PORTS */
-$def_snmp_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_snmp_ports'];
-if ($def_snmp_ports_info_chk == "")
-	$def_snmp_ports_type = "161";
-else 
-	$def_snmp_ports_type = "$def_snmp_ports_info_chk";
-	
-/* def FTP_SERVSERS */
-$def_ftp_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_ftp_servers'];
-if ($def_ftp_servers_info_chk == "")
-	$def_ftp_servers_type = "\$HOME_NET";
-else 
-	$def_ftp_servers_type = "$def_ftp_servers_info_chk";
-	
-/* def FTP_PORTS */
-$def_ftp_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_ftp_ports'];
-if ($def_ftp_ports_info_chk == "")
-	$def_ftp_ports_type = "21";
-else 
-	$def_ftp_ports_type = "$def_ftp_ports_info_chk";
-	
-/* def SSH_SERVSERS */
-$def_ssh_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_ssh_servers'];
-if ($def_ssh_servers_info_chk == "")
-	$def_ssh_servers_type = "\$HOME_NET";
-else 
-	$def_ssh_servers_type = "$def_ssh_servers_info_chk";
-	
-/* if user has defined a custom ssh port, use it */
-if($config['system']['ssh']['port'])
-	$ssh_port = $config['system']['ssh']['port'];
-else
-	$ssh_port = "22";
-	
-/* def SSH_PORTS */
-$def_ssh_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_ssh_ports'];
-if ($def_ssh_ports_info_chk == "")
-	$def_ssh_ports_type = "{$ssh_port}";
-else 
-	$def_ssh_ports_type = "$def_ssh_ports_info_chk";
-	
-/* def POP_SERVSERS */
-$def_pop_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_pop_servers'];
-if ($def_pop_servers_info_chk == "")
-	$def_pop_servers_type = "\$HOME_NET";
-else 
-	$def_pop_servers_type = "$def_pop_servers_info_chk";
-	
-/* def POP2_PORTS */
-$def_pop2_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_pop2_ports'];
-if ($def_pop2_ports_info_chk == "")
-	$def_pop2_ports_type = "109";
-else 
-	$def_pop2_ports_type = "$def_pop2_ports_info_chk";
-	
-/* def POP3_PORTS */
-$def_pop3_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_pop3_ports'];
-if ($def_pop3_ports_info_chk == "")
-	$def_pop3_ports_type = "110";
-else 
-	$def_pop3_ports_type = "$def_pop3_ports_info_chk";
-	
-/* def IMAP_SERVSERS */
-$def_imap_servers_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_imap_servers'];
-if ($def_imap_servers_info_chk == "")
-	$def_imap_servers_type = "\$HOME_NET";
-else 
-	$def_imap_servers_type = "$def_imap_servers_info_chk";
-	
-/* def IMAP_PORTS */
-$def_imap_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_imap_ports'];
-if ($def_imap_ports_info_chk == "")
-	$def_imap_ports_type = "143";
-else 
-	$def_imap_ports_type = "$def_imap_ports_info_chk";
-	
-/* def SIP_PROXY_IP */
-$def_sip_proxy_ip_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_sip_proxy_ip'];
-if ($def_sip_proxy_ip_info_chk == "")
-	$def_sip_proxy_ip_type = "\$HOME_NET";
-else 
-	$def_sip_proxy_ip_type = "$def_sip_proxy_ip_info_chk";
-	
-/* def SIP_PROXY_PORTS */
-$def_sip_proxy_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_sip_proxy_ports'];
-if ($def_sip_proxy_ports_info_chk == "")
-	$def_sip_proxy_ports_type = "5060:5090,16384:32768";
-else 
-	$def_sip_proxy_ports_type = "$def_sip_proxy_ports_info_chk";
-	
-/* def AUTH_PORTS */
-$def_auth_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_auth_ports'];
-if ($def_auth_ports_info_chk == "")
-	$def_auth_ports_type = "113";
-else 
-	$def_auth_ports_type = "$def_auth_ports_info_chk";
-	
-/* def FINGER_PORTS */
-$def_finger_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_finger_ports'];
-if ($def_finger_ports_info_chk == "")
-	$def_finger_ports_type = "79";
-else 
-	$def_finger_ports_type = "$def_finger_ports_info_chk";
-	
-/* def IRC_PORTS */
-$def_irc_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_irc_ports'];
-if ($def_irc_ports_info_chk == "")
-	$def_irc_ports_type = "6665,6666,6667,6668,6669,7000";
-else 
-	$def_irc_ports_type = "$def_irc_ports_info_chk";
-	
-/* def NNTP_PORTS */
-$def_nntp_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_nntp_ports'];
-if ($def_nntp_ports_info_chk == "")
-	$def_nntp_ports_type = "119";
-else 
-	$def_nntp_ports_type = "$def_nntp_ports_info_chk";
-	
-/* def RLOGIN_PORTS */
-$def_rlogin_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_rlogin_ports'];
-if ($def_rlogin_ports_info_chk == "")
-	$def_rlogin_ports_type = "513";
-else 
-	$def_rlogin_ports_type = "$def_rlogin_ports_info_chk";
-	
-/* def RSH_PORTS */
-$def_rsh_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_rsh_ports'];
-if ($def_rsh_ports_info_chk == "")
-	$def_rsh_ports_type = "514";
-else 
-	$def_rsh_ports_type = "$def_rsh_ports_info_chk";
-	
-/* def SSL_PORTS */
-$def_ssl_ports_info_chk = $config['installedpackages']['snortdefservers']['config'][0]['def_ssl_ports'];
-if ($def_ssl_ports_info_chk == "")
-	$def_ssl_ports_type = "25,443,465,636,993,995";
-else 
-	$def_ssl_ports_type = "$def_ssl_ports_info_chk";
-	
-	/* add auto update scripts to /etc/crontab */
-//	$text_ww   = "*/60\t* \t 1\t *\t *\t root\t /usr/bin/nice -n20 /usr/local/pkg/snort_check_for_rule_updates.php";
-//	$filenamea = "/etc/crontab";
-//	remove_text_from_file($filenamea, $text_ww);
-//	add_text_to_file($filenamea, $text_ww);
-//	exec("killall -HUP cron"); */
-
-	/* should we install a automatic update crontab entry? */
-	$automaticrulesupdate = $config['installedpackages']['snort']['config'][0]['automaticrulesupdate'];
-
-	/* if user is on pppoe, we really want to use ng0 interface */
-	if($config['interfaces'][$snort_ext_int]['ipaddr'] == "pppoe")
-		$snort_ext_int = "ng0";
-
-	/* set the snort performance model */
-	if($config['installedpackages']['snort']['config'][0]['performance'])
-		$snort_performance = $config['installedpackages']['snort']['config'][0]['performance'];
-	else
-		$snort_performance = "ac-bnfa";
-
-	/* set the snort block hosts time IMPORTANT snort has trouble installing if snort_rm_blocked_info_ck != "" */
-	$snort_rm_blocked_info_ck = $config['installedpackages']['snort']['config'][0]['rm_blocked'];
-		if ($snort_rm_blocked_info_ck == "never_b")
-                $snort_rm_blocked_false = "";
-			else
-				$snort_rm_blocked_false = "true";
-
-if ($snort_rm_blocked_info_ck != "") {
-function snort_rm_blocked_install_cron($should_install) {
-        global $config, $g;
-
-        if ($g['booting']==true)
-                return;
-
-        $is_installed = false;
-
-        if(!$config['cron']['item'])
-                return;
-
-        $x=0;
-        foreach($config['cron']['item'] as $item) {
-                if (strstr($item['command'], "snort2c")) {
-                        $is_installed = true;
-                        break;
-                }
-                $x++;
-        }
-	$snort_rm_blocked_info_ck = $config['installedpackages']['snort']['config'][0]['rm_blocked'];
-		if ($snort_rm_blocked_info_ck == "1h_b") {
-                $snort_rm_blocked_min = "*/5";
-                $snort_rm_blocked_hr = "*";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "3600";
-		}
-		if ($snort_rm_blocked_info_ck == "3h_b") {
-                $snort_rm_blocked_min = "*/15";
-                $snort_rm_blocked_hr = "*";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "10800";
-		}
-		if ($snort_rm_blocked_info_ck == "6h_b") {
-                $snort_rm_blocked_min = "*/30";
-                $snort_rm_blocked_hr = "*";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "21600";
-		}
-		if ($snort_rm_blocked_info_ck == "12h_b") {
-                $snort_rm_blocked_min = "2";
-                $snort_rm_blocked_hr = "*/1";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "43200";
-		}
-		if ($snort_rm_blocked_info_ck == "1d_b") {
-                $snort_rm_blocked_min = "2";
-                $snort_rm_blocked_hr = "*/2";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "86400";
-		}
-		if ($snort_rm_blocked_info_ck == "4d_b") {
-                $snort_rm_blocked_min = "2";
-                $snort_rm_blocked_hr = "*/8";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "345600";
-		}
-		if ($snort_rm_blocked_info_ck == "7d_b") {
-                $snort_rm_blocked_min = "2";
-                $snort_rm_blocked_hr = "*/14";
-                $snort_rm_blocked_mday = "*";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "604800";
-		}
-		if ($snort_rm_blocked_info_ck == "28d_b") {
-                $snort_rm_blocked_min = "2";
-                $snort_rm_blocked_hr = "0";
-                $snort_rm_blocked_mday = "*/2";
-                $snort_rm_blocked_month = "*";
-                $snort_rm_blocked_wday = "*";
-				$snort_rm_blocked_expire = "2419200";
-		}
-        switch($should_install) {
-                case true:
-                        if(!$is_installed) {		
-                                $cron_item = array();
-                                $cron_item['minute'] = "$snort_rm_blocked_min";
-                                $cron_item['hour'] = "$snort_rm_blocked_hr";
-                                $cron_item['mday'] = "$snort_rm_blocked_mday";
-                                $cron_item['month'] = "$snort_rm_blocked_month";
-                                $cron_item['wday'] = "$snort_rm_blocked_wday";
-                                $cron_item['who'] = "root";
-                                $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/expiretable -t $snort_rm_blocked_expire snort2c";
-                                $config['cron']['item'][] = $cron_item;
-                                write_config("Installed 15 minute filter reload for Time Based Rules");
-                                configure_cron();
-                        }
-                break;
-                case false:
-                        if($is_installed == true) {
-                                if($x > 0) {
-                                        unset($config['cron']['item'][$x]);
-                                        write_config();
-                                }
-                                configure_cron();
-                        }
-                break;
-		}
-	}
-	snort_rm_blocked_install_cron("");
-	snort_rm_blocked_install_cron($snort_rm_blocked_false);
-}
-
-	/* set the snort rules update time */
-	$snort_rules_up_info_ck = $config['installedpackages']['snort']['config'][0]['autorulesupdate7'];
-		if ($snort_rules_up_info_ck == "never_up")
-                $snort_rules_up_false = "";
-			else
-				$snort_rules_up_false = "true";
-
-if ($snort_rules_up_info_ck != "") {
-function snort_rules_up_install_cron($should_install) {
-        global $config, $g;
-
-        if ($g['booting']==true)
-                return;
-
-        $is_installed = false;
-
-        if(!$config['cron']['item'])
-                return;
-
-        $x=0;
-        foreach($config['cron']['item'] as $item) {
-                if (strstr($item['command'], "snort_check_for_rule_updates.php")) {
-                        $is_installed = true;
-                        break;
-                }
-                $x++;
-        }
-	$snort_rules_up_info_ck = $config['installedpackages']['snort']['config'][0]['autorulesupdate7'];
-		if ($snort_rules_up_info_ck == "6h_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "*/6";
-                $snort_rules_up_mday = "*";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-		if ($snort_rules_up_info_ck == "12h_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "*/12";
-                $snort_rules_up_mday = "*";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-		if ($snort_rules_up_info_ck == "1d_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "0";
-                $snort_rules_up_mday = "*/1";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-		if ($snort_rules_up_info_ck == "4d_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "0";
-                $snort_rules_up_mday = "*/4";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-		if ($snort_rules_up_info_ck == "7d_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "0";
-                $snort_rules_up_mday = "*/7";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-		if ($snort_rules_up_info_ck == "28d_up") {
-                $snort_rules_up_min = "3";
-                $snort_rules_up_hr = "0";
-                $snort_rules_up_mday = "*/28";
-                $snort_rules_up_month = "*";
-                $snort_rules_up_wday = "*";
-		}
-        switch($should_install) {
-                case true:
-                        if(!$is_installed) {		
-                                $cron_item = array();
-                                $cron_item['minute'] = "$snort_rules_up_min";
-                                $cron_item['hour'] = "$snort_rules_up_hr";
-                                $cron_item['mday'] = "$snort_rules_up_mday";
-                                $cron_item['month'] = "$snort_rules_up_month";
-                                $cron_item['wday'] = "$snort_rules_up_wday";
-                                $cron_item['who'] = "root";
-                                $cron_item['command'] = "/usr/bin/nice -n20 /usr/local/bin/php -f /usr/local/pkg/snort_check_for_rule_updates.php >> /usr/local/etc/snort_bkup/snort_update.log";
-                                $config['cron']['item'][] = $cron_item;
-                                write_config("Installed 15 minute filter reload for Time Based Rules");
-                                configure_cron();
-                        }
-                break;
-                case false:
-                        if($is_installed == true) {
-                                if($x > 0) {
-                                        unset($config['cron']['item'][$x]);
-                                        write_config();
-                                }
-                                configure_cron();
-                        }
-                break;
-		}
-	}
-	snort_rules_up_install_cron("");
-	snort_rules_up_install_cron($snort_rules_up_false);
-}
-
-	/* open snort2c's whitelist for writing */
-	$whitelist = fopen("/var/db/whitelist", "w");
-	if(!$whitelist) {
-		log_error("Could not open /var/db/whitelist for writing.");
-		return;
-	}
-
-	/* build an interface array list */
-	$int_array = array('lan');
-	for ($j = 1; isset ($config['interfaces']['opt' . $j]); $j++)
-		if(isset($config['interfaces']['opt' . $j]['enable']))
-			if(!$config['interfaces']['opt' . $j]['gateway'])
-				$int_array[] = "opt{$j}";
-
-	/*  iterate through interface list and write out whitelist items
-	 *  and also compile a home_net list for snort.
-	 */
-	foreach($int_array as $int) {
-		/* calculate interface subnet information */
-		$ifcfg = &$config['interfaces'][$int];
-		$subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']);
-		$subnetmask = gen_subnet_mask($ifcfg['subnet']);
-		if($subnet == "pppoe" or $subnet == "dhcp") {
-			$subnet = find_interface_ip("ng0");
-			if($subnet)
-				$home_net .= "{$subnet} ";
-		} else {
-			if ($subnet)
-				if($ifcfg['subnet']) 
-					$home_net .= "{$subnet}/{$ifcfg['subnet']} ";
-		}
-	}
-
-	/* add all WAN ips to the whitelist */
-	$wan_if = get_real_wan_interface();
-	$ip = find_interface_ip($wan_if);
-	if($ip) 
-		$home_net .= "{$ip} ";
-	
-	/* Add Gateway on WAN interface to whitelist (For RRD graphs) */
-	$int = convert_friendly_interface_to_real_interface_name("WAN");
-	$gw = get_interface_gateway($int);
-	if($gw) 
-		$home_net .= "{$gw} ";
-	
-	/* Add DNS server for WAN interface to whitelist */
-	$dns_servers = get_dns_servers();
-	foreach($dns_servers as $dns) {
-		if($dns) 
-			$home_net .= "{$dns} ";		
-	}
-		
-	/* Add loopback to whitelist (ftphelper) */
-	$home_net .= "127.0.0.1 "; 	
-	
-	/* iterate all vips and add to whitelist */
-	if($config['virtualip'])
-		foreach($config['virtualip']['vip'] as $vip)
-			if($vip['subnet']) 
-				$home_net .= $vip['subnet'] . " ";
-
-	if($config['installedpackages']['snortwhitelist'])
-		foreach($config['installedpackages']['snortwhitelist']['config'] as $snort)
-			if($snort['ip']) 
-				$home_net .= $snort['ip'] . " ";
-
-	/* write out whitelist, convert spaces to carriage returns */
-	$whitelist_home_net = str_replace("  ", " ", $home_net);
-	$whitelist_home_net = str_replace(" ", "\n", $home_net);
-
-	/* make $home_net presentable to snort */
-	$home_net = trim($home_net);
-	$home_net = str_replace(" ", ",", $home_net);
-	$home_net = "[{$home_net}]";
-
-	/* foreach through whitelist, writing out to file */
-	$whitelist_split = split("\n", $whitelist_home_net);
-	foreach($whitelist_split as $wl)
-		if(trim($wl))
-			fwrite($whitelist, trim($wl) . "\n");
-
-	/* should we whitelist vpns? */
-	$whitelistvpns = $config['installedpackages']['snort']['config'][0]['whitelistvpns'];
-
-	/* grab a list of vpns and whitelist if user desires added by nestorfish 954 */
-	if($whitelistvpns) {
-		$vpns_list = get_vpns_list();
-		$whitelist_vpns = split(" ", $vpns_list);
-		foreach($whitelist_vpns as $wl)
-			if(trim($wl))
-				fwrite($whitelist, trim($wl) . "\n");
-	}
-
-	/* close file */
-	fclose($whitelist);
-
-     /* open snort's threshold.conf for writing */
-     $threshlist = fopen("/usr/local/etc/snort/threshold.conf", "w");
-     if(!$threshlist) {
-             log_error("Could not open /usr/local/etc/snort/threshold.conf for writing.");
-             return;
-    }
-
-     /* list all entries to new lines  */
-    if($config['installedpackages']['snortthreshold'])
-            foreach($config['installedpackages']['snortthreshold']['config'] as $snortthreshlist)
-                    if($snortthreshlist['threshrule'])
-                             $snortthreshlist_r .= $snortthreshlist['threshrule'] . "\n";
-
-
-     /* foreach through threshlist, writing out to file */
-     $threshlist_split = split("\n", $snortthreshlist_r);
-     foreach($threshlist_split as $wl)
-             if(trim($wl))
-                     fwrite($threshlist, trim($wl) . "\n");
-
-     /* close snort's threshold.conf file */
-     fclose($threshlist);	
-
-	/* generate rule sections to load */
-	$enabled_rulesets = $config['installedpackages']['snort']['rulesets'];
-	if($enabled_rulesets) {
-		$selected_rules_sections = "";
-		$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
-		foreach($enabled_rulesets_array as $enabled_item)
-			$selected_rules_sections  .= "include \$RULE_PATH/{$enabled_item}\n";
-	}
-
-	conf_mount_ro();
-
-	/* build snort configuration file */
-        /* TODO; feed back from pfsense users to reduce false positives */
-	$snort_conf_text = <<<EOD
-
-# snort configuration file
-# generated by the pfSense
-# package manager system
-# see /usr/local/pkg/snort.inc
-# for more information
-#	snort.conf
-#   Snort can be found at http://www.snort.org/
-
-#	Copyright (C) 2006 Robert Zelaya
-#	part of pfSense
-#	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.
-
-#########################
-                        #
-# Define Local Network  #
-                        #
-#########################
-
-var HOME_NET {$home_net}
-var EXTERNAL_NET !\$HOME_NET
-
-###################
-                  #
-# Define Servers  #
-                  #
-###################
-
-var DNS_SERVERS [{$def_dns_servers_type}]
-var SMTP_SERVERS [{$def_smtp_servers_type}]
-var HTTP_SERVERS [{$def_http_servers_type}]
-var SQL_SERVERS [{$def_sql_servers_type}]
-var TELNET_SERVERS [{$def_telnet_servers_type}]
-var SNMP_SERVERS [{$def_snmp_servers_type}]
-var FTP_SERVERS [{$def_ftp_servers_type}]
-var SSH_SERVERS [{$def_ssh_servers_type}]
-var POP_SERVERS [{$def_pop_servers_type}]
-var IMAP_SERVERS [{$def_imap_servers_type}]
-var RPC_SERVERS \$HOME_NET
-var WWW_SERVERS [{$def_www_servers_type}]
-var SIP_PROXY_IP [{$def_sip_proxy_ip_type}]
-var AIM_SERVERS \
-[64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24]
-
-########################
-                       #
-# Define Server Ports  #
-                       #
-########################
-
-portvar HTTP_PORTS [{$def_http_ports_type}]
-portvar SHELLCODE_PORTS !80
-portvar ORACLE_PORTS [{$def_oracle_ports_type}]
-portvar AUTH_PORTS [{$def_auth_ports_type}]
-portvar DNS_PORTS [{$def_dns_ports_type}]
-portvar FINGER_PORTS [{$def_finger_ports_type}]
-portvar FTP_PORTS [{$def_ftp_ports_type}]
-portvar IMAP_PORTS [{$def_imap_ports_type}]
-portvar IRC_PORTS [{$def_irc_ports_type}]
-portvar MSSQL_PORTS [{$def_mssql_ports_type}]
-portvar NNTP_PORTS [{$def_nntp_ports_type}]
-portvar POP2_PORTS [{$def_pop2_ports_type}]
-portvar POP3_PORTS [{$def_pop3_ports_type}]
-portvar SUNRPC_PORTS [111,32770,32771,32772,32773,32774,32775,32776,32777,32778,32779]
-portvar RLOGIN_PORTS [{$def_rlogin_ports_type}]
-portvar RSH_PORTS [{$def_rsh_ports_type}]
-portvar SMB_PORTS [139,445]
-portvar SMTP_PORTS [{$def_smtp_ports_type}]
-portvar SNMP_PORTS [{$def_snmp_ports_type}]
-portvar SSH_PORTS [{$def_ssh_ports_type}]
-portvar TELNET_PORTS [{$def_telnet_ports_type}]
-portvar MAIL_PORTS [{$def_mail_ports_type}]
-portvar SSL_PORTS [{$def_ssl_ports_type}]
-portvar SIP_PROXY_PORTS [{$def_sip_proxy_ports_type}]
-
-# DCERPC NCACN-IP-TCP
-portvar DCERPC_NCACN_IP_TCP [139,445]
-portvar DCERPC_NCADG_IP_UDP [138,1024:]
-portvar DCERPC_NCACN_IP_LONG [135,139,445,593,1024:]
-portvar DCERPC_NCACN_UDP_LONG [135,1024:]
-portvar DCERPC_NCACN_UDP_SHORT [135,593,1024:]
-portvar DCERPC_NCACN_TCP [2103,2105,2107]
-portvar DCERPC_BRIGHTSTORE [6503,6504]
-
-#####################
-                    #
-# Define Rule Paths #
-                    #
-#####################
-
-var RULE_PATH /usr/local/etc/snort/rules
-# var PREPROC_RULE_PATH ./preproc_rules
-
-################################
-                               #
-# Configure the snort decoder  #
-                               #
-################################
-
-config checksum_mode: all
-config disable_decode_alerts
-config disable_tcpopt_experimental_alerts
-config disable_tcpopt_obsolete_alerts
-config disable_ttcp_alerts
-config disable_tcpopt_alerts
-config disable_ipopt_alerts
-config disable_decode_drops
-
-###################################
-                                  #
-# Configure the detection engine  #
-# Use lower memory models         #
-                                  #
-###################################
-
-config detection: search-method {$snort_performance}
-config detection: max_queue_events 5
-config event_queue: max_queue 8 log 3 order_events content_length
-
-#Configure dynamic loaded libraries
-dynamicpreprocessor directory /usr/local/lib/snort/dynamicpreprocessor/
-dynamicengine /usr/local/lib/snort/dynamicengine/libsf_engine.so
-dynamicdetection directory /usr/local/lib/snort/dynamicrules/
-
-###################
-                  #
-# Flow and stream #
-                  #
-###################
-
-preprocessor frag3_global: max_frags 8192
-preprocessor frag3_engine: policy windows
-preprocessor frag3_engine: policy linux
-preprocessor frag3_engine: policy first
-preprocessor frag3_engine: policy bsd detect_anomalies
-
-preprocessor stream5_global: max_tcp 8192, track_tcp yes, \
-track_udp yes, track_icmp yes
-preprocessor stream5_tcp: bind_to any, policy windows
-preprocessor stream5_tcp: bind_to any, policy linux
-preprocessor stream5_tcp: bind_to any, policy vista
-preprocessor stream5_tcp: bind_to any, policy macos
-preprocessor stream5_tcp: policy BSD, ports both all, use_static_footprint_sizes
-preprocessor stream5_udp
-preprocessor stream5_icmp
-
-##########################
-                         #
-# NEW                    #
-# Performance Statistics #
-                         #
-##########################
-
-preprocessor perfmonitor: time 300 file /var/log/snort/snort.stats pktcnt 10000
-
-#################
-                #
-# HTTP Inspect  #
-                #
-#################
-
-preprocessor http_inspect: global iis_unicode_map unicode.map 1252
-
-preprocessor http_inspect_server: server default \
-                        ports  { 80 8080 }  \
-                        no_alerts \
-                        non_strict \
-                        non_rfc_char  { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 }  \
-                        flow_depth 0  \
-                        apache_whitespace yes \
-                        directory no \
-                        iis_backslash no \
-                        u_encode yes \
-                        ascii yes \
-                        chunk_length 500000 \
-                        bare_byte yes \
-                        double_decode yes \
-                        iis_unicode yes \
-                        iis_delimiter yes \
-                        multi_slash no
-
-##################
-                 #
-# Other preprocs #
-                 #
-##################
-
-preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779
-preprocessor bo
-
-#####################
-                    #
-# ftp preprocessor  #
-                    #
-#####################
-
-preprocessor ftp_telnet: global \
-inspection_type stateless
-
-preprocessor ftp_telnet_protocol: telnet \
-   normalize \
-   ayt_attack_thresh 200
-
-preprocessor ftp_telnet_protocol: \
-    ftp server default \
-    def_max_param_len 100 \
-    ports { 21 } \
-    ftp_cmds { USER PASS ACCT CWD SDUP SMNT QUIT REIN PORT PASV TYPE STRU MODE } \
-    ftp_cmds { RETR STOR STOU APPE ALLO REST RNFR RNTO ABOR DELE RMD MKD PWD } \
-    ftp_cmds { LIST NLST SITE SYST STAT HELP NOOP } \
-    ftp_cmds { AUTH ADAT PROT PBSZ CONF ENC } \
-    ftp_cmds { FEAT CEL CMD MACB } \
-    ftp_cmds { MDTM REST SIZE MLST MLSD } \
-    ftp_cmds { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \
-    alt_max_param_len 0 { CDUP QUIT REIN PASV STOU ABOR PWD SYST NOOP } \
-    alt_max_param_len 100 { MDTM CEL XCWD SITE USER PASS REST DELE RMD SYST TEST STAT MACB EPSV CLNT LPRT } \
-    alt_max_param_len 200 { XMKD NLST ALLO STOU APPE RETR STOR CMD RNFR HELP } \
-    alt_max_param_len 256 { RNTO CWD } \
-    alt_max_param_len 400 { PORT } \
-    alt_max_param_len 512 { SIZE } \
-    chk_str_fmt { USER PASS ACCT CWD SDUP SMNT PORT TYPE STRU MODE } \
-    chk_str_fmt { RETR STOR STOU APPE ALLO REST RNFR RNTO DELE RMD MKD } \
-    chk_str_fmt { LIST NLST SITE SYST STAT HELP } \
-    chk_str_fmt { AUTH ADAT PROT PBSZ CONF ENC } \
-    chk_str_fmt { FEAT CEL CMD } \
-    chk_str_fmt { MDTM REST SIZE MLST MLSD } \
-    chk_str_fmt { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \
-    cmd_validity MODE < char ASBCZ > \
-    cmd_validity STRU < char FRP > \
-    cmd_validity ALLO < int [ char R int ] > \
-    cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } > \
-    cmd_validity MDTM < [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string > \
-    cmd_validity PORT < host_port >
-
-preprocessor ftp_telnet_protocol: ftp client default \
-   max_resp_len 256 \
-   bounce yes \
-   telnet_cmds yes
-
-#####################
-                    #
-# SMTP preprocessor #
-                    #
-#####################
-
-preprocessor SMTP: \
-    ports { 25 465 691 } \
-    inspection_type stateful \
-    normalize cmds \
-    valid_cmds { MAIL RCPT HELP HELO ETRN EHLO EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET SEND SAML SOML AUTH TURN ETRN PIPELINING \
-CHUNKING DATA DSN RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUEU XSTA XTRN XUSR } \
-    normalize_cmds { MAIL RCPT HELP HELO ETRN EHLO EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET SEND SAML SOML AUTH TURN ETRN \
-PIPELINING CHUNKING DATA DSN RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUEU XSTA XTRN XUSR } \
-    max_header_line_len 1000 \ 
-    max_response_line_len 512 \
-    alt_max_command_line_len 260 { MAIL } \
-    alt_max_command_line_len 300 { RCPT } \
-    alt_max_command_line_len 500 { HELP HELO ETRN EHLO } \
-    alt_max_command_line_len 255 { EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET } \
-    alt_max_command_line_len 246 { SEND SAML SOML AUTH TURN ETRN PIPELINING CHUNKING DATA DSN RSET QUIT ONEX } \
-    alt_max_command_line_len 246 { QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR } \
-    alt_max_command_line_len 246 { XAUTH XCIR XEXCH50 XGEN XLICENSE XQUEU XSTA XTRN XUSR } \
-    xlink2state { enable }
-
-################
-               #
-# sf Portscan  #
-               #
-################
-
-preprocessor sfportscan: scan_type { all } \
-                         proto  { all } \
-                         memcap { 10000000 } \
-                         sense_level { medium } \
-                         ignore_scanners { \$HOME_NET }
-
-############################
-                           #
-# OLD                      #
-# preprocessor dcerpc: \   #
-#    autodetect \          #
-#    max_frag_size 3000 \  #
-#    memcap 100000         #
-                           #
-############################
-
-###############
-              #
-# NEW         #
-# DCE/RPC 2   #
-              #
-###############
-
-preprocessor dcerpc2: memcap 102400, events [smb, co, cl]
-preprocessor dcerpc2_server: default, policy WinXP, \
-    detect [smb [139,445], tcp 135, udp 135, rpc-over-http-server 593], \
-    autodetect [tcp 1025:, udp 1025:, rpc-over-http-server 1025:], \
-    smb_max_chain 3
-
-####################
-                   #
-# DNS preprocessor #
-                   #
-####################
-
-preprocessor dns: \
-    ports { 53 } \
-    enable_rdata_overflow
-
-##############################
-                             #
-# NEW                        #
-# Ignore SSL and Encryption  #
-                             #
-##############################
-
-preprocessor ssl: ports { 443 465 563 636 989 992 993 994 995 }, trustservers, noinspect_encrypted
-
-#####################
-                    #
-# Snort Output Logs #
-                    #
-#####################
-
-$snortalertlogtype_type
-$alertsystemlog_type
-$tcpdumplog_type
-$snortmysqllog_info_chk
-$snortunifiedlog_type
-$spoink_type
-						
-#################
-                #
-# Misc Includes #
-                #
-#################
-
-include /usr/local/etc/snort/reference.config
-include /usr/local/etc/snort/classification.config
-include /usr/local/etc/snort/threshold.conf
-
-# Snort user pass through configuration
-{$snort_config_pass_thru}
-
-###################
-                  #
-# Rules Selection #
-                  #
-###################
-
-{$selected_rules_sections}
-
-EOD;
-
-	return $snort_conf_text;
-}
-
-/*   check downloaded text from snort.org to make sure that an error did not occur
- *   for example, if you are not a premium subscriber you can only download rules
- *   so often, etc.
- */
-function check_for_common_errors($filename) {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	$contents = file_get_contents($filename);
-	if(stristr($contents, "You don't have permission")) {
-		if(!$console_mode) {
-			update_all_status("An error occured while downloading {$filename}.");
-			hide_progress_bar_status();
-		} else {
-			log_error("An error occured.  Scroll down to inspect it's contents.");
-			echo "An error occured.  Scroll down to inspect it's contents.";
-		}
-		if(!$console_mode) {
-			update_output_window(strip_tags("$contents"));
-		} else {
-			$contents = strip_tags($contents);
-			log_error("Error downloading snort rules: {$contents}");
-			echo "Error downloading snort rules: {$contents}";
-		}
-		scroll_down_to_bottom_of_page();
-		exit;
-	}
-}
-
-/* force browser to scroll all the way down */
-function scroll_down_to_bottom_of_page() {
-	global $snort_filename, $console_mode;
-	ob_flush();
-	if(!$console_mode)
-		echo "\n<script type=\"text/javascript\">parent.scrollTo(0,1500);\n</script>";
-}
-
-/* ensure downloaded file looks sane */
-function verify_downloaded_file($filename) {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	if(filesize($filename)<9500) {
-		if(!$console_mode) {
-			update_all_status("Checking {$filename}...");
-			check_for_common_errors($filename);
-		}
-	}
-	update_all_status("Verifying {$filename}...");
-	if(!file_exists($filename)) {
-		if(!$console_mode) {
-			update_all_status("Could not fetch snort rules ({$filename}).  Check oinkid key and dns and try again.");
-			hide_progress_bar_status();
-		} else {
-			log_error("Could not fetch snort rules ({$filename}).  Check oinkid key and dns and try again.");
-			echo "Could not fetch snort rules ({$filename}).  Check oinkid key and dns and try again.";
-		}
-		exit;
-	}
-	update_all_status("Verifyied {$filename}.");
-}
-
-/* extract rules */
-function extract_snort_rules_md5($tmpfname) {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	if(!$console_mode) {
-		$static_output = gettext("Extracting snort rules...");
-		update_all_status($static_output);
-	}
-	if(!is_dir("/usr/local/etc/snort/rules/"))
-		mkdir("/usr/local/etc/snort/rules/");
-	$cmd = "/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C /usr/local/etc/snort/ rules/";
-	$handle = popen("{$cmd} 2>&1", 'r');
-	while(!feof($handle)) {
-		$buffer = fgets($handle);
-		update_output_window($buffer);
-	}
-	pclose($handle);	
-
-	if(!$console_mode) {
-		$static_output = gettext("Snort rules extracted.");
-		update_all_status($static_output);
-	} else {
-		log_error("Snort rules extracted.");
-		echo "Snort rules extracted.";
-	}
-}
-
-/* verify MD5 against downloaded item */
-function verify_snort_rules_md5($tmpfname) {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	if(!$console_mode) {
-		$static_output = gettext("Verifying md5 signature...");
-		update_all_status($static_output);
-	}
-
-        $md555 = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
-        $md5 = `/bin/echo "{$md555}" | /usr/bin/awk '{ print $4 }'`;
-	$file_md5_ondisk = `/sbin/md5 {$tmpfname}/{$snort_filename} | /usr/bin/awk '{ print $4 }'`;
-	if($md5 == $file_md5_ondisk) {
-		if(!$console_mode) {
-			$static_output = gettext("snort rules: md5 signature of rules mismatch.");
-			update_all_status($static_output);
-			hide_progress_bar_status();
-		} else {
-			log_error("snort rules: md5 signature of rules mismatch.");
-			echo "snort rules: md5 signature of rules mismatch.";
-		}
-		exit;
-	}
-}
-
-/* hide progress bar */
-function hide_progress_bar_status() {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	if(!$console_mode)
-		echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';\n</script>";
-}
-
-/* unhide progress bar */
-function unhide_progress_bar_status() {
-        global $snort_filename, $snort_filename_md5, $console_mode;
-        ob_flush();
-        if(!$console_mode)
-                echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='visible';\n</script>";
-}
-
-/* update both top and bottom text box during an operation */
-function update_all_status($status) {
-	global $snort_filename, $snort_filename_md5, $console_mode;
-	ob_flush();
-	if(!$console_mode) {
-		update_status($status);
-		update_output_window($status);
-	}
-}
-
-/* obtain alert description for an ip address */
-function get_snort_alert($ip) {
-	global $snort_alert_file_split, $snort_config;
-	if(!file_exists("/var/log/snort/alert"))
-		return;
-	if(!$snort_config)
-		$snort_config = read_snort_config_cache();
-	if($snort_config[$ip])
-		return $snort_config[$ip];
-	if(!$snort_alert_file_split)
-		$snort_alert_file_split = split("\n", file_get_contents("/var/log/snort/alert"));
-	foreach($snort_alert_file_split as $fileline) {
-		if (preg_match("/\[\*\*\] (\[.*\]) (.*) (\[\*\*\])/", $fileline, $matches))
-			$alert_title = $matches[2];
-		if (preg_match("/(\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b)/", $fileline, $matches))
-			$alert_ip = $matches[0];
-		if($alert_ip == $ip) {
-			if(!$snort_config[$ip])
-				$snort_config[$ip] = $alert_title;
-			return $alert_title;
-		}
-	}
-	return "n/a";
-}
-
-function make_clickable($buffer) {
-    global $config, $g;
-    /* if clickable urls is disabled, simply return buffer back to caller */
-    $clickablalerteurls = $config['installedpackages']['snort']['config'][0]['oinkmastercode'];
-    if(!$clickablalerteurls)
-    	return $buffer;
-    $buffer = eregi_replace("(^|[ \n\r\t])((http(s?)://)(www\.)?([a-z0-9_-]+(\.[a-z0-9_-]+)+)(/[^/ \n\r]*)*)","\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $buffer);
-    $buffer = eregi_replace("(^|[ \n\r\t])((ftp://)(www\.)?([a-z0-9_-]+(\.[a-z0-9_-]+)+)(/[^/ \n\r]*)*)","\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $buffer);
-    $buffer = eregi_replace("([a-z_-][a-z0-9\._-]*@[a-z0-9_-]+(\.[a-z0-9_-]+)+)","<a href=\"mailto:\\1\">\\1</a>", $buffer);
-    $buffer = eregi_replace("(^|[ \n\r\t])(www\.([a-z0-9_-]+(\.[a-z0-9_-]+)+)(/[^/ \n\r]*)*)","\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $buffer);
-    $buffer = eregi_replace("(^|[ \n\r\t])(ftp\.([a-z0-9_-]+(\.[a-z0-9_-]+)+)(/[^/ \n\r]*)*)","\\1<a href=\"ftp://\\2\" target=\"_blank\">\\2</a>", $buffer);
-
-    return $buffer;
-}
-
-function read_snort_config_cache() {
-	global $g, $config, $snort_config;
-	if($snort_config)
-		return $snort_config;
-	if(file_exists($g['tmp_path'] . '/snort_config.cache')) {
-		$snort_config = unserialize(file_get_contents($g['tmp_path'] . '/snort_config.cache'));
-		return $snort_config;
-	}
-	return;
-}
-
-function write_snort_config_cache($snort_config) {
-	global $g, $config;
-	conf_mount_rw();
-	$configcache = fopen($g['tmp_path'] . '/snort_config.cache', "w");
-	if(!$configcache) {
-		log_error("Could not open {$g['tmp_path']}/snort_config.cache  for writing.");
-		return false;
-	}
-	fwrite($configcache, serialize($snort_config));
-	fclose($configcache);
-	conf_mount_ro();
-	return true;
-}
-
-function snort_advanced() {
-	global $g, $config;
-	sync_package_snort();
-}
-
-function snort_define_servers() {
-	global $g, $config;
-	sync_package_snort();
-}
-
-?>
diff --git a/config/snort-dev/bkup/snort.xml b/config/snort-dev/bkup/snort.xml
deleted file mode 100644
index fc32ceb9..00000000
--- a/config/snort-dev/bkup/snort.xml
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfsense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>Snort</name>
-	<version>2.8.4.1_5</version>
-	<title>Services: Snort 2.8.4.1_5 pkg v. 1.7 alpha</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
-	<menu>
-		<name>Snort</name>
-		<tooltiptext>Setup snort specific settings</tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-	</menu>
-	<service>
-		<name>snort</name>
-		<rcfile>snort.sh</rcfile>
-		<executable>snort</executable>
-		<description>Snort is the most widely deployed IDS/IPS technology worldwide..</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Update Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Categories</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Rules</text>
-			<url>/snort_rules.php</url>
-		</tab>
-		<tab>
-			<text>Servers</text>
-			<url>/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Blocked</text>
-			<url>/snort_blocked.php</url>
-		</tab>
-		<tab>
-			<text>Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
-		</tab>
-		<tab>
-			<text>Threshold</text>
-			<url>/pkg.php?xml=snort_threshold.xml</url>
-		</tab>
-		<tab>
-			<text>Alerts</text>
-			<url>/snort_alerts.php</url>
-		</tab>
-		<tab>
-			<text>Advanced</text>
-			<url>/pkg_edit.php?xml=snort_advanced.xml&amp;id=0</url>
-		</tab>
-	</tabs>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/bin/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/bin/barnyard2</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/bin/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/bin/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/bin/oinkmaster_contrib/oinkmaster.pl</item>
-	</additional_files_needed>	
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_download_rules.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rules.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rules_edit.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rulesets.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_whitelist.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_blocked.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_check_for_rule_updates.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_alerts.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/pf/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_dynamic_ip_reload.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_advanced.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_define_servers.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_threshold.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/pfsense_rules/local.rules</item>
-	</additional_files_needed>
-	<fields>
-		<field>
-			<fielddescr>Interface</fielddescr>
-			<fieldname>iface_array</fieldname>
-			<description>Select the interface(s) Snort will listen on.</description>
-			<type>interfaces_selection</type>
-			<required/>
-			<size>3</size>
-			<value>lan</value>
-			<multiple>true</multiple>
-		</field>
-		<field>
-			<fielddescr>Memory Performance</fielddescr>
-			<fieldname>performance</fieldname>
-			<description>Lowmem and ac-bnfa are recommended for low end systems, Ac: high memory, best performance, ac-std: moderate memory,high performance, acs: small memory, moderateperformance, ac-banded: small memory,moderate performance, ac-sparsebands: small memory, high performance.</description>
-			<type>select</type>
-			<options>
-				<option>
-					<name>ac-bnfa</name>
-					<value>ac-bnfa</value>
-				</option>
-				<option>
-					<name>lowmem</name>
-					<value>lowmem</value>
-				</option>
-				<option>
-					<name>ac-std</name>
-					<value>ac-std</value>
-				</option>
-				<option>
-					<name>ac</name>
-					<value>ac</value>
-				</option>
-				<option>
-					<name>ac-banded</name>
-					<value>ac-banded</value>
-				</option>
-				<option>
-					<name>ac-sparsebands</name>
-					<value>ac-sparsebands</value>
-				</option>
-				<option>
-					<name>acs</name>
-					<value>acs</value>
-				</option>
-			</options>
-			<required/>
-		</field>
-		<field>
-		</field>
-		<field>
-			<fielddescr>Install Snort.org rules.</fielddescr>
-			<fieldname>installsnortrules</fieldname>
-			<description>Free Snort.org rules that are maintained by Sourcefire. See the Pfsense Snort FAQ on how to get a subscription.</description>
-			<type>checkbox</type>
-			<required/>
-		</field>
-		<field>
-			<fielddescr>Oinkmaster code</fielddescr>
-			<fieldname>oinkmastercode</fieldname>
-			<description>Obtain a snort.org Oinkmaster code and paste here.</description>
-			<type>input</type>
-			<size>60</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Snort.org subscriber</fielddescr>
-			<fieldname>subscriber</fieldname>
-			<description>Check this box if you are a Snort.org subscriber (premium rules). &lt;b&gt;HIGHLY RECOMMENDED!&lt;/b&gt;</description>
-			<type>checkbox</type>
-			<size>60</size>
-		</field>
-		<field>
-		</field>
-		<field>
-			<fielddescr>Install emergingthreats rules.</fielddescr>
-			<fieldname>emergingthreats</fieldname>
-			<description>Emerging Threats is an open source community that produces fastest moving and diverse Snort Rules.</description>
-			<type>checkbox</type>
-			<required/>
-		</field>
-		<field>
-			<fielddescr>Install Pfsense rules.</fielddescr>
-			<fieldname>installpfsenserules</fieldname>
-			<description>Snort rules that Pfsense maintainers have requested for their packages.</description>
-			<type>checkbox</type>
-			<required/>
-		</field>
-		<field>
-			<fielddescr>Block offenders</fielddescr>
-			<fieldname>blockoffenders7</fieldname>
-			<description>Checking this option will automatically block hosts that generate a snort alert.</description>
-			<type>checkbox</type>
-			<size>60</size>
-		</field>
-		<field>
-			<fielddescr>Remove blocked hosts every</fielddescr>
-			<fieldname>rm_blocked</fieldname>
-			<description>Please select the amount of time hosts are blocked</description>
-			<type>select</type>
-			<options>
-				<option>
-					<name>never</name>
-					<value>never_b</value>
-				</option>
-				<option>
-					<name>1 hour</name>
-					<value>1h_b</value>
-				</option>
-				<option>
-					<name>3 hours</name>
-					<value>3h_b</value>
-				</option>
-				<option>
-					<name>6 hours</name>
-					<value>6h_b</value>
-				</option>
-				<option>
-					<name>12 hours</name>
-					<value>12h_b</value>
-				</option>
-				<option>
-					<name>1 day</name>
-					<value>1d_b</value>
-				</option>
-				<option>
-					<name>4 days</name>
-					<value>4d_b</value>
-				</option>
-				<option>
-					<name>7 days</name>
-					<value>7d_b</value>
-				</option>
-				<option>
-					<name>28 days</name>
-					<value>28d_b</value>
-				</option>
-			</options>
-		</field>
-		<field>
-			<fielddescr>Update rules automatically</fielddescr>
-			<fieldname>autorulesupdate7</fieldname>
-			<description>Please select the update times for rules.</description>
-			<type>select</type>
-			<options>
-				<option>
-					<name>never</name>
-					<value>never_up</value>
-				</option>
-				<option>
-					<name>6 hours</name>
-					<value>6h_up</value>
-				</option>
-				<option>
-					<name>12 hours</name>
-					<value>12h_up</value>
-				</option>
-				<option>
-					<name>1 day</name>
-					<value>1d_up</value>
-				</option>
-				<option>
-					<name>4 days</name>
-					<value>4d_up</value>
-				</option>
-				<option>
-					<name>7 days</name>
-					<value>7d_up</value>
-				</option>
-				<option>
-					<name>28 days</name>
-					<value>28d_up</value>
-				</option>
-			</options>
-		</field>
-		<field>
-			<fielddescr>Whitelist VPNs automatically</fielddescr>
-			<fieldname>whitelistvpns</fieldname>
-			<description>Checking this option will install whitelists for all VPNs.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Convert Snort alerts urls to clickable links</fielddescr>
-			<fieldname>clickablalerteurls</fieldname>
-			<description>Checking this option will automatically convert URLs in the Snort alerts tab to clickable links.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Associate events on Blocked tab</fielddescr>
-			<fieldname>associatealertip</fieldname>
-			<description>Checking this option will automatically associate the blocked reason from the snort alerts file.</description>
-			<type>checkbox</type>
-		</field>
-    </fields>
-	<custom_php_resync_config_command>
-		sync_package_snort();
-	</custom_php_resync_config_command>
-	<custom_add_php_command>
-	</custom_add_php_command>
-    <custom_php_install_command>
-		sync_package_snort_reinstall();
-    </custom_php_install_command>
-	<custom_php_deinstall_command>
-		snort_deinstall();
-	</custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_advanced.xml b/config/snort-dev/bkup/snort_advanced.xml
deleted file mode 100644
index 1fdddda2..00000000
--- a/config/snort-dev/bkup/snort_advanced.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>SnortAdvanced</name>
-	<version>none</version>
-	<title>Services: Snort Advanced</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Update Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Categories</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Rules</text>
-			<url>/snort_rules.php</url>
-		</tab>
-		<tab>
-			<text>Servers</text>
-			<url>/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Blocked</text>
-			<url>/snort_blocked.php</url>
-		</tab>
-		<tab>
-			<text>Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
-		</tab>
-		<tab>
-			<text>Threshold</text>
-			<url>/pkg.php?xml=snort_threshold.xml</url>
-		</tab>
-		<tab>
-			<text>Alerts</text>
-			<url>/snort_alerts.php</url>
-		</tab>
-		<tab>
-			<text>Advanced</text>
-			<url>/pkg_edit.php?xml=snort_advanced.xml&amp;id=0</url>
-			<active/>
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<fielddescr>BPF Buffer size</fielddescr>
-			<fieldname>bpfbufsize</fieldname>
-			<description>Changing this option adjusts the system BPF buffer size.  Leave blank if you do not know what this does. Default is 1024.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Maximum BPF buffer size</fielddescr>
-			<fieldname>bpfmaxbufsize</fieldname>
-			<description>Changing this option adjusts the system maximum BPF buffer size.  Leave blank if you do not know what this does. Default is 524288. This value should never be set above hardware cache size. The best (optimal size) is 50% - 80% of the hardware cache size.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Maximum BPF inserts</fielddescr>
-			<fieldname>bpfmaxinsns</fieldname>
-			<description>Changing this option adjusts the system maximum BPF insert size.  Leave blank if you do not know what this does. Default is 512.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Advanced configuration pass through</fielddescr>
-			<fieldname>configpassthru</fieldname>
-			<description>Add items to here will be automatically inserted into the running snort configuration</description>
-			<type>textarea</type>
-			<cols>40</cols>
-			<rows>5</rows>
-		</field>
-		<field>
-			<fielddescr>Snort signature info files.</fielddescr>
-			<fieldname>signatureinfo</fieldname>
-			<description>Snort signature info files will be installed during updates. At leats 500 mb of memory is needed.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Alerts Tab logging type.</fielddescr>
-			<fieldname>snortalertlogtype</fieldname>
-			<description>Please choose the type of Alert logging you will like see in the Alerts Tab. The options are Full descriptions or Fast short descriptions</description>
-			<type>select</type>
-			<options>
-				<option>
-					<name>fast</name>
-					<value>fast</value>
-				</option>
-				<option>
-					<name>full</name>
-					<value>full</value>
-				</option>
-			</options>
-		</field>
-		<field>
-			<fielddescr>Send alerts to main System logs.</fielddescr>
-			<fieldname>alertsystemlog</fieldname>
-			<description>Snort will send Alerts to the Pfsense system logs.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Log to a Tcpdump file.</fielddescr>
-			<fieldname>tcpdumplog</fieldname>
-			<description>Snort will log packets to a tcpdump-formatted file. The file then can be analyzed by a wireshark type of application. WARNING: File may become large.</description>
-			<type>checkbox</type>
-		</field>
-        <field>
-            <fielddescr>Enable Barnyard2.</fielddescr>
-            <fieldname>snortbarnyardlog</fieldname>
-            <description>This will enable barnyard2 in the snort package. You will also have to set the database credentials.</description>
-            <type>checkbox</type>
-        </field>
-		<field>
-			<fielddescr>Barnyard2 Log Mysql Database.</fielddescr>
-			<fieldname>snortbarnyardlog_database</fieldname>
-			<description>Example: output database: log, mysql, dbname=snort user=snort host=localhost password=xyz</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Barnyard2 Configure Hostname ID.</fielddescr>
-			<fieldname>snortbarnyardlog_hostname</fieldname>
-			<description>Example: pfsense.local</description>
-			<type>input</type>
-			<size>25</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Barnyard2 Configure Interface ID</fielddescr>
-			<fieldname>snortbarnyardlog_interface</fieldname>
-			<description>Example: vr0</description>
-			<type>input</type>
-			<size>25</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Log Alerts to a snort unified2 file.</fielddescr>
-			<fieldname>snortunifiedlog</fieldname>
-			<description>Snort will log Alerts to a file in the UNIFIED2 format. This is a requirement for barnyard2.</description>
-			<type>checkbox</type>
-		</field>		
-    </fields>
-	<custom_php_deinstall_command>
-		snort_advanced();
-	</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/snort-dev/bkup/snort_alerts.php b/config/snort-dev/bkup/snort_alerts.php
deleted file mode 100644
index f463c0b9..00000000
--- a/config/snort-dev/bkup/snort_alerts.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort_alerts.php
-	part of pfSense
-
-	Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	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.
-*/
-
-require("globals.inc");
-require("guiconfig.inc");
-require("/usr/local/pkg/snort.inc");
-
-$snort_logfile = "{$g['varlog_path']}/snort/alert";
-
-$nentries = $config['syslog']['nentries'];
-if (!$nentries)
-	$nentries = 50;
-
-if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("rm {$snort_logfile}; touch {$snort_logfile}");
-	system_syslogd_start();
-	exec("/usr/bin/killall -HUP snort");
-	exec("/usr/bin/killall snort2c");
-	if ($config['installedpackages']['snort']['config'][0]['blockoffenders'] == 'on')
-		exec("/usr/local/bin/snort2c -w /var/db/whitelist -a /var/log/snort/alert");
-}
-
-$pgtitle = "Services: Snort: Snort Alerts";
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<?php
-if(!$pgtitle_output)
-	echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td>
-<?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");	
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"),false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), true, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-		  <tr>
-			<td colspan="2" class="listtopic">
-			  Last <?=$nentries;?> Snort Alert entries</td>
-		  </tr>
-		  <?php dump_log_file($snort_logfile, $nentries); ?>
-			<tr><td><br><form action="snort_alerts.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
-		</table>
-	</div>
-	</form>
-	</td>
-  </tr>
-</table>
-<?php include("fend.inc"); ?>
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
-</body>
-</html>
-<!-- <?php echo $snort_logfile; ?> -->
-
-<?php
-
-function dump_log_file($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "") {
-	global $g, $config;
-    $logarr = "";
-	exec("cat {$logfile} | /usr/bin/tail -n {$tail}", $logarr);
-    foreach ($logarr as $logent) {
-            if(!logent)
-            	continue;
-            $ww_logent = $logent;
-			$ww_logent = str_replace("[", " [ ", $ww_logent);
-			$ww_logent = str_replace("]", " ] ", $ww_logent);
-            echo "<tr valign=\"top\">\n";
-            echo "<td colspan=\"2\" class=\"listr\">" . make_clickable($ww_logent) . "&nbsp;</td>\n";
-            echo "</tr>\n";
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_blocked.php b/config/snort-dev/bkup/snort_blocked.php
deleted file mode 100644
index ff158853..00000000
--- a/config/snort-dev/bkup/snort_blocked.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort_blocked.php
-	Copyright (C) 2006 Scott Ullrich
-	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.
-*/
-
-require("guiconfig.inc");
-require("/usr/local/pkg/snort.inc");
-
-if($_POST['todelete'] or $_GET['todelete']) {
-	if($_POST['todelete'])
-		$ip = $_POST['todelete'];
-	if($_GET['todelete'])
-		$ip = $_GET['todelete'];
-	exec("/sbin/pfctl -t snort2c -T delete {$ip}");
-}
-
-$pgtitle = "Snort: Snort Blocked";
-include("head.inc");
-
-?>
-
-<body link="#000000" vlink="#000000" alink="#000000">
-<?php include("fbegin.inc"); ?>
-
-<?php
-if(!$pgtitle_output)
-	echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-
-<form action="snort_rulesets.php" method="post" name="iform" id="iform">
-<script src="/row_toggle.js" type="text/javascript"></script>
-<script src="/javascript/sorttable.js" type="text/javascript"></script>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<table width="99%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-   		<td>
-<?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), true, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-?>
-  		</td>
-  </tr>
-  <tr>
-    <td>
-		<div id="mainarea">
-			<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<table id="sortabletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-						    <tr id="frheader">
-								<td width="5%" class="listhdrr">Remove</td>
-								<td class="listhdrr">IP</td>
-								<td class="listhdrr">Alert Description</td>
-							</tr>
-<?php
-
-	$associatealertip = $config['installedpackages']['snort']['config'][0]['associatealertip'];
-	$ips = `/sbin/pfctl -t snort2c -T show`;
-	$ips_array = split("\n", $ips);
-	$counter = 0;
-	foreach($ips_array as $ip) {
-		if(!$ip)
-			continue;
-		$ww_ip = str_replace(" ", "", $ip);
-		$counter++;
-		if($associatealertip)
-			$alert_description = get_snort_alert($ww_ip);
-		else
-			$alert_description = "";
-		echo "\n<tr>";
-		echo "\n<td align=\"center\" valign=\"top\"'><a href='snort_blocked.php?todelete=" . trim(urlencode($ww_ip)) . "'>";
-		echo "\n<img title=\"Delete\" border=\"0\" name='todelete' id='todelete' alt=\"Delete\" src=\"./themes/{$g['theme']}/images/icons/icon_x.gif\"></a></td>";
-		echo "\n<td>&nbsp;{$ww_ip}</td>";
-		echo "\n<td>&nbsp;{$alert_description}<!-- |{$ww_ip}| get_snort_alert($ww_ip); --></td>";
-		echo "\n</tr>";
-	}
-	echo "\n<tr><td colspan='3'>&nbsp;</td></tr>";
-	if($counter < 1)
-		echo "\n<tr><td colspan='3' align=\"center\" valign=\"top\">There are currently no items being blocked by snort.</td></tr>";
-	else
-		echo "\n<tr><td colspan='3' align=\"center\" valign=\"top\">{$counter} items listed.</td></tr>";
-
-?>
-
-						</table>
-		    		</td>
-		  		</tr>
-			</table>
-		</div>
-	</td>
-  </tr>
-</table>
-
-</form>
-
-<p>
-
-<?php
-
-$blockedtab_msg_chk = $config['installedpackages']['snort']['config'][0]['rm_blocked'];
-	if ($blockedtab_msg_chk == "1h_b") {
-		$blocked_msg = "hour";
-	}
-	if ($blockedtab_msg_chk == "3h_b") {
-		$blocked_msg = "3 hours";
-	}
-	if ($blockedtab_msg_chk == "6h_b") {
-		$blocked_msg = "6 hours";
-	}
-	if ($blockedtab_msg_chk == "12h_b") {
-		$blocked_msg = "12 hours";
-	}
-	if ($blockedtab_msg_chk == "1d_b") {
-		$blocked_msg = "day";
-	}
-	if ($blockedtab_msg_chk == "4d_b") {
-		$blocked_msg = "4 days";
-	}
-	if ($blockedtab_msg_chk == "7d_b") {
-		$blocked_msg = "7 days";
-	}
-	if ($blockedtab_msg_chk == "28d_b") {
-		$blocked_msg = "28 days";
-	}
-
-echo "This page lists hosts that have been blocked by Snort. Hosts are automatically deleted every $blocked_msg.";
-
-?>
-
-<?php include("fend.inc"); ?>
-
-</body>
-</html>
-
-<?php
-
-/* write out snort cache */
-write_snort_config_cache($snort_config);
-
-?>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_check_for_rule_updates.php b/config/snort-dev/bkup/snort_check_for_rule_updates.php
deleted file mode 100644
index 95adbaa6..00000000
--- a/config/snort-dev/bkup/snort_check_for_rule_updates.php
+++ /dev/null
@@ -1,629 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich
-	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 */
-$tmpfname = "/tmp/snort_rules_up";
-$snortdir = "/usr/local/etc/snort_bkup";
-$snortdir_wan = "/usr/local/etc/snort";
-$snort_filename_md5 = "snortrules-snapshot-2.8.tar.gz.md5";
-$snort_filename = "snortrules-snapshot-2.8.tar.gz";
-$emergingthreats_filename_md5 = "version.txt";
-$emergingthreats_filename = "emerging.rules.tar.gz";
-$pfsense_rules_filename_md5 = "pfsense_rules.tar.gz.md5";
-$pfsense_rules_filename = "pfsense_rules.tar.gz";
-
-require("/usr/local/pkg/snort.inc");
-require_once("config.inc");
-
-?>
-
-
-<?php
-
-$up_date_time = date('l jS \of F Y h:i:s A');
-echo "";
-echo "#########################";
-echo "$up_date_time";
-echo "#########################";
-echo "";
-
-/* Begin main code */
-/* Set user agent to Mozilla */
-ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-ini_set("memory_limit","125M");
-
-/* send current buffer */
-ob_flush();
-
-/* define oinkid */
-if($config['installedpackages']['snort'])
-        $oinkid = $config['installedpackages']['snort']['config'][0]['oinkmastercode'];
-
-/* if missing oinkid exit */
-if(!$oinkid) {
-        echo "Please add you oink code\n";
-        exit;
-}
-
-/* premium_subscriber check  */
-//unset($config['installedpackages']['snort']['config'][0]['subscriber']);
-//write_config();
-$premium_subscriber_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-
-if ($premium_subscriber_chk === on) {
-    $premium_subscriber = "_s";
-}else{
-    $premium_subscriber = "";
-}
-
-$premium_url_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-if ($premium_url_chk === on) {
-    $premium_url = "sub-rules";
-}else{
-    $premium_url = "reg-rules";
-}
-
-/* send current buffer */
-ob_flush();
-
-/*  remove old $tmpfname files */
-if (file_exists("{$tmpfname}")) {
-    exec("/bin/rm -r {$tmpfname}");
-	apc_clear_cache();
-}
-
-/* send current buffer */
-ob_flush();
-
-/* If tmp dir does not exist create it */
-if (file_exists($tmpfname)) {
-    echo "The directory tmp exists...\n";
-} else {
-    mkdir("{$tmpfname}", 700);
-}
-
-/*  download md5 sig from snort.org */
-if (file_exists("{$tmpfname}/{$snort_filename_md5}")) {
-    echo "md5 temp file exists...\n";
-} else {
-    echo "Downloading md5 file...\n";
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://dl.snort.org/{$premium_url}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz.md5?oink_code={$oinkid}");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz.md5");
-    $f = fopen("{$tmpfname}/snortrules-snapshot-2.8.tar.gz.md5", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    echo "Done. downloading md5\n";
-}
-
-/*  download md5 sig from emergingthreats.net */
-$emergingthreats_url_chk = $config['installedpackages']['snort']['config'][0]['emergingthreats'];
-if ($emergingthreats_url_chk == on) {
-    echo "Downloading md5 file...\n";
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.emergingthreats.net/version.txt");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/version.txt");
-    $f = fopen("{$tmpfname}/version.txt", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    echo "Done. downloading md5\n";
-}
-
-/*  download md5 sig from pfsense.org */
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename_md5}")) {
-    echo "md5 temp file exists...\n";
-} else {
-    echo "Downloading pfsense md5 file...\n";
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz.md5");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz.md5");
-    $f = fopen("{$tmpfname}/pfsense_rules.tar.gz.md5", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    echo "Done. downloading md5\n";
-}
-
-/*  Time stamps define */
-$last_md5_download = $config['installedpackages']['snort']['last_md5_download'];
-$last_rules_install = $config['installedpackages']['snort']['last_rules_install'];
-
-/* If md5 file is empty wait 15min exit */
-if (0 == filesize("{$tmpfname}/snortrules-snapshot-2.8.tar.gz.md5")){
-    echo "Please wait... You may only check for New Rules every 15 minutes...\n";
-    echo "Rules are released every month from snort.org. You may download the Rules at any time.\n";
-    exit(0);
-}
-
-/* If emergingthreats md5 file is empty wait 15min exit not needed */
-
-/* If pfsense md5 file is empty wait 15min exit */
-if (0 == filesize("{$tmpfname}/$pfsense_rules_filename_md5")){
-    echo "Please wait... You may only check for New Pfsense Rules every 15 minutes...\n";
-    echo "Rules are released to support Pfsense packages.\n";
-    exit(0);
-}
-
-/* Check if were up to date snort.org */
-if (file_exists("{$snortdir}/snortrules-snapshot-2.8.tar.gz.md5")){
-$md5_check_new_parse = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
-$md5_check_new = `/bin/echo "{$md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
-$md5_check_old_parse = file_get_contents("{$snortdir}/{$snort_filename_md5}");
-$md5_check_old = `/bin/echo "{$md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-/* Write out time of last sucsessful md5 to cache */
-$config['installedpackages']['snort']['last_md5_download'] = date("Y-M-jS-h:i-A");
-write_config();
-if ($md5_check_new == $md5_check_old) {
-        echo "Your rules are up to date...\n";
-        echo "You may start Snort now, check update.\n";
-        $snort_md5_check_ok = on;
-    }
-}
-
-/* Check if were up to date emergingthreats.net */
-$emergingthreats_url_chk = $config['installedpackages']['snort']['config'][0]['emergingthreats'];
-if ($emergingthreats_url_chk == on) {
-if (file_exists("{$snortdir}/version.txt")){
-$emerg_md5_check_new_parse = file_get_contents("{$tmpfname}/version.txt");
-$emerg_md5_check_new = `/bin/echo "{$emerg_md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
-$emerg_md5_check_old_parse = file_get_contents("{$snortdir}/version.txt");
-$emerg_md5_check_old = `/bin/echo "{$emerg_md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-/* Write out time of last sucsessful md5 to cache */
-$config['installedpackages']['snort']['last_md5_download'] = date("Y-M-jS-h:i-A");
-write_config();
-if ($emerg_md5_check_new == $emerg_md5_check_old) {
-        echo "Your emergingthreats rules are up to date...\n";
-        echo "You may start Snort now, check update.\n";
-        $emerg_md5_check_chk_ok = on;
-    }
-  }
-}
-
-/* Check if were up to date pfsense.org */
-if (file_exists("{$snortdir}/$pfsense_rules_filename_md5")){
-$pfsense_md5_check_new_parse = file_get_contents("{$tmpfname}/{$snort_filename_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}/{$snort_filename_md5}");
-$pfsense_md5_check_old = `/bin/echo "{$md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-if ($pfsense_md5_check_new == $pfsense_md5_check_old) {
-        $pfsense_md5_check_ok = on;
-    }
-}
-
-/*  Make Clean Snort Directory emergingthreats not checked */
-if ($snort_md5_check_ok == on && $emergingthreats_url_chk != on) {
-	echo "Cleaning the snort Directory...\n";
-    echo "removing...\n";
-	exec("/bin/rm {$snortdir}/rules/emerging*\n");
-	exec("/bin/rm {$snortdir}/version.txt");
-	echo "Done making cleaning emrg direcory.\n";
-}
-
-/* Check if were up to date exits */
-if ($snort_md5_check_ok == on && $emerg_md5_check_chk_ok == on && $pfsense_md5_check_ok == on) {
-		echo "Your rules are up to date...\n";
-		echo "You may start Snort now...\n";
-		exit(0);
-}
-
-if ($snort_md5_check_ok == on && $pfsense_md5_check_ok == on && $emergingthreats_url_chk != on) {
-		echo "Your rules are up to date...\n";
-		echo "You may start Snort now...\n";
-		exit(0);
-}
-		
-/* You are Not Up to date, always stop snort when updating rules for low end machines */;
-echo "You are NOT up to date...\n";
-echo "Stopping Snort service...\n";
-$chk_if_snort_up = exec("pgrep -x snort");
-if ($chk_if_snort_up != "") {
-	exec("/usr/bin/touch /tmp/snort_download_halt.pid");
-	stop_service("snort");
-	sleep(2);
-}
-
-/* download snortrules file */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$snort_filename}")) {
-    echo "Snortrule tar file exists...\n";
-} else {
-
-    echo "There is a new set of Snort rules posted. Downloading...\n";
-    echo "May take 4 to 10 min...\n";
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://dl.snort.org/{$premium_url}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz?oink_code={$oinkid}");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz");
-    $f = fopen("{$tmpfname}/snortrules-snapshot-2.8.tar.gz", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    echo "Done downloading rules file.\n";
-    if (150000 > filesize("{$tmpfname}/$snort_filename")){
-          echo "Error with the snort rules download...\n";
-          echo "Snort rules file downloaded failed...\n";
-          exit(0);
-  }		  
- }
-}
-
-/* download emergingthreats rules file */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_ok != on) {
-if (file_exists("{$tmpfname}/{$emergingthreats_filename}")) {
-    echo "Emergingthreats tar file exists...\n";
-} else {
-    echo "There is a new set of Emergingthreats rules posted. Downloading...\n";
-    echo "May take 4 to 10 min...\n";	
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.emergingthreats.net/rules/emerging.rules.tar.gz");
-//    $image = @file_get_contents("http://www.emergingthreats.net/rules/emerging.rules.tar.gz");
-    $f = fopen("{$tmpfname}/emerging.rules.tar.gz", 'w');
-    fwrite($f, $image);
-    fclose($f);	
-    echo "Done downloading Emergingthreats rules file.\n";
-   }
-  }
- }
-
-/* download pfsense rules file */
-if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
-    echo "Snortrule tar file exists...\n";
-} else {
-
-    echo "There is a new set of Pfsense rules posted. Downloading...\n";
-    echo "May take 4 to 10 min...\n";	
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz");
-    $f = fopen("{$tmpfname}/pfsense_rules.tar.gz", 'w');
-    fwrite($f, $image);
-    fclose($f);			
-    echo "Done downloading rules file.\n";
- }
-}
-
-/* Untar snort rules file individually to help people with low system specs */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$snort_filename}")) {
-    echo "Extracting rules...\n";
-    echo "May take a while...\n";
-    exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} etc/");
-	exec("`/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/*`");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/bad-traffic.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/chat.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/dos.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/exploit.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/imap.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/misc.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/multimedia.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/netbios.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/nntp.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/p2p.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/smtp.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/sql.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-client.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-misc.rules/");
-    echo "Done extracting Rules.\n";
-} else {
-    echo "The Download rules file missing...\n";
-    echo "Error rules extracting failed...\n";
-    exit(0);
- }
-}
-
-/* Untar emergingthreats rules to tmp */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_ok != on) {
-if (file_exists("{$tmpfname}/{$emergingthreats_filename}")) {
-    echo "Extracting rules...\n";
-    echo "May take a while...\n";
-    exec("/usr/bin/tar xzf {$tmpfname}/{$emergingthreats_filename} -C {$snortdir} rules/");
-  }
- }
-}
-
-/* Untar Pfsense rules to tmp */
-if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename}")) {
-    echo "Extracting Pfsense rules...\n";
-    echo "May take a while...\n";
-    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']['snortadvanced']['config'][0]['signatureinfo'];
-if ($premium_url_chk == on) {
-	echo "Extracting Signatures...\n";
-	echo "May take a while...\n";
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} doc/signatures/");
-	echo "Done extracting Signatures.\n";
-  }
- }
-}
-
-/*  Make Clean Snort Directory */
-//if ($snort_md5_check_ok != on && $emerg_md5_check_chk_ok != on && $pfsense_md5_check_ok != on) {
-//if (file_exists("{$snortdir}/rules")) {
-//    echo "Cleaning the snort Directory...\n";
-//    echo "removing...\n";
-//    exec("/bin/mkdir -p {$snortdir}");
-//	exec("/bin/mkdir -p {$snortdir}/rules");
-//	exec("/bin/mkdir -p {$snortdir}/signatures");
-//	exec("/bin/rm {$snortdir}/*");
-//	exec("/bin/rm {$snortdir}/rules/*");
-//	exec("/bin/rm {$snortdir_wan}/*");
-//	exec("/bin/rm {$snortdir_wan}/rules/*");
-//    exec("/bin/rm /usr/local/lib/snort/dynamicrules/*");	
-//} else {
-//    echo "Making Snort Directory...\n";
-//    echo "should be fast...\n";
-//    exec("/bin/mkdir {$snortdir}");
-//	exec("/bin/mkdir {$snortdir}/rules");
-//	exec("/bin/rm {$snortdir_wan}/\*");
-//	exec("/bin/rm {$snortdir_wan}/rules/*");
-//	exec("/bin/rm /usr/local/lib/snort/dynamicrules/\*");
-//    echo "Done making snort direcory.\n";
-//  }
-//}
-
-/*  Copy so_rules dir to snort lib dir */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/")) {
-    echo "Copying so_rules...\n";
-    echo "May take a while...\n";
-	sleep(2);
-    exec("`/bin/cp -f {$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/* /usr/local/lib/snort/dynamicrules/`");
-	exec("/bin/cp {$snortdir}/so_rules/bad-traffic.rules {$snortdir}/rules/bad-traffic.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/chat.rules {$snortdir}/rules/chat.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/dos.rules {$snortdir}/rules/dos.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/exploit.rules {$snortdir}/rules/exploit.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/imap.rules {$snortdir}/rules/imap.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/misc.rules {$snortdir}/rules/misc.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/multimedia.rules {$snortdir}/rules/multimedia.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/netbios.rules {$snortdir}/rules/netbios.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/nntp.rules {$snortdir}/rules/nntp.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/p2p.rules {$snortdir}/rules/p2p.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/smtp.rules {$snortdir}/rules/smtp.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/sql.rules {$snortdir}/rules/sql.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/web-client.rules {$snortdir}/rules/web-client.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/web-misc.rules {$snortdir}/rules/web-misc.so.rules");
-	exec("/bin/rm -r {$snortdir}/so_rules");
-    echo "Done copying so_rules.\n";
-} else {
-    echo "Directory so_rules does not exist...\n";
-    echo "Error copping so_rules...\n";
-    exit(0);
- }
-}
-
-/*  enable disable setting will carry over with updates */
-/*  TODO carry signature changes with the updates */
-if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_check_ok != on) {
-
-if (!empty($config['installedpackages']['snort']['rule_sid_on'])) {
-$enabled_sid_on = $config['installedpackages']['snort']['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']['snort']['rule_sid_off'])) {
-$enabled_sid_off = $config['installedpackages']['snort']['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
-
-###########################################
-#                                         #
-# this is auto generated on snort updates #
-#                                         #
-###########################################
-
-path = /bin:/usr/bin:/usr/local/bin
-
-update_files = \.rules$|\.config$|\.conf$|\.txt$|\.map$
-
-url = dir:///usr/local/etc/snort_bkup/rules
-
-$selected_sid_on_sections
-
-$selected_sid_off_sections
-
-EOD;
-
-     /* open snort's threshold.conf for writing */
-     $oinkmasterlist = fopen("/usr/local/etc/snort_bkup/oinkmaster.conf", "w");
-
-     fwrite($oinkmasterlist, "$snort_sid_text");
-
-     /* close snort's threshold.conf file */
-     fclose($oinkmasterlist);
-
-}
-
-/*  Copy configs to snort dir */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$snortdir}/etc/Makefile.am")) {
-    echo "Copying configs to snort directory...\n";
-    exec("/bin/cp {$snortdir}/etc/* {$snortdir}");
-	exec("/bin/rm -r {$snortdir}/etc");
-} else {
-    echo "The snort configs does not exist...\n";
-    echo "Error copping config...\n";
-    exit(0);
- }
-}
-
-/*  Copy md5 sig to snort dir */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/$snort_filename_md5")) {
-    echo "Copying md5 sig to snort directory...\n";
-    exec("/bin/cp {$tmpfname}/$snort_filename_md5 {$snortdir}/$snort_filename_md5");
-} else {
-    echo "The md5 file does not exist...\n";
-    echo "Error copping config...\n";
-    exit(0);
- }
-}
-
-/*  Copy emergingthreats md5 sig to snort dir */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_ok != on) {
-if (file_exists("{$tmpfname}/$emergingthreats_filename_md5")) {
-    echo "Copying md5 sig to snort directory...\n";
-    exec("/bin/cp {$tmpfname}/$emergingthreats_filename_md5 {$snortdir}/$emergingthreats_filename_md5");
-} else {
-    echo "The emergingthreats md5 file does not exist...\n";
-    echo "Error copping config...\n";
-    exit(0);
-  }
- }
-}
-
-/*  Copy Pfsense md5 sig to snort dir */
-if ($pfsense_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/$pfsense_rules_filename_md5")) {
-    echo "Copying Pfsense md5 sig to snort directory...\n";
-    exec("/bin/cp {$tmpfname}/$pfsense_rules_filename_md5 {$snortdir}/$pfsense_rules_filename_md5");
-} else {
-    echo "The Pfsense md5 file does not exist...\n";
-    echo "Error copping config...\n";
-    exit(0);
- }
-}
-
-/*  Copy signatures dir to snort dir */
-if ($snort_md5_check_ok != on) {
-$signature_info_chk = $config['installedpackages']['snort']['config'][0]['signatureinfo'];
-if ($premium_url_chk == on) {
-if (file_exists("{$snortdir}/doc/signatures")) {
-    echo "Copying signatures...\n";
-    echo "May take a while...\n";
-    exec("/bin/mv -f {$snortdir}/doc/signatures {$snortdir}/signatures");
-	exec("/bin/rm -r {$snortdir}/doc/signatures");
-    echo "Done copying signatures.\n";
-} else {
-    echo "Directory signatures exist...\n";
-    echo "Error copping signature...\n";
-    exit(0);
-  }
- }
-}
-
-/* double make shure clean up emerg rules that dont belong */
-if (file_exists("/usr/local/etc/snort_bkup/rules/emerging-botcc-BLOCK.rules")) {
-	apc_clear_cache();
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-botcc-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-botcc.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-compromised-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-drop-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-dshield-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-rbn-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-tor-BLOCK.rules");
-}
-
-if (file_exists("/usr/local/lib/snort/dynamicrules/lib_sfdynamic_example_rule.so")) {
-	exec("/bin/rm /usr/local/lib/snort/dynamicrules/lib_sfdynamic_example_rule.so");
-	exec("/bin/rm /usr/local/lib/snort/dynamicrules/lib_sfdynamic_example\*");
-}
-
-echo "Updating Alert Messages...\n";
-echo "Please Wait...\n";
-sleep(2);
-exec("/usr/local/bin/perl /usr/local/bin/create-sidmap.pl /usr/local/etc/snort_bkup/rules > /usr/local/etc/snort_bkup/sid-msg.map");
-
-/*  Run oinkmaster to snort_wan and cp configs */
-/*  If oinkmaster is not needed cp rules normally */
-/*  TODO add per interface settings here */
-if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_check_ok != on) {
-
-	if (empty($config['installedpackages']['snort']['rule_sid_on']) || empty($config['installedpackages']['snort']['rule_sid_off'])) {
-echo "Your first set of rules are being copied...\n";
-echo "May take a while...\n";
-
-    exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/rules/");
-	exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/generators {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}");
-
-} else {
-		echo "Your enable and disable changes are being applied to your fresh set of rules...\n";
-		echo "May take a while...\n";
-		exec("/bin/cp {$snortdir}/rules/* {$snortdir_wan}/rules/");
-		exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/generators {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}");
-
-		/*  oinkmaster.pl will convert saved changes for the new updates then we have to change #alert to # alert for the gui */
-		/*  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_bkup/oinkmaster.conf -o /usr/local/etc/snort/rules > /usr/local/etc/snort_bkup/oinkmaster.log");
-		exec("/usr/local/bin/perl -pi -e 's/#alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-		exec("/usr/local/bin/perl -pi -e 's/##alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-		exec("/usr/local/bin/perl -pi -e 's/## alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-				
-	}
-}
-
-/*  remove old $tmpfname files */
-if (file_exists("{$tmpfname}")) {
-    echo "Cleaning up...\n";
-    exec("/bin/rm -r /tmp/snort_rules_up");
-}
-
-/* php code to flush out cache some people are reportting missing files this might help  */
-sleep(5);
-apc_clear_cache();
-exec("/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync");
-
-/* if snort is running hardrestart, if snort is not running do nothing */
-if (file_exists("/tmp/snort_download_halt.pid")) {
-	start_service("snort");
-	echo "The Rules update finished...\n";
-	echo "Snort has restarted with your new set of rules...\n";
-	exec("/bin/rm /tmp/snort_download_halt.pid");
-} else {
-		echo "The Rules update finished...\n";
-		echo "You may start snort now...\n";
-}
-
-?>
diff --git a/config/snort-dev/bkup/snort_define_servers.xml b/config/snort-dev/bkup/snort_define_servers.xml
deleted file mode 100644
index 7df880d0..00000000
--- a/config/snort-dev/bkup/snort_define_servers.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>SnortDefServers</name>
-	<version>none</version>
-	<title>Services: Snort Define Servers</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Update Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Categories</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Rules</text>
-			<url>/snort_rules.php</url>
-		</tab>
-		<tab>
-			<text>Servers</text>
-			<url>/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Blocked</text>
-			<url>/snort_blocked.php</url>
-		</tab>
-		<tab>
-			<text>Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
-		</tab>
-		<tab>
-			<text>Threshold</text>
-			<url>/pkg.php?xml=snort_threshold.xml</url>
-		</tab>
-		<tab>
-			<text>Alerts</text>
-			<url>/snort_alerts.php</url>
-		</tab>
-		<tab>
-			<text>Advanced</text>
-			<url>/pkg_edit.php?xml=snort_advanced.xml&amp;id=0</url>
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<fielddescr>Define DNS_SERVERS</fielddescr>
-			<fieldname>def_dns_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define DNS_PORTS</fielddescr>
-			<fieldname>def_dns_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 53.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SMTP_SERVERS</fielddescr>
-			<fieldname>def_smtp_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SMTP_PORTS</fielddescr>
-			<fieldname>def_smtp_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define Mail_Ports</fielddescr>
-			<fieldname>def_mail_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25,143,465,691.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define HTTP_SERVERS</fielddescr>
-			<fieldname>def_http_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define WWW_SERVERS</fielddescr>
-			<fieldname>def_www_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define HTTP_PORTS</fielddescr>
-			<fieldname>def_http_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 80.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-			<field>
-			<fielddescr>Define SQL_SERVERS</fielddescr>
-			<fieldname>def_sql_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define ORACLE_PORTS</fielddescr>
-			<fieldname>def_oracle_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 1521.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define MSSQL_PORTS</fielddescr>
-			<fieldname>def_mssql_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 1433.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define TELNET_SERVERS</fielddescr>
-			<fieldname>def_telnet_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define TELNET_PORTS</fielddescr>
-			<fieldname>def_telnet_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 23.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SNMP_SERVERS</fielddescr>
-			<fieldname>def_snmp_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SNMP_PORTS</fielddescr>
-			<fieldname>def_snmp_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 161.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define FTP_SERVERS</fielddescr>
-			<fieldname>def_ftp_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define FTP_PORTS</fielddescr>
-			<fieldname>def_ftp_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 21.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SSH_SERVERS</fielddescr>
-			<fieldname>def_ssh_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SSH_PORTS</fielddescr>
-			<fieldname>def_ssh_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is Pfsense SSH port.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define POP_SERVERS</fielddescr>
-			<fieldname>def_pop_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define POP2_PORTS</fielddescr>
-			<fieldname>def_pop2_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 109.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define POP3_PORTS</fielddescr>
-			<fieldname>def_pop3_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 110.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define IMAP_SERVERS</fielddescr>
-			<fieldname>def_imap_servers</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define IMAP_PORTS</fielddescr>
-			<fieldname>def_imap_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 143.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SIP_PROXY_IP</fielddescr>
-			<fieldname>def_sip_proxy_ip</fieldname>
-			<description>Example: "192.168.1.3/24,192.168.1.4/24". Leave blank to scan all networks.</description>
-			<type>input</type>
-			<size>101</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SIP_PROXY_PORTS</fielddescr>
-			<fieldname>def_sip_proxy_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 5060:5090,16384:32768.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define AUTH_PORTS</fielddescr>
-			<fieldname>def_auth_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 113.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define FINGER_PORTS</fielddescr>
-			<fieldname>def_finger_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 79.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define IRC_PORTS</fielddescr>
-			<fieldname>def_irc_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 6665,6666,6667,6668,6669,7000.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define NNTP_PORTS</fielddescr>
-			<fieldname>def_nntp_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 119.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define RLOGIN_PORTS</fielddescr>
-			<fieldname>def_rlogin_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 513.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define RSH_PORTS</fielddescr>
-			<fieldname>def_rsh_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 514.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Define SSL_PORTS</fielddescr>
-			<fieldname>def_ssl_ports</fieldname>
-			<description>Example: Specific ports "25,443" or All ports betwen "5060:5090 . Default is 25,443,465,636,993,995.</description>
-			<type>input</type>
-			<size>43</size>
-			<value></value>
-		</field>
-    </fields>
-	<custom_php_deinstall_command>
-		snort_define_servers();
-	</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/snort-dev/bkup/snort_download_rules.php b/config/snort-dev/bkup/snort_download_rules.php
deleted file mode 100644
index 133f2d2a..00000000
--- a/config/snort-dev/bkup/snort_download_rules.php
+++ /dev/null
@@ -1,782 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich and 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 */
-$tmpfname = "/tmp/snort_rules_up";
-$snortdir = "/usr/local/etc/snort_bkup";
-$snortdir_wan = "/usr/local/etc/snort";
-$snort_filename_md5 = "snortrules-snapshot-2.8.tar.gz.md5";
-$snort_filename = "snortrules-snapshot-2.8.tar.gz";
-$emergingthreats_filename_md5 = "version.txt";
-$emergingthreats_filename = "emerging.rules.tar.gz";
-$pfsense_rules_filename_md5 = "pfsense_rules.tar.gz.md5";
-$pfsense_rules_filename = "pfsense_rules.tar.gz";
-
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("service-utils.inc");
-require("/usr/local/pkg/snort.inc");
-
-$pgtitle = "Services: Snort: Update Rules";
-
-include("/usr/local/www/head.inc");
-
-?>
-
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
-<?php include("/usr/local/www/fbegin.inc"); ?>
-
-<?php
-if(!$pgtitle_output)
-        echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-
-<form action="snort_download_rules.php" method="post">
-<div id="inputerrors"></div>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr>
-    <td>
-<?php
-        $tab_array = array();
-        $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-        $tab_array[] = array(gettext("Update Rules"), true, "/snort_download_rules.php");
-        $tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-        $tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");
-		$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-        $tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-        $tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-		$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-        $tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-        $tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-        display_top_tabs($tab_array);
-?>
-    </td>
-  </tr>
-        <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>
-</table>
-</form>
-
-<?php include("fend.inc");?>
-
-<?php
-
-
-/* Begin main code */
-/* Set user agent to Mozilla */
-ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-ini_set("memory_limit","125M");
-
-/* send current buffer */
-ob_flush();
-
-/* define oinkid */
-if($config['installedpackages']['snort'])
-        $oinkid = $config['installedpackages']['snort']['config'][0]['oinkmastercode'];
-
-/* if missing oinkid exit */
-if(!$oinkid) {
-        $static_output = gettext("You must obtain an oinkid from snort.org and set its value in the Snort settings tab.");
-        update_all_status($static_output);
-        hide_progress_bar_status();
-        exit;
-}
-
-/* premium_subscriber check  */
-//unset($config['installedpackages']['snort']['config'][0]['subscriber']);
-//write_config();
-$premium_subscriber_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-
-if ($premium_subscriber_chk === on) {
-    $premium_subscriber = "_s";
-}else{
-    $premium_subscriber = "";
-}
-
-$premium_url_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-if ($premium_url_chk === on) {
-    $premium_url = "sub-rules";
-}else{
-    $premium_url = "reg-rules";
-}
-
-/* hide progress bar */
-hide_progress_bar_status();
-
-/* send current buffer */
-ob_flush();
-
-/*  remove old $tmpfname files */
-if (file_exists("{$tmpfname}")) {
-    update_status(gettext("Removing old tmp files..."));
-    exec("/bin/rm -r {$tmpfname}");
-	apc_clear_cache();
-}
-
-/*  Make shure snortdir exits */
-exec("/bin/mkdir -p {$snortdir}");
-exec("/bin/mkdir -p {$snortdir}/rules");
-exec("/bin/mkdir -p {$snortdir}/signatures");
-
-/* send current buffer */
-ob_flush();
-
-/* If tmp dir does not exist create it */
-if (file_exists($tmpfname)) {
-    update_status(gettext("The directory tmp exists..."));
-} else {
-    mkdir("{$tmpfname}", 700);
-}
-
-/* unhide progress bar and lets end this party */
-unhide_progress_bar_status();
-
-/*  download md5 sig from snort.org */
-if (file_exists("{$tmpfname}/{$snort_filename_md5}")) {
-    update_status(gettext("md5 temp file exists..."));
-} else {
-    update_status(gettext("Downloading md5 file..."));
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://dl.snort.org/{$premium_url}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz.md5?oink_code={$oinkid}");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz.md5");
-    $f = fopen("{$tmpfname}/snortrules-snapshot-2.8.tar.gz.md5", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    update_status(gettext("Done. downloading md5"));
-}
-
-/*  download md5 sig from emergingthreats.net */
-$emergingthreats_url_chk = $config['installedpackages']['snort']['config'][0]['emergingthreats'];
-if ($emergingthreats_url_chk == on) {
-    update_status(gettext("Downloading md5 file..."));
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.emergingthreats.net/version.txt");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/version.txt");
-    $f = fopen("{$tmpfname}/version.txt", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    update_status(gettext("Done. downloading md5"));
-}
-
-/*  download md5 sig from pfsense.org */
-if (file_exists("{$tmpfname}/{$pfsense_rules_filename_md5}")) {
-    update_status(gettext("md5 temp file exists..."));
-} else {
-    update_status(gettext("Downloading pfsense md5 file..."));
-    ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
-    $image = @file_get_contents("http://www.pfsense.com/packages/config/snort/pfsense_rules/pfsense_rules.tar.gz.md5");
-//    $image = @file_get_contents("http://www.mtest.local/pub-bin/oinkmaster.cgi/{$oinkid}/pfsense_rules.tar.gz.md5");
-    $f = fopen("{$tmpfname}/pfsense_rules.tar.gz.md5", 'w');
-    fwrite($f, $image);
-    fclose($f);
-    update_status(gettext("Done. downloading md5"));
-}
-
-/*  Time stamps define */
-$last_md5_download = $config['installedpackages']['snort']['last_md5_download'];
-$last_rules_install = $config['installedpackages']['snort']['last_rules_install'];
-
-/* If md5 file is empty wait 15min exit */
-if (0 == filesize("{$tmpfname}/snortrules-snapshot-2.8.tar.gz.md5")){
-    update_status(gettext("Please wait... You may only check for New Rules every 15 minutes..."));
-    update_output_window(gettext("Rules are released every month from snort.org. You may download the Rules at any time."));
-    hide_progress_bar_status();
-    /* Display last time of sucsessful md5 check from cache */
-    echo "\n<p align=center><b>You last checked for updates: </b>{$last_md5_download}</p>\n";
-    echo "\n<p align=center><b>You last installed for rules: </b>{$last_rules_install}</p>\n";
-    echo "\n\n</body>\n</html>\n";
-    exit(0);
-}
-
-/* If emergingthreats md5 file is empty wait 15min exit not needed */
-
-/* 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<p align=center><b>You last checked for updates: </b>{$last_md5_download}</p>\n";
-    echo "\n<p align=center><b>You last installed for rules: </b>{$last_rules_install}</p>\n";
-    echo "\n\n</body>\n</html>\n";
-    exit(0);
-}
-
-/* Check if were up to date snort.org */
-if (file_exists("{$snortdir}/snortrules-snapshot-2.8.tar.gz.md5")){
-$md5_check_new_parse = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
-$md5_check_new = `/bin/echo "{$md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
-$md5_check_old_parse = file_get_contents("{$snortdir}/{$snort_filename_md5}");
-$md5_check_old = `/bin/echo "{$md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-/* Write out time of last sucsessful md5 to cache */
-$config['installedpackages']['snort']['last_md5_download'] = date("Y-M-jS-h:i-A");
-write_config();
-if ($md5_check_new == $md5_check_old) {
-        update_status(gettext("Your rules are up to date..."));
-        update_output_window(gettext("You may start Snort now, check update."));
-        hide_progress_bar_status();
-        /* Timestamps to html  */
-        echo "\n<p align=center><b>You last checked for updates: </b>{$last_md5_download}</p>\n";
-        echo "\n<p align=center><b>You last installed for rules: </b>{$last_rules_install}</p>\n";
-//        echo "P is this code {$premium_subscriber}";
-        echo "\n\n</body>\n</html>\n";
-        $snort_md5_check_ok = on;
-    }
-}
-
-/* Check if were up to date emergingthreats.net */
-$emergingthreats_url_chk = $config['installedpackages']['snort']['config'][0]['emergingthreats'];
-if ($emergingthreats_url_chk == on) {
-if (file_exists("{$snortdir}/version.txt")){
-$emerg_md5_check_new_parse = file_get_contents("{$tmpfname}/version.txt");
-$emerg_md5_check_new = `/bin/echo "{$emerg_md5_check_new_parse}" | /usr/bin/awk '{ print $1 }'`;
-$emerg_md5_check_old_parse = file_get_contents("{$snortdir}/version.txt");
-$emerg_md5_check_old = `/bin/echo "{$emerg_md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-/* Write out time of last sucsessful md5 to cache */
-$config['installedpackages']['snort']['last_md5_download'] = date("Y-M-jS-h:i-A");
-write_config();
-if ($emerg_md5_check_new == $emerg_md5_check_old) {
-        update_status(gettext("Your emergingthreats rules are up to date..."));
-        update_output_window(gettext("You may start Snort now, check update."));
-        hide_progress_bar_status();
-        $emerg_md5_check_chk_ok = on;
-    }
-  }
-}
-
-/* Check if were up to date pfsense.org */
-if (file_exists("{$snortdir}/$pfsense_rules_filename_md5")){
-$pfsense_md5_check_new_parse = file_get_contents("{$tmpfname}/{$snort_filename_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}/{$snort_filename_md5}");
-$pfsense_md5_check_old = `/bin/echo "{$md5_check_old_parse}" | /usr/bin/awk '{ print $1 }'`;
-if ($pfsense_md5_check_new == $pfsense_md5_check_old) {
-        $pfsense_md5_check_ok = on;
-    }
-}
-
-/*  Make Clean Snort Directory emergingthreats not checked */
-if ($snort_md5_check_ok == on && $emergingthreats_url_chk != on) {
-	update_status(gettext("Cleaning the snort Directory..."));
-    update_output_window(gettext("removing..."));
-	exec("/bin/rm {$snortdir}/rules/emerging*");
-	exec("/bin/rm {$snortdir}/version.txt");
-	exec("/bin/rm {$snortdir_wan}/rules/emerging*");
-	exec("/bin/rm {$snortdir_wan}/version.txt");
-	update_status(gettext("Done making cleaning emrg direcory."));
-}
-
-/* Check if were up to date exits */
-if ($snort_md5_check_ok == on && $emerg_md5_check_chk_ok == on && $pfsense_md5_check_ok == on) {
-		update_status(gettext("Your rules are up to date..."));
-		update_output_window(gettext("You may start Snort now..."));
-		exit(0);
-}
-
-if ($snort_md5_check_ok == on && $pfsense_md5_check_ok == on && $emergingthreats_url_chk != on) {
-		update_status(gettext("Your rules are up to date..."));
-		update_output_window(gettext("You may start Snort now..."));
-		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..."));
-$chk_if_snort_up = exec("pgrep -x snort");
-if ($chk_if_snort_up != "") {
-	exec("/usr/bin/touch /tmp/snort_download_halt.pid");
-	stop_service("snort");
-	sleep(2);
-}
-
-/* download snortrules file */
-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 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}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz", $tmpfname . "/{$snort_filename}", "read_body_firmware");
-    download_file_with_progress_bar("http://dl.snort.org/{$premium_url}/snortrules-snapshot-2.8{$premium_subscriber}.tar.gz?oink_code={$oinkid}", $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..."));
-          exit(0);
-  }		  
- }
-}
-
-/* download emergingthreats rules file */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_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."));
-   }
-  }
- }
-
-/* 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."));
- }
-}
-
-/* Compair md5 sig to file sig */
-
-//$premium_url_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-//if ($premium_url_chk == on) {
-//$md5 = file_get_contents("{$tmpfname}/{$snort_filename_md5}");
-//$file_md5_ondisk = `/sbin/md5 {$tmpfname}/{$snort_filename} | /usr/bin/awk '{ print $4 }'`;
-// if ($md5 == $file_md5_ondisk) {
-//    update_status(gettext("Valid md5 checksum pass..."));
-//} else {
-//    update_status(gettext("The downloaded file does not match the md5 file...P is ON"));
-//    update_output_window(gettext("Error md5 Mismatch..."));
-//    exit(0);
-//  }
-//}
-
-//$premium_url_chk = $config['installedpackages']['snort']['config'][0]['subscriber'];
-//if ($premium_url_chk != on) {
-//$md55 = `/bin/cat {$tmpfname}/{$snort_filename_md5} | /usr/bin/awk '{ print $4 }'`;
-//$file_md5_ondisk2 = `/sbin/md5 {$tmpfname}/{$snort_filename} | /usr/bin/awk '{ print $4 }'`;
-// if ($md55 == $file_md5_ondisk2) {
-//    update_status(gettext("Valid md5 checksum pass..."));
-//} else {
-//    update_status(gettext("The downloaded file does not match the md5 file...Not P"));
-//    update_output_window(gettext("Error md5 Mismatch..."));
-//    exit(0);
-//    }
-//}
-
-/* Untar snort rules file individually to help people with low system specs */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$snort_filename}")) {
-    update_status(gettext("Extracting rules..."));
-    update_output_window(gettext("May take a while..."));
-    exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} etc/");
-	exec("`/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/*`");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/bad-traffic.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/chat.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/dos.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/exploit.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/imap.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/misc.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/multimedia.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/netbios.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/nntp.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/p2p.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/smtp.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/sql.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-client.rules/");
-	exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-misc.rules/");
-    update_status(gettext("Done extracting Rules."));
-} else {
-    update_status(gettext("The Download rules file missing..."));
-    update_output_window(gettext("Error rules extracting failed..."));
-    exit(0);
- }
-}
-
-/* Untar emergingthreats rules to tmp */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_ok != on) {
-if (file_exists("{$tmpfname}/{$emergingthreats_filename}")) {
-    update_status(gettext("Extracting rules..."));
-    update_output_window(gettext("May take a while..."));
-    exec("/usr/bin/tar xzf {$tmpfname}/{$emergingthreats_filename} -C {$snortdir} rules/");
-  }
- }
-}
-
-/* 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/");
- }
-}
-
-/* Untar snort signatures */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$tmpfname}/{$snort_filename}")) {
-$signature_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['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."));
-  }
- }
-}
-
-/*  Make Clean Snort Directory */
-//if ($snort_md5_check_ok != on && $emerg_md5_check_chk_ok != on && $pfsense_md5_check_ok != on) {
-//if (file_exists("{$snortdir}/rules")) {
-//    update_status(gettext("Cleaning the snort Directory..."));
-//    update_output_window(gettext("removing..."));
-//    exec("/bin/mkdir -p {$snortdir}");
-//	exec("/bin/mkdir -p {$snortdir}/rules");
-//	exec("/bin/mkdir -p {$snortdir}/signatures");
-//	exec("/bin/rm {$snortdir}/*");
-//	exec("/bin/rm {$snortdir}/rules/*");
-//	exec("/bin/rm {$snortdir_wan}/*");
-//	exec("/bin/rm {$snortdir_wan}/rules/*");
-	
-//    exec("/bin/rm /usr/local/lib/snort/dynamicrules/*");	
-//} else {
-//    update_status(gettext("Making Snort Directory..."));
-//    update_output_window(gettext("should be fast..."));
-//    exec("/bin/mkdir -p {$snortdir}");
-//	exec("/bin/mkdir -p {$snortdir}/rules");
-//	exec("/bin/rm {$snortdir_wan}/*");
-//	exec("/bin/rm {$snortdir_wan}/rules/*");
-//	exec("/bin/rm /usr/local/lib/snort/dynamicrules/\*");
-//    update_status(gettext("Done making snort direcory."));
-//  }
-//}
-
-/*  Copy so_rules dir to snort lib dir */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/")) {
-    update_status(gettext("Copying so_rules..."));
-    update_output_window(gettext("May take a while..."));
-    exec("`/bin/cp -f {$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/* /usr/local/lib/snort/dynamicrules/`");
-	exec("/bin/cp {$snortdir}/so_rules/bad-traffic.rules {$snortdir}/rules/bad-traffic.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/chat.rules {$snortdir}/rules/chat.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/dos.rules {$snortdir}/rules/dos.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/exploit.rules {$snortdir}/rules/exploit.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/imap.rules {$snortdir}/rules/imap.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/misc.rules {$snortdir}/rules/misc.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/multimedia.rules {$snortdir}/rules/multimedia.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/netbios.rules {$snortdir}/rules/netbios.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/nntp.rules {$snortdir}/rules/nntp.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/p2p.rules {$snortdir}/rules/p2p.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/smtp.rules {$snortdir}/rules/smtp.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/sql.rules {$snortdir}/rules/sql.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/web-client.rules {$snortdir}/rules/web-client.so.rules");
-	exec("/bin/cp {$snortdir}/so_rules/web.misc.rules {$snortdir}/rules/web.misc.so.rules");
-	exec("/bin/rm -r {$snortdir}/so_rules");
-    update_status(gettext("Done copying so_rules."));
-} else {
-    update_status(gettext("Directory so_rules does not exist..."));
-    update_output_window(gettext("Error copping so_rules..."));
-    exit(0);
- }
-}
-
-/*  enable disable setting will carry over with updates */
-/*  TODO carry signature changes with the updates */
-if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_check_ok != on) {
-
-if (!empty($config['installedpackages']['snort']['rule_sid_on'])) {
-$enabled_sid_on = $config['installedpackages']['snort']['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']['snort']['rule_sid_off'])) {
-$enabled_sid_off = $config['installedpackages']['snort']['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
-
-###########################################
-#                                         #
-# this is auto generated on snort updates #
-#                                         #
-###########################################
-
-path = /bin:/usr/bin:/usr/local/bin
-
-update_files = \.rules$|\.config$|\.conf$|\.txt$|\.map$
-
-url = dir:///usr/local/etc/snort_bkup/rules
-
-$selected_sid_on_sections
-
-$selected_sid_off_sections
-
-EOD;
-
-     /* open snort's threshold.conf for writing */
-     $oinkmasterlist = fopen("/usr/local/etc/snort_bkup/oinkmaster.conf", "w");
-
-     fwrite($oinkmasterlist, "$snort_sid_text");
-
-     /* close snort's threshold.conf file */
-     fclose($oinkmasterlist);
-
-}
-
-/*  Copy configs to snort dir */
-if ($snort_md5_check_ok != on) {
-if (file_exists("{$snortdir}/etc/Makefile.am")) {
-    update_status(gettext("Copying configs to snort directory..."));
-    exec("/bin/cp {$snortdir}/etc/* {$snortdir}");
-	exec("/bin/rm -r {$snortdir}/etc");
-	
-} else {
-    update_status(gettext("The snort configs does not exist..."));
-    update_output_window(gettext("Error copping config..."));
-    exit(0);
- }
-}
-
-/*  Copy md5 sig to snort dir */
-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 copping config..."));
-    exit(0);
- }
-}
-
-/*  Copy emergingthreats md5 sig to snort dir */
-if ($emergingthreats_url_chk == on) {
-if ($emerg_md5_check_chk_ok != on) {
-if (file_exists("{$tmpfname}/$emergingthreats_filename_md5")) {
-    update_status(gettext("Copying md5 sig to snort directory..."));
-    exec("/bin/cp {$tmpfname}/$emergingthreats_filename_md5 {$snortdir}/$emergingthreats_filename_md5");
-} else {
-    update_status(gettext("The emergingthreats md5 file does not exist..."));
-    update_output_window(gettext("Error copping config..."));
-    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 copping config..."));
-    exit(0);
- }
-}
- 
-/*  Copy signatures dir to snort dir */
-if ($snort_md5_check_ok != on) {
-$signature_info_chk = $config['installedpackages']['snort']['config'][0]['signatureinfo'];
-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 copping signature..."));
-    exit(0);
-  }
- }
-}
-
-/* double make shure cleanup emerg rules that dont belong */
-if (file_exists("/usr/local/etc/snort_bkup/rules/emerging-botcc-BLOCK.rules")) {
-	apc_clear_cache();
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-botcc-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-botcc.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-compromised-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-drop-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-dshield-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-rbn-BLOCK.rules");
-	exec("/bin/rm /usr/local/etc/snort_bkup/rules/emerging-tor-BLOCK.rules");
-}
-
-if (file_exists("/usr/local/lib/snort/dynamicrules/lib_sfdynamic_example_rule.so")) {
-	exec("/bin/rm /usr/local/lib/snort/dynamicrules/lib_sfdynamic_example_rule.so");
-	exec("/bin/rm /usr/local/lib/snort/dynamicrules/lib_sfdynamic_example\*");
-}
-
-/* create a msg-map for snort  */
-update_status(gettext("Updating Alert Messages..."));
-update_output_window(gettext("Please Wait..."));
-exec("/usr/local/bin/perl /usr/local/bin/create-sidmap.pl /usr/local/etc/snort_bkup/rules > /usr/local/etc/snort_bkup/sid-msg.map");
-
-/*  Run oinkmaster to snort_wan and cp configs */
-/*  If oinkmaster is not needed cp rules normally */
-/*  TODO add per interface settings here */
-if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_check_ok != on) {
-
-	if (empty($config['installedpackages']['snort']['rule_sid_on']) || empty($config['installedpackages']['snort']['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}/rules/");
-	exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/generators {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}");
-
-} 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}/rules/");
-		exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/generators {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}");
-		exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}");
-
-		/*  oinkmaster.pl will convert saved changes for the new updates then we have to change #alert to # alert for the gui */
-		/*  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_bkup/oinkmaster.conf -o /usr/local/etc/snort/rules > /usr/local/etc/snort_bkup/oinkmaster.log");
-		exec("/usr/local/bin/perl -pi -e 's/#alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-		exec("/usr/local/bin/perl -pi -e 's/##alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-		exec("/usr/local/bin/perl -pi -e 's/## alert/# alert/g' /usr/local/etc/snort/rules/*.rules");
-		
-		
-	}
-}
-
-/*  remove old $tmpfname files */
-if (file_exists("{$tmpfname}")) {
-    update_status(gettext("Cleaning up..."));
-    exec("/bin/rm -r /tmp/snort_rules_up");
-//	apc_clear_cache();
-}
-
-/* php code to flush out cache some people are reportting missing files this might help  */
-sleep(2);
-apc_clear_cache();
-exec("/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync ;/bin/sync");
-
-/* if snort is running hardrestart, if snort is not running do nothing */
-if (file_exists("/tmp/snort_download_halt.pid")) {
-	start_service("snort");
-	update_status(gettext("The Rules update finished..."));
-	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..."));
-}
-
-/* hide progress bar and lets end this party */
-hide_progress_bar_status();
-
-?>
-
-<?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;
-}
-
-?>
-
-</body>
-</html>
diff --git a/config/snort-dev/bkup/snort_dynamic_ip_reload.php b/config/snort-dev/bkup/snort_dynamic_ip_reload.php
deleted file mode 100644
index 0fad085b..00000000
--- a/config/snort-dev/bkup/snort_dynamic_ip_reload.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/* $Id$ */
-/*
-	snort_dynamic_ip_reload.php
-	Copyright (C) 2006 Scott Ullrich and Robert Zeleya
-	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.
-*/
-
-/* NOTE: this file gets included from the pfSense filter.inc plugin process */
-/* NOTE: file location /usr/local/pkg/pf, all files in pf dir get exec on filter reloads */
-
-require_once("/usr/local/pkg/snort.inc");
-require_once("service-utils.inc");
-require_once("config.inc");
-
-
-if($config['interfaces']['wan']['ipaddr'] == "pppoe" or
-   $config['interfaces']['wan']['ipaddr'] == "dhcp") {
-		create_snort_conf();
-		exec("killall -HUP snort");
-		/* define snortbarnyardlog_chk */
-        $snortbarnyardlog_info_chk = $config['installedpackages']['snortadvanced']['config'][0]['snortbarnyardlog'];
-        if ($snortbarnyardlog_info_chk == on)
-                exec("killall -HUP barnyard2");
-}
-
-?>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_rules.php b/config/snort-dev/bkup/snort_rules.php
deleted file mode 100644
index 233841b1..00000000
--- a/config/snort-dev/bkup/snort_rules.php
+++ /dev/null
@@ -1,620 +0,0 @@
-<?php
-/* $Id$ */
-/*
-    edit_snortrule.php
-    Copyright (C) 2004, 2005 Scott Ullrich and Rober 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.
-*/
-require("guiconfig.inc");
-require("config.inc");
-
-if(!is_dir("/usr/local/etc/snort/rules"))
-	exec('mkdir /usr/local/etc/snort/rules/');
-
-/* Check if the rules dir is empy if so warn the user */
-/* TODO give the user the option to delete the installed rules rules */
-$isrulesfolderempty = exec('ls -A /usr/local/etc/snort/rules/*.rules');
-if ($isrulesfolderempty == "") {
-
-include("head.inc");
-include("fbegin.inc");
-
-echo "<body link=\"#000000\" vlink=\"#000000\" alink=\"#000000\">";
-
-echo "<script src=\"/row_toggle.js\" type=\"text/javascript\"></script>\n
-<script src=\"/javascript/sorttable.js\" type=\"text/javascript\"></script>\n
-<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n
-   <tr>\n
-   		<td>\n";
-
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), true, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-
-echo  		"</td>\n
-  </tr>\n
-  <tr>\n
-    <td>\n
-		<div id=\"mainarea\">\n
-			<table id=\"maintable\" class=\"tabcont\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n
-				<tr>\n
-					<td>\n
-# The rules directory is empty.\n
-		    		</td>\n
-		  		</tr>\n
-			</table>\n
-		</div>\n
-	</td>\n
-  </tr>\n
-</table>\n
-\n
-</form>\n
-\n
-<p>\n\n";
-
-echo "Please click on the Update Rules tab to install your selected rule sets.";
-include("fend.inc");
-
-echo "</body>";
-echo "</html>";
-
-exit(0);
-
-}
-
-function get_middle($source, $beginning, $ending, $init_pos) {
-   $beginning_pos = strpos($source, $beginning, $init_pos);
-   $middle_pos = $beginning_pos + strlen($beginning);
-   $ending_pos = strpos($source, $ending, $beginning_pos);
-   $middle = substr($source, $middle_pos, $ending_pos - $middle_pos);
-   return $middle;
-}
-
-function write_rule_file($content_changed, $received_file)
-{
-    //read snort file with writing enabled
-    $filehandle = fopen($received_file, "w");
-
-    //delimiter for each new rule is a new line
-    $delimiter = "\n";
-
-    //implode the array back into a string for writing purposes
-    $fullfile = implode($delimiter, $content_changed);
-
-    //write data to file
-    fwrite($filehandle, $fullfile);
-
-    //close file handle
-    fclose($filehandle);
-
-}
-
-function load_rule_file($incoming_file)
-{
-
-    //read snort file
-    $filehandle = fopen($incoming_file, "r");
-
-    //read file into string, and get filesize
-    $contents = fread($filehandle, filesize($incoming_file));
-
-    //close handler
-    fclose ($filehandle);
-
-    //string for populating category select
-    $currentruleset = substr($file, 27);
-
-    //delimiter for each new rule is a new line
-    $delimiter = "\n";
-
-    //split the contents of the string file into an array using the delimiter
-    $splitcontents = explode($delimiter, $contents);
-
-    return $splitcontents;
-
-}
-
-$ruledir = "/usr/local/etc/snort/rules/";
-$dh  = opendir($ruledir);
-
-$message_reload = "The Snort rule configuration has been changed.<br>You must apply the changes in order for them to take effect.";
-
-while (false !== ($filename = readdir($dh)))
-{
-    //only populate this array if its a rule file
-    $isrulefile = strstr($filename, ".rules");
-    if ($isrulefile !== false)
-    {
-        $files[] = $filename;
-    }
-}
-
-sort($files);
-
-if ($_GET['openruleset'])
-{
-    $file = $_GET['openruleset'];
-}
-else
-{
-    $file = $ruledir.$files[0];
-
-}
-
-//Load the rule file
-$splitcontents = load_rule_file($file);
-
-if ($_POST)
-{
-	if (!$_POST['apply']) {
-	    //retrieve POST data
-	    $post_lineid = $_POST['lineid'];
-	    $post_enabled = $_POST['enabled'];
-	    $post_src = $_POST['src'];
-	    $post_srcport = $_POST['srcport'];
-	    $post_dest = $_POST['dest'];
-	    $post_destport = $_POST['destport'];
-	
-		//clean up any white spaces insert by accident
-		$post_src = str_replace(" ", "", $post_src);
-		$post_srcport = str_replace(" ", "", $post_srcport);
-		$post_dest = str_replace(" ", "", $post_dest);
-		$post_destport = str_replace(" ", "", $post_destport);
-	
-	    //copy rule contents from array into string
-	    $tempstring = $splitcontents[$post_lineid];
-	
-	    //search string
-	    $findme = "# alert"; //find string for disabled alerts
-	
-	    //find if alert is disabled
-	    $disabled = strstr($tempstring, $findme);
-	
-	    //if find alert is false, then rule is disabled
-	    if ($disabled !== false)
-	    {
-	        //has rule been enabled
-	        if ($post_enabled == "yes")
-	        {
-	            //move counter up 1, so we do not retrieve the # in the rule_content array
-	            $tempstring = str_replace("# alert", "alert", $tempstring);
-	            $counter2 = 1;
-	        }
-	        else
-	        {
-	            //rule is staying disabled
-	            $counter2 = 2;
-	        }
-	    }
-	    else
-	    {
-	        //has rule been disabled
-	        if ($post_enabled != "yes")
-	        {
-	            //move counter up 1, so we do not retrieve the # in the rule_content array
-	            $tempstring = str_replace("alert", "# alert", $tempstring);
-	            $counter2 = 2;
-	        }
-	        else
-	        {
-	            //rule is staying enabled
-	            $counter2 = 1;
-	        }
-	    }
-	
-	    //explode rule contents into an array, (delimiter is space)
-	    $rule_content = explode(' ', $tempstring);
-	
-		//insert new values
-	    $counter2++;
-	    $rule_content[$counter2] = $post_src;//source location
-	    $counter2++;
-	    $rule_content[$counter2] = $post_srcport;//source port location
-	    $counter2 = $counter2+2;
-	    $rule_content[$counter2] = $post_dest;//destination location
-	    $counter2++;
-	    $rule_content[$counter2] = $post_destport;//destination port location
-	
-		//implode the array back into string
-		$tempstring = implode(' ', $rule_content);
-	
-		//copy string into file array for writing
-	    $splitcontents[$post_lineid] = $tempstring;
-	
-	    //write the new .rules file
-	    write_rule_file($splitcontents, $file);
-	
-	    //once file has been written, reload file
-	    $splitcontents = load_rule_file($file);
-	    
-	    $stopMsg = true;
-	}
-	
-	if ($_POST['apply']) {
-//		stop_service("snort");
-//		sleep(2);
-//		start_service("snort");
-		$savemsg = "The snort rules selections have been saved. Please restart snort by clicking save on the settings tab.";
-		$stopMsg = false;
-	}
-
-}
-else if ($_GET['act'] == "toggle")
-{
-    $toggleid = $_GET['id'];
-
-    //copy rule contents from array into string
-    $tempstring = $splitcontents[$toggleid];
-
-    //explode rule contents into an array, (delimiter is space)
-    $rule_content = explode(' ', $tempstring);
-
-    //search string
-    $findme = "# alert"; //find string for disabled alerts
-
-    //find if alert is disabled
-    $disabled = strstr($tempstring, $findme);
-
-    //if find alert is false, then rule is disabled
-    if ($disabled !== false)
-    {
-        //rule has been enabled
-        //move counter up 1, so we do not retrieve the # in the rule_content array
-        $tempstring = str_replace("# alert", "alert", $tempstring);
-
-    }
-    else
-    {
-        //has rule been disabled
-        //move counter up 1, so we do not retrieve the # in the rule_content array
-        $tempstring = str_replace("alert", "# alert", $tempstring);
-
-    }
-
-    //copy string into array for writing
-    $splitcontents[$toggleid] = $tempstring;
-
-    //write the new .rules file
-    write_rule_file($splitcontents, $file);
-
-    //once file has been written, reload file
-    $splitcontents = load_rule_file($file);
-    
-    $stopMsg = true;
-	
-		//write disable/enable sid to config.xml
-		if ($disabled == false) {
-            $string_sid = strstr($tempstring, 'sid:');
-            $sid_pieces = explode(";", $string_sid);
-            $sid_off_cut = $sid_pieces[0];
-            // sid being turned off
-            $sid_off  = str_replace("sid:", "", $sid_off_cut);
-			// rule_sid_on registers
-			$sid_on_pieces = $config['installedpackages']['snort']['rule_sid_on'];
-			// if off sid is the same as on sid remove it
-			$sid_on_old = str_replace("||enablesid $sid_off", "", "$sid_on_pieces");
-			// write the replace sid back as empty
-			$config['installedpackages']['snort']['rule_sid_on'] = $sid_on_old;
-			// rule sid off registers
-			$sid_off_pieces = $config['installedpackages']['snort']['rule_sid_off'];
-			// if off sid is the same as off sid remove it
-			$sid_off_old = str_replace("||disablesid $sid_off", "", "$sid_off_pieces");
-			// write the replace sid back as empty
-			$config['installedpackages']['snort']['rule_sid_off'] = $sid_off_old;
-			// add sid off registers to new off sid
-			$config['installedpackages']['snort']['rule_sid_off'] = "||disablesid $sid_off" . $config['installedpackages']['snort']['rule_sid_off'];
-			write_config();
-		}
-		else
-		{
-            $string_sid = strstr($tempstring, 'sid:');
-            $sid_pieces = explode(";", $string_sid);
-            $sid_on_cut = $sid_pieces[0];
-            // sid being turned off
-            $sid_on  = str_replace("sid:", "", $sid_on_cut);
-			// rule_sid_off registers
-			$sid_off_pieces = $config['installedpackages']['snort']['rule_sid_off'];
-			// if off sid is the same as on sid remove it
-			$sid_off_old = str_replace("||disablesid $sid_on", "", "$sid_off_pieces");
-			// write the replace sid back as empty
-			$config['installedpackages']['snort']['rule_sid_off'] = $sid_off_old;
-			// rule sid on registers
-			$sid_on_pieces = $config['installedpackages']['snort']['rule_sid_on'];
-			// if on sid is the same as on sid remove it
-			$sid_on_old = str_replace("||enablesid $sid_on", "", "$sid_on_pieces");
-			// write the replace sid back as empty
-			$config['installedpackages']['snort']['rule_sid_on'] = $sid_on_old;
-			// add sid on registers to new on sid
-			$config['installedpackages']['snort']['rule_sid_on'] = "||enablesid $sid_on" . $config['installedpackages']['snort']['rule_sid_on'];
-			write_config();
-		}
-	
-}
-
-
-$pgtitle = "Snort: Rules";
-require("guiconfig.inc");
-include("head.inc");
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<?php
-if(!$pgtitle_output)
-	echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-<form action="snort_rules.php" method="post" name="iform" id="iform">
-<?php if ($savemsg){print_info_box($savemsg);} else if ($stopMsg){print_info_box_np($message_reload);}?>
-<br>
-</form>
-<script type="text/javascript" language="javascript" src="row_toggle.js">
-    <script src="/javascript/sorttable.js" type="text/javascript">
-</script>
-
-<script language="javascript" type="text/javascript">
-<!--
-function go()
-{
-    var agt=navigator.userAgent.toLowerCase();
-    if (agt.indexOf("msie") != -1) {
-        box = document.forms.selectbox;
-    } else {
-        box = document.forms[1].selectbox;
-	}
-    destination = box.options[box.selectedIndex].value;
-    if (destination) 
-		location.href = destination;
-}
-// -->
-</script>
-
-<table width="99%" border="0" cellpadding="0" cellspacing="0">
-  <tr>
-      <td>
-<?php
-    $tab_array = array();
-    $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-    $tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-    $tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-    $tab_array[] = array(gettext("Rules"), true, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-    $tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-    $tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-    $tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-    $tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-    display_top_tabs($tab_array);
-?>
-      </td>
-  </tr>
-  <tr>
-    <td>
-        <div id="mainarea">
-            <table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td>
-                        <table id="ruletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-                            <tr id="frheader">
-                                    <td width="3%" class="list">&nbsp;</td>
-                                    <td width="5%" class="listhdr">SID</td>
-                                    <td width="6%" class="listhdrr">Proto</td>
-                                    <td width="15%" class="listhdrr">Source</td>
-                                    <td width="10%" class="listhdrr">Port</td>
-                                    <td width="15%" class="listhdrr">Destination</td>
-                                    <td width="10%" class="listhdrr">Port</td>
-                                  <td width="32%" class="listhdrr">Message</td>
-
-                              </tr>
-                            <tr>
-                            <?php
-
-                                echo "<br>Category: ";
-
-                                //string for populating category select
-                                $currentruleset = substr($file, 27);
-                                ?>
-                                <form name="forms">
-                                    <select name="selectbox" class="formfld" onChange="go()">
-                                        <?php
-                                        $i=0;
-                                        foreach ($files as $value)
-                                        {
-                                            $selectedruleset = "";
-                                            if ($files[$i] === $currentruleset)
-                                                $selectedruleset = "selected";
-                                            ?>
-                                            <option value="?&openruleset=<?=$ruledir;?><?=$files[$i];?>" <?=$selectedruleset;?>><?=$files[$i];?></option>"
-                                            <?php
-                                            $i++;
-
-                                        }
-                                        ?>
-                                    </select>
-                                </form>
-                            </tr>
-                            <?php
-
-                            $counter = 0;
-                            $printcounter = 0;
-
-                            foreach ( $splitcontents as $value )
-                            {
-
-                                $counter++;
-                                $disabled = "False";
-                                $comments = "False";
-
-                                $tempstring = $splitcontents[$counter];
-                                $findme = "# alert"; //find string for disabled alerts
-
-                                //find alert
-                                $disabled_pos = strstr($tempstring, $findme);
-
-
-                                    //do soemthing, this rule is enabled
-                                    $counter2 = 1;
-
-                                    //retrieve sid value
-                                    $sid = get_middle($tempstring, 'sid:', ';', 0);
-
-                                    //check to see if the sid is numberical
-                                    $is_sid_num = is_numeric($sid);
-
-                                    //if SID is numerical, proceed
-                                    if ($is_sid_num)
-                                    {
-
-                                        //if find alert is false, then rule is disabled
-                                        if ($disabled_pos !== false){
-                                            $counter2 = $counter2+1;
-                                            $textss = "<span class=\"gray\">";
-                                            $textse = "</span>";
-                                            $iconb = "icon_block_d.gif";
-                                        }
-                                        else
-                                        {
-                                            $textss = $textse = "";
-                                            $iconb = "icon_block.gif";
-                                        }
-
-                                        $rule_content = explode(' ', $tempstring);
-
-                                        $protocol = $rule_content[$counter2];//protocol location
-                                        $counter2++;
-                                        $source = $rule_content[$counter2];//source location
-                                        $counter2++;
-                                        $source_port = $rule_content[$counter2];//source port location
-                                        $counter2 = $counter2+2;
-                                        $destination = $rule_content[$counter2];//destination location
-                                        $counter2++;
-                                        $destination_port = $rule_content[$counter2];//destination port location
-
-                                        $message = get_middle($tempstring, 'msg:"', '";', 0);										
-										
-                                        echo "<tr>";
-                                        echo "<td class=\"listt\">";
-                                        echo $textss;
-                                        ?>
-                                        <a href="?&openruleset=<?=$file;?>&act=toggle&id=<?=$counter;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/<?=$iconb;?>" width="11" height="11" border="0" title="click to toggle enabled/disabled status"></a>
-                                        <?php
-                                        echo $textse;
-                                        echo "</td>";
-
-
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $sid;
-                                        echo $textse;
-                                        echo "</td>";
-
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $protocol;
-                                        $printcounter++;
-                                        echo $textse;
-                                        echo "</td>";
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $source;
-                                        echo $textse;
-                                        echo "</td>";
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $source_port;
-                                        echo $textse;
-                                        echo "</td>";
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $destination;
-                                        echo $textse;
-                                        echo "</td>";
-                                        echo "<td class=\"listlr\">";
-                                        echo $textss;
-                                        echo $destination_port;
-                                        echo $textse;
-                                        echo "</td>";
-                                        ?>
-                                        <td class="listbg"><font color="white">
-                                        <?php
-                                        echo $textss;
-                                        echo $message;
-                                        echo $textse;
-                                        echo "</td>";
-                                        ?>
-                                          <td valign="middle" nowrap class="list">
-                                            <table border="0" cellspacing="0" cellpadding="1">
-                                                <tr>
-                                                  <td><a href="snort_rules_edit.php?openruleset=<?=$file;?>&id=<?=$counter;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit rule" width="17" height="17" border="0"></a></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <?php
-                                    }
-                            }
-                            echo "   ";
-                            echo "There are ";
-                            echo $printcounter;
-                            echo " rules in this category. <br><br>";
-                            ?>
-                         </table>
-                    </td>
-                </tr>
-                <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-                                <tr>
-                                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11"></td>
-                                  <td>Rule Enabled</td>
-                                </tr>
-                                <tr>
-                                  <td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block_d.gif" width="11" height="11"></td>
-                                  <td nowrap>Rule Disabled</td>
-
-
-                                </tr>
-                        <tr>
-                          <td colspan="10">
-                  <p>
-                  <!--<strong><span class="red">Warning:<br>
-                  </span></strong>Editing these r</p>-->
-                         </td>
-                            </tr>
-              </table>
-            </table>
-
-    </td>
-  </tr>
-</table>
-
-
-<?php include("fend.inc"); ?>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_rules_edit.php b/config/snort-dev/bkup/snort_rules_edit.php
deleted file mode 100644
index cbabce73..00000000
--- a/config/snort-dev/bkup/snort_rules_edit.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/* $Id$ */
-/*
-    snort_rules_edit.php
-    Copyright (C) 2004, 2005 Scott Ullrich
-    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.
-*/
-
-function get_middle($source, $beginning, $ending, $init_pos) {
-   $beginning_pos = strpos($source, $beginning, $init_pos);
-   $middle_pos = $beginning_pos + strlen($beginning);
-   $ending_pos = strpos($source, $ending, $beginning_pos);
-   $middle = substr($source, $middle_pos, $ending_pos - $middle_pos);
-   return $middle;
-}
-
-
-$file = $_GET['openruleset'];
-
-//read snort file
-$filehandle = fopen($file, "r");
-
-//get rule id
-$lineid = $_GET['id'];
-
-//read file into string, and get filesize
-$contents = fread($filehandle, filesize($file));
-
-//close handler
-fclose ($filehandle);
-
-//delimiter for each new rule is a new line
-$delimiter = "\n";
-
-//split the contents of the string file into an array using the delimiter
-$splitcontents = explode($delimiter, $contents);
-
-//copy rule contents from array into string
-$tempstring = $splitcontents[$lineid];
-
-//explode rule contents into an array, (delimiter is space)
-$rule_content = explode(' ', $tempstring);
-
-//search string
-$findme = "# alert"; //find string for disabled alerts
-
-//find if alert is disabled
-$disabled = strstr($tempstring, $findme);
-
-//get sid
-$sid = get_middle($tempstring, 'sid:', ';', 0);
-
-
-//if find alert is false, then rule is disabled
-if ($disabled !== false)
-{
-	//move counter up 1, so we do not retrieve the # in the rule_content array
-	$counter2 = 2;
-}
-else
-{
-	$counter2 = 1;
-}
-
-
-$protocol = $rule_content[$counter2];//protocol location
-$counter2++;
-$source = $rule_content[$counter2];//source location
-$counter2++;
-$source_port = $rule_content[$counter2];//source port location
-$counter2++;
-$direction = $rule_content[$counter2];
-$counter2++;
-$destination = $rule_content[$counter2];//destination location
-$counter2++;
-$destination_port = $rule_content[$counter2];//destination port location
-$message = get_middle($tempstring, 'msg:"', '";', 0);
-
-$content = get_middle($tempstring, 'content:"', '";', 0);
-$classtype = get_middle($tempstring, 'classtype:', ';', 0);
-$revision = get_middle($tempstring, 'rev:', ';',0);
-
-$pgtitle = "Snort: Edit Rule";
-require("guiconfig.inc");
-include("head.inc");
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
-<?php include("fbegin.inc"); ?>
-<?php
-if(!$pgtitle_output)
-	echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-<table width="99%" border="0" cellpadding="0" cellspacing="0">
-  <tr>
-  	<td>
-<?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), true, "/snort_rules.php?openruleset=/usr/local/etc/snort/rules/attack-responses.rules");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-?>
-  	</td>
-  </tr>
-  <tr>
-    <td>
-		<div id="mainarea">
-			<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<form action="snort_rules.php?openruleset=<?=$file;?>&id=<?=$lineid;?>" target="" method="post" name="editform" id="editform">
-							<table id="edittable" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-								<tr>
-										<td class="listhdr" width="10%">Enabled: </td>
-										<td class="listlr" width="30%"><input name="enabled" type="checkbox" id="enabled" value="yes" <?php if ($disabled === false) echo "checked";?>></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">SID: </td>
-										<td class="listlr" width="30%"><?php echo $sid; ?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Protocol: </td>
-										<td class="listlr" width="30%"><?php echo $protocol; ?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Source: </td>
-										<td class="listlr" width="30%"><input name="src" type="text" id="src" size="20" value="<?php echo $source;?>"></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Source Port: </td>
-										<td class="listlr" width="30%"><input name="srcport" type="text" id="srcport" size="20" value="<?php echo $source_port;?>"></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Direction:</td>
-										<td class="listlr" width="30%"><?php echo $direction;?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Destination:</td>
-										<td class="listlr" width="30%"><input name="dest" type="text" id="dest" size="20" value="<?php echo $destination;?>"></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Destination Port: </td>
-										<td class="listlr" width="30%"><input name="destport" type="text" id="destport" size="20" value="<?php echo $destination_port;?>"></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Message: </td>
-										<td class="listlr" width="30%"><?php echo $message; ?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Content: </td>
-										<td class="listlr" width="30%"><?php echo $content; ?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Classtype: </td>
-										<td class="listlr" width="30%"><?php echo $classtype; ?></td>
-								</tr>
-								<tr>
-										<td class="listhdr" width="10%">Revision: </td>
-										<td class="listlr" width="30%"><?php echo $revision; ?></td>
-								</tr>
-								<tr><td>&nbsp</td></tr>
-								<tr>
-										<td><input name="lineid" type="hidden" value="<?=$lineid;?>"></td>
-										<td><input class="formbtn" value="Save" type="submit" name="editsave" id="editsave">&nbsp&nbsp&nbsp<input type="button" class="formbtn" value="Cancel" onclick="history.back()"></td>
-								</tr>
-							</table>
-						</form>
-					</td>
-				</tr>
-			</table>
-	</td>
-</tr>
-</table>
-
-<?php include("fend.inc"); ?>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_rulesets.php b/config/snort-dev/bkup/snort_rulesets.php
deleted file mode 100644
index 8e5179d6..00000000
--- a/config/snort-dev/bkup/snort_rulesets.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich
-	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.
-*/
-
-require("guiconfig.inc");
-require_once("service-utils.inc");
-require("/usr/local/pkg/snort.inc");
-
-if(!is_dir("/usr/local/etc/snort/rules"))
-	exec('mkdir /usr/local/etc/snort/rules/');
-
-/* Check if the rules dir is empy if so warn the user */
-/* TODO give the user the option to delete the installed rules rules */
-$isrulesfolderempty = exec('ls -A /usr/local/etc/snort/rules/*.rules');
-if ($isrulesfolderempty == "") {
-
-include("head.inc");
-include("fbegin.inc");
-
-echo "<body link=\"#000000\" vlink=\"#000000\" alink=\"#000000\">";
-
-echo "<script src=\"/row_toggle.js\" type=\"text/javascript\"></script>\n
-<script src=\"/javascript/sorttable.js\" type=\"text/javascript\"></script>\n
-<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n
-   <tr>\n
-   		<td>\n";
-
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), true, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-
-echo  		"</td>\n
-  </tr>\n
-  <tr>\n
-    <td>\n
-		<div id=\"mainarea\">\n
-			<table id=\"maintable\" class=\"tabcont\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n
-				<tr>\n
-					<td>\n
-# The rules directory is empty.\n
-		    		</td>\n
-		  		</tr>\n
-			</table>\n
-		</div>\n
-	</td>\n
-  </tr>\n
-</table>\n
-\n
-</form>\n
-\n
-<p>\n\n";
-
-echo "Please click on the Update Rules tab to install your selected rule sets.";
-include("fend.inc");
-
-echo "</body>";
-echo "</html>";
-
-exit(0);
-
-}
-
-if($_POST) {
-	$enabled_items = "";
-	$isfirst = true;
-	foreach($_POST['toenable'] as $toenable) {
-		if(!$isfirst)
-			$enabled_items .= "||";
-		$enabled_items .= "{$toenable}";
-		$isfirst = false;
-	}
-	$config['installedpackages']['snort']['rulesets'] = $enabled_items;
-	write_config();
-	stop_service("snort");
-	create_snort_conf();
-	sleep(2);
-	start_service("snort");
-	$savemsg = "The snort ruleset selections have been saved.";
-}
-
-$enabled_rulesets = $config['installedpackages']['snort']['rulesets'];
-if($enabled_rulesets)
-	$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
-
-$pgtitle = "Snort: Categories";
-include("head.inc");
-
-?>
-
-<body link="#000000" vlink="#000000" alink="#000000">
-<?php include("fbegin.inc"); ?>
-
-<?php
-if(!$pgtitle_output)
-	echo "<p class=\"pgtitle\"><?=$pgtitle?></p>";
-?>
-
-<form action="snort_rulesets.php" method="post" name="iform" id="iform">
-<script src="/row_toggle.js" type="text/javascript"></script>
-<script src="/javascript/sorttable.js" type="text/javascript"></script>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<table width="99%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-   		<td>
-<?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update  Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), true, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
-?>
-  		</td>
-  </tr>
-  <tr>
-    <td>
-		<div id="mainarea">
-			<table id="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<table id="sortabletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-						    <tr id="frheader">
-								<td width="5%" class="listhdrr">Enabled</td>
-								<td class="listhdrr">Ruleset: Rules that end with "so.rules" are shared object rules.</td>
-								<!-- <td class="listhdrr">Description</td> -->
-							</tr>
-<?php
-	$dir = "/usr/local/etc/snort/rules/";
-	$dh  = opendir($dir);
-	while (false !== ($filename = readdir($dh))) {
-   		$files[] = $filename;
-	}
-	sort($files);
-	foreach($files as $file) {
-		if(!stristr($file, ".rules"))
-			continue;
-		echo "<tr>";
-		echo "<td align=\"center\" valign=\"top\">";
-		if(is_array($enabled_rulesets_array))
-			if(in_array($file, $enabled_rulesets_array)) {
-				$CHECKED = " checked=\"checked\"";
-			} else {
-				$CHECKED = "";
-			}
-		else
-			$CHECKED = "";
-		echo "	<input type='checkbox' name='toenable[]' value='$file' {$CHECKED} />";
-		echo "</td>";
-		echo "<td>";
-		echo "<a href='snort_rules.php?openruleset=/usr/local/etc/snort/rules/" . urlencode($file) . "'>{$file}</a>";
-		echo "</td>";
-		//echo "<td>";
-		//echo "description";
-		//echo "</td>";
-	}
-
-?>
-						</table>
-		    		</td>
-		  		</tr>
-		  		<tr><td>&nbsp;</td></tr>
-		  		<tr><td>Check the rulesets that you would like Snort to load at startup.</td></tr>
-		  		<tr><td>&nbsp;</td></tr>
-		  		<tr><td><input value="Save" type="submit" name="save" id="save" /></td></tr>
-			</table>
-		</div>
-	</td>
-  </tr>
-</table>
-
-</form>
-
-<p><b>NOTE:</b> You can click on a ruleset name to edit the ruleset.
-
-<?php include("fend.inc"); ?>
-
-</body>
-</html>
-
-<?php
-
-	function get_snort_rule_file_description($filename) {
-		$filetext = file_get_contents($filename);
-
-	}
-
-?>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_threshold.xml b/config/snort-dev/bkup/snort_threshold.xml
deleted file mode 100644
index f9075d3d..00000000
--- a/config/snort-dev/bkup/snort_threshold.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>snort-threshold</name>
-	<version>0.1.0</version>
-	<title>Snort: Alert Thresholding and Suppression</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
-	<!-- Menu is where this packages menu will appear -->
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Update Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Categories</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Rules</text>
-			<url>/snort_rules.php</url>
-		</tab>
-		<tab>
-			<text>Servers</text>
-			<url>/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Blocked</text>
-			<url>/snort_blocked.php</url>
-		</tab>
-		<tab>
-			<text>Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
-		</tab>
-		<tab>
-			<text>Threshold</text>
-			<url>/pkg.php?xml=snort_threshold.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Alerts</text>
-			<url>/snort_alerts.php</url>
-		</tab>
-		<tab>
-			<text>Advanced</text>
-			<url>/pkg_edit.php?xml=snort_advanced.xml&amp;id=0</url>
-		</tab>		
-	</tabs>
-	<adddeleteeditpagefields>
-		<columnitem>
-			<fielddescr>Thresholding or Suppression Rule</fielddescr>
-			<fieldname>threshrule</fieldname>
-		</columnitem>
-		<columnitem>
-			<fielddescr>Description</fielddescr>
-			<fieldname>description</fieldname>
-		</columnitem>
-	</adddeleteeditpagefields>
-	<fields>
-		<field>
-			<fielddescr>Thresholding or Suppression Rule</fielddescr>
-			<fieldname>threshrule</fieldname>
-			<description>Enter the Rule. Example; "suppress gen_id 125, sig_id 4" or "threshold gen_id 1, sig_id 1851, type limit, track by_src, count 1, seconds 60"</description>
-			<type>input</type>
-			<size>40</size>
-		</field>
-		<field>
-			<fielddescr>Description</fielddescr>
-			<fieldname>description</fieldname>
-			<description>Enter the description for this item</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-	</fields>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_delete_php_command>
-	</custom_delete_php_command>
-	<custom_php_resync_config_command>
-		create_snort_conf();
-	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_whitelist.xml b/config/snort-dev/bkup/snort_whitelist.xml
deleted file mode 100644
index 42769e4e..00000000
--- a/config/snort-dev/bkup/snort_whitelist.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>snort-whitelist</name>
-	<version>0.1.0</version>
-	<title>Snort: Whitelist</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
-	<!-- Menu is where this packages menu will appear -->
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Update Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Categories</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Rules</text>
-			<url>/snort_rules.php</url>
-		</tab>
-		<tab>
-			<text>Servers</text>
-			<url>/pkg_edit.php?xml=snort_define_servers.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Blocked</text>
-			<url>/snort_blocked.php</url>
-		</tab>
-		<tab>
-			<text>Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Threshold</text>
-			<url>/pkg.php?xml=snort_threshold.xml</url>
-		</tab>
-		<tab>
-			<text>Alerts</text>
-			<url>/snort_alerts.php</url>
-		</tab>
-		<tab>
-			<text>Advanced</text>
-			<url>/pkg_edit.php?xml=snort_advanced.xml&amp;id=0</url>
-		</tab>
-	</tabs>
-	<adddeleteeditpagefields>
-		<columnitem>
-			<fielddescr>Whitelisted IP</fielddescr>
-			<fieldname>ip</fieldname>
-		</columnitem>
-		<columnitem>
-			<fielddescr>Description</fielddescr>
-			<fieldname>description</fieldname>
-		</columnitem>
-	</adddeleteeditpagefields>
-	<fields>
-		<field>
-			<fielddescr>Whitelisted IP</fielddescr>
-			<fieldname>ip</fieldname>
-			<description>Enter the IP or network to whitelist from snort blocking.  Network items should be expressed in CIDR notation.  Example: 0.0.0.0/24 or 0.0.0.0/32</description>
-			<type>input</type>
-			<size>40</size>
-		</field>
-		<field>
-			<fielddescr>Description</fielddescr>
-			<fieldname>description</fieldname>
-			<description>Enter the description for this item</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-	</fields>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_delete_php_command>
-	</custom_delete_php_command>
-	<custom_php_resync_config_command>
-		create_snort_conf();
-	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
diff --git a/config/snort-dev/bkup/snort_xmlrpc_sync.php b/config/snort-dev/bkup/snort_xmlrpc_sync.php
deleted file mode 100644
index db8b3f3e..00000000
--- a/config/snort-dev/bkup/snort_xmlrpc_sync.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/* $Id$ */
-/*
-	snort_xmlrpc_sync.php
-	Copyright (C) 2006 Scott Ullrich
-	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.
-*/
-
-/* NOTE: this file gets included from the pfSense filter.inc plugin process */
-
-require_once("/usr/local/pkg/snort.inc");
-require_once("service-utils.inc");
-
-if(!$config) {
- 	log_error("\$config is not enabled!!");
-} else {
-	if(!$g['booting'])
-		snort_do_xmlrpc_sync();
-}
-
-function snort_do_xmlrpc_sync() {
-
-	return;  /* need to fix the bug which whipes out carp sync settings, etc */
-
-	global $config, $g;
-	$syncxmlrpc = $config['installedpackages']['snort']['config'][0]['syncxmlrpc'];
-	/* option enabled? */
-	if(!$syncxmlrpc)
-		return;
-
-	$carp = &$config['installedpackages']['carpsettings']['config'][0];
-	$password = $carp['password'];
-
-	if(!$carp['synchronizetoip'])
-		return;
-
-	log_error("[SNORT] snort_xmlrpc_sync.php is starting.");
-	$xmlrpc_sync_neighbor = $carp['synchronizetoip'];
-    if($config['system']['webgui']['protocol'] != "") {
-		$synchronizetoip = $config['system']['webgui']['protocol'];
-		$synchronizetoip .= "://";
-    }
-    $port = $config['system']['webgui']['port'];
-    /* if port is empty lets rely on the protocol selection */
-    if($port == "") {
-		if($config['system']['webgui']['protocol'] == "http") {
-			$port = "80";
-		} else {
-			$port = "443";
-		}
-    }
-	$synchronizetoip .= $carp['synchronizetoip'];
-
-	/* xml will hold the sections to sync */
-	$xml = array();
-	$xml['installedpackages']['snort'] = &$config['installedpackages']['snort'];
-	$xml['installedpackages']['snortwhitelist'] = &$config['installedpackages']['snortwhitelist'];
-
-	/* assemble xmlrpc payload */
-	$params = array(
-		XML_RPC_encode($password),
-		XML_RPC_encode($xml)
-	);
-
-	/* set a few variables needed for sync code borrowed from filter.inc */
-	$url = $synchronizetoip;
-	$method = 'pfsense.restore_config_section';
-
-	/* Sync! */
-	log_error("Beginning Snort XMLRPC sync to {$url}:{$port}.");
-	$msg = new XML_RPC_Message($method, $params);
-	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-	$cli->setCredentials('admin', $password);
-	if($g['debug'])
-		$cli->setDebug(1);
-	/* send our XMLRPC message and timeout after 240 seconds */
-	$resp = $cli->send($msg, "999");
-	if(!$resp) {
-		$error = "A communications error occured while attempting Snort XMLRPC sync with {$url}:{$port}.";
-		log_error($error);
-		file_notice("sync_settings", $error, "Snort Settings Sync", "");
-	} elseif($resp->faultCode()) {
-		$error = "An error code was received while attempting Snort XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
-		log_error($error);
-		file_notice("sync_settings", $error, "Snort Settings Sync", "");
-	} else {
-		log_error("Snort XMLRPC sync successfully completed with {$url}:{$port}.");
-	}
-	log_error("[SNORT] snort_xmlrpc_sync.php is ending.");
-}
-
-?>
\ No newline at end of file
diff --git a/config/snort-dev/snort b/config/snort-dev/snort
new file mode 100755
index 00000000..5b725cfe
--- /dev/null
+++ b/config/snort-dev/snort
@@ -0,0 +1,99 @@
+#!/bin/sh
+# $FreeBSD: ports/security/snort/files/snort.sh.in,v 1.4 2009/10/29 01:27:53 clsung Exp $
+
+# PROVIDE: snort
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+. /var/etc/rc.snort
+
+name="snort"
+rcvar=`set_rcvar`
+start_cmd="snort_start"
+stop_cmd="snort_stop"
+
+snort_bin="/usr/local/bin/snort"
+barnyard_bin="/usr/local/bin/barnyard2"
+
+[ -z "$snort_enable" ]    && snort_enable="YES"
+[ -z "$snort_flags" ]     && snort_flags="-u snort -g snort -D -q -l /var/log/snort"
+[ -z "$barnyard_flags" ]     && barnyard_flags="-u snort -g snort -d /var/log/snort"
+
+snort_start()             
+{                       
+        echo -n 'Starting snort:'
+        for _s in ${snort_list}
+	do
+		echo -n " ${_s}"
+
+		eval _conf=\"\$snort_${_s}_conf\"
+		eval _name=\"\$snort_${_s}_name\"
+		eval _id=\"\$snort_${_s}_id\"
+		eval _iface=\"\$snort_${_s}_interface\"
+		eval _enable=\"\$snort_${_s}_enable\"
+		eval _barnyard=\"\$snort_${_s}_barnyard\"
+		_confdir=${_conf%/*}
+
+		_enable="${_enable:-YES}"
+		if ! checkyesno _enable; then
+			continue;
+		fi
+
+		if [ -f /var/run/snort_${_iface}${_name}.pid ]; then
+			if pgrep -F /var/run/snort_${_iface}${_name}.pid snort; then
+				echo -n " [snort ${_s} already running]"
+				continue;
+			fi
+		fi
+		${snort_bin} ${snort_flags} -G ${_id} -R ${_name} -c ${_conf} -i ${_iface}
+
+		_barnyard="${_barnyard:-NO}"
+		if checkyesno _barnyard; then
+			${barnyard_bin} ${snort_flags} -R ${_name} -c ${_confdir}/barnyard2.conf \
+				-f snort.u2_${_name} -w ${_confdir}/barnyard2.waldo
+		fi
+	done
+	echo
+}
+
+snort_stop()             
+{                       
+        echo -n 'Stopping snort:'
+	_pidlist=''
+        for _s in ${snort_list}
+	do
+		echo -n " ${_s}"
+
+		eval _conf=\"\$snort_${_s}_conf\"
+		eval _name=\"\$snort_${_s}_name\"
+		eval _iface=\"\$snort_${_s}_interface\"
+
+		if [ -f /var/run/snort_${_iface}${_name}.pid ]; then
+			_pid=$(pgrep -F /var/run/snort_${_iface}${_name}.pid snort)
+			if [ -n "${_pid}" ]; then
+				kill ${_pid}
+				_pidlist="${_pidlist} ${_pid}"
+			fi
+		fi
+		if [ -f /var/run/barnyard_${_iface}${_name}.pid ]; then
+			_pid=$(pgrep -F /var/run/barnyard_${_iface}${_name}.pid barnyard2)
+			if [ -n "${_pid}" ]; then
+				kill ${_pid}
+				_pidlist="${_pidlist} ${_pid}"
+			fi
+		fi
+	done
+	echo
+	wait_for_pids ${_pidlist}
+}
+
+cmd="$1"
+if [ $# -gt 0 ]; then
+	shift
+fi
+if [ -n "$*" ]; then
+	snort_list="$*"
+fi
+run_rc_command "${cmd}"
diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc
index db7bbc27..b565d102 100644
--- a/config/snort-dev/snort.inc
+++ b/config/snort-dev/snort.inc
@@ -31,7 +31,7 @@
 
 require_once("pfsense-utils.inc");
 
-// Needed on 2.0 because of get_vpns_list()
+// Needed on 2.0 because of filter_get_vpns_list()
 require_once("filter.inc");
 
 /* Get id and realinterfaces */
@@ -108,7 +108,6 @@ function snort_postinstall()
 		exec("/bin/rm /usr/local/etc/snort/reference.config-sample");
 		exec("/bin/rm /usr/local/etc/snort/gen-msg.map-sample");
 		exec("/bin/rm /usr/local/etc/snort/sid");
-		exec("/bin/rm -f /usr/local/etc/rc.d/snort");
 	}
 	
 	if(!file_exists("/usr/local/etc/snort/custom_rules"))
@@ -126,9 +125,7 @@ function snort_postinstall()
 	exec("/bin/chmod -R 755  /usr/local/lib/snort");
 	
 	
-/* remove example files */
-/* TODO: remove these filese during binary builds */
-
+	/* remove example files */
 	if(file_exists("/usr/local/lib/snort/dynamicrules/lib_sfdynamic_example_rule.so.0"))
 	{
 		exec('/bin/rm /usr/local/lib/snort/dynamicrules/lib_sfdynamic_example*');
@@ -185,52 +182,6 @@ function sync_package_snort_reinstall()
 	conf_mount_ro();
 }
 
-/* stop snort interface  */
-function stop_snort()
-{
-	global $config, $g, $id, $if_real, $interface_fake;
-	
-	$a_nat = &$config['installedpackages']['snortglobal']['rule'];
-	$if_real2 = convert_friendly_interface_to_real_interface_name($a_nat[$id]['interface']);
-	
-	
-	$start_up_pre = exec("/bin/cat /var/run/snort_{$if_real2}{$id}{$if_real2}.pid");
-	$start_up_s = exec("/usr/bin/top -U snort -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-	$start_up_r = exec("/usr/bin/top -U root -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-					
-	$start2_upb_pre = exec("/bin/cat /var/run/barnyard2_{$id}{$if_real2}.pid");
-	$start2_upb_s = exec("/usr/bin/top -U snort -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-	$start2_upb_r = exec("/usr/bin/top -U root -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-					
-	if ($start_up_s != "" || $start_up_r != "" || $start2_upb_s != "" || $start2_upb_r != "")
-	{	
-		if ($start_up_s != "")
-		{
-			exec("/bin/kill {$start_up_s}");
-			exec("/bin/rm /var/run/snort_$if_real2$id$if_real2*");
-		}
-		
-		if ($start2_upb_s != "")
-		{
-			exec("/bin/kill {$start2_upb_s}");
-			exec("/bin/rm /var/run/barnyard2_$id$if_real2*");
-		}
-		
-		if ($start_up_r != "")
-		{
-			exec("/bin/kill {$start_up_r}");
-			exec("/bin/rm /var/run/snort_$if_real2$id$if_real2*");
-		}
-		
-		if ($start2_upb_r != "")
-		{
-			exec("/bin/kill {$start2_upb_r}");
-			exec("/bin/rm /var/run/barnyard2_$id$if_real2*");
-		}
-	}
-
-}
-
 /* func for updating cron */
 function snort_rm_blocked_install_cron($should_install) 
 {
@@ -502,37 +453,32 @@ exec("/sbin/sysctl net.inet.tcp.rfc1323=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_name($result_lan);
+				$result_lan = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
+				$if_real = convert_friendly_interface_to_real_interface_name($result_lan);
 
 				/* create snort configuration file */
 				create_snort_conf();
 
-				/* create snort.sh file */
-				create_snort_sh();
-				
 				/* if rules exist cp rules to each iface */
 				create_rules_iface();
 
-			/* create barnyard2 configuration file */
-			$snortbarnyardlog_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['barnyard_enable'];
-			if ($snortbarnyardlog_info_chk == on)
-			create_barnyard2_conf();
-	
+				/* create barnyard2 configuration file */
+				$snortbarnyardlog_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['barnyard_enable'];
+				if ($snortbarnyardlog_info_chk == 'on')
+					create_barnyard2_conf();
+
 			}
 
 		}else{
 
-		/* create snort configuration file */
-		create_snort_conf();
-	
-		/* create snort.sh file */
-		create_snort_sh();
-		
-		/* if rules exist cp rules to each iface */
-		create_rules_iface();
+			/* create snort configuration file */
+			create_snort_conf();
+
+
+			/* if rules exist cp rules to each iface */
+			create_rules_iface();
 
 			/* create barnyard2 configuration file */
 			$snortbarnyardlog_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['barnyard_enable'];
@@ -556,6 +502,39 @@ exec("/sbin/sysctl net.inet.tcp.rfc1323=1");
 	exec("/bin/chmod -R 755  /usr/local/etc/snort");
 	exec("/bin/chmod -R 755  /usr/local/lib/snort");	
 
+	/* Generate the snort instance list */
+	$rc_snort = "";
+	$i = 0;
+	$rules = &$config['installedpackages']['snortglobal']['rule'];
+	foreach($rules as $snort) {
+		$name = "${i}${if_real}";
+		$if_real = convert_friendly_interface_to_real_interface_name($snort['interface']);
+		$rc_snort .= "snort_list=\"\${snort_list} ${name}\"\n";
+		$rc_snort .= "snort_${name}_conf=\"/usr/local/etc/snort/snort_${name}/snort.conf\"\n";
+		$rc_snort .= "snort_${name}_name=\"${name}\"\n";
+		$rc_snort .= "snort_${name}_id=\"${i}\"\n";
+		$rc_snort .= "snort_${name}_interface=\"${if_real}\"\n";
+
+		$snortenable_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['enable'];
+		if ($snortenable_info_chk == 'on')
+			$rc_snort .= "snort_${name}_enable=\"YES\"\n";
+		else
+			$rc_snort .= "snort_${name}_enable=\"NO\"\n";
+
+		$snortbarnyardlog_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['barnyard_enable'];
+		if ($snortbarnyardlog_info_chk == 'on')
+			$rc_snort .= "snort_${name}_barnyard=\"YES\"\n";
+		$i++;
+	}
+	$rcconf = fopen("/var/etc/rc.snort", "w");
+	if(!$rcconf) {
+		log_error("Could not open /var/etc/rc.snort for writing.");
+		exit;
+	}
+	fwrite($rcconf, $rc_snort);
+	fclose($rcconf);
+
+
 	conf_mount_ro();
 
 }
@@ -585,205 +564,6 @@ function create_rules_iface()
 	}
 }
 
-/* open snort.sh for writing" */
-function create_snort_sh()
-{
-
-        global $config, $g, $id, $if_real, $if_real_wan;
-        conf_mount_rw();
-
-	/* let there be snort.sh for each rule */
-	/* start snort.sh for writing */
-
-	$snortbarnyardlog_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['barnyard_enable'];
-
-	/* define snortbarnyardlog_chk */
-	if ($snortbarnyardlog_info_chk == on) {
-
-	$start_barnyard2 = "\nsleep 4\n/usr/local/bin/barnyard2 -u snort -g snort -c /usr/local/etc/snort/snort_$id$if_real/barnyard2.conf -d /var/log/snort -f snort.u2_$id$if_real -w /usr/local/etc/snort/snort_$id$if_real/barnyard2.waldo -D -q\n\n";
-	
-}
-
-/* open snort.sh for writing" */
-conf_mount_rw();
-
-$snort_sh_text = <<<EOD
-#	snort.sh
-#
-#	Copyright (C) 2009 Robert Zelaya
-#	part of pfSense
-#	All rights reserved.
-#
-#	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.
-#
-
-#!/bin/sh
-# This file was automatically generated
-# by the pfSense service handler.
-# Code added to protect from double starts on pfSense bootup
-
-rc_start() {
-
-        if /bin/ls /tmp/snort_$id$if_real.sh.pid > /dev/null ; then
-        /bin/echo "snort.sh is running"
-        exit 0
-        else
-        /bin/echo "snort.sh is not running"
-        fi
-
-        if [ "`/bin/ps -auwx | /usr/bin/grep -v grep | /usr/bin/grep "$if_real -c" | /usr/bin/awk '{print $2;}'`" != "" ] ; then
-		/bin/echo "snort_$id$if_real.sh run" > /tmp/snort_$id$if_real.sh.pid
-        snort_pid="`/bin/ps -auwx | /usr/bin/grep -v grep | /usr/bin/grep "$if_real -c" | /usr/bin/awk '{print $2;}'`"
-        /bin/cp /var/log/system.log /var/log/system.log.bk
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort already running, soft restart"
-        /usr/local/bin/php -f /usr/local/pkg/pf/snort_dynamic_ip_reload.php $id $if_real
-        /bin/kill -HUP \${snort_pid}
-        sleep 3
-		AFTER_MEM=`/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{print $2}'`
-        /bin/cp /var/log/system.log /var/log/snort/snort_sys_$if_real.log
-		/usr/bin/killall syslogd
-        /usr/sbin/clog -i -s 262144 /var/log/system.log
-        /bin/cp /var/log/system.log.bk /var/log/system.log
-		/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort Soft Reload For $id$if_real..."
-		/usr/bin/logger -p daemon.info -i -t SnortStartup "MEM after $id$if_real START \${AFTER_MEM}"
-		/bin/rm /tmp/snort_$id$if_real.sh.pid
-        exit 1
-        fi
-		
-		rc_start_real
-}
-
-rc_start_real() {
-	
-        # If no rules dir exit
-
-        if [ "/bin/ls -A /usr/local/etc/snort/snort_$id$if_real/rules" ] ; then
-        /bin/echo "rules DO exist"
-        else
-        exit 2
-        fi
-
-        # If Snort.sh is running exit
-
-        if /bin/ls /tmp/snort_$id$if_real.sh.pid > /dev/null ; then
-        /bin/echo "snort.sh is running"
-        exit 3
-        else
-        /bin/echo "snort.sh is not running"
-        fi
-
-        # If Snort proc is running exit
-
-        if [ "`/bin/ps -auwx | grep -v grep | grep "$id$if_real -c" | awk '{print $2;}'`" != "" ] ; then
-        /bin/echo "Snort is  running"
-        exit 4
-        fi
-
-        /bin/cp /var/log/system.log /var/log/system.log.bk
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort is NOT running, hard restart"
-
-        if [ "`/bin/ps -auwx | /usr/bin/grep -v grep | /usr/bin/grep "$id$if_real -c" | /usr/bin/awk '{print $2;}'`" = "" ] ; then
-        /bin/rm /tmp/snort_$id$if_real.sh.pid
-        fi
-
-        /bin/echo "snort_$id$if_real.sh run" > /tmp/snort_$id$if_real.sh.pid
-
-        /bin/echo "snort_$id$if_real.sh run" >> /tmp/snort_$id$if_real.sh_startup.log
-
-        # Start the interfaces
-		/bin/rm /var/run/snort_$if_real$id$if_real.pid
-		/bin/rm /var/run/snort_$if_real$id$if_real.pid.lck
-		/usr/local/bin/snort -u snort -g snort -G $id -R $id$if_real -c /usr/local/etc/snort/snort_$id$if_real/snort.conf -l /var/log/snort -D -i $if_real -q
-		/sbin/ifconfig $if_real_wan polling promisc
-		$start_barnyard2
-
-        sleep 3
-        /bin/cp /var/log/system.log /var/log/snort/snort_sys_$id$if_real.log
-		/usr/bin/killall syslogd
-        /usr/sbin/clog -i -s 262144 /var/log/system.log
-        /bin/cp /var/log/system.log.bk /var/log/system.log
-		/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort HARD Reload For $id$if_real..."
-        AFTER_MEM=`/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{print $2}'`
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "MEM after $id$if_real START \${AFTER_MEM}"
-        /bin/echo "snort is running, but snort.sh finished removed pid"
-        /bin/rm /tmp/snort_$id$if_real.sh.pid
-	
-}
-
-rc_stop() {
-
-		pid_s=`/bin/ps -auwx | /usr/bin/grep -v grep | /usr/bin/grep "$id$if_real -c" | /usr/bin/awk '{print \$2;}'`
-		sleep 3
-		pid_b=`/bin/ps -auwx | /usr/bin/grep -v grep | /usr/bin/grep "snort.u2_$id$if_real" | /usr/bin/awk '{print \$2;}'`
-	
-		if [ \${pid_s} ] ; then
-        /bin/cp /var/log/system.log /var/log/system.log.bk
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort IS running, hard STOP"
-		/bin/kill \${pid_s}
-		sleep 3
-		/bin/kill \${pid_b}
-		/sbin/ifconfig $if_real_wan -promisc
-		/bin/rm /var/run/snort_$if_real$id$if_real.pid
-		/bin/rm /var/run/snort_$if_real$id$if_real.pid.lck
-        AFTER_MEM=`/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{print $2}'`
-        /bin/cp /var/log/system.log /var/log/snort/snort_sys_$id$if_real.log
-		/usr/bin/killall syslogd
-        /usr/sbin/clog -i -s 262144 /var/log/system.log
-        /bin/cp /var/log/system.log.bk /var/log/system.log
-		/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort HARD STOP For $id$if_real..."
-        /usr/bin/logger -p daemon.info -i -t SnortStartup "MEM after $id$if_real STOP \${AFTER_MEM}"
-		fi
-}
-
-case $1 in
-	start)
-		rc_start
-		;;
-	start_real)
-		rc_start_real
-		;;
-	stop)
-		rc_stop
-		;;
-	restart)
-		rc_stop
-		rc_start_real
-		;;
-esac
-
-EOD;
-
-        /* write out snort.sh */
-        $bconf = fopen("/usr/local/etc/rc.d/snort_$id$if_real.sh", "w");
-        if(!$bconf) {
-                log_error("Could not open /usr/local/etc/rc.d/snort_$id$if_real.sh for writing.");
-                exit;
-        }
-		/* write snort.sh */
-        fwrite($bconf, $snort_sh_text);
-        fclose($bconf);
-
-}
-
 /* open barnyard2.conf for writing */
 function create_barnyard2_conf() {
         global $bconfig, $bg, $id, $if_real;
@@ -904,7 +684,6 @@ function snort_deinstall()
 	sleep(2);
 	exec("/usr/sbin/pw userdel snort");
 	exec("/usr/sbin/pw groupdel snort");
-	exec("rm -f /usr/local/etc/rc.d/snort*");
 	exec("rm -rf /usr/local/etc/snort*");
 	exec("cd /var/db/pkg && pkg_delete `ls | grep snort`");
 	exec("cd /var/db/pkg && pkg_delete `ls | grep mysql-client`");
@@ -914,8 +693,8 @@ function snort_deinstall()
 
 	/* Remove snort cron entries Ugly code needs smoothness*/
 	
-	function snort_rm_blocked_deinstall_cron($should_install)
-	{
+function snort_rm_blocked_deinstall_cron($should_install)
+{
         global $config, $g;
 		conf_mount_rw();
 
@@ -992,7 +771,6 @@ snort_rules_up_deinstall_cron("");
 	exec("rm -r /usr/local/www/snort");
 	exec("rm -r /usr/local/pkg/snort");
 	exec("rm -r /usr/local/lib/snort/");
-	exec('rm -r /usr/local/etc/rc.d/snort_*');
 	
 	conf_mount_ro();
 	
@@ -1052,9 +830,9 @@ $snortunifiedlog_info_chk = $config['installedpackages']['snortglobal']['rule'][
 if ($snortunifiedlog_info_chk == on)
     $snortunifiedlog_type = "output unified2: filename snort.u2_$id$if_real, limit 128";
 
-/* define spoink */
+/* define spoink (DISABLED)*/
 $spoink_info_chk = $config['installedpackages']['snortglobal']['rule'][$id]['blockoffenders7'];
-if ($spoink_info_chk == on)
+if (0 && $spoink_info_chk == on)
     $spoink_type = "output alert_pf: /var/db/whitelist,snort2c";
 
 	/* define servers and ports snortdefservers */
@@ -1396,7 +1174,7 @@ else
 
 	/* grab a list of vpns and whitelist if user desires added by nestorfish 954 */
 	if($whitelistvpns) {
-		$vpns_list = get_vpns_list();
+		$vpns_list = filter_get_vpns_list();
 		$whitelist_vpns = split(" ", $vpns_list);
 		foreach($whitelist_vpns as $wl)
 			if(trim($wl))
@@ -1954,7 +1732,7 @@ function verify_downloaded_file($filename) {
 		}
 		exit;
 	}
-	update_all_status("Verifyied {$filename}.");
+	update_all_status("Verified {$filename}.");
 }
 
 /* extract rules */
@@ -2110,4 +1888,4 @@ function snort_define_servers() {
 	sync_package_snort();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/config/snort-dev/snort.xml b/config/snort-dev/snort.xml
index 5dbbc693..fe8a4334 100644
--- a/config/snort-dev/snort.xml
+++ b/config/snort-dev/snort.xml
@@ -178,17 +178,22 @@
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/snort-dev/snort_preprocessors.php</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/etc/rc.d/</prefix>
+		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort</item>
+	</additional_files_needed>
 	<fields>
-    </fields>
+	</fields>
 	<custom_add_php_command>
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		sync_snort_package();
 	</custom_php_resync_config_command>
-    <custom_php_install_command>
+	<custom_php_install_command>
 		snort_postinstall();
-    </custom_php_install_command>
+	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		snort_deinstall();
 	</custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/snort-dev/snort_download_rules.php b/config/snort-dev/snort_download_rules.php
index d4862453..18dc91b7 100644
--- a/config/snort-dev/snort_download_rules.php
+++ b/config/snort-dev/snort_download_rules.php
@@ -666,23 +666,23 @@ if ($snortdownload != "off")
 		update_status(gettext("Extracting rules..."));
 		update_output_window(gettext("May take a while..."));
 		exec("/bin/mkdir -p {$snortdir}/rules_bk/");
-		exec("`/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir}/rules_bk rules/*`");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} etc/");
-		exec("`/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/*`");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/bad-traffic.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/chat.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/dos.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/exploit.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/imap.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/misc.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/multimedia.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/netbios.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/nntp.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/p2p.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/smtp.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/sql.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-client.rules/");
-		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir} so_rules/web-misc.rules/");
+		exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir}/rules_bk rules/\*" .
+			"etc/" .
+			"so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/\*" .
+			"so_rules/bad-traffic.rules/" .
+			"so_rules/chat.rules/" .
+			"so_rules/dos.rules/" .
+			"so_rules/exploit.rules/" .
+			"so_rules/imap.rules/" .
+			"so_rules/misc.rules/" .
+			"so_rules/multimedia.rules/" .
+			"so_rules/netbios.rules/" .
+			"so_rules/nntp.rules/" .
+			"so_rules/p2p.rules/" .
+			"so_rules/smtp.rules/" .
+			"so_rules/sql.rules/" .
+			"so_rules/web-client.rules/" .
+			"so_rules/web-misc.rules/");
 		/* add prefix to all snort.org files */
 		/* remove this part and make it all php with the simplst code posible */
 		chdir ("/usr/local/etc/snort/rules_bk/rules");
@@ -749,7 +749,7 @@ if ($snortdownload != "off")
 	if (file_exists("{$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/")) {
 		update_status(gettext("Copying so_rules..."));
 		update_output_window(gettext("May take a while..."));
-		exec("`/bin/cp -f {$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/* /usr/local/lib/snort/dynamicrules/`");
+		exec("/bin/cp -f {$snortdir}/so_rules/precompiled/FreeBSD-7.0/i386/2.8.4/* /usr/local/lib/snort/dynamicrules/");
 		exec("/bin/cp {$snortdir}/so_rules/bad-traffic.rules {$snortdir}/rules/snort_bad-traffic.so.rules");
 		exec("/bin/cp {$snortdir}/so_rules/chat.rules {$snortdir}/rules/snort_chat.so.rules");
 		exec("/bin/cp {$snortdir}/so_rules/dos.rules {$snortdir}/rules/snort_dos.so.rules");
diff --git a/config/snort-dev/snort_interfaces.php b/config/snort-dev/snort_interfaces.php
index 2732ebbb..55f729f5 100644
--- a/config/snort-dev/snort_interfaces.php
+++ b/config/snort-dev/snort_interfaces.php
@@ -78,84 +78,35 @@ if (isset($_POST['del_x'])) {
     /* delete selected rules */
     if (is_array($_POST['rule']) && count($_POST['rule'])) {
 	    foreach ($_POST['rule'] as $rulei) {
-			
-			/* convert fake interfaces to real */
-			$if_real = convert_friendly_interface_to_real_interface_name($a_nat[$rulei]['interface']);
-			
-			$snort_pid = exec("/bin/ps -auwx | grep -v grep | grep \"$if_real -c\" | awk '{print $2;}'");
-			
-			if ($snort_pid != "")
-			{
-			
-				$start_up_pre = exec("/bin/cat /var/run/snort_{$if_real}{$rulei}{$if_real}.pid");
-				$start_up_s = exec("/usr/bin/top -U snort -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-				$start_up_r = exec("/usr/bin/top -U root -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-					
-				$start2_upb_pre = exec("/bin/cat /var/run/barnyard2_{$rulei}{$if_real}.pid");
-				$start2_upb_s = exec("/usr/bin/top -U snort -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-				$start2_upb_r = exec("/usr/bin/top -U root -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-				
-					
-				if ($start_up_s != "" || $start_up_r != "" || $start2_upb_s != "" || $start2_upb_r != "")
-				{
-				
-				/* dont flood the syslog code */
-				exec("/bin/cp /var/log/system.log /var/log/system.log.bk");
-				sleep(3);
-					
-					
-					/* remove only running instances */
-					if ($start_up_s != "")
-						{
-							exec("/bin/kill {$start_up_s}");
-							exec("/bin/rm /var/run/snort_$if_real$rulei$if_real*");
-						}
-		
-					if ($start2_upb_s != "")
-						{
-							exec("/bin/kill {$start2_upb_s}");
-							exec("/bin/rm /var/run/barnyard2_$rulei$if_real*");
-						}
-		
-					if ($start_up_r != "")
-						{
-							exec("/bin/kill {$start_up_r}");
-							exec("/bin/rm /var/run/snort_$if_real$rulei$if_real*");
-						}
-		
-					if ($start2_upb_r != "")
-						{
-							exec("/bin/kill {$start2_upb_r}");
-							exec("/bin/rm /var/run/barnyard2_$rulei$if_real*");
-						}
-						
-			/* stop syslog flood code */		
-			$if_real_wan_rulei = $a_nat[$rulei]['interface'];
-			$if_real_wan_rulei2 = convert_friendly_interface_to_real_interface_name2($if_real_wan_rulei);
-			exec("/sbin/ifconfig $if_real_wan_rulei2 -promisc");
-			exec("/bin/cp /var/log/system.log /var/log/snort/snort_sys_$rulei$if_real.log");
-			exec("/usr/bin/killall syslogd");
-			exec("/usr/sbin/clog -i -s 262144 /var/log/system.log");
-			exec("/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf");
-			sleep(2);
-			exec("/bin/cp /var/log/system.log.bk /var/log/system.log");
-			$after_mem = exec("/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{ print $2 }'");
-			exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'MEM after {$rulei}{$if_real} STOP {$after_mem}'");				
-			exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'Interface Rule removed for {$rulei}{$if_real}...'");
-			
-				}
-			
-			}
-			
-	        unset($a_nat[$rulei]);
-			
+
+
+		    /* dont flood the syslog code */
+		    exec("/bin/cp /var/log/system.log /var/log/system.log.bk");
+		    exec("/bin/sh /usr/local/etc/rc.d/snort stop $rulei");
+
+		    /* stop syslog flood code */		
+		    $if_real_wan_rulei = $a_nat[$rulei]['interface'];
+		    $if_real_wan_rulei2 = convert_friendly_interface_to_real_interface_name2($if_real_wan_rulei);
+		    exec("/bin/cp /var/log/system.log /var/log/snort/snort_sys_$rulei$if_real.log");
+		    exec("/usr/bin/killall syslogd");
+		    exec("/usr/sbin/clog -i -s 262144 /var/log/system.log");
+		    exec("/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf");
+		    sleep(2);
+		    exec("/bin/cp /var/log/system.log.bk /var/log/system.log");
+		    $after_mem = exec("/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{ print $2 }'");
+		    exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'MEM after {$rulei}{$if_real} STOP {$after_mem}'");				
+		    exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'Interface Rule removed for {$rulei}{$if_real}...'");
+
+		    unset($a_nat[$rulei]);
+
 	    }
-		
-			conf_mount_rw();
-			exec("/bin/rm -r /usr/local/etc/snort/snort_$rulei$if_real");
-			exec("/bin/rm /usr/local/etc/rc.d/snort_$rulei$if_real.sh");
-			exec("/bin/rm /var/log/snort/snort.u2_$rulei$if_real*");
-			conf_mount_ro();
+
+
+
+	    conf_mount_rw();
+	    exec("/bin/rm -r /usr/local/etc/snort/snort_$rulei$if_real");
+	    exec("/bin/rm /var/log/snort/snort.u2_$rulei$if_real*");
+	    conf_mount_ro();
 		
 	    write_config();
 	    // touch($d_natconfdirty_path);
@@ -215,67 +166,16 @@ if ($_GET['act'] == "toggle" && $_GET['id'] != "")
 {
 
 	$if_real2 = convert_friendly_interface_to_real_interface_name($a_nat[$id]['interface']);
+	$name = "{$id}{$if_real2}";
+	$snort_pid = exec("pgrep -F /var/run/snort_{$if_real2}{$name}.pid snort");
 	
-	$start_up_pre = exec("/bin/cat /var/run/snort_{$if_real2}{$id}{$if_real2}.pid");
-	$start_up_s = exec("/usr/bin/top -U snort -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-	$start_up_r = exec("/usr/bin/top -U root -u | grep snort | grep {$start_up_pre} | awk '{ print $1; }'");
-					
-	$start2_upb_pre = exec("/bin/cat /var/run/barnyard2_{$id}{$if_real2}.pid");
-	$start2_upb_s = exec("/usr/bin/top -U snort -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-	$start2_upb_r = exec("/usr/bin/top -U root -u | grep barnyard2 | grep {$start2_upb_pre} | awk '{ print $1; }'");
-					
-	if ($start_up_s != "" || $start_up_r != "" || $start2_upb_s != "" || $start2_upb_r != "")
-	{
-	
-		/* stop syslog flood code */
-		exec("/bin/cp /var/log/system.log /var/log/system.log.bk");
-		sleep(3);	
-	
-		if ($start_up_s != "")
-		{
-			exec("/bin/kill {$start_up_s}");
-			exec("/bin/rm /var/run/snort_$if_real2$id$if_real2*");
-		}
-		
-		if ($start2_upb_s != "")
-		{
-			exec("/bin/kill {$start2_upb_s}");
-			exec("/bin/rm /var/run/barnyard2_$id$if_real2*");
-		}
-		
-		if ($start_up_r != "")
-		{
-			exec("/bin/kill {$start_up_r}");
-			exec("/bin/rm /var/run/snort_$if_real2$id$if_real2*");
-		}
-		
-		if ($start2_upb_r != "")
-		{
-			exec("/bin/kill {$start2_upb_r}");
-			exec("/bin/rm /var/run/barnyard2_$id$if_real2*");
-		}
-		
-					/* stop syslog flood code */
-					$if_real_wan_id = $a_nat[$id]['interface'];
-					$if_real_wan_id2 = convert_friendly_interface_to_real_interface_name2($if_real_wan_id);
-					exec("/sbin/ifconfig $if_real_wan_id2 -promisc");
-					exec("/bin/cp /var/log/system.log /var/log/snort/snort_sys_$id$if_real2.log");
-					exec("/usr/bin/killall syslogd");
-					exec("/usr/sbin/clog -i -s 262144 /var/log/system.log");
-					exec("/usr/sbin/syslogd -c -ss -f /var/etc/syslog.conf");
-					sleep(2);
-					exec("/bin/cp /var/log/system.log.bk /var/log/system.log");
-					$after_mem2 = exec("/usr/bin/top | /usr/bin/grep Wired | /usr/bin/awk '{ print $2 }'");
-					exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'MEM after {$id}{$if_real2} STOP {$after_mem2}'");
-					exec("/usr/bin/logger -p daemon.info -i -t SnortStartup 'Interface Rule STOP for {$id}{$if_real2}...'");
-		
-		header("Location: snort_interfaces.php");				
+	if ($snort_pid != "") {
+		exec("/bin/sh /usr/local/etc/rc.d/snort stop $name");
 	}else{
 		sync_snort_package_all();
-		exec("/bin/sh /usr/local/etc/rc.d/snort_{$id}{$if_real2}.sh start");
-		header("Location: snort_interfaces.php");
+		exec("/bin/sh /usr/local/etc/rc.d/snort start $name");
 	}
-
+	header("Location: snort_interfaces.php");
 }	
 
 $pgtitle = "Services: Snort 2.8.4.1_7 pkg v. 1.8 alpha";
@@ -375,10 +275,8 @@ padding: 15px 10px 50% 50px;
 					/* convert fake interfaces to real and check if iface is up */
 					$if_real = convert_friendly_interface_to_real_interface_name($natent['interface']);
 
-					$color_up_pre = exec("/bin/cat /var/run/snort_{$if_real}{$nnats}{$if_real}.pid");
-					$color_up_s = exec("/usr/bin/top -U snort -u | grep snort | grep {$color_up_pre}");
-					$color_up_r = exec("/usr/bin/top -U root -u | grep snort | grep {$color_up_pre}");
-					if ($color_up_s != "" || $color_up_r != "") {
+					$snort_pid = exec("pgrep -F /var/run/snort_{$if_real}{$nnats}{$if_real}.pid snort");
+					if ($snort_pid)
 						$class_color_up = "listbg2";
 						$iconfn = "block";
 					}else{
@@ -441,11 +339,8 @@ padding: 15px 10px 50% 50px;
                   </td>
 				  <?php
 				 				  
-					$color2_udp_pre = exec("/bin/cat /var/run/barnyard2_{$nnats}{$if_real}.pid");
-					
-					$color2_upb_s = exec("/usr/bin/top -U snort -u | grep barnyard2 | grep {$color2_udp_pre}");
-					$color2_upb_r = exec("/usr/bin/top -U root -u | grep barnyard2 | grep {$color2_udp_pre}");
-					if ($color2_upb_s != "" || $color2_upb_r != "") {
+					$byard_pid = exec("pgrep -F /var/run/barnyard2_{$nnats}{$if_real}.pid barnyard2");
+					if ($byard_pid)
 						$class_color_upb = "listbg2";
 					}else{
 						$class_color_upb = "listbg";
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index bb878438..ba2fe647 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -238,6 +238,25 @@
 	  <after_install_info>Please visit the Snort settings tab and enter your oinkid code.   Afterwards visit the update rules tab to download the snort rules.</after_install_info>
     </package>
     <package>
+      <name>snort-dev</name>
+	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
+      <website>http://www.snort.org</website>
+      <descr>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.</descr>
+      <category>Security</category>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort-dev/bin/</depends_on_package_base_url>
+	  <depends_on_package>libnet10-1.0.2a_4,1.tbz</depends_on_package>
+	  <depends_on_package>pcre-7.9.tbz</depends_on_package>
+          <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package>
+	  <depends_on_package>snort-2.8.5.2.tbz</depends_on_package>
+	  <depends_on_package>barnyard2-1.7.tbz</depends_on_package>
+      <config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file>
+      <version>2.8.5.2</version>
+      <required_version>2.0</required_version>
+      <status>Stable</status>
+      <configurationfile>/snort.xml</configurationfile>
+	  <after_install_info>Please visit the Snort settings tab and enter your oinkid code.   Afterwards visit the update rules tab to download the snort rules.</after_install_info>
+    </package>
+    <package>
       <name>spamd</name>
       <website>http://www.openbsd.org/spamd/</website>
       <descr>Tarpits like spamd are fake SMTP servers, which accept connections but don't deliver mail. Instead, they keep the connections open and reply very slowly. If the peer is patient enough to actually complete the SMTP dialogue (which will take ten minutes or more), the tarpit returns a 'temporary error' code (4xx), which indicates that the mail could not be delivered successfully and that the sender should keep the mail in their queue and retry again later.</descr>