Commit 8164cdd8 authored by Marius Cramer's avatar Marius Cramer
Browse files

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.
parents 8537705b a67681db
...@@ -181,6 +181,19 @@ class tools_sites { ...@@ -181,6 +181,19 @@ class tools_sites {
return $domain['domain']; 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'];
}
} }
?> ?>
...@@ -72,6 +72,14 @@ class page_action extends tform_actions { ...@@ -72,6 +72,14 @@ class page_action extends tform_actions {
function onShowEnd() { function onShowEnd() {
global $app, $conf; 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 user is admin, we will allow him to select to whom this record belongs
if($_SESSION["s"]["user"]["typ"] == 'admin') { if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Domains of the user // Getting Domains of the user
...@@ -108,14 +116,7 @@ class page_action extends tform_actions { ...@@ -108,14 +116,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("client_group_id", $client_select); $app->tpl->setVar("client_group_id", $client_select);
} }
} else {
/*
* 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. * The domain-module is in use.
*/ */
...@@ -160,6 +161,9 @@ class page_action extends tform_actions { ...@@ -160,6 +161,9 @@ class page_action extends tform_actions {
$app->uses('ini_parser,getconf'); $app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains'); $settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') { 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']); $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['origin']);
if(!$domain_check) { if(!$domain_check) {
// invalid domain selected // invalid domain selected
......
...@@ -82,6 +82,14 @@ class page_action extends tform_actions { ...@@ -82,6 +82,14 @@ class page_action extends tform_actions {
function onShowEnd() { function onShowEnd() {
global $app, $conf; 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 user is admin, we will allow him to select to whom this record belongs
if($_SESSION["s"]["user"]["typ"] == 'admin') { if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Domains of the user // Getting Domains of the user
...@@ -118,7 +126,7 @@ class page_action extends tform_actions { ...@@ -118,7 +126,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("client_group_id", $client_select); $app->tpl->setVar("client_group_id", $client_select);
} }
$app->tpl->setVar("client_group_id", $client_select); }
// } // }
...@@ -150,12 +158,6 @@ class page_action extends tform_actions { ...@@ -150,12 +158,6 @@ class page_action extends tform_actions {
} }
/*
* 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 ($settings['use_domain_module'] == 'y') {
/* /*
* The domain-module is in use. * The domain-module is in use.
...@@ -197,10 +199,14 @@ class page_action extends tform_actions { ...@@ -197,10 +199,14 @@ class page_action extends tform_actions {
function onSubmit() { function onSubmit() {
global $app, $conf; 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! */ /* check if the domain module is used - and check if the selected domain can be used! */
$app->uses('ini_parser,getconf'); $app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains'); $settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') { 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']); $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['origin']);
if(!$domain_check) { if(!$domain_check) {
// invalid domain selected // invalid domain selected
...@@ -265,7 +271,7 @@ function onSubmit() { ...@@ -265,7 +271,7 @@ function onSubmit() {
if($tmp["number"] > 0) { if($tmp["number"] > 0) {
$app->error($app->tform->wordbook["origin_error_unique"]); $app->error($app->tform->wordbook["origin_error_unique"]);
} }
}
parent::onSubmit(); parent::onSubmit();
} }
......
...@@ -71,6 +71,9 @@ foreach($records as $rec){ ...@@ -71,6 +71,9 @@ foreach($records as $rec){
unset($n); unset($n);
$app->tpl->setVar("template_id_option", $template_id_option); $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 the user is administrator
if($_SESSION['s']['user']['typ'] == 'admin') { if($_SESSION['s']['user']['typ'] == 'admin') {
...@@ -83,6 +86,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') { ...@@ -83,6 +86,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
} }
$app->tpl->setVar("server_id", $server_id_option); $app->tpl->setVar("server_id", $server_id_option);
if ($domains_settings['use_domain_module'] != 'y') {
// load the list of clients // 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"; $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); $clients = $app->db->queryAllRecords($sql);
...@@ -96,6 +100,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') { ...@@ -96,6 +100,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
} }
$app->tpl->setVar("client_group_id", $client_select); $app->tpl->setVar("client_group_id", $client_select);
}
} }
if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
...@@ -105,6 +110,7 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO ...@@ -105,6 +110,7 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO
$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"); $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 // 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"; $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); $clients = $app->db->queryAllRecords($sql);
...@@ -118,6 +124,7 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO ...@@ -118,6 +124,7 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO
} }
$app->tpl->setVar("client_group_id", $client_select); $app->tpl->setVar("client_group_id", $client_select);
}
} }
if($_SESSION["s"]["user"]["typ"] != 'admin') if($_SESSION["s"]["user"]["typ"] != 'admin')
...@@ -162,9 +169,7 @@ if(is_array($fields)) { ...@@ -162,9 +169,7 @@ if(is_array($fields)) {
* Now we have to check, if we should use the domain-module to select the domain * Now we have to check, if we should use the domain-module to select the domain
* or not * or not
*/ */
$app->uses('ini_parser,getconf'); if ($domains_settings['use_domain_module'] == 'y') {
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
/* /*
* The domain-module is in use. * The domain-module is in use.
*/ */
...@@ -215,7 +220,10 @@ if($_POST['create'] == 1) { ...@@ -215,7 +220,10 @@ if($_POST['create'] == 1) {
// apply filters // apply filters
if(isset($_POST['domain']) && $_POST['domain'] != ''){ if(isset($_POST['domain']) && $_POST['domain'] != ''){
/* check if the domain module is used - and check if the selected domain can be used! */ /* 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']); $domain_check = $app->tools_sites->checkDomainModuleDomain($_POST['domain']);
if(!$domain_check) { if(!$domain_check) {
// invalid domain selected // invalid domain selected
......
...@@ -20,20 +20,24 @@ ...@@ -20,20 +20,24 @@
</select> </select>
</tmpl_if> </tmpl_if>
</div> </div>
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller"> <tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="origin">{tmpl_var name='origin_txt'}</label> <label for="origin">{tmpl_var name='origin_txt'}</label>
......
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
</select> </select>
</tmpl_if> </tmpl_if>
</div> </div>
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
<tmpl_else> <tmpl_else>
<tmpl_if name="only_one_server"> <tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" /> <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
...@@ -47,12 +49,14 @@ ...@@ -47,12 +49,14 @@
</tmpl_if> </tmpl_if>
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller"> <tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="origin">{tmpl_var name='origin_txt'}</label> <label for="origin">{tmpl_var name='origin_txt'}</label>
......
...@@ -22,12 +22,14 @@ ...@@ -22,12 +22,14 @@
{tmpl_var name='server_id'} {tmpl_var name='server_id'}
</select> </select>
</div> </div>
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
<tmpl_else> <tmpl_else>
<tmpl_if name="only_one_server"> <tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" /> <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
...@@ -41,12 +43,14 @@ ...@@ -41,12 +43,14 @@
</tmpl_if> </tmpl_if>
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller"> <tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<tmpl_if name="DOMAIN_VISIBLE"> <tmpl_if name="DOMAIN_VISIBLE">
<div class="ctrlHolder"> <div class="ctrlHolder">
......
...@@ -72,7 +72,10 @@ class page_action extends tform_actions { ...@@ -72,7 +72,10 @@ class page_action extends tform_actions {
function onShowEnd() { function onShowEnd() {
global $app, $conf; 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 // 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"; $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 @@ class page_action extends tform_actions { ...@@ -99,6 +102,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>$tmp[server_name]</option>"); $app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>$tmp[server_name]</option>");
unset($tmp); unset($tmp);
if ($settings['use_domain_module'] != 'y') {
// Fill the client select field // 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"; $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); $clients = $app->db->queryAllRecords($sql);
...@@ -112,7 +116,7 @@ class page_action extends tform_actions { ...@@ -112,7 +116,7 @@ class page_action extends tform_actions {
} }
} }
$app->tpl->setVar("client_group_id", $client_select); $app->tpl->setVar("client_group_id", $client_select);
}
} }
if($_SESSION["s"]["user"]["typ"] != 'admin') if($_SESSION["s"]["user"]["typ"] != 'admin')
...@@ -147,8 +151,6 @@ class page_action extends tform_actions { ...@@ -147,8 +151,6 @@ class page_action extends tform_actions {
* Now we have to check, if we should use the domain-module to select the domain * Now we have to check, if we should use the domain-module to select the domain
* or not * or not
*/ */
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') { if ($settings['use_domain_module'] == 'y') {
/* /*
* The domain-module is in use. * The domain-module is in use.
...@@ -211,6 +213,9 @@ class page_action extends tform_actions { ...@@ -211,6 +213,9 @@ class page_action extends tform_actions {
$app->uses('ini_parser,getconf'); $app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains'); $settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') { 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']); $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
if(!$domain_check) { if(!$domain_check) {
// invalid domain selected // invalid domain selected
......
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
</select> </select>
</tmpl_if> </tmpl_if>
</div> </div>
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
<tmpl_else> <tmpl_else>
<tmpl_if name="only_one_server"> <tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" /> <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
...@@ -48,12 +50,14 @@ ...@@ -48,12 +50,14 @@
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller"> <tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label> <label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<div class="ctrlHolder"> <div class="ctrlHolder">
......
...@@ -30,12 +30,14 @@ ...@@ -30,12 +30,14 @@
</select> </select>
</tmpl_if> </tmpl_if>
</div> </div>
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label> <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
<tmpl_else> <tmpl_else>
<tmpl_if name="only_one_server"> <tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" /> <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
...@@ -57,12 +59,14 @@ ...@@ -57,12 +59,14 @@
</tmpl_if> </tmpl_if>
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller"> <tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label> <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput"> <select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'} {tmpl_var name='client_group_id'}
</select> </select>
</div> </div>
</tmpl_unless>
</tmpl_if> </tmpl_if>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="ip_address">{tmpl_var name='ip_address_txt'}</label> <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
......
...@@ -129,6 +129,7 @@ class page_action extends tform_actions { ...@@ -129,6 +129,7 @@ class page_action extends tform_actions {
global $app, $conf; global $app, $conf;
$app->uses('ini_parser,getconf'); $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'); $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 @@ class page_action extends tform_actions { ...@@ -293,6 +294,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("server_id", $options_web_servers); $app->tpl->setVar("server_id", $options_web_servers);
unset($options_web_servers); unset($options_web_servers);
if ($settings['use_domain_module'] != 'y') {
// Fill the client select field // Fill the client select field