diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index a8b7d495..509928f8 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -315,7 +315,7 @@ else _urls = Regex.Replace(_urls, @"\r\n?|\n", ","); var duplicates = new List(); var aliases = await AliasService.GetAliasesAsync(); - foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries)) { if (aliases.Exists(item => item.Name == name)) { diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index 9c7dedb9..1c1998ad 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -299,7 +299,7 @@ { query = query.Substring(1); // ignore "?" } - foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string kvp in query.Split('&', StringSplitOptions.RemoveEmptyEntries)) { if (kvp != "") { @@ -358,7 +358,7 @@ } if (!string.IsNullOrEmpty(panes)) { - page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); + page.Panes = panes.Replace(";", ",").Split(',', StringSplitOptions.RemoveEmptyEntries).ToList(); if (!page.Panes.Contains(PaneNames.Default) && !page.Panes.Contains(PaneNames.Admin)) { _error = "The Current Theme Does Not Contain A Default Or Admin Pane"; @@ -407,7 +407,7 @@ // check if the module defines custom action routes if (module.ModuleDefinition.ControlTypeRoutes != "") { - foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(';', StringSplitOptions.RemoveEmptyEntries)) { if (route.StartsWith(action + "=")) { diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 82bfffd4..ed4a730c 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -370,7 +370,7 @@ namespace Oqtane.Infrastructure tenant = db.Tenant.FirstOrDefault(item => item.Name == install.TenantName); } - var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); + var aliasNames = install.Aliases.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); var firstAlias = aliasNames[0]; foreach (var aliasName in aliasNames) { @@ -406,7 +406,7 @@ namespace Oqtane.Infrastructure { var result = new Installation { Success = false, Message = string.Empty }; - var versions = Constants.ReleaseVersions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var versions = Constants.ReleaseVersions.Split(',', StringSplitOptions.RemoveEmptyEntries); using (var scope = _serviceScopeFactory.CreateScope()) { @@ -486,7 +486,7 @@ namespace Oqtane.Infrastructure { if (!string.IsNullOrEmpty(moduleDefinition.ReleaseVersions)) { - var versions = moduleDefinition.ReleaseVersions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var versions = moduleDefinition.ReleaseVersions.Split(',', StringSplitOptions.RemoveEmptyEntries); using (var db = GetInstallationContext()) { if (!string.IsNullOrEmpty(moduleDefinition.ServerManagerType)) @@ -575,7 +575,7 @@ namespace Oqtane.Infrastructure { // set the alias explicitly so the tenant can be resolved var aliases = scope.ServiceProvider.GetRequiredService(); - var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); + var aliasNames = install.Aliases.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); var firstAlias = aliasNames[0]; var alias = aliases.GetAliases().FirstOrDefault(item => item.Name == firstAlias); var tenantManager = scope.ServiceProvider.GetRequiredService(); diff --git a/Oqtane.Server/Infrastructure/TenantManager.cs b/Oqtane.Server/Infrastructure/TenantManager.cs index 53dd8d73..226f1d0a 100644 --- a/Oqtane.Server/Infrastructure/TenantManager.cs +++ b/Oqtane.Server/Infrastructure/TenantManager.cs @@ -37,7 +37,7 @@ namespace Oqtane.Infrastructure { // legacy support for client api requests which would include the alias as a path prefix ( ie. {alias}/api/[controller] ) int aliasId; - string[] segments = httpcontext.Request.Path.Value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + string[] segments = httpcontext.Request.Path.Value.Split('/', StringSplitOptions.RemoveEmptyEntries); if (segments.Length > 1 && Shared.Constants.ReservedRoutes.Contains(segments[1]) && int.TryParse(segments[0], out aliasId)) { alias = _aliasRepository.GetAliases().ToList().FirstOrDefault(item => item.AliasId == aliasId); diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index cbe3bd9c..1f914e6c 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -67,7 +67,7 @@ namespace Oqtane.Repository Alias alias = null; List aliases = GetAliases().ToList(); - var segments = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + var segments = url.Split('/', StringSplitOptions.RemoveEmptyEntries); // iterate segments to find keywords int start = segments.Length; diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index 55e96399..d6e3d75f 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -225,7 +225,7 @@ namespace Oqtane.Repository string securityid = ""; foreach (PermissionString permissionstring in JsonSerializer.Deserialize>(permissionStrings)) { - foreach (string id in permissionstring.Permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string id in permissionstring.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries)) { securityid = id; Permission permission = new Permission(); diff --git a/Oqtane.Shared/Security/UserSecurity.cs b/Oqtane.Shared/Security/UserSecurity.cs index 16169495..36cb21c9 100644 --- a/Oqtane.Shared/Security/UserSecurity.cs +++ b/Oqtane.Shared/Security/UserSecurity.cs @@ -62,7 +62,7 @@ namespace Oqtane.Security if (permissions != null) { - foreach (string permission in permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string permission in permissions.Split(';', StringSplitOptions.RemoveEmptyEntries)) { bool? allowed = VerifyPermission(userId, roles, permission); if (allowed.HasValue) @@ -155,7 +155,7 @@ namespace Oqtane.Security identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Admin)); identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Registered)); } - foreach (string role in user.Roles.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + foreach (string role in user.Roles.Split(';', StringSplitOptions.RemoveEmptyEntries)) { if (!identity.Claims.Any(item => item.Type == ClaimTypes.Role && item.Value == role)) {