From 83c58ebb377d9aab7003f2c123edc166668099c4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 24 Feb 2014 10:16:14 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/lib/classes/custom_datasource.inc.php | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
index 5fa0e9e..16036f5 100644
--- a/interface/lib/classes/custom_datasource.inc.php
+++ b/interface/lib/classes/custom_datasource.inc.php
@@ -32,7 +32,7 @@
function master_templates($field, $record) {
global $app, $conf;
- $records = $app->db->queryAllRecords("SELECT template_id,template_name FROM client_template WHERE template_type ='m'");
+ $records = $app->db->queryAllRecords("SELECT template_id,template_name FROM client_template WHERE template_type ='m' and ".$app->tform->getAuthSQL('r'));
$records_new[0] = $app->lng('Custom');
foreach($records as $rec) {
$key = $rec['template_id'];
@@ -139,6 +139,18 @@
case 'default_vserverserver':
$field = 'vserver_server';
break;
+ case 'mail_servers':
+ $field = 'mail_server';
+ break;
+ case 'web_servers':
+ $field = 'web_server';
+ break;
+ case 'dns_servers':
+ $field = 'dns_server';
+ break;
+ case 'db_servers':
+ $field = 'db_server';
+ break;
default:
$field = 'web_server';
break;
--
Gitblit v1.9.1