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

Spliting the cookie selector in to two allowing for FrontEnd cookie set and admin cookie set.

Browse Source
This commit is contained in:
Nicholas Mayne
2015-01-26 13:26:06 +00:00
parent d5c85265b5
commit d27fa1d413
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs
+10 -5
View File
@@ -14,7 +14,8 @@ namespace Orchard.Localization.Selectors {
private readonly IClock _clock; private readonly IClock _clock;
private readonly ShellSettings _shellSettings; private readonly ShellSettings _shellSettings;
private const string CookieName = "OrchardCurrentCulture"; private const string FrontEndCookieName = "OrchardCurrentCulture-FrontEnd";
private const string AdminCookieName = "OrchardCurrentCulture-Admin";
private const int DefaultExpireTimeYear = 1; private const int DefaultExpireTimeYear = 1;
public CookieCultureSelector(IHttpContextAccessor httpContextAccessor, public CookieCultureSelector(IHttpContextAccessor httpContextAccessor,
@@ -30,7 +31,9 @@ namespace Orchard.Localization.Selectors {
if (httpContext == null) return; if (httpContext == null) return;
var cookie = new HttpCookie(CookieName, culture) { var cookieName = ContextHelpers.IsRequestAdmin(httpContext) ? AdminCookieName : FrontEndCookieName;
var cookie = new HttpCookie(cookieName, culture) {
Expires = _clock.UtcNow.AddYears(DefaultExpireTimeYear), Expires = _clock.UtcNow.AddYears(DefaultExpireTimeYear),
}; };
@@ -42,15 +45,17 @@ namespace Orchard.Localization.Selectors {
cookie.Path = GetCookiePath(httpContext); cookie.Path = GetCookiePath(httpContext);
} }
httpContext.Request.Cookies.Remove(CookieName); httpContext.Request.Cookies.Remove(cookieName);
httpContext.Response.Cookies.Remove(CookieName); httpContext.Response.Cookies.Remove(cookieName);
httpContext.Response.Cookies.Add(cookie); httpContext.Response.Cookies.Add(cookie);
} }
public CultureSelectorResult GetCulture(HttpContextBase context) { public CultureSelectorResult GetCulture(HttpContextBase context) {
if (context == null) return null; if (context == null) return null;
var cookie = context.Request.Cookies.Get(CookieName); var cookieName = ContextHelpers.IsRequestAdmin(context) ? AdminCookieName : FrontEndCookieName;
var cookie = context.Request.Cookies.Get(cookieName);
if (cookie != null) if (cookie != null)
return new CultureSelectorResult { Priority = -1, CultureName = cookie.Value }; return new CultureSelectorResult { Priority = -1, CultureName = cookie.Value };