From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.

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

diff --git a/install/uninstall.php b/install/uninstall.php
index 96d98c7..5ca1c22 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -57,7 +57,7 @@
 
 exec("/etc/init.d/mysql stop");
 exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
-exec("/etc/init.d/mysql start");
+exec("/etc/init.d/mysql start >/dev/null 2>&1");
 
 // Deleting the symlink in /var/www
 // Apache
@@ -75,6 +75,15 @@
 // Delete the ispconfig files
 exec('rm -rf /usr/local/ispconfig');
 
+// 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 "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
 
 echo "Finished.\n";

--
Gitblit v1.9.1