From 43418672d32ee65ee6060314d4e66c3c44a8b0cb Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 04:59:36 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
interface/web/admin/form/server_config.tform.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 8c6f899..d1634f3 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -313,6 +313,12 @@
'width' => '40',
'maxlength' => '255'
),
+ 'dkim_strength' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1024',
+ 'value' => array('1024' => 'normal (1024)', '2048' => 'strong (2048)', '4096' => 'very strong (4096)')
+ ),
'relayhost_password' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -381,6 +387,10 @@
'mailbox_virtual_uidgid_maps' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
+ 'validators' => array (0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_server_mail_config',
+ 'function' => 'mailbox_virtual_uidgid_maps'),
+ ),
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
--
Gitblit v1.9.1