From b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Mar 2010 06:04:32 -0400
Subject: [PATCH] Fixed: FS#1124 - Traffic quota on some systems not working

---
 interface/web/mail/form/mail_user.tform.php |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index cf9985e..5214b62 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -88,16 +88,24 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'name' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
 		'quota' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
 			'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'
@@ -151,14 +159,14 @@
 		'disableimap' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
-			'default'	=> '0',
-			'value'		=> array(1 => '1',0 => '0')
+			'default'	=> 'n',
+			'value'		=> array(1 => 'y',0 => 'n')
 		),
 		'disablepop3' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
-			'default'	=> 'y',
-			'value'		=> array(1 => '1',0 => '0')
+			'default'	=> 'n',
+			'value'		=> array(1 => 'y',0 => 'n')
 		),
 	##################################
 	# ENDE Datatable fields
@@ -188,6 +196,24 @@
 			'default'	=> 'n',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		'autoresponder_start_date' => array (
+			'datatype'	=> 'DATETIME',
+			'formtype'	=> 'DATETIME',
+			'validators'=> array ( 	0 => array (	'type'	=> 'CUSTOM',
+													'class' => 'validate_autoresponder',
+													'function' => 'start_date',
+													'errmsg'=> 'autoresponder_start_date_isfuture'),
+								 ),
+		),
+		'autoresponder_end_date' => array (
+			'datatype'	=> 'DATETIME',
+			'formtype'	=> 'DATETIME',
+			'validators'=> array ( 	0 => array (	'type'	=> 'CUSTOM',
+													'class' => 'validate_autoresponder',
+													'function' => 'end_date',
+													'errmsg'=> 'autoresponder_end_date_isgreater'),
+								 ),
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################
@@ -202,7 +228,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