From ffa6f12f6b2320e5aed861abd4673b7cccc3e6f9 Mon Sep 17 00:00:00 2001
From: Dario Solera <dario.solera@threeplicate.com>
Date: Wed, 5 Jan 2011 14:19:41 +0000
Subject: [PATCH] Fixed more bugs in FixHost method.

---
 AssemblyVersion.cs                            |  4 ++--
 Core/Tools.cs                                 | 23 +++++++++++++++----
 WebApplication/AdminConfig.aspx               |  2 +-
 .../App_LocalResources/AdminConfig.aspx.resx  |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index ac96070..5e0185e 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.4.571")]
-[assembly: AssemblyFileVersion("3.0.4.571")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.4.572")]
+[assembly: AssemblyFileVersion("3.0.4.572")]
\ No newline at end of file
diff --git a/Core/Tools.cs b/Core/Tools.cs
index 0c1bfee..5438129 100644
--- a/Core/Tools.cs
+++ b/Core/Tools.cs
@@ -327,16 +327,31 @@ namespace ScrewTurn.Wiki {
 			return result;
 		}
 
+		private static string CleanupPort(string url, string host) {
+			if(!url.Contains(host)) {
+				int colonIndex = host.IndexOf(":");
+				if(colonIndex != -1) {
+					host = host.Substring(0, colonIndex);
+				}
+			}
+			
+			return host;
+		}
+
 		/// <summary>
-		/// Automatically replaces the host in the URL with that obtained from <see cref="Settings.GetMainUrl"/>.
+		/// Automatically replaces the host and port in the URL with those obtained from <see cref="Settings.GetMainUrl"/>.
 		/// </summary>
 		/// <param name="url">The URL.</param>
-		/// <returns>The URL with fixed host.</returns>
+		/// <returns>The URL with fixed host and port.</returns>
 		public static Uri FixHost(this Uri url) {
 			// Make sure the host is replaced only once
 			string originalUrl = url.ToString();
-			string originalHost = url.Host;
-			string newHost = Settings.GetMainUrl().Host;
+			string originalHost = url.GetComponents(UriComponents.HostAndPort, UriFormat.Unescaped);
+			Uri mainUrl = Settings.GetMainUrl();
+			string newHost = mainUrl.GetComponents(UriComponents.HostAndPort, UriFormat.Unescaped);
+
+			originalHost = CleanupPort(originalUrl, originalHost);
+			newHost = CleanupPort(mainUrl.ToString(), newHost);
 			
 			int hostIndex = originalUrl.IndexOf(originalHost);
 			string newUrl = originalUrl.Substring(0, hostIndex) + newHost + originalUrl.Substring(hostIndex + originalHost.Length);
diff --git a/WebApplication/AdminConfig.aspx b/WebApplication/AdminConfig.aspx
index 585af8c..a814b47 100644
--- a/WebApplication/AdminConfig.aspx
+++ b/WebApplication/AdminConfig.aspx
@@ -45,7 +45,7 @@
 			<asp:Literal ID="lblWikiUrl" runat="server" Text="Wiki URL" 
 				EnableViewState="False" meta:resourcekey="lblWikiUrlResource1" />
 			<span class="smalllabel">(<asp:Literal ID="lblUsedForEmailCommunications" 
-				runat="server" Text="used for email communications" EnableViewState="False" 
+				runat="server" Text="used for email communications and redirects" EnableViewState="False" 
 				meta:resourcekey="lblUsedForEmailCommunicationsResource1" /> - 
 			<anthem:LinkButton ID="btnAutoWikiUrl" runat="server" Text="autodetect" 
 				CausesValidation="False" OnClick="btnAutoWikiUrl_Click" 
diff --git a/WebApplication/App_LocalResources/AdminConfig.aspx.resx b/WebApplication/App_LocalResources/AdminConfig.aspx.resx
index d49d331..7c15a91 100644
--- a/WebApplication/App_LocalResources/AdminConfig.aspx.resx
+++ b/WebApplication/App_LocalResources/AdminConfig.aspx.resx
@@ -397,7 +397,7 @@
     <value />
   </data>
   <data name="lblUsedForEmailCommunicationsResource1.Text" xml:space="preserve">
-    <value>used for email communications</value>
+    <value>used for email communications and redirects</value>
   </data>
   <data name="lblWikiTitleResource1.Text" xml:space="preserve">
     <value>Wiki title</value>