fix some issues with QueryBuilder

i7MEDIA · May 28, 2024 · 1e0a37a · 1e0a37a
1 parent 6baae98
commit 1e0a37a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Web/Components/QueryBuilder.cs b/Web/Components/QueryBuilder.cs
@@ -11,16 +11,17 @@ public class QueryBuilder
 
 	public QueryBuilder(string url, bool includeSiteRoot = true)
 	{
+		this.url = url;
 		if (url.Contains("?"))
 		{
 			var query = HttpUtility.ParseQueryString(url);
 			foreach (KeyValuePair<string, string> item in query)
 			{
 				queries[item.Key] = item.Value;
 			}
+			this.url = url.Substring(0, url.IndexOf('?'));
 		}
 
-		this.url = url.Substring(0, url.IndexOf('?'));
 		this.includeSiteRoot = includeSiteRoot;
 	}
 	public QueryBuilder PageId(int id)
@@ -61,7 +62,7 @@ public override string ToString()
 
 		string qmark = queries.Count > 0 ? "?" : string.Empty;
 		//return string.Format(CultureInfo.InvariantCulture, $"{siteRoot}/{url.TrimStart('~', '/')}{qmark}{queries.ToDelimitedString()}".TrimStart('/'));
-		return $"{siteRoot}/{url.TrimStart('~', '/')}{qmark}{queries.ToDelimitedString()}".TrimStart('/');
+		return $"{siteRoot}/{url?.TrimStart('~', '/')}{qmark}{queries.ToDelimitedString()}".TrimStart('/');
 	}
 }
 

diff --git a/Web/Controls/ModuleTitleControl.cs b/Web/Controls/ModuleTitleControl.cs
@@ -515,9 +515,7 @@ private void Initialize()
 
 					siteRoot = SiteUtils.GetNavigationSiteRoot();
 
-					lnkModuleSettings.NavigateUrl = siteRoot
-						+ "/Admin/ModuleSettings.aspx?mid=" + ModuleInstance.ModuleId.ToInvariantString()
-						+ "&pageid=" + ModuleInstance.PageId.ToInvariantString();
+					lnkModuleSettings.NavigateUrl = "Admin/ModuleSettings.aspx".ToQueryBuilder().PageId(ModuleInstance.PageId).ModuleId(ModuleInstance.ModuleId).ToString();
 
 					if ((enableWorkflow) && (siteModule != null) && (siteModule is IWorkflow))
 					{