From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/uninstall.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/install/uninstall.php b/install/uninstall.php
index 111f574..c565d46 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -36,7 +36,7 @@
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/mysql_clientdb.conf";
+require "/usr/local/ispconfig/server/lib/mysql_clientdb.conf";
//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
@@ -51,7 +51,7 @@
echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>> Uninstall \n\n";
-echo "Are you sure you want to uninsatll ISPConfig? [no]";
+echo "Are you sure you want to uninstall ISPConfig? [no]";
$input = fgets(STDIN);
$do_uninstall = rtrim($input);
@@ -60,16 +60,16 @@
echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
- $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
+ $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
if (!$link) {
- echo "Unable to connect to the database'.mysql_error($link)";
+ echo "Unable to connect to the database. mysql_error($link)";
} else {
- $result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
- if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
- $result=mysql_query("DROP USER '".$conf['db_user'] ."';");
- if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
+ $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";
}
- mysql_close($link);
+ mysqli_close($link);
// Deleting the symlink in /var/www
// Apache
--
Gitblit v1.9.1