Merge branch 'hide_client' into 'master'

Marius Cramer

2014-07-09 8164cdd8c7f87d977ec35738ca121c7fc6e1cb2e

Merge branch 'hide_client' into 'master'

Hide client

When domain module is enabled in config, every module has a domain selector now, and changing domain's owner on domain list changes owner for every module. This patch removes client selector when domain module is enabled, because I don't see the point in having a client selector on mail, sites and dns, neither create nor update, because setting client to a different one than domain's owner, if that client try to edit, it will break because it's not domain's owner.

 interface/lib/classes/tools_sites.inc.php

@@ -181,6 +181,19 @@
        return $domain['domain'];
    }

    function getClientIdForDomain($domain_id) {
        global $app;

        $sql = "SELECT sys_groupid FROM domain WHERE domain_id = " . $app->functions->intval($domain_id);
        if ($_SESSION["s"]["user"]["typ"] != 'admin') {
            $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
            $sql .= " AND sys_groupid IN (".$groups.")";
        }
        $domain = $app->db->queryOneRecord($sql);
        if(!$domain || !$domain['sys_groupid']) return false;
        return $domain['sys_groupid'];
    }

}

?>

 interface/web/dns/dns_slave_edit.php

@@ -72,6 +72,14 @@
    function onShowEnd() {
        global $app, $conf;

        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');

        /*
         * Now we have to check, if we should use the domain-module to select the domain
         * or not
         */
        if ($settings['use_domain_module'] != 'y') {
        // If user is admin, we will allow him to select to whom this record belongs
        if($_SESSION["s"]["user"]["typ"] == 'admin') {
            // Getting Domains of the user
@@ -108,14 +116,7 @@
                $app->tpl->setVar("client_group_id", $client_select);

            }

        /*
         * Now we have to check, if we should use the domain-module to select the domain
         * or not
         */
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {
        } else {
            /*
             * The domain-module is in use.
            */
@@ -160,6 +161,9 @@
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {
            if ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
                $this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['origin']);
            }
            $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['origin']);
            if(!$domain_check) {
                // invalid domain selected

 interface/web/dns/dns_soa_edit.php

@@ -82,6 +82,14 @@
    function onShowEnd() {
        global $app, $conf;

        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');

        /*
         * Now we have to check, if we should use the domain-module to select the domain
         * or not
         */
        if ($settings['use_domain_module'] != 'y') {
        // If user is admin, we will allow him to select to whom this record belongs
        if($_SESSION["s"]["user"]["typ"] == 'admin') {
            // Getting Domains of the user
@@ -118,7 +126,7 @@
                $app->tpl->setVar("client_group_id", $client_select);

            }
        $app->tpl->setVar("client_group_id", $client_select);
        }

//    }

@@ -150,12 +158,6 @@

    }

    /*
     * Now we have to check, if we should use the domain-module to select the domain
     * or not
     */
    $app->uses('ini_parser,getconf');
    $settings = $app->getconf->get_global_config('domains');
    if ($settings['use_domain_module'] == 'y') {
        /*
         * The domain-module is in use.
@@ -197,10 +199,14 @@
function onSubmit() {
    global $app, $conf;

    if ($app->tform->getCurrentTab() == 'dns_soa') {
    /* check if the domain module is used - and check if the selected domain can be used! */
    $app->uses('ini_parser,getconf');
    $settings = $app->getconf->get_global_config('domains');
    if ($settings['use_domain_module'] == 'y') {
            if ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
                $this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['origin']);
            }
        $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['origin']);
        if(!$domain_check) {
            // invalid domain selected
@@ -265,7 +271,7 @@
    if($tmp["number"] > 0) {
        $app->error($app->tform->wordbook["origin_error_unique"]);
    }

    }
    parent::onSubmit();
}


 interface/web/dns/dns_wizard.php

@@ -71,6 +71,9 @@
unset($n);
$app->tpl->setVar("template_id_option", $template_id_option);

$app->uses('ini_parser,getconf');
$domains_settings = $app->getconf->get_global_config('domains');

// If the user is administrator
if($_SESSION['s']['user']['typ'] == 'admin') {

@@ -83,6 +86,7 @@
    }
    $app->tpl->setVar("server_id", $server_id_option);

    if ($domains_settings['use_domain_module'] != 'y') {
    // load the list of clients
    $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
    $clients = $app->db->queryAllRecords($sql);
@@ -97,6 +101,7 @@

    $app->tpl->setVar("client_group_id", $client_select);
}
}

if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {

@@ -105,6 +110,7 @@
    $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");


    if ($domains_settings['use_domain_module'] != 'y') {
    // load the list of clients
    $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
    $clients = $app->db->queryAllRecords($sql);
@@ -118,6 +124,7 @@
    }

    $app->tpl->setVar("client_group_id", $client_select);
    }
}

