From 34a3f8a1dc3cbbdc33aba3cfd4f81e537d236e50 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 19 Aug 2009 08:41:35 -0400
Subject: [PATCH] Fixed: FS#850 - Unlimitred mailbox quota when value = 0 

---
 interface/web/mail/lib/lang/en_mail_user.lng |    1 +
 interface/web/mail/form/mail_user.tform.php  |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index be3f675..cf9985e 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -93,6 +93,9 @@
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'quota_error_isint'),
+										1 => array (	'type'	=> 'REGEX',
+														'regex' => '/^(-1)|([1-9][0-9]*)$/',
+														'errmsg'=> 'quota_error_value'),
 									),
 			'default'	=> '0',
 			'value'		=> '',
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 65ee78a..bfca13a 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -28,4 +28,5 @@
 $wb["disableimap_txt"] = 'Disable IMAP';
 $wb["disablepop3_txt"] = 'Disable POP3';
 $wb["duplicate_alias_or_forward_txt"] = 'There is already an alias or forwrd with this email address.';
+$wb["quota_error_value"] = 'Invalid quota value. Allowed values are: -1 for unlimited or numbers > 1';
 ?>

--
Gitblit v1.9.1