Skip to content
Snippets Groups Projects
Commit 76ebcb3b authored by Falko Timme's avatar Falko Timme
Browse files

- Implemented FS#2200.

parent 248bc320
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 828 additions and 837 deletions
interface/web/dns/dns_import.php
+ 6
− 6
View file @ 76ebcb3b
...@@ -84,14 +84,14 @@ if($_SESSION['s']['user']['typ'] == 'admin') { ...@@ -84,14 +84,14 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
$app->tpl->setVar("server_id",$server_id_option); $app->tpl->setVar("server_id",$server_id_option);
// load the list of clients // load the list of clients
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':''; $selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
...@@ -102,18 +102,18 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO ...@@ -102,18 +102,18 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO
// 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, contact_name, CONCAT(company_name,' :: ',contact_name) 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(client.company_name,' :: ',client.contact_name) as contactname, sys_group.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 // load the list of clients
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname 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);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].'::'.$client['contactname'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':''; $selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
......
interface/web/dns/dns_slave_edit.php
+ 6
− 6
View file @ 76ebcb3b
...@@ -72,7 +72,7 @@ class page_action extends tform_actions { ...@@ -72,7 +72,7 @@ class page_action extends tform_actions {
// 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
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
...@@ -80,7 +80,7 @@ class page_action extends tform_actions { ...@@ -80,7 +80,7 @@ class page_action extends tform_actions {
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
...@@ -88,18 +88,18 @@ class page_action extends tform_actions { ...@@ -88,18 +88,18 @@ 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, sys_group.name, client.contact_name, CONCAT(company_name,' :: ',contact_name) as contactname 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, sys_group.name, client.contact_name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Fill the client select field // Fill the client select field
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].'::'.$client['contactname'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
//$tmp_data_record = $app->tform->getDataRecord($this->id); //$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
......
interface/web/dns/dns_soa_edit.php
+ 6
− 6
View file @ 76ebcb3b
...@@ -82,7 +82,7 @@ class page_action extends tform_actions { ...@@ -82,7 +82,7 @@ class page_action extends tform_actions {
// 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
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
...@@ -90,7 +90,7 @@ class page_action extends tform_actions { ...@@ -90,7 +90,7 @@ class page_action extends tform_actions {
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
...@@ -98,18 +98,18 @@ class page_action extends tform_actions { ...@@ -98,18 +98,18 @@ 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, client.contact_name, CONCAT(company_name,' :: ',contact_name) 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(client.company_name,' :: ',client.contact_name) as contactname, sys_group.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 // Fill the client select field
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].'::'.$client['contactname'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
//$tmp_data_record = $app->tform->getDataRecord($this->id); //$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
......
interface/web/dns/dns_wizard.php
+ 6
− 6
View file @ 76ebcb3b
...@@ -81,14 +81,14 @@ if($_SESSION['s']['user']['typ'] == 'admin') { ...@@ -81,14 +81,14 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
$app->tpl->setVar("server_id",$server_id_option); $app->tpl->setVar("server_id",$server_id_option);
// load the list of clients // load the list of clients
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':''; $selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
...@@ -99,18 +99,18 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO ...@@ -99,18 +99,18 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO
// 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, contact_name, CONCAT(company_name,' :: ',contact_name) 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(client.company_name,' :: ',client.contact_name) as contactname, sys_group.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 // load the list of clients
$sql = "SELECT groupid, name, CONCAT(company_name,' :: ',contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname 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);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].'::'.$client['contactname'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':''; $selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]::$client[contactname]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
......
interface/web/help/form/support_message.tform.php
+ 2
− 2
View file @ 76ebcb3b
...@@ -69,9 +69,9 @@ $form["tabs"]['message'] = array ( ...@@ -69,9 +69,9 @@ $form["tabs"]['message'] = array (
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => $sm_default_recipient_id, 'default' => $sm_default_recipient_id,
'datasource' => array ( 'type' => 'SQL', 'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT userid,username FROM sys_user WHERE userid != 1 AND {AUTHSQL} ORDER BY username', 'querystring' => "SELECT sys_user.userid, CONCAT(sys_user.username,' :: ',client.company_name,' :: ',client.contact_name) as contactname FROM sys_user, client WHERE sys_user.userid != 1 AND sys_user.client_id = client.client_id AND {AUTHSQL} ORDER BY sys_user.username",
'keyfield' => 'userid', 'keyfield' => 'userid',
'valuefield' => 'username' 'valuefield' => 'contactname'
), ),
'validators' => array ( 0 => array ( 'type' => 'ISINT', 'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'recipient_id_is_not_integer'), 'errmsg'=> 'recipient_id_is_not_integer'),
......
interface/web/mail/mail_domain_edit.php
+ 7
− 11
View file @ 76ebcb3b
...@@ -71,12 +71,8 @@ class page_action extends tform_actions { ...@@ -71,12 +71,8 @@ class page_action extends tform_actions {
if($_SESSION["s"]["user"]["typ"] == 'admin') { if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Clients of the user // Getting Clients of the user
if($_SESSION["s"]["user"]["typ"] == 'admin') { $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
} else {
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$sql = "SELECT client.client_id, limit_web_domain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id";
}
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
...@@ -84,7 +80,7 @@ class page_action extends tform_actions { ...@@ -84,7 +80,7 @@ class page_action extends tform_actions {
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
...@@ -93,7 +89,7 @@ class page_action extends tform_actions { ...@@ -93,7 +89,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, contact_name, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_mailserver, CONCAT(client.company_name,' :: ',client.contact_name) as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by client.contact_name");
// Set the mailserver to the default server of the client // Set the mailserver to the default server of the client
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_mailserver]"); $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_mailserver]");
...@@ -101,15 +97,15 @@ class page_action extends tform_actions { ...@@ -101,15 +97,15 @@ class page_action extends tform_actions {
unset($tmp); unset($tmp);
// 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 sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
//$tmp_data_record = $app->tform->getDataRecord($this->id); //$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
......
interface/web/mail/mail_mailinglist_edit.php
+ 6
− 11
View file @ 76ebcb3b
...@@ -72,12 +72,7 @@ class page_action extends tform_actions { ...@@ -72,12 +72,7 @@ class page_action extends tform_actions {
if($_SESSION["s"]["user"]["typ"] == 'admin') { if($_SESSION["s"]["user"]["typ"] == 'admin') {
// Getting Clients of the user // Getting Clients of the user
if($_SESSION["s"]["user"]["typ"] == 'admin') { $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
} else {
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$sql = "SELECT client.client_id, limit_web_domain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id";
}
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = ''; $client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>"; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
...@@ -85,7 +80,7 @@ class page_action extends tform_actions { ...@@ -85,7 +80,7 @@ class page_action extends tform_actions {
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; $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[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
...@@ -94,18 +89,18 @@ class page_action extends tform_actions { ...@@ -94,18 +89,18 @@ 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, contact_name, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_mailserver, CONCAT(client.company_name,' :: ',client.contact_name) as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name");
// 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 sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
$tmp_data_record = $app->tform->getDataRecord($this->id); $tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; $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[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
......
interface/web/sites/web_domain_edit.php
+ 783
− 783
View file @ 76ebcb3b
This diff is collapsed.
interface/web/vm/openvz_vm_edit.php
+ 6
− 6
View file @ 76ebcb3b
...@@ -96,19 +96,19 @@ class page_action extends tform_actions { ...@@ -96,19 +96,19 @@ 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, client.contact_name, client.limit_openvz_vm_template_id 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, client.limit_openvz_vm_template_id, CONCAT(client.company_name,' :: ',client.contact_name) as contactname, sys_group.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 //* 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']." ORDER BY name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
$records = $app->db->queryAllRecords($sql); $records = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>'; $client_select = '<option value="'.$tmp['groupid'].'">'.$client['name'].' :: '.$client['contactname'].'</option>';
//$tmp_data_record = $app->tform->getDataRecord($this->id); //$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($records)) { if(is_array($records)) {
foreach( $records as $rec) { foreach( $records as $rec) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$rec[groupid]' $selected>$rec[name]</option>\r\n"; $client_select .= "<option value='$rec[groupid]' $selected>$rec[name] :: $rec[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
...@@ -132,14 +132,14 @@ class page_action extends tform_actions { ...@@ -132,14 +132,14 @@ class page_action extends tform_actions {
} else { } else {
//* Fill the client select field //* Fill the client select field
$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(client.company_name,' :: ',client.contact_name) as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql); $clients = $app->db->queryAllRecords($sql);
$client_select = "<option value='0'></option>"; $client_select = "<option value='0'></option>";
//$tmp_data_record = $app->tform->getDataRecord($this->id); //$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) { if(is_array($clients)) {
foreach( $clients as $client) { foreach( $clients as $client) {
$selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n"; $client_select .= "<option value='$client[groupid]' $selected>$client[name] :: $client[contactname]</option>\r\n";
} }
} }
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
......
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