Marius Cramer
2014-08-13 8abd175abb8a5abfd25bc9172554bc05c8ce40c3
Merge branch 'domain_module_fixes' into 'master'

Domain module fixes

See merge request !116
2 files modified
4 ■■■■ changed files
interface/web/client/domain_del.php 2 ●●● patch | view | raw | blame | history
interface/web/client/domain_edit.php 2 ●●● patch | view | raw | blame | history
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']);
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);