From 63cfef8aed35a3fca16698a229851f5626ffd86d Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Mon, 29 Nov 2010 13:03:55 -0800
Subject: [PATCH] #16883: Including application path in permalinks

--HG--
branch : dev
---
 .../Parts/Routable.RoutePart.cshtml           |  2 +-
 .../Extensions/HttpRequestExtensions.cs       | 36 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
index 4e34d34f1..51c226dde 100644
--- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
+++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
@@ -7,7 +7,7 @@
     @Html.TextBoxFor(m => m.Title, new { @class = "large text" })
 </fieldset>
 <fieldset class="permalink">
-    <label class="sub" for="Slug">@T("Permalink")<br /><span>@Request.ToRootUrlString()/@Model.DisplayLeadingPath</span></label>
+    <label class="sub" for="Slug">@T("Permalink")<br /><span>@Request.ToApplicationRootUrlString()/@Model.DisplayLeadingPath</span></label>
     <span>@Html.TextBoxFor(m => m.Slug, new { @class = "text" })</span>
     <span class="checkbox-and-label">
         @Html.EditorFor(m => m.PromoteToHomePage)
diff --git a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
index 0c54b49e8..7a6e91d07 100644
--- a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
+++ b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
@@ -1,39 +1,61 @@
-using System;
 using System.Web;
-using System.Web.Mvc;
 
 namespace Orchard.Utility.Extensions {
     public static class HttpRequestExtensions {
         /// <summary>
-        /// Returns the root part of a request. 
+        /// Returns the root part of a request.
         /// </summary>
+        /// <example>http://localhost:3030</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToRootUrlString(this HttpRequestBase request) {
             return string.Format("{0}://{1}", request.Url.Scheme, request.Headers["Host"]);
         }
 
         /// <summary>
-        /// Returns the root part of a request. 
+        /// Returns the root part of a request.
         /// </summary>
+        /// <example>http://localhost:3030</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToRootUrlString(this HttpRequest request) {
             return string.Format("{0}://{1}", request.Url.Scheme, request.Headers["Host"]);
         }
 
         /// <summary>
-        /// Returns the client requested url. 
+        /// Returns the application root part of a request.
         /// </summary>
+        /// <example>http://localhost:3030/OrchardLocal</example>
+        /// <remarks>Prevents port number issues by using the client requested host</remarks>
+        public static string ToApplicationRootUrlString(this HttpRequestBase request) {
+            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.ApplicationPath);
+            return url;
+        }
+
+        /// <summary>
+        /// Returns the application root part of a request.
+        /// </summary>
+        /// <example>http://localhost:3030/OrchardLocal</example>
+        /// <remarks>Prevents port number issues by using the client requested host</remarks>
+        public static string ToApplicationRootUrlString(this HttpRequest request) {
+            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.ApplicationPath);
+            return url;
+        }
+
+        /// <summary>
+        /// Returns the client requested url.
+        /// </summary>
+        /// <example>http://localhost:3030/OrchardLocal/Admin/Blogs</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToUrlString(this HttpRequestBase request) {
             return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl);
         }
 
         /// <summary>
-        /// Returns the client requested url. 
+        /// Returns the client requested url.
         /// </summary>
+        /// <example>http://localhost:3030/OrchardLocal/Admin/Blogs</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToUrlString(this HttpRequest request) {
             return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl);
         }
     }
-}
+}
\ No newline at end of file