From fdc02320967c39aa58399a7eb9b94727a36b4386 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 05 Dec 2012 11:53:01 -0500
Subject: [PATCH] Fixed: Fixed: FS#2569 - Check for duplicate mailing list names is missing
---
interface/web/mail/lib/lang/en_mail_mailinglist.lng | 2 ++
interface/web/mail/form/mail_user.tform.php | 6 +++---
interface/web/mail/form/mail_mailinglist.tform.php | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/interface/web/mail/form/mail_mailinglist.tform.php b/interface/web/mail/form/mail_mailinglist.tform.php
index 7ccf1f6..3166c26 100644
--- a/interface/web/mail/form/mail_mailinglist.tform.php
+++ b/interface/web/mail/form/mail_mailinglist.tform.php
@@ -101,6 +101,8 @@
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'listname_error_empty'),
+ 1 => array ( 'type' => 'UNIQUE',
+ 'errmsg'=> 'listname_error_unique'),
),
'default' => '',
'value' => '',
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 94d35bf..5ec0cbc 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -136,10 +136,10 @@
'quota' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'validators' => array ( 1 => array ( 'type' => 'ISINT',
'errmsg'=> 'quota_error_isint'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^([0-9]*)$/',
+ 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^([0-9]{1,})$/',
'errmsg'=> 'quota_error_value'),
),
'default' => '-1',
diff --git a/interface/web/mail/lib/lang/en_mail_mailinglist.lng b/interface/web/mail/lib/lang/en_mail_mailinglist.lng
index d42c71b..b67e4c0 100644
--- a/interface/web/mail/lib/lang/en_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/en_mail_mailinglist.lng
@@ -16,4 +16,6 @@
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
+$wb["listname_error_unique"] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb["email_error_isemail"] = 'Email address is invalid.';
?>
\ No newline at end of file
--
Gitblit v1.9.1