From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.
---
server/lib/classes/openvz_tools.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/openvz_tools.inc.php b/server/lib/classes/openvz_tools.inc.php
index 403613c..16dc601 100644
--- a/server/lib/classes/openvz_tools.inc.php
+++ b/server/lib/classes/openvz_tools.inc.php
@@ -31,6 +31,8 @@
/**
* Checks, if the server ist a OpenVZ - Host
*/
+
+
public function isOpenVzHost() {
/*
* if there is a "/proc/user_beanconters" we have OpenVz "in use"
@@ -109,7 +111,7 @@
$item = trim($item);
/*
- * Now get every token and insert it to the array
+ * Now get every token and insert it to the array
*/
if ($item != '') {
$tmp = explode(' ', $item);
@@ -145,5 +147,7 @@
/* ready */
return $res;
}
+
}
-?>
\ No newline at end of file
+
+?>
--
Gitblit v1.9.1