lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5156 from MpDzik/pr/users-consts2

Browse Source 
Define constants for maximum username/email length
This commit is contained in:
Sébastien Ros
2015-04-16 12:57:47 -07:00
parent 0d9a4a295c c9ebd1db67
commit 3bb36ab010
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -362,7 +362,7 @@ namespace Orchard.Users.Controllers {
validate = false;
}
else {
if (userName.Length >= 255) {
if (userName.Length >= UserPart.MaxUserNameLength) {
ModelState.AddModelError("username", T("The username you provided is too long."));
validate = false;
}
@@ -372,7 +372,7 @@ namespace Orchard.Users.Controllers {
ModelState.AddModelError("email", T("You must specify an email address."));
validate = false;
}
else if (email.Length >= 255) {
else if (email.Length >= UserPart.MaxEmailLength) {
ModelState.AddModelError("email", T("The email address you provided is too long."));
validate = false;
}

3
src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
View File

@@ -7,6 +7,9 @@ namespace Orchard.Users.Models {
public const string EmailPattern =
@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
+ @"@([a-z0-9][\w-]*\.)+[a-z]{2,}$";
public const int MaxUserNameLength = 255;
public const int MaxEmailLength = 255;
public string UserName {
get { return Retrieve(x => x.UserName); }