if($_SESSION["s"]["user"]["typ"] != 'admin')
@@ -162,9 +169,7 @@
 * Now we have to check, if we should use the domain-module to select the domain
 * or not
 */
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
if ($domains_settings['use_domain_module'] == 'y') {
    /*
     * The domain-module is in use.
    */
@@ -215,7 +220,10 @@
    // apply filters
    if(isset($_POST['domain']) && $_POST['domain'] != ''){
        /* check if the domain module is used - and check if the selected domain can be used! */
        if ($settings['use_domain_module'] == 'y') {
        if ($domains_settings['use_domain_module'] == 'y') {
            if ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
                $_POST['client_group_id'] = $app->tools_sites->getClientIdForDomain($_POST['domain']);
            }
            $domain_check = $app->tools_sites->checkDomainModuleDomain($_POST['domain']);
            if(!$domain_check) {
                // invalid domain selected

 interface/web/dns/templates/dns_slave_edit.htm

@@ -20,20 +20,24 @@
                            </select>
                    </tmpl_if>
                </div>
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>
            <div class="ctrlHolder">
                <label for="origin">{tmpl_var name='origin_txt'}</label>

 interface/web/dns/templates/dns_soa_edit.htm

@@ -20,12 +20,14 @@
                            </select>
                    </tmpl_if>
                </div>
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -47,12 +49,14 @@
                </tmpl_if>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>
            <div class="ctrlHolder">
                <label for="origin">{tmpl_var name='origin_txt'}</label>

 interface/web/dns/templates/dns_wizard.htm

@@ -22,12 +22,14 @@
                        {tmpl_var name='server_id'}
                    </select>
                </div>
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -41,12 +43,14 @@
                </tmpl_if>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>
            <tmpl_if name="DOMAIN_VISIBLE">
                <div class="ctrlHolder">

 interface/web/mail/mail_domain_edit.php

@@ -72,7 +72,10 @@
    function onShowEnd() {
        global $app, $conf;

        if($_SESSION["s"]["user"]["typ"] == 'admin') {
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');

        if($_SESSION["s"]["user"]["typ"] == 'admin' && $settings['use_domain_module'] != 'y') {
            // Getting Clients of the user
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";

@@ -99,6 +102,7 @@
            $app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>$tmp[server_name]</option>");
            unset($tmp);

            if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$app->functions->intval($client['client_id'])." ORDER BY client.company_name, client.contact_name, sys_group.name";
            $clients = $app->db->queryAllRecords($sql);
@@ -112,7 +116,7 @@
                }
            }
            $app->tpl->setVar("client_group_id", $client_select);

            }
        }

        if($_SESSION["s"]["user"]["typ"] != 'admin')
@@ -147,8 +151,6 @@
         * Now we have to check, if we should use the domain-module to select the domain
         * or not
         */
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {
            /*
             * The domain-module is in use.
@@ -211,6 +213,9 @@
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {
            if ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
                $this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['domain']);
            }
            $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
            if(!$domain_check) {
                // invalid domain selected

 interface/web/mail/templates/mail_domain_edit.htm

@@ -20,12 +20,14 @@
                            </select>
                    </tmpl_if>
                </div>
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -48,12 +50,14 @@
            </tmpl_if>

            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>

            <div class="ctrlHolder">

 interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -30,12 +30,14 @@
                            </select>
                    </tmpl_if>
                </div>
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -57,12 +59,14 @@
                </tmpl_if>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <tmpl_unless name="domain_option">
                <div class="ctrlHolder">
                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
                    <select name="client_group_id" id="client_group_id" class="selectInput">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
                </tmpl_unless>
            </tmpl_if>
            <div class="ctrlHolder">
                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>

 interface/web/sites/web_vhost_domain_edit.php

@@ -129,6 +129,7 @@
        global $app, $conf;

        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');

        $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');

@@ -293,6 +294,7 @@
            $app->tpl->setVar("server_id", $options_web_servers);
            unset($options_web_servers);

            if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
            $records = $app->db->queryAllRecords($sql);
@@ -309,6 +311,7 @@
                }
            }
            $app->tpl->setVar("client_group_id", $client_select);
            }

            if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
                // check if server is in client's servers or add it.
@@ -493,6 +496,7 @@
            unset($tmp);
            unset($ips);

            if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
            $clients = $app->db->queryAllRecords($sql);
@@ -509,6 +513,7 @@
                }
            }
            $app->tpl->setVar("client_group_id", $client_select);
            }

            //PHP Version Selection (FastCGI)
            $server_type = 'apache';
@@ -628,8 +633,6 @@
         * Now we have to check, if we should use the domain-module to select the domain
         * or not
         */
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {
            /*
             * The domain-module is in use.
@@ -739,6 +742,10 @@
                    // invalid domain selected
                    $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
                } else {
                    if ($this->_vhostdomain_type == 'domain' &&
                            ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid']))) {
                        $this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['domain']);
                    }
                    if($this->_vhostdomain_type == 'subdomain') $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check;
                    else $this->dataRecord['domain'] = $domain_check;
                }