Merge pull request #1236 from johnhenley/issues/email-links-1235

FIX: Issues with email notifications

Author: johnhenley

Dnn.CommunityForums/CustomControls/UserControls/TopicView.cs

@@ -73,7 +73,7 @@ public class TopicView : ForumBase
 
         public string OptDefaultSort { get; set; }
 
-        public string MetaTemplate { get; set; } = "[META][TITLE][FORUMTOPIC:SUBJECT] - [PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][BODY:255][/DESCRIPTION][KEYWORDS][TAGS][VALUE][/KEYWORDS][/META]";
+        public string MetaTemplate { get; set; } = "[META][TITLE][FORUMTOPIC:SUBJECT] - [PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][FORUMTOPIC:BODY:255][/DESCRIPTION][KEYWORDS][TAGS][VALUE][/KEYWORDS][/META]";
 
         public string MetaTitle { get; set; } = string.Empty;
 

Dnn.CommunityForums/CustomControls/UserControls/TopicsView.cs

@@ -55,7 +55,7 @@ public class TopicsView : ForumBase
         private bool isSubscribedForum;
         private bool useListActions;
 
-        public string MetaTemplate { get; set; } = "[META][TITLE][PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][BODY][/DESCRIPTION][KEYWORDS][VALUE][/KEYWORDS][/META]";
+        public string MetaTemplate { get; set; } = "[META][TITLE][PORTAL:PORTALNAME] - [TAB:TITLE] - [FORUMGROUP:GROUPNAME] - [FORUM:FORUMNAME][/TITLE][DESCRIPTION][FORUM:FORUMDESCRIPTION][/DESCRIPTION][KEYWORDS][VALUE][/KEYWORDS][/META]";
 
         public string MetaTitle { get; set; } = string.Empty;
 
@@ -229,36 +229,6 @@ protected override void OnLoad(EventArgs e)
                             {
                                 this.MetaTemplate = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.RemoveObsoleteTokens(new StringBuilder( this.MetaTemplate)).ToString();
                                 this.MetaTemplate = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(new StringBuilder(this.MetaTemplate), this.ForumInfo, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl).ToString();
-                                this.MetaTemplate = this.MetaTemplate.Replace("[TAGS]", string.Empty);
-                                if (this.MetaTemplate.Contains("[TOPICSUBJECT:"))
-                                {
-                                    string pattern = "(\\[TOPICSUBJECT:(.+?)\\])";
-                                    foreach (Match m in RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Matches(this.MetaTemplate))
-                                    {
-                                        this.MetaTemplate = this.MetaTemplate.Replace(m.Value, string.Empty);
-                                    }
-                                }
-
-                                this.MetaTemplate = this.MetaTemplate.Replace("[TOPICSUBJECT]", string.Empty);
-                                if (this.MetaTemplate.Contains("[BODY:"))
-                                {
-                                    string pattern = "(\\[BODY:(.+?)\\])";
-                                    foreach (Match m in RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Matches(this.MetaTemplate))
-                                    {
-                                        int iLen = Convert.ToInt32(m.Groups[2].Value);
-                                        if (this.ForumInfo.ForumDesc.Length > iLen)
-                                        {
-                                            this.MetaTemplate = this.MetaTemplate.Replace(m.Value, this.ForumInfo.ForumDesc.Substring(0, iLen) + "...");
-                                        }
-                                        else
-                                        {
-                                            this.MetaTemplate = this.MetaTemplate.Replace(m.Value, this.ForumInfo.ForumDesc);
-                                        }
-                                    }
-                                }
-
-                                this.MetaTemplate = this.MetaTemplate.Replace("[BODY]", Utilities.StripHTMLTag(this.ForumInfo.ForumDesc));
-
                                 this.MetaTitle = TemplateUtils.GetTemplateSection(this.MetaTemplate, "[TITLE]", "[/TITLE]").Replace("[TITLE]", string.Empty).Replace("[/TITLE]", string.Empty);
                                 this.MetaTitle = this.MetaTitle.TruncateAtWord(SEOConstants.MaxMetaTitleLength);
                                 this.MetaDescription = TemplateUtils.GetTemplateSection(this.MetaTemplate, "[DESCRIPTION]", "[/DESCRIPTION]").Replace("[DESCRIPTION]", string.Empty).Replace("[/DESCRIPTION]", string.Empty);

Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs

@@ -947,6 +947,8 @@ internal static StringBuilder MapLegacyEmailNotificationTokenSynonyms(StringBuil
             template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[MODLINK]", "[FORUM:MODLINK", "[MODLINK]");
             template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[LINK]", "[FORUMPOST:LINK", "[LINK]");
             template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[HYPERLINK]", "[FORUMPOST:LINK", "[LINK]");
+            template = ReplaceTokenSynonym(template, "[SUBJECT]", "[FORUMPOST:SUBJECT]");
+            template = ReplaceTokenSynonym(template, "[SUBJECTLINK]", "[FORUMPOST:SUBJECTLINK]");
             template = ReplaceTokenSynonym(template, "[LINKURL]", "[FORUMPOST:LINK]");
             template = ReplaceTokenSynonym(template, "[FORUMLINK]", "[FORUM:FORUMLINK]");
 

Dnn.CommunityForums/class/Settings.cs

@@ -300,7 +300,10 @@ public int DefaultPermissionId
 
         public string DefaultSettingsKey
         {
-            get { return this.MainSettings.GetString(SettingKeys.DefaultSettingsKey); }
+            get
+            {
+                return this.MainSettings.GetString(SettingKeys.DefaultSettingsKey) ?? $"M:{this.ModuleId}";
+            }
         }
 
         public FeatureSettings ForumFeatureSettings

Dnn.CommunityForums/components/Controls/ControlUtils.cs

@@ -163,8 +163,9 @@ public string BuildUrl(int portalId, int tabId, int moduleId, string groupPrefix
                 return Utilities.NavigateURL(tabId, portalSettings, string.Empty, @params.ToArray());
             }
 
-            var sURL = string.Empty;
-            if (!string.IsNullOrEmpty(mainSettings.PrefixURLBase))
+            var sURL = Utilities.NavigateURL(tabId, portalSettings, string.Empty, @params.ToArray());
+            var tabInfo = DotNetNuke.Entities.Tabs.TabController.Instance.GetTab(tabId, portalId);
+            if (!string.IsNullOrEmpty(mainSettings.PrefixURLBase) && !mainSettings.PrefixURLBase.Trim().Equals(tabInfo.TabName.Trim(), StringComparison.InvariantCultureIgnoreCase))
             {
                 sURL += "/" + mainSettings.PrefixURLBase;
             }