Commit 7042add7 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

parents 0e41dea8 8abd175a
...@@ -80,7 +80,7 @@ class page_action extends tform_actions { ...@@ -80,7 +80,7 @@ class page_action extends tform_actions {
$app->error($wb['error_domain_in mailuse']); $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); $res = $app->db->queryOneRecord($sql);
if (is_array($res)){ if (is_array($res)){
$app->error($wb['error_domain_in webuse']); $app->error($wb['error_domain_in webuse']);
......
...@@ -89,7 +89,7 @@ class page_action extends tform_actions { ...@@ -89,7 +89,7 @@ class page_action extends tform_actions {
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; $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); $app->tpl->setVar("client_group_id", $client_select);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment