Merge pull request #119 from valadas/url-placeholder-fix

Fixed an issue where edit urls could get mangled

Author: valadas

Components/BaseController.cs

@@ -89,44 +89,11 @@ public PortalInfo PortalInfo
 
         protected int PortalId { get; set; }
 
-
-        public string EditUrlPattern { get; set; }
-
         public void Initialise(ModuleInstanceContext context)
         {
             _moduleSettings  = context.Settings;
             Configuration = context.Configuration;
             User = context.PortalSettings.UserInfo;
-         
-            EditUrlPattern = context.EditUrl(  DataTableColumn.RowId.ToString(CultureInfo.InvariantCulture), "{0}","edit");
-        }
-
-        /// <summary>
-        /// Sanitizes a URL by ensuring it has only one question mark separator between the base URL and query parameters.
-        /// This prevents duplicate question marks when formatting URL templates with parameters.
-        /// </summary>
-        /// <param name="url">The URL to sanitize</param>
-        /// <returns>A sanitized URL with proper query string formatting</returns>
-        public static string SanitizeUrl(string url)
-        {
-            if (string.IsNullOrEmpty(url))
-                return url;
-
-            // Find the first occurrence of '?'
-            var firstQuestionMarkIndex = url.IndexOf('?');
-            
-            if (firstQuestionMarkIndex == -1)
-                return url; // No query parameters, return as-is
-            
-            // Split into base URL and query parameters
-            var baseUrl = url.Substring(0, firstQuestionMarkIndex);
-            var queryPart = url.Substring(firstQuestionMarkIndex + 1);
-            
-            // Remove any additional '?' characters from the query part and replace with '&'
-            queryPart = queryPart.Replace('?', '&');
-            
-            // Reconstruct the URL
-            return baseUrl + "?" + queryPart;
         }
 
         public void Initialise(int moduleId, int tabId, UserInfo user)

Components/UserDefinedTableController.cs

@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Web;
-using System.Xml;
 using DotNetNuke.Abstractions;
 using DotNetNuke.Abstractions.Portals;
 using DotNetNuke.Common;
@@ -15,6 +7,15 @@
 using DotNetNuke.Modules.UserDefinedTable.Components;
 using DotNetNuke.Services.Localization;
 using DotNetNuke.UI.Modules;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.Remoting.Contexts;
+using System.Threading;
+using System.Web;
+using System.Xml;
 
 namespace DotNetNuke.Modules.UserDefinedTable
 {
@@ -83,8 +84,6 @@ void SetEditLinksAndVisibilityBasedOnPermissions(DataSet ds)
 
                 ds.Tables[DataSetTableName.Data].Columns.Add(DataTableColumn.EditLink, typeof (string));
 
-                var urlPattern = EditUrlPattern ?? this.NavigationManager.NavigateURL(TabId, "edit", "mid=" + ModuleId, DataTableColumn.RowId + "={0}");
-
                 foreach (DataRow row in ds.Tables[DataSetTableName.Data].Rows)
                 {
                     var rowCreatorUserName = row[createdByColumnName].ToString();
@@ -93,8 +92,7 @@ void SetEditLinksAndVisibilityBasedOnPermissions(DataSet ds)
                                           rowCreatorUserName != Definition.NameOfAnonymousUser);
                     if (security.IsAllowedToEditRow(isRowOwner))
                     {
-                        var formattedUrl = string.Format(urlPattern, row[DataTableColumn.RowId]);
-                        row[DataTableColumn.EditLink] = BaseController.SanitizeUrl(formattedUrl);
+                        row[DataTableColumn.EditLink] = this.NavigationManager.NavigateURL(TabId, "edit", $"mid={ModuleId}", $"{DataTableColumn.RowId}={row[DataTableColumn.RowId]}");
                     }
                 }
                 //Adjust visibility to actual permissions