From 7042add79b69c6f5f8fb4e6c7a1aa6b6d95cb677 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 10:43:06 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/client/domain_del.php | 2 +-
interface/web/client/domain_edit.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/client/domain_del.php b/interface/web/client/domain_del.php
index 9a02ac9..6bc07e6 100644
--- a/interface/web/client/domain_del.php
+++ b/interface/web/client/domain_del.php
@@ -80,7 +80,7 @@
$app->error($wb['error_domain_in mailuse']);
}
- $sql = "SELECT domain_id FROM web_domain WHERE domain = '" . $app->db->quote($domain) . "'";
+ $sql = "SELECT domain_id FROM web_domain WHERE (domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost', 'vhostalias')) OR (domain LIKE '%." . $app->db->quote($domain) . "' AND type IN ('subdomain', 'vhostsubdomain'))";
$res = $app->db->queryOneRecord($sql);
if (is_array($res)){
$app->error($wb['error_domain_in webuse']);
diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php
index 221e8a2..cda557c 100644
--- a/interface/web/client/domain_edit.php
+++ b/interface/web/client/domain_edit.php
@@ -89,7 +89,7 @@
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
- $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
+ $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
}
}
$app->tpl->setVar("client_group_id", $client_select);
--
Gitblit v1.9.1