From f8f2d8493be025464627ba990133a542bd071700 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Thu, 20 Feb 2014 15:32:18 -0500
Subject: unlink() can't delete directory, use "/bin/rm -rf" instead.

---
 config/suricata/suricata_uninstall.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'config/suricata/suricata_uninstall.php')

diff --git a/config/suricata/suricata_uninstall.php b/config/suricata/suricata_uninstall.php
index 071a89a4..0a7f8d5a 100644
--- a/config/suricata/suricata_uninstall.php
+++ b/config/suricata/suricata_uninstall.php
@@ -73,8 +73,8 @@ if ($config['installedpackages']['suricata']['config'][0]['clearlogs'] == 'on')
 }
 
 /* Remove the Suricata GUI app directories */
-@unlink("/usr/local/pkg/suricata");
-@unlink("/usr/local/www/suricata");
+mwexec("/bin/rm -rf /usr/local/pkg/suricata");
+mwexec("/bin/rm -rf /usr/local/www/suricata");
 
 /* Keep this as a last step */
 if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] != 'on') {
@@ -83,7 +83,6 @@ if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] !
 	unset($config['installedpackages']['suricatasync']);
 	@unlink("{$suricata_rules_upd_log}");
 	mwexec("/bin/rm -rf {$suricatalogdir}");
-	@unlink(SURICATALOGDIR);
 	log_error(gettext("[Suricata] The package has been removed from this system..."));
 }
 
-- 
cgit v1.2.3


From f0fd2cb8f5b76369a28467c93cc1c5b7c331191a Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Fri, 28 Feb 2014 20:21:17 -0500
Subject: Add built-in Dashboard Widget for Suricata and make it persistent.

---
 config/suricata/suricata_uninstall.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'config/suricata/suricata_uninstall.php')

diff --git a/config/suricata/suricata_uninstall.php b/config/suricata/suricata_uninstall.php
index 0a7f8d5a..b8ea6097 100644
--- a/config/suricata/suricata_uninstall.php
+++ b/config/suricata/suricata_uninstall.php
@@ -76,6 +76,31 @@ if ($config['installedpackages']['suricata']['config'][0]['clearlogs'] == 'on')
 mwexec("/bin/rm -rf /usr/local/pkg/suricata");
 mwexec("/bin/rm -rf /usr/local/www/suricata");
 
+/* Remove our associated Dashboard widget config and files. */
+/* If "save settings" is enabled, then save old widget      */
+/* container settings so we can restore them later.         */
+$widgets = $config['widgets']['sequence'];
+if (!empty($widgets)) {
+	$widgetlist = explode(",", $widgets);
+	foreach ($widgetlist as $key => $widget) {
+		if (strstr($widget, "suricata_alerts-container")) {
+			if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] == 'on') {
+				$config['installedpackages']['suricata']['config'][0]['dashboard_widget'] = $widget;
+				if ($config['widgets']['widget_suricata_display_lines']) {
+					$config['installedpackages']['suricata']['config'][0]['dashboard_widget_rows'] = $config['widgets']['widget_suricata_display_lines'];
+					unset($config['widgets']['widget_suricata_display_lines']);
+				}
+			}
+			unset($widgetlist[$key]);
+		}
+	}
+	$config['widgets']['sequence'] = implode(",", $widgetlist);
+	write_config();
+}
+@unlink("/usr/local/www/widgets/include/widget-suricata.inc");
+@unlink("/usr/local/www/widgets/widgets/suricata_alerts.widget.php");
+@unlink("/usr/local/www/widgets/javascript/suricata_alerts.js");
+
 /* Keep this as a last step */
 if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] != 'on') {
 	log_error(gettext("Not saving settings... all Suricata configuration info and logs deleted..."));
-- 
cgit v1.2.3