From 2c76f1a2117f56a3f13452eaca05a5b4d5751a1b Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Tue, 22 Oct 2013 20:31:57 -0400
Subject: [PATCH] - Fixed FS#3118 - munin & monit logins not being urlencoded.
---
interface/lib/classes/custom_datasource.inc.php | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
index 52ba34c..f309d01 100644
--- a/interface/lib/classes/custom_datasource.inc.php
+++ b/interface/lib/classes/custom_datasource.inc.php
@@ -63,6 +63,32 @@
return $records_new;
}
+ function webdav_domains($field, $record) {
+ global $app, $conf;
+
+ $servers = $app->db->queryAllRecords("SELECT * FROM server WHERE active = 1 AND mirror_server_id = 0");
+ $server_ids = array();
+ $app->uses('getconf');
+ if(is_array($servers) && !empty($servers)){
+ foreach($servers as $server){
+ $web_config = $app->getconf->get_server_config($server['server_id'], 'web');
+ if($web_config['server_type'] != 'nginx') $server_ids[] = $server['server_id'];
+ }
+ }
+ if(count($server_ids) == 0) return array();
+ $server_ids = implode(',', $server_ids);
+ $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");
+
+ $records_new = array();
+ if(is_array($records)) {
+ foreach($records as $rec) {
+ $key = $rec['domain_id'];
+ $records_new[$key] = $rec['parent_domain'];
+ }
+ }
+ return $records_new;
+ }
+
function client_servers($field, $record) {
global $app, $conf;
@@ -79,6 +105,9 @@
case 'default_dnsserver':
$field = 'dns_server';
break;
+ case 'default_slave_dnsserver':
+ $field = 'dns_server';
+ break;
case 'default_fileserver':
$field = 'file_server';
break;
--
Gitblit v1.9.1