FIX: correct behavior when Friendly URLs are disabled but still insta…

…lled DNNCommunity#326
johnhenley · Jun 16, 2023 · 0e015c9 · 0e015c9
1 parent 6ecb9af
commit 0e015c9
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 42 deletions.
diff --git a/CustomControls/HTML/CategoryTreeView.cs b/CustomControls/HTML/CategoryTreeView.cs
@@ -208,14 +208,6 @@ public string Render()
 			{
 				ParentForumId = ForumId;
 			}
-			string groupTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:FORUMGROUP]", "[/AF:DIR:FORUMGROUP]");
-			string forumTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:FORUM]", "[/AF:DIR:FORUM]");
-			string subForumTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:SUBFORUM]", "[/AF:DIR:SUBFORUM]");
-			bool useFriendlyUrl = Utilities.IsRewriteLoaded();
-			int currGroup = -1;
-			string gtmp = string.Empty;
-			string ftmp = string.Empty;
-			string subtmp = string.Empty;
 			using (IDataReader dr = db.ForumContent_List(PortalId, ModuleId, ForumGroupId, ForumId, ParentForumId))
 			{
 				//ParentForum Section

diff --git a/CustomControls/HTML/ForumContentView.cs b/CustomControls/HTML/ForumContentView.cs
@@ -208,14 +208,6 @@ public string Render()
 			{
 				ParentForumId = ForumId;
 			}
-			string groupTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:FORUMGROUP]", "[/AF:DIR:FORUMGROUP]");
-			string forumTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:FORUM]", "[/AF:DIR:FORUM]");
-			string subForumTemplate = TemplateUtils.GetTemplateSection(ItemTemplate, "[AF:DIR:SUBFORUM]", "[/AF:DIR:SUBFORUM]");
-			bool useFriendlyUrl = Utilities.IsRewriteLoaded();
-			int currGroup = -1;
-			string gtmp = string.Empty;
-			string ftmp = string.Empty;
-			string subtmp = string.Empty;
 			using (IDataReader dr = db.ForumContent_List(PortalId, ModuleId, ForumGroupId, ForumId, ParentForumId))
 			{
 				//ParentForum Section

diff --git a/CustomControls/ServerControls/WhatsNewControl.cs b/CustomControls/ServerControls/WhatsNewControl.cs
@@ -192,12 +192,9 @@ protected override void OnLoad(EventArgs e)
                 dr = DataProvider.Instance().GetPosts(PortalId, ForumIds, TopicsOnly, RandomOrder, Rows, Tags, FilterByUserId);
             }
 
