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 |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/install/uninstall.php b/install/uninstall.php
index e8085d4..5ca1c22 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -28,22 +28,64 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("/usr/local/ispconfig/server/lib/config.inc.php");
-require("/usr/local/ispconfig/server/lib/app.inc.php");
+/*
+	ISPConfig 3 uninstaller.
+*/
+
+error_reporting(E_ALL|E_STRICT);
+
+//** The banner on the command line
+echo "\n\n".str_repeat('-', 80)."\n";
+echo " _____ ___________   _____              __ _         ____
+|_   _/  ___| ___ \ /  __ \            / _(_)       /__  \
+  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _    _/ /
+  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |  |_ |
+ _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, | \____/
+                                              __/ |
+                                             |___/ ";
+echo "\n".str_repeat('-', 80)."\n";
+echo "\n\n>> Uninstall  \n\n";
+
+require "/usr/local/ispconfig/server/lib/config.inc.php";
+require "/usr/local/ispconfig/server/lib/app.inc.php";
 
 // Delete the ISPConfig database
 // $app->db->query("DROP DATABASE '".$conf["db_database"]."'");
+// $app->db->query("DELETE FROM mysql.user WHERE User = 'ispconfig'");
+
+
 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
-unlink("/etc/apache2/sites-enabled/ispconfig.vhost");
-unlink("/etc/apache2/sites-available/ispconfig.vhost");
+// Apache
+@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/apache2/sites-available/ispconfig.vhost");
+@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
+@unlink("/etc/apache2/sites-available/apps.vhost");
+
+// nginx
+@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/nginx/sites-available/ispconfig.vhost");
+@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
+@unlink("/etc/nginx/sites-available/apps.vhost");
 
 // 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";
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1