From e2b4f760bb91caf66445a888c7a185e972e97a3c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 11 Feb 2014 04:45:44 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/form/server_config.tform.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 89165ec..5b270c6 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -303,15 +303,19 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '/var/lib/amavis/dkim',
- 'validators' => array ( 0 => array ('type' => 'CUSTOM',
- 'class' => 'validate_dkim',
- 'function' => 'check_dkim_path',
- 'errmsg'=> 'dkim_path_error'),
- ),
'value' => '',
'width' => '40',
'maxlength' => '255'
),
+ 'relayhost_password' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+
'pop3_imap_daemon' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
--
Gitblit v1.9.1