From dce04a2587aeaa148331e01cb1be75b46e908694 Mon Sep 17 00:00:00 2001 From: Lombiq Date: Tue, 13 Aug 2019 20:30:42 +0200 Subject: [PATCH] Localization: ContextHelpers.IsRequestAdmin refactored to AdminFilter static method --- .../Helpers/ContextHelpers.cs | 18 ------------------ .../Orchard.Localization.csproj | 1 - .../Selectors/ContentCultureSelector.cs | 5 +++-- .../Selectors/CookieCultureSelector.cs | 7 ++++--- .../Selectors/RouteCultureSelector.cs | 7 ++++--- src/Orchard/UI/Admin/AdminFilter.cs | 7 ++++++- 6 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Localization/Helpers/ContextHelpers.cs diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Helpers/ContextHelpers.cs b/src/Orchard.Web/Modules/Orchard.Localization/Helpers/ContextHelpers.cs deleted file mode 100644 index 0d11c1d4d..000000000 --- a/src/Orchard.Web/Modules/Orchard.Localization/Helpers/ContextHelpers.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Web; -using Orchard.UI.Admin; - -namespace Orchard.Localization { - public static class ContextHelpers { - internal static bool IsRequestFrontEnd(HttpContextBase context) { - return !IsRequestAdmin(context); - } - - internal static bool IsRequestAdmin(HttpContextBase context) { - if (AdminFilter.IsApplied(context.Request.RequestContext)) - return true; - - return false; - } - - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj index fd6b9b90a..42844a468 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj +++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj @@ -100,7 +100,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs index 2276a261c..25ac9d180 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs @@ -3,9 +3,10 @@ using System.Web; using System.Web.Mvc; using Orchard.Alias; using Orchard.ContentManagement; +using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.Localization.Services; -using Orchard.Environment.Configuration; +using Orchard.UI.Admin; namespace Orchard.Localization.Selectors { [OrchardFeature("Orchard.Localization.CultureSelector")] @@ -27,7 +28,7 @@ namespace Orchard.Localization.Selectors { } public CultureSelectorResult GetCulture(HttpContextBase context) { - if (context == null || ContextHelpers.IsRequestAdmin(context)) return null; + if (context == null || AdminFilter.IsApplied(context)) return null; // Attempt to determine culture by previous route if by POST string path; diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs index 2cad672cc..d39abbb5b 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs @@ -6,6 +6,7 @@ using Orchard.Localization.Providers; using Orchard.Localization.Services; using Orchard.Mvc; using Orchard.Services; +using Orchard.UI.Admin; namespace Orchard.Localization.Selectors { [OrchardFeature("Orchard.Localization.CultureSelector")] @@ -31,10 +32,10 @@ namespace Orchard.Localization.Selectors { if (httpContext == null) return; - var cookieName = ContextHelpers.IsRequestAdmin(httpContext) ? AdminCookieName : FrontEndCookieName; + var cookieName = AdminFilter.IsApplied(httpContext) ? AdminCookieName : FrontEndCookieName; var cookie = new HttpCookie(cookieName, culture) { - Expires = _clock.UtcNow.AddYears(DefaultExpireTimeYear), + Expires = _clock.UtcNow.AddYears(DefaultExpireTimeYear), }; cookie.Domain = !httpContext.Request.IsLocal ? httpContext.Request.Url.Host : null; @@ -51,7 +52,7 @@ namespace Orchard.Localization.Selectors { public CultureSelectorResult GetCulture(HttpContextBase context) { if (context == null) return null; - var cookieName = ContextHelpers.IsRequestAdmin(context) ? AdminCookieName : FrontEndCookieName; + var cookieName = AdminFilter.IsApplied(context) ? AdminCookieName : FrontEndCookieName; var cookie = context.Request.Cookies.Get(cookieName); diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs index 83c2c9d00..d84bc422f 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs @@ -2,12 +2,13 @@ using System.Globalization; using System.Web; using Orchard.Environment.Extensions; using Orchard.Localization.Services; +using Orchard.UI.Admin; namespace Orchard.Localization.Selectors { [OrchardFeature("Orchard.Localization.CultureSelector")] public class RouteCultureSelector : ICultureSelector { public CultureSelectorResult GetCulture(HttpContextBase context) { - if (context == null || ContextHelpers.IsRequestAdmin(context)) return null; + if (context == null || AdminFilter.IsApplied(context)) return null; // Attempt to determine culture by route. // This normally happens when you are using non standard pages that are not content items @@ -17,9 +18,9 @@ namespace Orchard.Localization.Selectors { if (routeCulture != null && !string.IsNullOrWhiteSpace(routeCulture.ToString())) { try { var culture = CultureInfo.GetCultureInfo(routeCulture.ToString()); - return new CultureSelectorResult {Priority = -3, CultureName = culture.Name}; + return new CultureSelectorResult { Priority = -3, CultureName = culture.Name }; } - catch {} + catch { } } return null; diff --git a/src/Orchard/UI/Admin/AdminFilter.cs b/src/Orchard/UI/Admin/AdminFilter.cs index 86416051d..f441022e9 100644 --- a/src/Orchard/UI/Admin/AdminFilter.cs +++ b/src/Orchard/UI/Admin/AdminFilter.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Web; using System.Web.Mvc; using System.Web.Routing; using Orchard.Localization; @@ -34,7 +35,11 @@ namespace Orchard.UI.Admin { } public static bool IsApplied(RequestContext context) { - return context.HttpContext.Items.Contains(typeof(AdminFilter)); + return IsApplied(context.HttpContext); + } + + public static bool IsApplied(HttpContextBase context) { + return context.Items.Contains(typeof(AdminFilter)); } private static bool IsAdmin(AuthorizationContext filterContext) {