From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/uninstall.php | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/install/uninstall.php b/install/uninstall.php
index 053bade..c565d46 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -34,8 +34,9 @@
error_reporting(E_ALL|E_STRICT);
-require_once "/usr/local/ispconfig/server/lib/config.inc.php";
+require_once "/usr/local/ispconfig/server/lib/config.inc.php";
require_once "/usr/local/ispconfig/server/lib/app.inc.php";
+require "/usr/local/ispconfig/server/lib/mysql_clientdb.conf";
//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
@@ -50,18 +51,25 @@
echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>> Uninstall \n\n";
-$do_uninstall = $inst->simple_query('Are you sure you want to uninsatll ISPConfig?', array('yes', 'no'), 'no');
+echo "Are you sure you want to uninstall ISPConfig? [no]";
+$input = fgets(STDIN);
+$do_uninstall = rtrim($input);
+
+
if($do_uninstall == 'yes') {
+ echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
- // 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");
+ $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
+ if (!$link) {
+ echo "Unable to connect to the database. mysql_error($link)";
+ } else {
+ $result=mysqli_query($link,"DROP DATABASE ".$conf['db_database'].";");
+ if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysqli_error($link)."\n";
+ $result=mysqli_query($link,"DROP USER '".$conf['db_user']."'@'".$conf['db_host']."';");
+ if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysqli_error($link)."\n";
+ }
+ mysqli_close($link);
// Deleting the symlink in /var/www
// Apache
@@ -79,10 +87,19 @@
// 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 "Finished.\n";
+ echo "Backups in /var/backup/ and log files in /var/log/ispconfig are not deleted.";
+ echo "Finished uninstalling.\n";
+} else {
+ echo "\n\n>> Canceled uninstall. \n\n";
}
?>
--
Gitblit v1.9.1