From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/uninstall.php | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/install/uninstall.php b/install/uninstall.php
index 000c6c2..415ecf4 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -36,12 +36,12 @@
//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________ _____ __ _
-|_ _/ ___| ___ \ / __ \ / _(_)
- | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
- | | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
- _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
- \___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
+echo " _____ ___________ _____ __ _ ____
+|_ _/ ___| ___ \ / __ \ / _(_) /__ \
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
echo "\n".str_repeat('-',80)."\n";
@@ -60,8 +60,17 @@
exec("/etc/init.d/mysql start");
// Deleting the symlink in /var/www
-unlink("/etc/apache2/sites-enabled/ispconfig.vhost");
-unlink("/etc/apache2/sites-available/ispconfig.vhost");
+// Apache
+@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/apache2/sites-available/ispconfig.vhost");
+@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
+@unlink("/etc/apache2/sites-available/apps.vhost");
+
+// 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");
// Delete the ispconfig files
exec('rm -rf /usr/local/ispconfig');
@@ -70,4 +79,4 @@
echo "Finished.\n";
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1