Skip to content

Commit c1245b5

Browse files
author
Florian Schaal
committed
fixed loop in uninstall*
1 parent 03200f1 commit c1245b5

File tree

2 files changed

+93
-64
lines changed

2 files changed

+93
-64
lines changed

‎install/uninstall-fedora.php‎

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434

3535
error_reporting(E_ALL|E_STRICT);
3636

37+
require "/usr/local/ispconfig/server/lib/config.inc.php";
38+
require "/usr/local/ispconfig/server/lib/app.inc.php";
39+
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
40+
3741
//** The banner on the command line
3842
echo "\n\n".str_repeat('-', 80)."\n";
3943
echo " _____ ___________ _____ __ _ ____
@@ -47,43 +51,52 @@
4751
echo "\n".str_repeat('-', 80)."\n";
4852
echo "\n\n>> Uninstall \n\n";
4953

50-
require "/usr/local/ispconfig/server/lib/config.inc.php";
51-
require "/usr/local/ispconfig/server/lib/app.inc.php";
52-
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
54+
echo "Are you sure you want to uninsatll ISPConfig? [no]";
55+
$input = fgets(STDIN);
56+
$do_uninstall = rtrim($input);
5357

54-
// Delete the ISPConfig database
55-
//exec("/etc/init.d/mysqld stop");
56-
//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
57-
//exec("/etc/init.d/mysqld start");
58-
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
59-
if (!$link) {
60-
echo "Unable to connect to the database'.mysql_error($link)";
61-
} else {
62-
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
63-
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
64-
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
65-
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
66-
}
67-
mysql_close($link);
6858

69-
// Deleting the symlink in /var/www
70-
// Apache
71-
@unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
72-
@unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
73-
@unlink("/etc/httpd/conf/sites-enabled/000-apps.vhost");
74-
@unlink("/etc/httpd/conf/sites-available/apps.vhost");
59+
if($do_uninstall == 'yes') {
60+
61+
echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
62+
63+
64+
// Delete the ISPConfig database
65+
//exec("/etc/init.d/mysqld stop");
66+
//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
67+
//exec("/etc/init.d/mysqld start");
68+
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
69+
if (!$link) {
70+
echo "Unable to connect to the database'.mysql_error($link)";
71+
} else {
72+
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
73+
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
74+
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
75+
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
76+
}
77+
mysql_close($link);
7578

76-
// nginx
77-
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
78-
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
79-
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
80-
@unlink("/etc/nginx/sites-available/apps.vhost");
79+
// Deleting the symlink in /var/www
80+
// Apache
81+
@unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
82+
@unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
83+
@unlink("/etc/httpd/conf/sites-enabled/000-apps.vhost");
84+
@unlink("/etc/httpd/conf/sites-available/apps.vhost");
8185

82-
// Delete the ispconfig files
83-
exec('rm -rf /usr/local/ispconfig');
86+
// nginx
87+
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
88+
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
89+
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
90+
@unlink("/etc/nginx/sites-available/apps.vhost");
8491

85-
echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
92+
// Delete the ispconfig files
93+
exec('rm -rf /usr/local/ispconfig');
8694

87-
echo "Finished.\n";
95+
// echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
96+
97+
echo "Finished uninstalling.\n";
98+
} else {
99+
echo "\n\n>> Canceled uninstall. \n\n";
100+
}
88101

89102
?>

‎install/uninstall.php‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434

3535
error_reporting(E_ALL|E_STRICT);
3636

37+
require_once "/usr/local/ispconfig/server/lib/config.inc.php";
38+
require_once "/usr/local/ispconfig/server/lib/app.inc.php";
39+
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
40+
3741
//** The banner on the command line
3842
echo "\n\n".str_repeat('-', 80)."\n";
3943
echo " _____ ___________ _____ __ _ ____
@@ -47,43 +51,55 @@
4751
echo "\n".str_repeat('-', 80)."\n";
4852
echo "\n\n>> Uninstall \n\n";
4953

50-
require "/usr/local/ispconfig/server/lib/config.inc.php";
51-
require "/usr/local/ispconfig/server/lib/app.inc.php";
52-
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
54+
echo "Are you sure you want to uninsatll ISPConfig? [no]";
55+
$input = fgets(STDIN);
56+
$do_uninstall = rtrim($input);
5357

54-
// Delete the ISPConfig database
55-
//exec("/etc/init.d/mysql stop");
56-
//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
57-
//exec("/etc/init.d/mysql start");
58-
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
59-
if (!$link) {
60-
echo "Unable to connect to the database'.mysql_error($link)";
61-
} else {
62-
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
63-
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
64-
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
65-
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
66-
}
67-
mysql_close($link);
6858

69-
// Deleting the symlink in /var/www
70-
// Apache
71-
@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
72-
@unlink("/etc/apache2/sites-available/ispconfig.vhost");
73-
@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
74-
@unlink("/etc/apache2/sites-available/apps.vhost");
59+
if($do_uninstall == 'yes') {
7560

76-
// nginx
77-
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
78-
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
79-
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
80-
@unlink("/etc/nginx/sites-available/apps.vhost");
61+
echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
8162

82-
// Delete the ispconfig files
83-
exec('rm -rf /usr/local/ispconfig');
63+
// Delete the ISPConfig database
64+
// $app->db->query("DROP DATABASE '".$conf["db_database"]."'");
65+
// $app->db->query("DELETE FROM mysql.user WHERE User = 'ispconfig'");
66+
67+
// exec("/etc/init.d/mysql stop");
68+
// exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
69+
// exec("/etc/init.d/mysql start");
8470

85-
//echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
71+
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
72+
if (!$link) {
73+
echo "Unable to connect to the database'.mysql_error($link)";
74+
} else {
75+
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
76+
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
77+
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
78+
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
79+
}
80+
mysql_close($link);
81+
82+
// Deleting the symlink in /var/www
83+
// Apache
84+
@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
85+
@unlink("/etc/apache2/sites-available/ispconfig.vhost");
86+
@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
87+
@unlink("/etc/apache2/sites-available/apps.vhost");
88+
89+
// nginx
90+
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
91+
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
92+
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
93+
@unlink("/etc/nginx/sites-available/apps.vhost");
94+
95+
// Delete the ispconfig files
96+
exec('rm -rf /usr/local/ispconfig');
97+
98+
// echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
99+
echo "Finished uninstalling.\n";
86100

87-
echo "Finished.\n";
101+
} else {
102+
echo "\n\n>> Canceled uninstall. \n\n";
103+
}
88104

89105
?>

0 commit comments

Comments
 (0)