snort-dev, add alert log types to global

1 files changed, 17 insertions, 17 deletions

diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc
index e50f5a28..95e9576b 100644
--- a/config/snort-dev/snort.inc
+++ b/config/snort-dev/snort.inc
@@ -140,22 +140,22 @@ function snort_postinstall()
 	}
 
 	/* move files around, make it look clean */
-	exec("/bin/mkdir -p /usr/local/www/snort/css");
-	exec("/bin/mkdir -p /usr/local/www/snort/images");
-	exec("/bin/mkdir -p /usr/local/www/snort/javascript");
-	exec("/bin/mv /usr/local/www/snort/style.css /usr/local/www/snort/css/style.css);
-	exec("/bin/mv /usr/local/www/snort/alert.jpg /usr/local/www/snort/images/alert.jpg);
-	exec("/bin/mv /usr/local/www/snort/down.gif /usr/local/www/snort/images/down.gif);
-	exec("/bin/mv /usr/local/www/snort/down2.gif /usr/local/www/snort/images/down2.gif);
-	exec("/bin/mv /usr/local/www/snort/icon-table-sort.png /usr/local/www/snort/images/icon-table-sort.png);
-	exec("/bin/mv /usr/local/www/snort/icon-table-sort-asc.png /usr/local/www/snort/images/icon-table-sort-asc.png);
-	exec("/bin/mv /usr/local/www/snort/icon-table-sort-desc.png /usr/local/www/snort/images/icon-table-sort-desc.png);
-	exec("/bin/mv /usr/local/www/snort/up.gif /usr/local/www/snort/images/up.gif);
-	exec("/bin/mv /usr/local/www/snort/up2.gif /usr/local/www/snort/images/up2.gif);
-	exec("/bin/mv /usr/local/www/snort/jquery.blockUI.js /usr/local/www/snort/javascript/jquery.blockUI.js);
-	exec("/bin/mv /usr/local/www/snort/jquery-1.3.2.js /usr/local/www/snort/javascript/jquery-1.3.2.js);
-	exec("/bin/mv /usr/local/www/snort/mootools.js /usr/local/www/snort/javascript/mootools.js);
-	exec("/bin/mv /usr/local/www/snort/sortableTable.js /usr/local/www/snort/javascript/sortableTable.js);
+	exec('/bin/mkdir -p /usr/local/www/snort/css');
+	exec('/bin/mkdir -p /usr/local/www/snort/images');
+	exec('/bin/mkdir -p /usr/local/www/snort/javascript');
+	exec('/bin/mv /usr/local/www/snort/style.css /usr/local/www/snort/css/style.css');
+	exec('/bin/mv /usr/local/www/snort/alert.jpg /usr/local/www/snort/images/alert.jpg');
+	exec('/bin/mv /usr/local/www/snort/down.gif /usr/local/www/snort/images/down.gif');
+	exec('/bin/mv /usr/local/www/snort/down2.gif /usr/local/www/snort/images/down2.gif');
+	exec('/bin/mv /usr/local/www/snort/icon-table-sort.png /usr/local/www/snort/images/icon-table-sort.png');
+	exec('/bin/mv /usr/local/www/snort/icon-table-sort-asc.png /usr/local/www/snort/images/icon-table-sort-asc.png');
+	exec('/bin/mv /usr/local/www/snort/icon-table-sort-desc.png /usr/local/www/snort/images/icon-table-sort-desc.png');
+	exec('/bin/mv /usr/local/www/snort/up.gif /usr/local/www/snort/images/up.gif');
+	exec('/bin/mv /usr/local/www/snort/up2.gif /usr/local/www/snort/images/up2.gif');
+	exec('/bin/mv /usr/local/www/snort/jquery.blockUI.js /usr/local/www/snort/javascript/jquery.blockUI.js');
+	exec('/bin/mv /usr/local/www/snort/jquery-1.3.2.js /usr/local/www/snort/javascript/jquery-1.3.2.js');
+	exec('/bin/mv /usr/local/www/snort/mootools.js /usr/local/www/snort/javascript/mootools.js');
+	exec('/bin/mv /usr/local/www/snort/sortableTable.js /usr/local/www/snort/javascript/sortableTable.js');
 	
 	conf_mount_ro();
 	
@@ -1024,7 +1024,7 @@ function generate_snort_conf()
 	}
 	
 /* define snortalertlogtype */
-$snortalertlogtype = $config['installedpackages']['snortglobal']['rule'][$id]['snortalertlogtype'];
+$snortalertlogtype = $config['installedpackages']['snortglobal']['snortalertlogtype'];
 if ($snortalertlogtype == fast)
     $snortalertlogtype_type = "output alert_fast: alert";
 else