From 5bd2aa25f334944f4464fbb0086672286865ae7c Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Mon, 17 Feb 2014 07:51:42 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 install/uninstall.php |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/install/uninstall.php b/install/uninstall.php
index f2081d2..56cf0eb 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -95,7 +95,15 @@
 	// Delete the ispconfig files
 	exec('rm -rf /usr/local/ispconfig');
 	
-//	echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
+	// Delete various other files
+	@unlink("/usr/local/bin/ispconfig_update.sh");
+	@unlink("/usr/local/bin/ispconfig_update_from_svn.sh");
+	@unlink("/var/spool/mail/ispconfig");
+	@unlink("/var/www/ispconfig");
+	@unlink("/var/www/php-fcgi-scripts/ispconfig");
+	@unlink("/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter");
+	
+	echo "Backups in /var/backup/ and log files in /var/log/ispconfig are not deleted.";
 	echo "Finished uninstalling.\n";
 
 } else {

--
Gitblit v1.9.1