From 0ea47a55548b0c6d2cf3d011f51645dfc7673394 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Wed, 23 Nov 2016 03:39:40 +0100 Subject: [PATCH] Fixed the tenant name validation (#7429) --- .../Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs | 2 +- .../Modules/Orchard.MultiTenancy/Controllers/AdminController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs index b39d8497b..333b4e1fe 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs @@ -91,7 +91,7 @@ namespace Orchard.MultiTenancy.Commands { public void Create(string tenantName) { Context.Output.WriteLine(T("Creating tenant '{0}'...", tenantName)); - if (String.IsNullOrWhiteSpace(tenantName) || !Regex.IsMatch(tenantName, @"^\[a-zA-Z]\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.")); return; } diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs index 5754a500a..ac60e8f0b 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs @@ -66,7 +66,7 @@ namespace Orchard.MultiTenancy.Controllers { } // Ensure tenants name are valid. - if (!String.IsNullOrEmpty(viewModel.Name) && !Regex.IsMatch(viewModel.Name, @"^\[a-zA-Z]\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); }