fixed loop in uninstall*

Florian Schaal

2013-11-24 c1245b53259becc062276632384cb64e3d5cdfb8

fixed loop in uninstall*

 install/uninstall-fedora.php

@@ -34,6 +34,10 @@

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 " _____ ___________   _____              __ _         ____
@@ -47,9 +51,15 @@
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";
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
echo "Are you sure you want to uninsatll 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
//exec("/etc/init.d/mysqld stop");
@@ -82,8 +92,11 @@
// 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 "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";

echo "Finished.\n";
    echo "Finished uninstalling.\n";
} else {
    echo "\n\n>> Canceled uninstall. \n\n";
}

?>

 install/uninstall.php

@@ -34,6 +34,10 @@

error_reporting(E_ALL|E_STRICT);

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";

//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
echo " _____ ___________   _____              __ _         ____
@@ -47,14 +51,23 @@
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";
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
echo "Are you sure you want to uninsatll 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 = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
if (!$link) {
    echo "Unable to connect to the database'.mysql_error($link)";
@@ -83,7 +96,10 @@
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";

echo "Finished.\n";
} else {
    echo "\n\n>> Canceled uninstall. \n\n";
}

?>