Merge pull request #1363 from johnhenley/issues/tabid-stack-overflow-1343

WillStrohl · web-flow · commit 7dd0c2497e00 · 2025-03-18T16:45:29.000-07:00
FIX: TabId property stackoverflow in ForumInfo/ForumGroupInfo
diff --git a/Dnn.CommunityForums/Controllers/PermissionController.cs b/Dnn.CommunityForums/Controllers/PermissionController.cs
@@ -66,10 +66,10 @@ internal class PermissionController : DotNetNuke.Modules.ActiveForums.Controller
         internal void UpdateSecurityForSocialGroupForum(DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum)
         {
             var permissions = this.GetById(forum.PermissionsId, forum.ModuleId);
-            Hashtable htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.TabId, ignoreCache: false).TabModuleSettings;
+            Hashtable htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.GetTabId(), ignoreCache: false).TabModuleSettings;
             if (htSettings == null || htSettings.Count == 0)
             {
-                htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.TabId, ignoreCache: false).ModuleSettings;
+                htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.GetTabId(), ignoreCache: false).ModuleSettings;
             }
 
             if (htSettings == null || htSettings.Count == 0 || !htSettings.ContainsKey("ForumConfig"))
diff --git a/Dnn.CommunityForums/Controllers/ReplyController.cs b/Dnn.CommunityForums/Controllers/ReplyController.cs
@@ -192,19 +192,19 @@ public int Reply_Save(int portalId, int moduleId, DotNetNuke.Modules.ActiveForum
             // if existing topic, update associated journal item
             if (ri.ReplyId > 0)
             {
-                string fullURL = new ControlUtils().BuildUrl(portalId, ri.Forum.TabId, moduleId, ri.Forum.ForumGroup.PrefixURL, ri.Forum.PrefixURL, ri.Forum.ForumGroupId, ri.ForumId, ri.TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, ri.ReplyId, ri.Forum.SocialGroupId);
+                string fullURL = new ControlUtils().BuildUrl(portalId, ri.Forum.GetTabId(), moduleId, ri.Forum.ForumGroup.PrefixURL, ri.Forum.PrefixURL, ri.Forum.ForumGroupId, ri.ForumId, ri.TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, ri.ReplyId, ri.Forum.SocialGroupId);
 
                 if (fullURL.Contains("~/"))
                 {
-                    fullURL = Utilities.NavigateURL(ri.Forum.TabId, string.Empty, new string[] { $"{ParamKeys.TopicId}={ri.TopicId}", $"{ParamKeys.ContentJumpId}={ri.ReplyId}", });
+                    fullURL = Utilities.NavigateURL(ri.Forum.GetTabId(), string.Empty, new string[] { $"{ParamKeys.TopicId}={ri.TopicId}", $"{ParamKeys.ContentJumpId}={ri.ReplyId}", });
                 }
 
                 if (fullURL.EndsWith("/"))
                 {
                     fullURL += Utilities.UseFriendlyURLs(moduleId) ? $"#{ri.ReplyId}" : $"{ParamKeys.ContentJumpId}={ri.ReplyId}";
                 }
 
-                new Social().UpdateJournalItemForPost(ri.PortalId, ri.ModuleId, ri.Forum.TabId, ri.ForumId, ri.TopicId, ri.ReplyId, ri.Author.AuthorId, fullURL, ri.Content.Subject, string.Empty, ri.Content.Body);
+                new Social().UpdateJournalItemForPost(ri.PortalId, ri.ModuleId, ri.Forum.GetTabId(), ri.ForumId, ri.TopicId, ri.ReplyId, ri.Author.AuthorId, fullURL, ri.Content.Subject, string.Empty, ri.Content.Body);
             }
 
             int replyId = Convert.ToInt32(DotNetNuke.Modules.ActiveForums.DataProvider.Instance().Reply_Save(portalId, ri.TopicId, ri.ReplyId, ri.ReplyToId, ri.StatusId, ri.IsApproved, ri.IsDeleted, ri.Content.Subject.Trim(), ri.Content.Body.Trim(), ri.Content.DateCreated, ri.Content.DateUpdated, ri.Content.AuthorId, ri.Content.AuthorName, ri.Content.IPAddress));
diff --git a/Dnn.CommunityForums/Controllers/TopicController.cs b/Dnn.CommunityForums/Controllers/TopicController.cs
@@ -200,10 +200,10 @@ public static DotNetNuke.Modules.ActiveForums.Entities.TopicInfo Approve(int mod
 
             if (ti.Forum.FeatureSettings.ModApproveTemplateId > 0 & ti.Author.AuthorId > 0)
             {
-                DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(ti.Forum.FeatureSettings.ModApproveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.TabId, ti.ForumId, topicId, 0, ti.Author);
+                DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(ti.Forum.FeatureSettings.ModApproveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), ti.ForumId, topicId, 0, ti.Author);
             }
 
-            DotNetNuke.Modules.ActiveForums.Controllers.TopicController.QueueApprovedTopicAfterAction(portalId: ti.PortalId, tabId: ti.Forum.TabId, moduleId: ti.Forum.ModuleId, forumGroupId: ti.Forum.ForumGroupId, forumId: ti.ForumId, topicId: topicId,  replyId: -1,  contentId: ti.ContentId, userId: userId, authorId: ti.Content.AuthorId);
+            DotNetNuke.Modules.ActiveForums.Controllers.TopicController.QueueApprovedTopicAfterAction(portalId: ti.PortalId, tabId: ti.Forum.GetTabId(), moduleId: ti.Forum.ModuleId, forumGroupId: ti.Forum.ForumGroupId, forumId: ti.ForumId, topicId: topicId,  replyId: -1,  contentId: ti.ContentId, userId: userId, authorId: ti.Content.AuthorId);
             return ti;
         }
 
