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 1 Packages Projects Releases Wiki Activity

Localization: ContextHelpers.IsRequestAdmin refactored to AdminFilter static method

Browse Source
This commit is contained in:
Lombiq
2019-08-13 20:30:42 +02:00
committed by Benedek Farkas
parent a808fdbb6b
commit dce04a2587
6 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard.Web/Modules/Orchard.Localization/Helpers/ContextHelpers.cs
View File

@@ -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;
}
}
}

1
src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
View File

@@ -100,7 +100,6 @@
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Controllers\TransliterationAdminController.cs" />
<Compile Include="Controllers\AdminCultureSelectorController.cs" />
<Compile Include="Helpers\ContextHelpers.cs" />
<Compile Include="Models\TransliterationSpecificationRecord.cs" />
<Compile Include="Providers\ContentLocalizationTokens.cs" />
<Compile Include="Selectors\ContentCultureSelector.cs" />

5
src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs
View File

@@ -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;

7
src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs
View File

@@ -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);

7
src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs
View File

@@ -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;

7
src/Orchard/UI/Admin/AdminFilter.cs
View File

@@ -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) {