Skip to content

Commit 5796343

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
hide mirror-server from several lists / forms See merge request !224
2 parents e10d34a + aff9acb commit 5796343

25 files changed

+32
-32
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function dns_servers($field, $record) {
5050
$client = $app->db->queryOneRecord("SELECT default_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
5151
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
5252
} else {
53-
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name";
53+
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name AND mirror_server_id = 0";
5454
}
5555
$records = $app->db->queryAllRecords($sql, $client['default_dnsserver']);
5656
$records_new = array();
@@ -72,7 +72,7 @@ function slave_dns_servers($field, $record) {
7272
$client = $app->db->queryOneRecord("SELECT default_slave_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
7373
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
7474
} else {
75-
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name";
75+
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name AND mirror_server_id = 0";
7676
}
7777
$records = $app->db->queryAllRecords($sql, $client['default_slave_dnsserver']);
7878
$records_new = array();
@@ -99,7 +99,7 @@ function webdav_domains($field, $record) {
9999
}
100100
if(count($server_ids) == 0) return array();
101101
$server_ids = implode(',', $server_ids);
102-
$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 ? AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);
102+
$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 (?) AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain", $server_ids);
103103

104104
$records_new = array();
105105
if(is_array($records)) {
@@ -168,12 +168,12 @@ function client_servers($field, $record) {
168168
} else {
169169
//* Not able to find the clients defaults, use this as fallback and add a warning message to the log
170170
$app->log('Unable to find default server for client in custom_datasource.inc.php', 1);
171-
$sql = "SELECT server_id,server_name FROM server WHERE ?? = 1 ORDER BY server_name";
171+
$sql = "SELECT server_id,server_name FROM server WHERE ?? = 1 AND mirror_server_id = 0 ORDER BY server_name";
172172
$records = $app->db->queryAllRecords($sql, $field);
173173
}
174174
} else {
175175
//* The logged in user is admin, so we show him all available servers of a specific type.
176-
$sql = "SELECT server_id,server_name FROM server WHERE ?? = 1 ORDER BY server_name";
176+
$sql = "SELECT server_id,server_name FROM server WHERE ?? = 1 AND mirror_server_id = 0 ORDER BY server_name";
177177
$records = $app->db->queryAllRecords($sql, $field);
178178
}
179179

‎interface/web/admin/list/firewall.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
'prefix' => "%",
6464
'suffix' => "%",
6565
'datasource' => array ( 'type' => 'SQL',
66-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
66+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
6767
'keyfield'=> 'server_id',
6868
'valuefield'=> 'server_name'
6969
),

‎interface/web/admin/list/server_ip.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'prefix' => '',
5252
'suffix' => '',
5353
'datasource' => array ( 'type' => 'SQL',
54-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
54+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
5555
'keyfield'=> 'server_id',
5656
'valuefield'=> 'server_name'
5757
),

‎interface/web/admin/list/server_ip_map.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
'prefix' => '',
2828
'suffix' => '',
2929
'datasource' => array ( 'type' => 'SQL',
30-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
30+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id <> 0 ORDER BY server_name',
3131
'keyfield'=> 'server_id',
3232
'valuefield'=> 'server_name'
3333
),

‎interface/web/admin/list/server_php.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'prefix' => '',
5252
'suffix' => '',
5353
'datasource' => array ( 'type' => 'SQL',
54-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
54+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
5555
'keyfield'=> 'server_id',
5656
'valuefield'=> 'server_name'
5757
),

‎interface/web/mail/list/mail_blacklist.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
'prefix' => "%",
6666
'suffix' => "%",
6767
'datasource' => array ( 'type' => 'SQL',
68-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
68+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
6969
'keyfield'=> 'server_id',
7070
'valuefield'=> 'server_name'
7171
),

‎interface/web/mail/list/mail_content_filter.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
'prefix' => "%",
6767
'suffix' => "%",
6868
'datasource' => array ( 'type' => 'SQL',
69-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
69+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
7070
'keyfield'=> 'server_id',
7171
'valuefield'=> 'server_name'
7272
),

‎interface/web/mail/list/mail_get.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
'prefix' => "%",
6565
'suffix' => "%",
6666
'datasource' => array ( 'type' => 'SQL',
67-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
67+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
6868
'keyfield'=> 'server_id',
6969
'valuefield'=> 'server_name'
7070
),

‎interface/web/mail/list/mail_relay_recipient.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
'prefix' => "%",
6565
'suffix' => "%",
6666
'datasource' => array ( 'type' => 'SQL',
67-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
67+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
6868
'keyfield'=> 'server_id',
6969
'valuefield'=> 'server_name'
7070
),

‎interface/web/mail/list/mail_spamfilter.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
'prefix' => "%",
6565
'suffix' => "%",
6666
'datasource' => array ( 'type' => 'SQL',
67-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
67+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
6868
'keyfield'=> 'server_id',
6969
'valuefield'=> 'server_name'
7070
),

0 commit comments

Comments
 (0)