Commit 0fd51fc5 authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#786 - Client with enables client module cannot choose a client when adding a dns zone

Fixed: FS#787 - A sub-client can see all the clients on the system in the client drop down list 
parent bf787679
...@@ -76,7 +76,7 @@ class page_action extends tform_actions { ...@@ -76,7 +76,7 @@ class page_action extends tform_actions {
global $app, $conf; global $app, $conf;
// 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' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) { if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Domains of the user // Getting Domains of the user
$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
...@@ -89,6 +89,24 @@ class page_action extends tform_actions { ...@@ -89,6 +89,24 @@ class page_action extends tform_actions {
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
} else if($app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql);
$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
}
}
$app->tpl->setVar("client_group_id",$client_select);
} }
parent::onShowEnd(); parent::onShowEnd();
......
...@@ -93,9 +93,30 @@ if($_SESSION['s']['user']['typ'] == 'admin') { ...@@ -93,9 +93,30 @@ 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'])) {
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// load the list of clients
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql);
$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
}
}
$app->tpl->setVar("client_group_id",$client_select);
} }
$template_record = $app->db->queryOneRecord("SELECT * FROM dns_template WHERE template_id = '$template_id'"); $template_record = $app->db->queryOneRecord("SELECT * FROM dns_template WHERE template_id = '$template_id'");
$fields = explode(',',$template_record['fields']); $fields = explode(',',$template_record['fields']);
if(is_array($fields)) { if(is_array($fields)) {
......
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
</select> </select>
</div> </div>
</tmpl_if> </tmpl_if>
<tmpl_if name="is_reseller">
<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_if>
<tmpl_if name="DOMAIN_VISIBLE"> <tmpl_if name="DOMAIN_VISIBLE">
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="domain">{tmpl_var name='domain_txt'}</label> <label for="domain">{tmpl_var name='domain_txt'}</label>
......
...@@ -98,7 +98,7 @@ class page_action extends tform_actions { ...@@ -98,7 +98,7 @@ class page_action extends tform_actions {
// Get the limits of the client // Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver 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, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Set the webserver to the default server of the client // Set the webserver to the default server of the client
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
...@@ -108,7 +108,7 @@ class page_action extends tform_actions { ...@@ -108,7 +108,7 @@ class page_action extends tform_actions {
// Fill the client select field // Fill the client select field
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':''; $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
......
...@@ -109,7 +109,7 @@ class page_action extends tform_actions { ...@@ -109,7 +109,7 @@ class page_action extends tform_actions {
// Get the limits of the client // Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver 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, limit_web_domain, default_webserver, client.contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Set the webserver to the default server of the client // Set the webserver to the default server of the client
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
...@@ -119,7 +119,7 @@ class page_action extends tform_actions { ...@@ -119,7 +119,7 @@ class page_action extends tform_actions {
// Fill the client select field // Fill the client select field
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':''; $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
...@@ -207,7 +207,7 @@ class page_action extends tform_actions { ...@@ -207,7 +207,7 @@ class page_action extends tform_actions {
if($_SESSION["s"]["user"]["typ"] != 'admin') { if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client // Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); $client = $app->db->queryOneRecord("SELECT limit_web_domain, default_webserver, parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// When the record is updated // When the record is updated
if($this->id > 0) { if($this->id > 0) {
......
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