Skip to content

Commit d5473be

Browse files
falkotimmefalkotimme
committed
- Display server name in all web domains select fields so that you know which domain from which server you select.
1 parent acdd7a7 commit d5473be

13 files changed

+26
-21
lines changed

‎interface/lib/classes/custom_datasource.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ function webdav_domains($field, $record) {
7777
}
7878
if(count($server_ids) == 0) return array();
7979
$server_ids = implode(',', $server_ids);
80-
$records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND server_id IN (".$server_ids.") AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
80+
$records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN (".$server_ids.") AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain");
8181

8282
$records_new = array();
8383
if(is_array($records)) {
8484
foreach($records as $rec) {
8585
$key = $rec['domain_id'];
86-
$records_new[$key] = $rec['domain'];
86+
$records_new[$key] = $rec['parent_domain'];
8787
}
8888
}
8989
return $records_new;

‎interface/lib/classes/tform.inc.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ function getDatasourceData($field, $record) {
251251
unset($tmp_recordid);
252252

253253
$querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring);
254+
$querystring = preg_replace_callback('@{AUTHSQL::(.+?)}@', "self::table_auth_sql", $querystring);
254255

255256
// Getting the records
256257
$tmp_records = $app->db->queryAllRecords($querystring);
@@ -292,6 +293,10 @@ function getDatasourceData($field, $record) {
292293

293294
}
294295

296+
function table_auth_sql($matches){
297+
return $this->getAuthSQL('r', $matches[1]);
298+
}
299+
295300
//* If the parameter 'valuelimit' is set
296301
function applyValueLimit($limit,$values) {
297302

‎interface/web/sites/form/cron.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
'formtype' => 'SELECT',
8080
'default' => '',
8181
'datasource' => array ( 'type' => 'SQL',
82-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
82+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
8383
'keyfield'=> 'domain_id',
84-
'valuefield'=> 'domain'
84+
'valuefield'=> 'parent_domain'
8585
),
8686
'value' => ''
8787
),

‎interface/web/sites/form/database.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
'formtype' => 'SELECT',
8080
'default' => '',
8181
'datasource' => array ( 'type' => 'SQL',
82-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
82+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
8383
'keyfield'=> 'domain_id',
84-
'valuefield'=> 'domain'
84+
'valuefield'=> 'parent_domain'
8585
),
8686
'value' => array('0' => 'select_site_txt')
8787
),

‎interface/web/sites/form/ftp_user.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
'formtype' => 'SELECT',
8080
'default' => '',
8181
'datasource' => array ( 'type' => 'SQL',
82-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
82+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
8383
'keyfield'=> 'domain_id',
84-
'valuefield'=> 'domain'
84+
'valuefield'=> 'parent_domain'
8585
),
8686
'value' => ''
8787
),

‎interface/web/sites/form/shell_user.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
'formtype' => 'SELECT',
8080
'default' => '',
8181
'datasource' => array ( 'type' => 'SQL',
82-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
82+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
8383
'keyfield'=> 'domain_id',
84-
'valuefield'=> 'domain'
84+
'valuefield'=> 'parent_domain'
8585
),
8686
'value' => ''
8787
),

‎interface/web/sites/form/web_aliasdomain.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
'formtype' => 'SELECT',
107107
'default' => '',
108108
'datasource' => array ( 'type' => 'SQL',
109-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
109+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
110110
'keyfield'=> 'domain_id',
111-
'valuefield'=> 'domain'
111+
'valuefield'=> 'parent_domain'
112112
),
113113
'value' => ''
114114
),

‎interface/web/sites/form/web_folder.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
'formtype' => 'SELECT',
7575
'default' => '',
7676
'datasource' => array ( 'type' => 'SQL',
77-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE (type = 'vhost' OR type = 'vhostsubdomain') AND {AUTHSQL} ORDER BY domain",
77+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE (web_domain.type = 'vhost' OR web_domain.type = 'vhostsubdomain') AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
7878
'keyfield'=> 'domain_id',
79-
'valuefield'=> 'domain'
79+
'valuefield'=> 'parent_domain'
8080
),
8181
'value' => ''
8282
),

‎interface/web/sites/form/web_folder_user.tform.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
5151
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
5252

53-
$auth_sql = (isset($app->tform) ? $app->tform->getAuthSQL('r', 'web_domain') : '1');
54-
5553
$form["tabs"]['user'] = array (
5654
'title' => "Folder",
5755
'width' => 100,
@@ -76,7 +74,7 @@
7674
'formtype' => 'SELECT',
7775
'default' => '',
7876
'datasource' => array ( 'type' => 'SQL',
79-
'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
77+
'querystring' => "Select concat(web_domain.domain,' ',web_folder.path, ' :: ', server.server_name) as name, web_folder.web_folder_id from web_domain, web_folder, server WHERE web_domain.domain_id = web_folder.parent_domain_id AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
8078
'keyfield'=> 'web_folder_id',
8179
'valuefield'=> 'name'
8280
),

‎interface/web/sites/form/web_subdomain.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
'formtype' => 'SELECT',
107107
'default' => '',
108108
'datasource' => array ( 'type' => 'SQL',
109-
'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
109+
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
110110
'keyfield'=> 'domain_id',
111-
'valuefield'=> 'domain'
111+
'valuefield'=> 'parent_domain'
112112
),
113113
'value' => '',
114114
'searchable' => 2

0 commit comments

Comments
 (0)