From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.
---
install/uninstall-fedora.php | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/install/uninstall-fedora.php b/install/uninstall-fedora.php
index d8efc4f..66eb300 100644
--- a/install/uninstall-fedora.php
+++ b/install/uninstall-fedora.php
@@ -35,7 +35,7 @@
error_reporting(E_ALL|E_STRICT);
//** The banner on the command line
-echo "\n\n".str_repeat('-',80)."\n";
+echo "\n\n".str_repeat('-', 80)."\n";
echo " _____ ___________ _____ __ _ ____
|_ _/ ___| ___ \ / __ \ / _(_) /__ \
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
@@ -44,11 +44,11 @@
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
-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");
+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"]."'");
@@ -60,8 +60,17 @@
exec("/etc/init.d/mysqld start");
// Deleting the symlink in /var/www
-unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
-unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
+// 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");
+
+// 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');
--
Gitblit v1.9.1