From b6108193aa434a0502261e4057a897344e465f94 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 13:51:18 -0400
Subject: [PATCH] Added: FS#873 - Option to redirect spam into a .Junk directory

---
 interface/web/mail/form/mail_user.tform.php |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index cf9985e..a96d80c 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -94,10 +94,10 @@
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'quota_error_isint'),
 										1 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(-1)|([1-9][0-9]*)$/',
+														'regex' => '/^([0-9]*)$/',
 														'errmsg'=> 'quota_error_value'),
 									),
-			'default'	=> '0',
+			'default'	=> '-1',
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
@@ -202,7 +202,12 @@
 	##################################
 	# Begin Datatable fields
 	##################################
-		
+		'move_junk' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'n',
+			'value'		=> array(0 => 'n',1 => 'y')
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################

--
Gitblit v1.9.1