Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Canonical and None mapping redirects #3396

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Fixed Canonical and None mapping redirects #3396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions DNN Platform/Library/Entities/Portals/PortalAliasExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ public static PortalAliasInfo GetAliasByPortalIdAndSettings(this IEnumerable<Por
{
var aliasList = aliases.ToList();

var defaultAlias = aliasList.ToList().Where(a => a.PortalID == portalId)
.OrderByDescending(a => a.IsPrimary)
.FirstOrDefault();

//First check if our current alias is already a perfect match.
PortalAliasInfo foundAlias = null;
if (result != null && !string.IsNullOrEmpty(result.HttpAlias))
Expand All @@ -107,15 +103,13 @@ public static PortalAliasInfo GetAliasByPortalIdAndSettings(this IEnumerable<Por
foundAlias = aliasList.FirstOrDefault(a => a.BrowserType == browserType &&
(String.Compare(a.CultureCode, cultureCode,
StringComparison.OrdinalIgnoreCase) == 0)
&& a.IsPrimary
&& a.PortalID == portalId
&& a.HTTPAlias == result.HttpAlias);
if (foundAlias == null) //let us try again using Startswith() to find matching Hosts
{
foundAlias = aliasList.FirstOrDefault(a => a.BrowserType == browserType &&
(String.Compare(a.CultureCode, cultureCode,
StringComparison.OrdinalIgnoreCase) == 0)
&& a.IsPrimary
&& a.PortalID == portalId
&& a.HTTPAlias.StartsWith(result.HttpAlias.Split('/')[0]));
}
Expand Down Expand Up @@ -164,10 +158,15 @@ public static PortalAliasInfo GetAliasByPortalIdAndSettings(this IEnumerable<Por
}
else
{
// if we didn't find a specific match, return the default, which is the closest match
var defaultAlias = aliasList
.Where(a => a.PortalID == portalId)
.OrderByDescending(a => a.IsPrimary)
.FirstOrDefault();

foundAlias = defaultAlias;
}

//if we didn't find a specific match, return the default, which is the closest match
return foundAlias;
}

Expand Down
4 changes: 3 additions & 1 deletion DNN Platform/Library/Entities/Urls/AdvancedUrlRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,9 @@ protected bool IsPortalAliasIncorrect(HttpContext context,
//var cpa = portalAliases.GetAliasByPortalIdAndSettings(result);
string url = requestUri.ToString();
RewriteController.CheckLanguageMatch(ref url, result);
var cpa = portalAliases.GetAliasByPortalIdAndSettings(result.PortalId, result, result.CultureCode, result.BrowserType);
var cpa = portalAliases
.Where(a => a.IsPrimary || result.PortalAliasMapping != PortalSettings.PortalAliasMapping.Redirect)
.GetAliasByPortalIdAndSettings(result.PortalId, result, result.CultureCode, result.BrowserType);

if (cpa != null)
{
Expand Down