-            var useFriendly = Utilities.IsRewriteLoaded();
-            var sHost = Utilities.GetHost();
-            try
+           try
             {
                 var sTempTemplate = sTemplate;
-                string lastPostDate;
                 while (dr.Read())
                 {
                     var groupName = Convert.ToString(dr["GroupName"]);
@@ -253,7 +250,7 @@ protected override void OnLoad(EventArgs e)
                     if (TabId == -1)
                         TabId = Convert.ToInt32(topicTabId);
 
-                    if (useFriendly && !(string.IsNullOrEmpty(sForumUrl)) && !(string.IsNullOrEmpty(sTopicURL)))
+                    if (Utilities.UseFriendlyURLs( Utilities.SafeConvertInt(topicModuleId)) && !(string.IsNullOrEmpty(sForumUrl)) && !(string.IsNullOrEmpty(sTopicURL)))
                     {
                         var ctlUtils = new ControlUtils();
                         sTopicURL = ctlUtils.BuildUrl(Convert.ToInt32(topicTabId), Convert.ToInt32(topicModuleId), sGroupPrefixURL, sForumUrl, Convert.ToInt32(groupId), Convert.ToInt32(forumId), Convert.ToInt32(topicId), sTopicURL, -1, -1, string.Empty, 1, Convert.ToInt32(replyId), -1);

diff --git a/CustomControls/UserControls/WhatsNewRSS.cs b/CustomControls/UserControls/WhatsNewRSS.cs
@@ -256,7 +256,6 @@ private string BuildRSS()
 
             var forumids = Settings.RSSIgnoreSecurity ? Settings.Forums : AuthorizedForums;
 
-            var useFriendly = Utilities.IsRewriteLoaded();
             var dr = DataProvider.Instance().GetPosts(RequestPortalID, forumids, true, false, Settings.Rows, Settings.Tags);
             var sHost = Utilities.GetHost();
 
@@ -297,7 +296,7 @@ private string BuildRSS()
                     var ts = DataCache.MainSettings(topicModuleId);
 
                     string url;
-                    if (string.IsNullOrEmpty(sTopicUrl) || !useFriendly)
+                    if (string.IsNullOrEmpty(sTopicUrl) || !Utilities.UseFriendlyURLs(topicModuleId))
                     {
                         string[] Params = { ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.ForumId + "=" + forumId, ParamKeys.TopicId + "=" + topicId };
                         url = Common.Globals.NavigateURL(topicTabId, "", Params);

diff --git a/Services/AdminServiceController.cs b/Services/AdminServiceController.cs
@@ -43,7 +43,6 @@ public class ToggleUrlHandlerDTO
         public HttpResponseMessage ToggleURLHandler(ToggleUrlHandlerDTO dto)
         {
             var cfg = new ConfigUtils();
-            bool success;
             if (Utilities.IsRewriteLoaded())
             {
                 cfg.DisableRewriter(HttpContext.Current.Server.MapPath("~/web.config"));

diff --git a/WhatsNew.ascx.cs b/WhatsNew.ascx.cs
@@ -104,7 +104,6 @@ protected override void OnLoad(EventArgs e)
 
             var sb = new StringBuilder(Settings.Header);
 
-            var useFriendly = Utilities.IsRewriteLoaded();
             var sHost = Utilities.GetHost();
 
             try
@@ -136,17 +135,6 @@ protected override void OnLoad(EventArgs e)
 
                     var ts = DataCache.MainSettings(topicModuleId);
 
-                    // The Module Stores the PostDate in the Current Time Zone format of the Server, not in UTC.
-                    // So we need to calculate the difference between the Site UTC Offset  and the Server UTC Offset and Users UTC Offset and the Server offset and add that to the displayed time.
-                    //AF now stores in UTC; 
-                    //var dtNow = DateTime.UtcNow;
-                    //var timeOffsetServer = (int)TimeZoneInfo.Local.GetUtcOffset(dtNow).TotalMinutes;
-                    //var timeOffsetSite = (int)PortalSettings.TimeZone.GetUtcOffset(dtNow).TotalMinutes;
-                    //var timeOffsetUser = (int)UserInfo.Profile.PreferredTimeZone.GetUtcOffset(postDate).TotalMinutes;
-
-                    //var timeOffset = (timeOffsetSite - timeOffsetServer) + (timeOffsetUser- timeOffsetServer);
-
-                    // Use a stringBuilder for better performance;
                     var sbTemplate = new StringBuilder(Settings.Format ?? string.Empty);
 
                     sbTemplate = sbTemplate.Replace("[FORUMGROUPNAME]", groupName);
@@ -166,7 +154,7 @@ protected override void OnLoad(EventArgs e)
                     sbTemplate = sbTemplate.Replace("[REPLYID]", replyId.ToString());
                     sbTemplate = sbTemplate.Replace("[REPLYCOUNT]", replyCount.ToString());
 
-                    if (useFriendly && !(string.IsNullOrEmpty(sForumUrl) && string.IsNullOrEmpty(sTopicUrl)))
+                    if (Utilities.UseFriendlyURLs(topicModuleId) && !(string.IsNullOrEmpty(sForumUrl) && string.IsNullOrEmpty(sTopicUrl)))
                     {
                         var ctlUtils = new ControlUtils();
 

diff --git a/class/TemplateUtils.cs b/class/TemplateUtils.cs
@@ -232,7 +232,7 @@ public static string ParseEmailTemplate(string template, string templateName, in
 
             // Build the link
             string link;
-            if (string.IsNullOrEmpty(fi.PrefixURL) || !Utilities.IsRewriteLoaded())
+            if (string.IsNullOrEmpty(fi.PrefixURL) || !Utilities.UseFriendlyURLs(moduleID))
             {
                 if (replyId == 0)
                     link = ms.UseShortUrls ? Common.Globals.NavigateURL(tabID, string.Empty, new[] { string.Concat(ParamKeys.TopicId, "=", topicId) })

diff --git a/class/Utilities.cs b/class/Utilities.cs
@@ -934,6 +934,10 @@ internal static bool IsRewriteLoaded()
                 return false;
             }
         }
+        internal static bool UseFriendlyURLs(int ModuleId)
+        {
+            return IsRewriteLoaded() && SettingsBase.GetModuleSettings(ModuleId).URLRewriteEnabled;
+        }
 
         /// <summary>
         /// Get the template as a string from the specified path

diff --git a/components/Helpers/URL.cs b/components/Helpers/URL.cs
@@ -18,6 +18,8 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+using System;
+
 namespace DotNetNuke.Modules.ActiveForums
 {
 	public class URL
@@ -85,12 +87,17 @@ public static string TopicLink(int tabId, int moduleId, TopicInfo ti)
 
 			return sURL;
 		}
+		[Obsolete("Deprecated in Community Forums. Scheduled for removal in 09.00.00. ReplyLink(int tabId, int moduleId, TopicInfo ti, int userId, int replyId)")]
 
-		public static string ReplyLink(int tabId, TopicInfo ti, int userId, int replyId)
+        public static string ReplyLink(int tabId, TopicInfo ti, int userId, int replyId)
+		{
+			return ReplyLink(tabId, DotNetNuke.Common.Utilities.Null.NullInteger, ti, userId, replyId);
+		}
+            public static string ReplyLink(int tabId, int moduleId, TopicInfo ti, int userId, int replyId)
 		{
 			var sURL = Utilities.NavigateUrl(tabId, string.Empty, new [] { ParamKeys.TopicId + "=" + ti.TopicId, ParamKeys.ContentJumpId + "=" + replyId });
 
-			if (string.IsNullOrEmpty(ti.URL) || ! Utilities.IsRewriteLoaded())
+			if (string.IsNullOrEmpty(ti.URL) || ! Utilities.UseFriendlyURLs(moduleId))
 				return sURL;
 
             var db = new Data.Common();

diff --git a/components/Topics/TopicsController.cs b/components/Topics/TopicsController.cs
@@ -406,7 +406,7 @@ public override IList<SearchDocument> GetModifiedSearchDocuments(ModuleInfo modu
 
 			/* since this code runs without HttpContext, get https:// by looking at page settings */
 			bool isHttps = new DotNetNuke.Entities.Tabs.TabController().GetTab(moduleInfo.TabID, moduleInfo.PortalID).IsSecure;
-			bool isRewriteLoaded = Utilities.IsRewriteLoaded();
+			bool useFriendlyURLs = Utilities.UseFriendlyURLs(moduleInfo.ModuleID);
 			string primaryPortalAlias = new DotNetNuke.Entities.Portals.PortalAliasController().GetPortalAliasesByPortalId(moduleInfo.PortalID).FirstOrDefault(x => x.IsPrimary).HTTPAlias;
 
 			ForumController fc = new ForumController();
@@ -459,7 +459,7 @@ public override IList<SearchDocument> GetModifiedSearchDocuments(ModuleInfo modu
 						ForumUrlPrefixes.Add(forumid, forumPrefixUrl);
 					}
 					string link = string.Empty;
-					if (!string.IsNullOrEmpty(forumPrefixUrl) && isRewriteLoaded)
+					if (!string.IsNullOrEmpty(forumPrefixUrl) && useFriendlyURLs)
 					{
 						link = new Data.Common().GetUrl(moduleInfo.ModuleID, -1, forumid, topicid, -1, contentid);
 					}