@@ -240,7 +240,7 @@ public static void Move(int moduleId, int userId, int topicId, int newForumId)
 
             if (oldForum.FeatureSettings.ModMoveTemplateId > 0 & ti?.Author?.AuthorId > 0)
             {
-                DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(oldForum.FeatureSettings.ModMoveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.TabId, forumId: ti.Forum.ForumID, topicId: ti.TopicId, replyId: -1, author: ti.Author);
+                DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(oldForum.FeatureSettings.ModMoveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), forumId: ti.Forum.ForumID, topicId: ti.TopicId, replyId: -1, author: ti.Author);
             }
 
             new DotNetNuke.Modules.ActiveForums.Controllers.ProcessQueueController().Add(ProcessType.UpdateForumLastUpdated, ti.PortalId, tabId: -1, moduleId: ti.ModuleId, forumGroupId: oldForum.ForumGroupId, forumId: oldForum.ForumID, topicId: topicId, replyId: -1, contentId: ti.ContentId, authorId: ti.Content.AuthorId, userId: userId, requestUrl: null);
@@ -283,8 +283,8 @@ public static int Save(DotNetNuke.Modules.ActiveForums.Entities.TopicInfo ti)
             // if existing topic, update associated journal item
             if (ti.TopicId > 0)
             {
-                string sUrl = new ControlUtils().BuildUrl(ti.PortalId, ti.Forum.TabId, ti.ModuleId, ti.Forum.ForumGroup.PrefixURL, ti.Forum.PrefixURL, ti.Forum.ForumGroupId, ti.ForumId, ti.TopicId, ti.TopicUrl, -1, -1, string.Empty, 1, -1, ti.Forum.SocialGroupId);
-                new Social().UpdateJournalItemForPost(ti.PortalId, ti.ModuleId, ti.Forum.TabId, ti.ForumId, ti.TopicId, 0, ti.Author.AuthorId, sUrl, ti.Content.Subject, string.Empty, ti.Content.Body);
+                string sUrl = new ControlUtils().BuildUrl(ti.PortalId, ti.Forum.GetTabId(), ti.ModuleId, ti.Forum.ForumGroup.PrefixURL, ti.Forum.PrefixURL, ti.Forum.ForumGroupId, ti.ForumId, ti.TopicId, ti.TopicUrl, -1, -1, string.Empty, 1, -1, ti.Forum.SocialGroupId);
+                new Social().UpdateJournalItemForPost(ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), ti.ForumId, ti.TopicId, 0, ti.Author.AuthorId, sUrl, ti.Content.Subject, string.Empty, ti.Content.Body);
             }
 
             // TODO: convert to use DAL2?
