Remove all snort layout customizations since they cause issues allover and remove all unneeded files anymore.

1 files changed, 2 insertions, 26 deletions

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index a3b94a15..533cc856 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -423,29 +423,6 @@ function snort_postinstall()
 	mwexec('/usr/sbin/chown snort:snort /tmp/snort*', true);
 	mwexec('/usr/sbin/chown snort:snort /var/db/whitelist', true);
 
-	/* move files around, make it look clean */
-	mwexec('/bin/mkdir -p /usr/local/www/snort/css');
-	mwexec('/bin/mkdir -p /usr/local/www/snort/images');
-
-	chdir ("/usr/local/www/snort/css/");
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/css/style.css');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/css/sexybuttons.css');
-	chdir("/usr/local/www/snort/images/");
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/alert.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/down.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/down2.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort-asc.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon-table-sort-desc.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/up.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/up2.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/logo.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/icon_excli.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/arrow_down.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/awesome-overlay-sprite.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/logo22.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort/images/page_white_text.png');
-
 	/* remake saved settings */
 	if ($config['installedpackages']['snortglobal']['forcekeepsettings'] == 'on') {
 		update_status(gettext("Saved settings detected..."));
@@ -473,7 +450,7 @@ function snort_snortloglimit_install_cron($should_install) {
 	$x=0;
 	$is_installed = false;
 	foreach($config['cron']['item'] as $item) {
-		if (strstr($item['command'], '/usr/local/pkg/snort/snort_check_cron_misc.inc')) {
+		if (strstr($item['command'], 'snort_check_cron_misc.inc')) {
 			$is_installed = true;
 			break;
 		}
@@ -1124,10 +1101,9 @@ function snort_deinstall() {
 
 	snort_deinstall_cron("snort2c");
 	snort_deinstall_cron("snort_check_for_rule_updates.php");
-	snort_deinstall_cron("/usr/local/pkg/snort/snort_check_cron_misc.inc");
+	snort_deinstall_cron("snort_check_cron_misc.inc");
 	configure_cron();
 
-	/* Unset snort registers in conf.xml IMPORTANT snort will not start with out this */
 	/* Keep this as a last step */
 	if ($config['installedpackages']['snortglobal']['forcekeepsettings'] != 'on')
 		unset($config['installedpackages']['snortglobal']);