From 9a63318da16fecd56dbd9fb75fae75f91c2bb23a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Feb 2012 04:06:34 -0500
Subject: [PATCH] Removed -n switch from mpt-status command to get a cleaner output of the raid state in monitor.
---
interface/web/mail/form/mail_get.tform.php | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/form/mail_get.tform.php b/interface/web/mail/form/mail_get.tform.php
index 3de9b10..0d08055 100644
--- a/interface/web/mail/form/mail_get.tform.php
+++ b/interface/web/mail/form/mail_get.tform.php
@@ -63,7 +63,7 @@
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
'valuefield'=> 'server_name'
),
@@ -73,13 +73,16 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
- 'value' => array('pop3' => 'POP3','imap'=>'IMAP')
+ 'value' => array('pop3' => 'POP3','imap'=>'IMAP','pop3ssl' => 'POP3SSL','imapssl'=>'IMAPSSL')
),
'source_server' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'source_server_error_isempty'),
+ 1 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}$/',
+ 'errmsg'=> 'source_server_error_regex'),
),
'default' => '',
'value' => '',
@@ -114,6 +117,12 @@
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
+ 'source_read_all' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n',1 => 'y')
+ ),
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
--
Gitblit v1.9.1