diff --git a/Dnn.CommunityForums/Controllers/UrlController.cs b/Dnn.CommunityForums/Controllers/UrlController.cs
@@ -95,13 +95,13 @@ internal static string BuildForumUrlSegment(int portalId, int moduleId, DotNetNu
         internal static string BuildForumUrl(INavigationManager navigationManager, DotNetNuke.Abstractions.Portals.IPortalSettings portalSettings, SettingsInfo mainSettings, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forumInfo)
         {
             // Build the forum Url
-            return mainSettings.UseShortUrls ? navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}" })
-                : navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}", $"{ParamKeys.ViewType}={Views.Topics}" });
+            return mainSettings.UseShortUrls ? navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}" })
+                : navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}", $"{ParamKeys.ViewType}={Views.Topics}" });
         }
 
         internal static string BuildModeratorUrl(INavigationManager navigationManager, DotNetNuke.Abstractions.Portals.IPortalSettings portalSettings, SettingsInfo mainSettings, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forumInfo)
         {
-            return navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ViewType}={Views.ModerateTopics}", $"{ParamKeys.ForumId}={forumInfo.ForumID}" });
+            return navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ViewType}={Views.ModerateTopics}", $"{ParamKeys.ForumId}={forumInfo.ForumID}" });
         }
     }
 }
