lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Fixes #7378] Fixed tenant name validation regex, not to allow numbers. (#7399)

Browse Source 
[Fixes #7378]
This commit is contained in:
Szymon Seliga
2016-11-18 19:25:31 +01:00
committed by Sébastien Ros
parent 4299239482
commit d8f423888a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs
View File

@@ -91,7 +91,7 @@ namespace Orchard.MultiTenancy.Commands {
public void Create(string tenantName) { public void Create(string tenantName) {
Context.Output.WriteLine(T("Creating tenant '{0}'...", tenantName)); Context.Output.WriteLine(T("Creating tenant '{0}'...", tenantName));
if (String.IsNullOrWhiteSpace(tenantName) || !Regex.IsMatch(tenantName, @"^\w+$")) { if (String.IsNullOrWhiteSpace(tenantName) || !Regex.IsMatch(tenantName, @"^\[a-zA-Z]\w*$")) {
Context.Output.WriteLine(T("Invalid tenant name. Must contain characters only and no spaces.")); Context.Output.WriteLine(T("Invalid tenant name. Must contain characters only and no spaces."));
return; return;
} }

4
src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
View File

@@ -66,7 +66,7 @@ namespace Orchard.MultiTenancy.Controllers {
} }
// Ensure tenants name are valid. // Ensure tenants name are valid.
if (!String.IsNullOrEmpty(viewModel.Name) && !Regex.IsMatch(viewModel.Name, @"^\w+$")) { if (!String.IsNullOrEmpty(viewModel.Name) && !Regex.IsMatch(viewModel.Name, @"^\[a-zA-Z]\w*$")) {
ModelState.AddModelError("Name", T("Invalid tenant name. Must contain characters only and no spaces.").Text); ModelState.AddModelError("Name", T("Invalid tenant name. Must contain characters only and no spaces.").Text);
} }
@@ -270,4 +270,4 @@ namespace Orchard.MultiTenancy.Controllers {
return _thisShellSettings.Name == ShellSettings.DefaultName; return _thisShellSettings.Name == ShellSettings.DefaultName;
} }
} }
} }