last checkin optimized ^^

Author: renky

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

@@ -106,7 +106,9 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'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",
+				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+				// Commented out until {AUTHSQL::web_domain} is working
+				//'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",
 				'keyfield'=> 'domain_id',
 				'valuefield'=> 'parent_domain'
 			),

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

@@ -106,7 +106,9 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'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",
+				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+				// Commented out until {AUTHSQL::web_domain} is working
+				//'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",
 				'keyfield'=> 'domain_id',
 				'valuefield'=> 'parent_domain'
 			),

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

@@ -143,7 +143,7 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
 				// Commented out until {AUTHSQL::web_domain} is working
 				//'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",
 				'keyfield'=> 'domain_id',

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

@@ -143,7 +143,7 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
+				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
 				// Commented out until {AUTHSQL::web_domain} is working
 				//'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",
 				'keyfield'=> 'domain_id',