Skip to content

Commit f902e3b

Browse files
committed
removed other commented parts
1 parent 484e593 commit f902e3b

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@
106106
'formtype' => 'SELECT',
107107
'default' => '',
108108
'datasource' => array ( 'type' => 'SQL',
109-
'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
110-
// Commented out until {AUTHSQL::web_domain} is working
111-
//'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",
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",
112110
'keyfield'=> 'domain_id',
113111
'valuefield'=> 'parent_domain'
114112
),

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@
106106
'formtype' => 'SELECT',
107107
'default' => '',
108108
'datasource' => array ( 'type' => 'SQL',
109-
'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
110-
// Commented out until {AUTHSQL::web_domain} is working
111-
//'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",
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",
112110
'keyfield'=> 'domain_id',
113111
'valuefield'=> 'parent_domain'
114112
),

0 commit comments

Comments
 (0)