summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorGravatar mszulecki2009-12-22 17:48:29 +0000
committerGravatar mszulecki2009-12-22 17:48:29 +0000
commita9e431e79b4197ea663777d46a5e08521fee14d1 (patch)
tree8071f44c6f39c081f5fc6a5057a1d151314a29a0 /apps
parent27a3ab7430cc7fdb8ba1d45c01bc5e7cf8384108 (diff)
downloadmailadmin-a9e431e79b4197ea663777d46a5e08521fee14d1.tar.gz
mailadmin-a9e431e79b4197ea663777d46a5e08521fee14d1.tar.bz2
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
Diffstat (limited to 'apps')
-rw-r--r--apps/admin/modules/mailbox/validate/create.yml4
-rw-r--r--apps/admin/modules/mailbox/validate/edit.yml4
2 files changed, 4 insertions, 4 deletions
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