diff --git a/Dnn.CommunityForums/CustomControls/UserControls/ForumView.cs b/Dnn.CommunityForums/CustomControls/UserControls/ForumView.cs
@@ -356,11 +356,11 @@ private string ParseForumRow(string template, DotNetNuke.Modules.ActiveForums.En
         {
             if (template.Contains("[SUBFORUMS]") && template.Contains("[/SUBFORUMS]"))
             {
-                template = this.GetSubForums(template, fi.ForumID, fi.TabId);
+                template = this.GetSubForums(template, fi.ForumID, fi.GetTabId());
             }
             else
             {
-                template = template.Replace("[SUBFORUMS]", this.GetSubForums(template: string.Empty, forumId: fi.ForumID, tabId: fi.TabId));
+                template = template.Replace("[SUBFORUMS]", this.GetSubForums(template: string.Empty, forumId: fi.ForumID, tabId: fi.GetTabId()));
             }
 
             string[] css = null;
diff --git a/Dnn.CommunityForums/Entities/ForumGroupInfo.cs b/Dnn.CommunityForums/Entities/ForumGroupInfo.cs
@@ -42,6 +42,7 @@ public partial class ForumGroupInfo : DotNetNuke.Services.Tokens.IPropertyAccess
         private DotNetNuke.Modules.ActiveForums.SettingsInfo mainSettings;
         private PortalSettings portalSettings;
         private ModuleInfo moduleInfo;
+        private int? tabId;
 
         public int ForumGroupId { get; set; }
 
@@ -66,9 +67,12 @@ public partial class ForumGroupInfo : DotNetNuke.Services.Tokens.IPropertyAccess
 
         [IgnoreColumn]
         public string RawUrl { get; set; }
-
+        
         [IgnoreColumn]
-        public int TabId => this.GetTabId();
+        public int TabId
+        {
+            set => this.tabId = value;
+        }
 
         [IgnoreColumn]
         public string ThemeLocation => Utilities.ResolveUrl(SettingsBase.GetModuleSettings(this.ModuleId).ThemeLocation);
@@ -223,10 +227,7 @@ internal ModuleInfo LoadModuleInfo()
         [IgnoreColumn]
         public DotNetNuke.Services.Tokens.CacheLevel Cacheability
         {
-            get
-            {
-                return DotNetNuke.Services.Tokens.CacheLevel.notCacheable;
-            }
+            get => DotNetNuke.Services.Tokens.CacheLevel.notCacheable;
         }
 
         /// <inheritdoc/>
@@ -281,9 +282,23 @@ public string GetProperty(string propertyName, string format, System.Globalizati
             return string.Empty;
         }
 
-        private int GetTabId()
+        internal int GetTabId()
         {
-            return this.PortalSettings.ActiveTab.TabID == -1 || this.PortalSettings.ActiveTab.TabID == this.PortalSettings.HomeTabId ? this.TabId : this.PortalSettings.ActiveTab.TabID;
+            if (this.PortalSettings.ActiveTab.TabID == -1 || this.PortalSettings.ActiveTab.TabID == this.PortalSettings.HomeTabId)
+            {
+                if (!this.tabId.Equals(null))
+                {
+                    return (int)this.tabId;
+                }
+                else
+                {
+                    return this.ModuleInfo.TabID;
+                }
+            }
+            else
+            {
+                return this.PortalSettings.ActiveTab.TabID;
+            }
         }
 
         internal string GetCacheKey() => string.Format(this.cacheKeyTemplate, this.ModuleId, this.ForumGroupId);
diff --git a/Dnn.CommunityForums/Entities/ForumInfo.cs b/Dnn.CommunityForums/Entities/ForumInfo.cs
@@ -50,6 +50,7 @@ public class ForumInfo : DotNetNuke.Services.Tokens.IPropertyAccess
         private ModuleInfo moduleInfo;
         private int? subscriberCount;
         private int? lastPostTopicId;
+        private int? tabId;
         private string lastPostTopicUrl;
         private string rssLink;
         private List<PropertyInfo> properties;
@@ -67,7 +68,7 @@ public ForumInfo(int portalId)
             this.PortalSettings = Utilities.GetPortalSettings(portalId);
             this.UpdateCache();
         }
-        
+
         public ForumInfo(DotNetNuke.Entities.Portals.PortalSettings portalSettings)
         {
             this.PortalSettings = portalSettings;
@@ -389,7 +390,10 @@ public int SubscriberCount
         public string ParentForumUrlPrefix => this.ParentForumId > 0 ? new Controllers.ForumController().GetById(this.ParentForumId, this.ModuleId).PrefixURL : string.Empty;
 
         [IgnoreColumn]
-        public int TabId => this.GetTabId();
+        public int TabId
+        {
+            set => this.tabId = value;
+        }
 
         [IgnoreColumn]
         public string ForumURL => URL.ForumLink(this.GetTabId(), this);
@@ -984,9 +988,23 @@ public string GetProperty(string propertyName, string format, System.Globalizati
             return string.Empty;
         }
 
-        private int GetTabId()
+        internal int GetTabId()
         {
-            return this.PortalSettings.ActiveTab.TabID == -1 || this.PortalSettings.ActiveTab.TabID == this.PortalSettings.HomeTabId ? this.TabId : this.PortalSettings.ActiveTab.TabID;
+            if (this.PortalSettings.ActiveTab.TabID == -1 || this.PortalSettings.ActiveTab.TabID == this.PortalSettings.HomeTabId)
+            {
+                if (!this.tabId.Equals(null))
+                {
+                    return (int)this.tabId;
+                }
+                else
+                {
+                    return this.ModuleInfo.TabID;
+                }
+            }
+            else
+            {
+                return this.PortalSettings.ActiveTab.TabID;
+            }
         }
 
         internal string GetCacheKey() => string.Format(this.cacheKeyTemplate, this.ModuleId, this.ForumID);
diff --git a/Dnn.CommunityForums/Entities/ReplyInfo.cs b/Dnn.CommunityForums/Entities/ReplyInfo.cs
@@ -673,7 +673,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati
         [IgnoreColumn]
         private int GetTabId()
         {
-            return this.Forum.PortalSettings.ActiveTab.TabID == -1 || this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.TabId : this.Forum.PortalSettings.ActiveTab.TabID;
+            return this.Forum.PortalSettings.ActiveTab.TabID == -1 || this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.GetTabId() : this.Forum.PortalSettings.ActiveTab.TabID;
         }
 
         [IgnoreColumn]
diff --git a/Dnn.CommunityForums/Entities/TopicInfo.cs b/Dnn.CommunityForums/Entities/TopicInfo.cs
@@ -1483,7 +1483,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati
         [IgnoreColumn]
         private int GetTabId()
         {
-            return this.Forum.PortalSettings.ActiveTab.TabID == -1 || this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.TabId : this.Forum.PortalSettings.ActiveTab.TabID;
+            return this.Forum.PortalSettings.ActiveTab.TabID == -1 || this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.GetTabId() : this.Forum.PortalSettings.ActiveTab.TabID;
         }
 
         [IgnoreColumn]
diff --git a/Dnn.CommunityForums/Services/Controllers/TopicController.cs b/Dnn.CommunityForums/Services/Controllers/TopicController.cs
@@ -171,7 +171,7 @@ public HttpResponseMessage Pin(TopicDto1 dto)
                             {
                                 new DotNetNuke.Modules.ActiveForums.Controllers.ProcessQueueController().Add(ProcessType.TopicPinned,
                                     portalId: ti.PortalId,
-                                    tabId: ti.Forum.TabId,
+                                    tabId: ti.Forum.GetTabId(),
                                     moduleId: ti.ModuleId,
                                     forumGroupId: ti.Forum.ForumGroupId,
                                     forumId: ti.ForumId,
diff --git a/Dnn.CommunityForums/Services/ModerationService.cs b/Dnn.CommunityForums/Services/ModerationService.cs
@@ -185,7 +185,7 @@ public HttpResponseMessage DeletePost(ModerationDTO dto)
                 rc.Reply_Delete(this.PortalSettings.PortalId, this.forumId, this.topicId, this.replyId, ms.DeleteBehavior);
                 if (fi.FeatureSettings.ModDeleteTemplateId > 0 && reply?.Content?.AuthorId > 0)
                 {
-                    DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.TabId, fi.ForumID, this.topicId, this.replyId, reply.Author);
+                    DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.GetTabId(), fi.ForumID, this.topicId, this.replyId, reply.Author);
                 }
             }
             else
@@ -198,7 +198,7 @@ public HttpResponseMessage DeletePost(ModerationDTO dto)
                 new DotNetNuke.Modules.ActiveForums.Controllers.TopicController(this.moduleId).DeleteById(this.topicId);
                 if (fi.FeatureSettings.ModDeleteTemplateId > 0 && ti?.Content?.AuthorId > 0)
                 {
-                    DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.TabId, fi.ForumID, this.topicId, this.replyId, ti.Author);
+                    DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.GetTabId(), fi.ForumID, this.topicId, this.replyId, ti.Author);
                 }
             }
 
