Merge branch 'domain_module_fixes' into 'master'
Domain module fixes
See merge request !116
| | |
| | | $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']); |
| | |
| | | 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); |