summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mszulecki2009-12-23 13:23:01 +0000
committerGravatar mszulecki2009-12-23 13:23:01 +0000
commit98fea044acc8e00277d7bdf904843e75b9cb5539 (patch)
treea49091e548823c5cc5ae53b784b3c6659e52f499
parentf614fbf46129fffc5e66e954114ddc3ea6e7119a (diff)
downloadmailadmin-98fea044acc8e00277d7bdf904843e75b9cb5539.tar.gz
mailadmin-98fea044acc8e00277d7bdf904843e75b9cb5539.tar.bz2
Also forbid whitespaces in mailbox names
git-svn-id: http://svn.sukimashita.com/repos/mailadmin/trunk@7 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
-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 20163c8..2148f51 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 ".,;@/" and whitespaces are not allowed'
+ pattern: '/^[^\.\s,;@\/]+$/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 0802e39..fe94818 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 ".,;@/" and whitespaces are not allowed'
+ pattern: '/^[^\.\s,;@\/]+$/i'
myDenyStringValidator:
values: [<?php echo implode(', ',sfConfig::get('app_mailbox_deny_names')) ?>]
values_error: This Username is not allowed