diff --git a/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs b/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs
diff --git a/Dnn.CommunityForums/class/TemplateUtils.cs b/Dnn.CommunityForums/class/TemplateUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,10 @@ internal class PermissionController : DotNetNuke.Modules.ActiveForums.Controller`
`66`	`66`	`internal void UpdateSecurityForSocialGroupForum(DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum)`
`67`	`67`	`{`
`68`	`68`	`var permissions = this.GetById(forum.PermissionsId, forum.ModuleId);`
`69`		`- Hashtable htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.TabId, ignoreCache: false).TabModuleSettings;`
	`69`	`+ Hashtable htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.GetTabId(), ignoreCache: false).TabModuleSettings;`
`70`	`70`	`if (htSettings == null \|\| htSettings.Count == 0)`
`71`	`71`	`{`
`72`		`- htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.TabId, ignoreCache: false).ModuleSettings;`
	`72`	`+ htSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: forum.ModuleId, tabId: forum.GetTabId(), ignoreCache: false).ModuleSettings;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (htSettings == null \|\| htSettings.Count == 0 \|\| !htSettings.ContainsKey("ForumConfig"))`
Original file line number	Diff line number	Diff line change
`@@ -192,19 +192,19 @@ public int Reply_Save(int portalId, int moduleId, DotNetNuke.Modules.ActiveForum`
`192`	`192`	`// if existing topic, update associated journal item`
`193`	`193`	`if (ri.ReplyId > 0)`
`194`	`194`	`{`
`195`		`- string fullURL = new ControlUtils().BuildUrl(portalId, ri.Forum.TabId, moduleId, ri.Forum.ForumGroup.PrefixURL, ri.Forum.PrefixURL, ri.Forum.ForumGroupId, ri.ForumId, ri.TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, ri.ReplyId, ri.Forum.SocialGroupId);`
	`195`	`+ string fullURL = new ControlUtils().BuildUrl(portalId, ri.Forum.GetTabId(), moduleId, ri.Forum.ForumGroup.PrefixURL, ri.Forum.PrefixURL, ri.Forum.ForumGroupId, ri.ForumId, ri.TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, ri.ReplyId, ri.Forum.SocialGroupId);`
`196`	`196`
`197`	`197`	`if (fullURL.Contains("~/"))`
`198`	`198`	`{`
`199`		`- fullURL = Utilities.NavigateURL(ri.Forum.TabId, string.Empty, new string[] { $"{ParamKeys.TopicId}={ri.TopicId}", $"{ParamKeys.ContentJumpId}={ri.ReplyId}", });`
	`199`	`+ fullURL = Utilities.NavigateURL(ri.Forum.GetTabId(), string.Empty, new string[] { $"{ParamKeys.TopicId}={ri.TopicId}", $"{ParamKeys.ContentJumpId}={ri.ReplyId}", });`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`if (fullURL.EndsWith("/"))`
`203`	`203`	`{`
`204`	`204`	`fullURL += Utilities.UseFriendlyURLs(moduleId) ? $"#{ri.ReplyId}" : $"{ParamKeys.ContentJumpId}={ri.ReplyId}";`
`205`	`205`	`}`
`206`	`206`
`207`		`- new Social().UpdateJournalItemForPost(ri.PortalId, ri.ModuleId, ri.Forum.TabId, ri.ForumId, ri.TopicId, ri.ReplyId, ri.Author.AuthorId, fullURL, ri.Content.Subject, string.Empty, ri.Content.Body);`
	`207`	`+ new Social().UpdateJournalItemForPost(ri.PortalId, ri.ModuleId, ri.Forum.GetTabId(), ri.ForumId, ri.TopicId, ri.ReplyId, ri.Author.AuthorId, fullURL, ri.Content.Subject, string.Empty, ri.Content.Body);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`int replyId = Convert.ToInt32(DotNetNuke.Modules.ActiveForums.DataProvider.Instance().Reply_Save(portalId, ri.TopicId, ri.ReplyId, ri.ReplyToId, ri.StatusId, ri.IsApproved, ri.IsDeleted, ri.Content.Subject.Trim(), ri.Content.Body.Trim(), ri.Content.DateCreated, ri.Content.DateUpdated, ri.Content.AuthorId, ri.Content.AuthorName, ri.Content.IPAddress));`
Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,10 @@ public static DotNetNuke.Modules.ActiveForums.Entities.TopicInfo Approve(int mod`
`200`	`200`
`201`	`201`	`if (ti.Forum.FeatureSettings.ModApproveTemplateId > 0 & ti.Author.AuthorId > 0)`
`202`	`202`	`{`
`203`		`- DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(ti.Forum.FeatureSettings.ModApproveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.TabId, ti.ForumId, topicId, 0, ti.Author);`
	`203`	`+ DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(ti.Forum.FeatureSettings.ModApproveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), ti.ForumId, topicId, 0, ti.Author);`
`204`	`204`	`}`
`205`	`205`
`206`		`- DotNetNuke.Modules.ActiveForums.Controllers.TopicController.QueueApprovedTopicAfterAction(portalId: ti.PortalId, tabId: ti.Forum.TabId, moduleId: ti.Forum.ModuleId, forumGroupId: ti.Forum.ForumGroupId, forumId: ti.ForumId, topicId: topicId, replyId: -1, contentId: ti.ContentId, userId: userId, authorId: ti.Content.AuthorId);`
	`206`	`+ DotNetNuke.Modules.ActiveForums.Controllers.TopicController.QueueApprovedTopicAfterAction(portalId: ti.PortalId, tabId: ti.Forum.GetTabId(), moduleId: ti.Forum.ModuleId, forumGroupId: ti.Forum.ForumGroupId, forumId: ti.ForumId, topicId: topicId, replyId: -1, contentId: ti.ContentId, userId: userId, authorId: ti.Content.AuthorId);`
`207`	`207`	`return ti;`
`208`	`208`	`}`
`209`	`209`
`@@ -240,7 +240,7 @@ public static void Move(int moduleId, int userId, int topicId, int newForumId)`
`240`	`240`
`241`	`241`	`if (oldForum.FeatureSettings.ModMoveTemplateId > 0 & ti?.Author?.AuthorId > 0)`
`242`	`242`	`{`
`243`		`- DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(oldForum.FeatureSettings.ModMoveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.TabId, forumId: ti.Forum.ForumID, topicId: ti.TopicId, replyId: -1, author: ti.Author);`
	`243`	`+ DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(oldForum.FeatureSettings.ModMoveTemplateId, ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), forumId: ti.Forum.ForumID, topicId: ti.TopicId, replyId: -1, author: ti.Author);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`new DotNetNuke.Modules.ActiveForums.Controllers.ProcessQueueController().Add(ProcessType.UpdateForumLastUpdated, ti.PortalId, tabId: -1, moduleId: ti.ModuleId, forumGroupId: oldForum.ForumGroupId, forumId: oldForum.ForumID, topicId: topicId, replyId: -1, contentId: ti.ContentId, authorId: ti.Content.AuthorId, userId: userId, requestUrl: null);`
`@@ -283,8 +283,8 @@ public static int Save(DotNetNuke.Modules.ActiveForums.Entities.TopicInfo ti)`
`283`	`283`	`// if existing topic, update associated journal item`
`284`	`284`	`if (ti.TopicId > 0)`
`285`	`285`	`{`
`286`		`- string sUrl = new ControlUtils().BuildUrl(ti.PortalId, ti.Forum.TabId, ti.ModuleId, ti.Forum.ForumGroup.PrefixURL, ti.Forum.PrefixURL, ti.Forum.ForumGroupId, ti.ForumId, ti.TopicId, ti.TopicUrl, -1, -1, string.Empty, 1, -1, ti.Forum.SocialGroupId);`
`287`		`- new Social().UpdateJournalItemForPost(ti.PortalId, ti.ModuleId, ti.Forum.TabId, ti.ForumId, ti.TopicId, 0, ti.Author.AuthorId, sUrl, ti.Content.Subject, string.Empty, ti.Content.Body);`
	`286`	`+ string sUrl = new ControlUtils().BuildUrl(ti.PortalId, ti.Forum.GetTabId(), ti.ModuleId, ti.Forum.ForumGroup.PrefixURL, ti.Forum.PrefixURL, ti.Forum.ForumGroupId, ti.ForumId, ti.TopicId, ti.TopicUrl, -1, -1, string.Empty, 1, -1, ti.Forum.SocialGroupId);`
	`287`	`+ new Social().UpdateJournalItemForPost(ti.PortalId, ti.ModuleId, ti.Forum.GetTabId(), ti.ForumId, ti.TopicId, 0, ti.Author.AuthorId, sUrl, ti.Content.Subject, string.Empty, ti.Content.Body);`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`// TODO: convert to use DAL2?`
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,13 @@ internal static string BuildForumUrlSegment(int portalId, int moduleId, DotNetNu`
`95`	`95`	`internal static string BuildForumUrl(INavigationManager navigationManager, DotNetNuke.Abstractions.Portals.IPortalSettings portalSettings, SettingsInfo mainSettings, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forumInfo)`
`96`	`96`	`{`
`97`	`97`	`// Build the forum Url`
`98`		`- return mainSettings.UseShortUrls ? navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}" })`
`99`		`- : navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}", $"{ParamKeys.ViewType}={Views.Topics}" });`
	`98`	`+ return mainSettings.UseShortUrls ? navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}" })`
	`99`	`+ : navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ForumId}={forumInfo.ForumID}", $"{ParamKeys.ViewType}={Views.Topics}" });`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`internal static string BuildModeratorUrl(INavigationManager navigationManager, DotNetNuke.Abstractions.Portals.IPortalSettings portalSettings, SettingsInfo mainSettings, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forumInfo)`
`103`	`103`	`{`
`104`		`- return navigationManager.NavigateURL(forumInfo.TabId, portalSettings, string.Empty, new[] { $"{ParamKeys.ViewType}={Views.ModerateTopics}", $"{ParamKeys.ForumId}={forumInfo.ForumID}" });`
	`104`	`+ return navigationManager.NavigateURL(forumInfo.GetTabId(), portalSettings, string.Empty, new[] { $"{ParamKeys.ViewType}={Views.ModerateTopics}", $"{ParamKeys.ForumId}={forumInfo.ForumID}" });`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -356,11 +356,11 @@ private string ParseForumRow(string template, DotNetNuke.Modules.ActiveForums.En`
`356`	`356`	`{`
`357`	`357`	`if (template.Contains("[SUBFORUMS]") && template.Contains("[/SUBFORUMS]"))`
`358`	`358`	`{`
`359`		`- template = this.GetSubForums(template, fi.ForumID, fi.TabId);`
	`359`	`+ template = this.GetSubForums(template, fi.ForumID, fi.GetTabId());`
`360`	`360`	`}`
`361`	`361`	`else`
`362`	`362`	`{`
`363`		`- template = template.Replace("[SUBFORUMS]", this.GetSubForums(template: string.Empty, forumId: fi.ForumID, tabId: fi.TabId));`
	`363`	`+ template = template.Replace("[SUBFORUMS]", this.GetSubForums(template: string.Empty, forumId: fi.ForumID, tabId: fi.GetTabId()));`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`string[] css = null;`
Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati`
`673`	`673`	`[IgnoreColumn]`
`674`	`674`	`private int GetTabId()`
`675`	`675`	`{`
`676`		`- return this.Forum.PortalSettings.ActiveTab.TabID == -1 \|\| this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.TabId : this.Forum.PortalSettings.ActiveTab.TabID;`
	`676`	`+ return this.Forum.PortalSettings.ActiveTab.TabID == -1 \|\| this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.GetTabId() : this.Forum.PortalSettings.ActiveTab.TabID;`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`[IgnoreColumn]`
Original file line number	Diff line number	Diff line change
`@@ -1483,7 +1483,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati`
`1483`	`1483`	`[IgnoreColumn]`
`1484`	`1484`	`private int GetTabId()`
`1485`	`1485`	`{`
`1486`		`- return this.Forum.PortalSettings.ActiveTab.TabID == -1 \|\| this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.TabId : this.Forum.PortalSettings.ActiveTab.TabID;`
	`1486`	`+ return this.Forum.PortalSettings.ActiveTab.TabID == -1 \|\| this.Forum.PortalSettings.ActiveTab.TabID == this.Forum.PortalSettings.HomeTabId ? this.Forum.GetTabId() : this.Forum.PortalSettings.ActiveTab.TabID;`
`1487`	`1487`	`}`
`1488`	`1488`
`1489`	`1489`	`[IgnoreColumn]`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public HttpResponseMessage Pin(TopicDto1 dto)`
`171`	`171`	`{`
`172`	`172`	`new DotNetNuke.Modules.ActiveForums.Controllers.ProcessQueueController().Add(ProcessType.TopicPinned,`
`173`	`173`	`portalId: ti.PortalId,`
`174`		`- tabId: ti.Forum.TabId,`
	`174`	`+ tabId: ti.Forum.GetTabId(),`
`175`	`175`	`moduleId: ti.ModuleId,`
`176`	`176`	`forumGroupId: ti.Forum.ForumGroupId,`
`177`	`177`	`forumId: ti.ForumId,`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public HttpResponseMessage DeletePost(ModerationDTO dto)`
`185`	`185`	`rc.Reply_Delete(this.PortalSettings.PortalId, this.forumId, this.topicId, this.replyId, ms.DeleteBehavior);`
`186`	`186`	`if (fi.FeatureSettings.ModDeleteTemplateId > 0 && reply?.Content?.AuthorId > 0)`
`187`	`187`	`{`
`188`		`- DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.TabId, fi.ForumID, this.topicId, this.replyId, reply.Author);`
	`188`	`+ DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.GetTabId(), fi.ForumID, this.topicId, this.replyId, reply.Author);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`else`
`@@ -198,7 +198,7 @@ public HttpResponseMessage DeletePost(ModerationDTO dto)`
`198`	`198`	`new DotNetNuke.Modules.ActiveForums.Controllers.TopicController(this.moduleId).DeleteById(this.topicId);`
`199`	`199`	`if (fi.FeatureSettings.ModDeleteTemplateId > 0 && ti?.Content?.AuthorId > 0)`
`200`	`200`	`{`
`201`		`- DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.TabId, fi.ForumID, this.topicId, this.replyId, ti.Author);`
	`201`	`+ DotNetNuke.Modules.ActiveForums.Controllers.EmailController.SendEmail(fi.FeatureSettings.ModDeleteTemplateId, fi.PortalId, fi.ModuleId, fi.GetTabId(), fi.ForumID, this.topicId, this.replyId, ti.Author);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`