Skip to content

Commit ab75287

Browse files
committed
removed unnecessary lines and removed temporary comments
1 parent b8a75ef commit ab75287

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@
143143
'formtype' => 'SELECT',
144144
'default' => '',
145145
'datasource' => array ( 'type' => 'SQL',
146-
'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
147-
// Commented out until {AUTHSQL::web_domain} is working
148-
//'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",
146+
'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",
149147
'keyfield'=> 'domain_id',
150148
'valuefield'=> 'parent_domain'
151149
),

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@
143143
'formtype' => 'SELECT',
144144
'default' => '',
145145
'datasource' => array ( 'type' => 'SQL',
146-
'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
147-
// Commented out until {AUTHSQL::web_domain} is working
148-
//'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",
146+
'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",
149147
'keyfield'=> 'domain_id',
150148
'valuefield'=> 'parent_domain'
151149
),

interface/web/themes/blue/templates/main.tpl.htm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
1515
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
1616
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
17-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
1817
<script type="text/javascript" src="js/scrigo.js.php"></script>
1918
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
2019
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>

0 commit comments

Comments
 (0)