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-fedora.php | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/install/uninstall-fedora.php b/install/uninstall-fedora.php
index b0d37ed..8aa5fcf 100644
--- a/install/uninstall-fedora.php
+++ b/install/uninstall-fedora.php
@@ -34,40 +34,69 @@
error_reporting(E_ALL|E_STRICT);
+require "/usr/local/ispconfig/server/lib/config.inc.php";
+require "/usr/local/ispconfig/server/lib/app.inc.php";
+require "/usr/local/ispconfig/server/mysql_clientdb.conf";
+
//** The banner on the command line
-echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________ _____ __ _
-|_ _/ ___| ___ \ / __ \ / _(_)
- | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
- | | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
- _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
- \___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
+echo "\n\n".str_repeat('-', 80)."\n";
+echo " _____ ___________ _____ __ _ ____
+|_ _/ ___| ___ \ / __ \ / _(_) /__ \
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
-echo "\n".str_repeat('-',80)."\n";
+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'");
+echo "Are you sure you want to uninsatll ISPConfig? [no]";
+$input = fgets(STDIN);
+$do_uninstall = rtrim($input);
-exec("/etc/init.d/mysqld stop");
-exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
-exec("/etc/init.d/mysqld start");
+if($do_uninstall == 'yes') {
-// Deleting the symlink in /var/www
-unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
-unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
+ echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
-// Delete the ispconfig files
-exec('rm -rf /usr/local/ispconfig');
+
+ // Delete the ISPConfig database
+ //exec("/etc/init.d/mysqld stop");
+ //exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
+ //exec("/etc/init.d/mysqld 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'] ."';");
+ if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysqli_error($link)."\n";
+ }
+ mysqli_close($link);
-echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
+ // Deleting the symlink in /var/www
+ // Apache
+ @unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
+ @unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
+ @unlink("/etc/httpd/conf/sites-enabled/000-apps.vhost");
+ @unlink("/etc/httpd/conf/sites-available/apps.vhost");
-echo "Finished.\n";
+ // 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");
-?>
\ No newline at end of file
+ // 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";
+
+ echo "Finished uninstalling.\n";
+} else {
+ echo "\n\n>> Canceled uninstall. \n\n";
+}
+
+?>
--
Gitblit v1.9.1