Skip to content

some cleanup code in the private method GetSiteMaster() #113

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

Merged
rxtur merged 1 commit into from
Oct 19, 2016
Merged

some cleanup code in the private method GetSiteMaster() #113

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
35 changes: 21 additions & 14 deletions BlogEngine/BlogEngine.Core/Web/Controls/BlogBasePage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace BlogEngine.Core.Web.Controls
using System.IO;

namespace BlogEngine.Core.Web.Controls
{
using System;
using System.Web;
Expand Down Expand Up @@ -256,34 +258,39 @@ protected override void Render(HtmlTextWriter writer)
/// <returns>Path to the master page</returns>
string GetSiteMaster()
{
if (Request.FilePath.Contains("post.aspx", StringComparison.InvariantCultureIgnoreCase))
if(FilePathContains("post.aspx"))
{
string path = $"{Utils.ApplicationRelativeWebRoot}Custom/Themes/{BlogSettings.Instance.Theme}/post.master";
if (System.IO.File.Exists(Server.MapPath(path)))
if (File.Exists(Server.MapPath(path)))
return path;
}

// if page.master exists, use it for all common pages
// and site.master only for post list
if (Request.FilePath.Contains("page.aspx", StringComparison.InvariantCultureIgnoreCase) ||
Request.FilePath.Contains("archive.aspx", StringComparison.InvariantCultureIgnoreCase) ||
Request.FilePath.Contains("contact.aspx", StringComparison.InvariantCultureIgnoreCase) ||
Request.FilePath.Contains("error.aspx", StringComparison.InvariantCultureIgnoreCase) ||
Request.FilePath.Contains("error404.aspx", StringComparison.InvariantCultureIgnoreCase) ||
Request.FilePath.Contains("search.aspx", StringComparison.InvariantCultureIgnoreCase))
if (PageMasterExists)
{
string path = $"{Utils.ApplicationRelativeWebRoot}Custom/Themes/{BlogSettings.Instance.Theme}/page.master";
if (System.IO.File.Exists(Server.MapPath(path)))
if (File.Exists(Server.MapPath(path)))
return path;
}

var siteMaster = $"{Utils.ApplicationRelativeWebRoot}Custom/Themes/{BlogSettings.Instance.GetThemeWithAdjustments(null)}/site.master";

if (System.IO.File.Exists(Server.MapPath(siteMaster)))
return siteMaster;
else
return $"{Utils.ApplicationRelativeWebRoot}Custom/Themes/Standard/site.master";
return File.Exists(Server.MapPath(siteMaster))
? siteMaster
: $"{Utils.ApplicationRelativeWebRoot}Custom/Themes/Standard/site.master";
}

private bool PageMasterExists => FilePathContains("page.aspx") ||
FilePathContains("archive.aspx") ||
FilePathContains("contact.aspx") ||
FilePathContains("error.aspx") ||
FilePathContains("error404.aspx") ||
FilePathContains("search.aspx");

private bool FilePathContains(string path)
{
return Request.FilePath.Contains(path, StringComparison.InvariantCultureIgnoreCase);
}
}
}