yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/base issue with virtual directories fixes: 30042

Browse Source
This commit is contained in:
PerPloug
2011-02-16 08:27:41 -01:00
parent ba3c7fd680
commit fa4483f08c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
umbraco/businesslogic/IO/SystemDirectories.cs
View File

@@ -20,6 +20,14 @@ namespace umbraco.IO
}
}
public static string Base
{
get
{
return IOHelper.returnPath("umbracoBaseDirectory", "~/base");
}
}
public static string Config
{
get
@@ -27,7 +35,7 @@ namespace umbraco.IO
return IOHelper.returnPath("umbracoConfigDirectory", "~/config");
}
}
public static string Css
{
get

18
umbraco/presentation/umbracobase/baseHttpModule.cs
View File

@@ -28,7 +28,7 @@ namespace umbraco.presentation.umbracobase
public void Init(HttpApplication httpApp)
{
// httpApp.PostAuthorizeRequest += new EventHandler(httpApp_PreRequestHandlerExecute);
//httpApp.PostAuthorizeRequest += new EventHandler(httpApp_PreRequestHandlerExecute);
httpApp.PostAcquireRequestState += new EventHandler(httpApp_PostAcquireRequestState);
httpApp.PostMapRequestHandler += new EventHandler(httpApp_PostMapRequestHandler);
}
@@ -39,10 +39,10 @@ namespace umbraco.presentation.umbracobase
HttpApplication httpApp = (HttpApplication)sender;
string url = httpApp.Context.Request.RawUrl;
string urlStart = IO.IOHelper.ResolveUrl( IO.SystemDirectories.Base ).TrimEnd('/').ToLower() + "/";
if (url.ToLower().StartsWith("/base/"))
if (url.ToLower().StartsWith(urlStart))
{
if (httpApp.Context.Handler is IReadOnlySessionState || httpApp.Context.Handler is IRequiresSessionState)
{
// no need to replace the current handler
@@ -51,7 +51,6 @@ namespace umbraco.presentation.umbracobase
// swap the current handler
httpApp.Context.Handler = new MyHttpHandler(httpApp.Context.Handler);
}
}
@@ -61,10 +60,10 @@ namespace umbraco.presentation.umbracobase
//remove extension and split the url
string url = httpApp.Context.Request.RawUrl;
string urlStart = IO.IOHelper.ResolveUrl(IO.SystemDirectories.Base).TrimEnd('/').ToLower() + "/";
if (url.ToLower().StartsWith("/base/"))
{
if (url.ToLower().StartsWith(urlStart))
{
MyHttpHandler resourceHttpHandler = HttpContext.Current.Handler as MyHttpHandler;
if (resourceHttpHandler != null)
@@ -73,6 +72,11 @@ namespace umbraco.presentation.umbracobase
HttpContext.Current.Handler = resourceHttpHandler.OriginalHandler;
}
string basedir = "/" + IO.SystemDirectories.Base.TrimStart('~').Trim('/') + "/";
int indexOfBase = url.ToLower().IndexOf(basedir);
url = url.Substring(indexOfBase);
if (url.ToLower().Contains(".aspx"))
url = url.Substring(0, url.IndexOf(".aspx"));