From a9e431e79b4197ea663777d46a5e08521fee14d1 Mon Sep 17 00:00:00 2001
From: mszulecki
Date: Tue, 22 Dec 2009 17:48:29 +0000
Subject: Fix matching of mailbox username regex to avoid invalid characters

git-svn-id: http://svn.sukimashita.com/repos/mailadmin/trunk@5 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
---
 apps/admin/modules/mailbox/validate/create.yml | 4 ++--
 apps/admin/modules/mailbox/validate/edit.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'apps/admin/modules/mailbox')

diff --git a/apps/admin/modules/mailbox/validate/create.yml b/apps/admin/modules/mailbox/validate/create.yml
index 3668321..20163c8 100644
--- a/apps/admin/modules/mailbox/validate/create.yml
+++ b/apps/admin/modules/mailbox/validate/create.yml
@@ -26,8 +26,8 @@ fields:
     myStringValidator:
     sfRegexValidator:
       match:..........Yes
-      match_error:    'The characters ".,;/" are not allowed'
-      pattern:        '/[^.,;\/]$/i'
+      match_error:    'The characters ".,;@/" are not allowed'
+      pattern:        '/^[^\.,;@\/]+$/i'
     myDenyStringValidator:
       values:         [<?php echo implode(', ',sfConfig::get('app_mailbox_deny_names')) ?>]
       values_error:   This Username is not allowed
diff --git a/apps/admin/modules/mailbox/validate/edit.yml b/apps/admin/modules/mailbox/validate/edit.yml
index 1629a9d..0802e39 100644
--- a/apps/admin/modules/mailbox/validate/edit.yml
+++ b/apps/admin/modules/mailbox/validate/edit.yml
@@ -26,8 +26,8 @@ fields:
     myStringValidator:
     sfRegexValidator:
       match:..........Yes
-      match_error:    'The characters ".,;/" are not allowed'
-      pattern:        '/[^.,;\/]$/i'
+      match_error:    'The characters ".,;@/" are not allowed'
+      pattern:        '/^[^\.,;@\/]+$/i'
     myDenyStringValidator:
       values:         [<?php echo implode(', ',sfConfig::get('app_mailbox_deny_names')) ?>]
       values_error:   This Username is not allowed
-- 
cgit v1.1-32-gdbae