Enhance Page Header Tag Management Functionality

DNN Platform/Library/Entities/Portals/Templates/PortalTemplateExporter.cs

@@ -231,11 +231,26 @@ private static void SerializePortalSettings(XmlWriter writer, PortalInfo portal,
             writer.WriteElementString("userquota", portal.UserQuota.ToString(CultureInfo.InvariantCulture));
             writer.WriteElementString("pagequota", portal.PageQuota.ToString(CultureInfo.InvariantCulture));
 
-            settingsDictionary.TryGetValue("PageHeadText", out setting);
-            if (!string.IsNullOrEmpty(setting))
-            {
-                writer.WriteElementString("pageheadtext", setting);
-            }
+            settingsDictionary.TryGetValue("PageHeadText", out setting);
+            if (!string.IsNullOrEmpty(setting) && !string.Equals(setting, "false", StringComparison.OrdinalIgnoreCase))
+            {
+                writer.WriteElementString("pageheadtext", setting);
+            }
+
+            var pageHeaderTags = PageHeaderTagInfo.GetPortalItems(((IPortalInfo)portal).PortalId);
+            if (pageHeaderTags.Count > 0)
+            {
+                writer.WriteStartElement("pageheadertags");
+                foreach (var item in pageHeaderTags)
+                {
+                    writer.WriteStartElement("pageheadertag");
+                    writer.WriteAttributeString("name", item.Name);
+                    writer.WriteCData(item.Content ?? string.Empty);
+                    writer.WriteEndElement();
+                }
+
+                writer.WriteEndElement();
+            }
 
             settingsDictionary.TryGetValue("InjectModuleHyperLink", out setting);
             if (!string.IsNullOrEmpty(setting))

DNN Platform/Library/Entities/Portals/Templates/PortalTemplateImporter.cs

@@ -962,10 +962,27 @@ private void ParsePortalSettings(XmlNode nodeSettings, int portalId)
                 PortalController.UpdatePortalSetting(this.portalController, portalId, "ControlPanelVisibility", XmlUtils.GetNodeValue(nodeSettings, "controlpanelvisibility"));
             }
 
-            if (!string.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "pageheadtext", string.Empty)))
-            {
-                PortalController.UpdatePortalSetting(this.portalController, portalId, "PageHeadText", XmlUtils.GetNodeValue(nodeSettings, "pageheadtext", string.Empty));
-            }
+            if (!string.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "pageheadtext", string.Empty)))
+            {
+                PortalController.UpdatePortalSetting(this.portalController, portalId, "PageHeadText", XmlUtils.GetNodeValue(nodeSettings, "pageheadtext", string.Empty));
+            }
+
+            var pageHeaderTagNodes = nodeSettings.SelectNodes("pageheadertags/pageheadertag");
+            if (pageHeaderTagNodes != null && pageHeaderTagNodes.Count > 0)
+            {
+                var items = new List<PageHeaderTagInfo>();
+                foreach (XmlNode node in pageHeaderTagNodes)
+                {
+                    items.Add(new PageHeaderTagInfo
+                    {
+                        Name = node.Attributes?["name"]?.Value,
+                        Content = node.InnerText,
+                    });
+                }
+
+                PageHeaderTagInfo.SavePortalItems(portalId, items);
+                PortalController.UpdatePortalSetting(this.portalController, portalId, "PageHeadText", "false");
+            }
 
             if (!string.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "injectmodulehyperlink", string.Empty)))
             {

DNN Platform/Library/Entities/Tabs/PageHeaderTagInfo.cs

@@ -0,0 +1,152 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Entities.Tabs
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Portals;
+
+    public class PageHeaderTagInfo
+    {
+        public const string SettingPrefix = "PageHeaderTag_";
+
+        public string Name { get; set; }
+
+        public string Content { get; set; }
+
+        public string SettingName => SettingPrefix + this.Name;
+
+        public static IList<PageHeaderTagInfo> FromSettings(IDictionary settings)
+        {
+            var items = new List<PageHeaderTagInfo>();
+            if (settings == null)
+            {
+                return items;
+            }
+
+            foreach (DictionaryEntry entry in settings)
+            {
+                var key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
+                if (string.IsNullOrEmpty(key) || !key.StartsWith(SettingPrefix, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                var name = key.Substring(SettingPrefix.Length);
+                if (string.IsNullOrWhiteSpace(name))
+                {
+                    continue;
+                }
+
+                items.Add(new PageHeaderTagInfo
+                {
+                    Name = name,
+                    Content = Convert.ToString(entry.Value, CultureInfo.InvariantCulture),
+                });
+            }
+
+            return items.OrderBy(item => item.Name, StringComparer.OrdinalIgnoreCase).ToList();
+        }
+
+        public static IList<PageHeaderTagInfo> GetTabItems(int tabId)
+        {
+            return FromSettings(TabController.Instance.GetTabSettings(tabId));
+        }
+
+        public static IList<PageHeaderTagInfo> GetPortalItems(int portalId, string cultureCode = null)
+        {
+            var settings = string.IsNullOrEmpty(cultureCode)
+                ? PortalController.Instance.GetPortalSettings(portalId)
+                : PortalController.Instance.GetPortalSettings(portalId, cultureCode);
+
+            return FromSettings(new Hashtable(settings));
+        }
+
+        public static string Render(IEnumerable<PageHeaderTagInfo> items)
+        {
+            if (items == null)
+            {
+                return string.Empty;
+            }
+
+            return string.Join(Environment.NewLine, items.Select(item => item.Content).Where(content => !string.IsNullOrWhiteSpace(content)));
+        }
+
+        public static void SaveTabItems(int tabId, IEnumerable<PageHeaderTagInfo> items)
+        {
+            var normalizedItems = Normalize(items);
+            var targetSettingNames = new HashSet<string>(normalizedItems.Select(item => item.SettingName), StringComparer.OrdinalIgnoreCase);
+            var existingSettingNames = TabController.Instance.GetTabSettings(tabId)
+                .Cast<DictionaryEntry>()
+                .Select(entry => Convert.ToString(entry.Key, CultureInfo.InvariantCulture))
+                .Where(key => !string.IsNullOrEmpty(key))
+                .ToList();
+
+            foreach (var key in existingSettingNames)
+            {
+                if (key.StartsWith(SettingPrefix, StringComparison.Ordinal) && !targetSettingNames.Contains(key))
+                {
+                    TabController.Instance.DeleteTabSetting(tabId, key);
+                }
+            }
+
+            foreach (var item in normalizedItems)
+            {
+                TabController.Instance.UpdateTabSetting(tabId, item.SettingName, item.Content);
+            }
+        }
+
+        public static void SavePortalItems(int portalId, IEnumerable<PageHeaderTagInfo> items, string cultureCode = null)
+        {
+            var normalizedItems = Normalize(items);
+            var targetSettingNames = new HashSet<string>(normalizedItems.Select(item => item.SettingName), StringComparer.OrdinalIgnoreCase);
+            var existingSettingNames = (string.IsNullOrEmpty(cultureCode)
+                ? PortalController.Instance.GetPortalSettings(portalId)
+                : PortalController.Instance.GetPortalSettings(portalId, cultureCode))
+                .Keys
+                .Where(key => !string.IsNullOrEmpty(key))
+                .ToList();
+
+            foreach (var key in existingSettingNames)
+            {
+                if (key.StartsWith(SettingPrefix, StringComparison.Ordinal) && !targetSettingNames.Contains(key))
+                {
+                    PortalController.DeletePortalSetting(portalId, key);
+                }
+            }
+
+            foreach (var item in normalizedItems)
+            {
+                PortalController.Instance.UpdatePortalSetting(portalId, item.SettingName, item.Content, true, cultureCode ?? Null.NullString);
+            }
+        }
+
+        private static List<PageHeaderTagInfo> Normalize(IEnumerable<PageHeaderTagInfo> items)
+        {
+            if (items == null)
+            {
+                return new List<PageHeaderTagInfo>();
+            }
+
+            return items
+                .Where(item => item != null)
+                .Select(item => new PageHeaderTagInfo
+                {
+                    Name = (item.Name ?? string.Empty).Trim(),
+                    Content = item.Content ?? string.Empty,
+                })
+                .Where(item => !string.IsNullOrWhiteSpace(item.Name) && !string.IsNullOrWhiteSpace(item.Content))
+                .GroupBy(item => item.Name, StringComparer.OrdinalIgnoreCase)
+                .Select(group => group.Last())
+                .OrderBy(item => item.Name, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+    }
+}

DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs

@@ -261,6 +261,11 @@ protected virtual void ProcessImportPage(ExportTab otherTab, IList<ExportTab> ex
                         }
 
                         SetTabData(localTab, otherTab);
+                        if (this.Repository.GetRelatedItems<ExportTabSetting>(otherTab.Id).Any(setting => setting.SettingName.StartsWith(PageHeaderTagInfo.SettingPrefix, StringComparison.Ordinal)))
+                        {
+                            localTab.PageHeadText = null;
+                        }
+
                         localTab.StateID = this.GetLocalStateId(otherTab.StateID);
                         var parentId = this.IgnoreParentMatch ? otherTab.ParentId.GetValueOrDefault(Null.NullInteger) : TryFindLocalParentTabId(otherTab, exportedTabs, localTabs);
                         if (parentId == -1 && otherTab.ParentId > 0)
@@ -327,6 +332,11 @@ protected virtual void ProcessImportPage(ExportTab otherTab, IList<ExportTab> ex
             {
                 localTab = new TabInfo { PortalID = portalId };
                 SetTabData(localTab, otherTab);
+                if (this.Repository.GetRelatedItems<ExportTabSetting>(otherTab.Id).Any(setting => setting.SettingName.StartsWith(PageHeaderTagInfo.SettingPrefix, StringComparison.Ordinal)))
+                {
+                    localTab.PageHeadText = null;
+                }
+
                 localTab.StateID = this.GetLocalStateId(otherTab.StateID);
                 var parentId = this.IgnoreParentMatch ? otherTab.ParentId.GetValueOrDefault(Null.NullInteger) : TryFindLocalParentTabId(otherTab, exportedTabs, localTabs);
                 var checkPartial = false;

DNN Platform/Website/Components/Portals/portal.template.xsd

@@ -41,6 +41,21 @@
               <xs:element name="controlpanelsecurity" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="controlpanelvisibility" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="pageheadtext" type="xs:string" minOccurs="0" maxOccurs="1" />
+              <xs:element name="pageheadertags" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="pageheadertag" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="xs:string">
+                            <xs:attribute name="name" type="xs:string" use="required" />
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
               <xs:element name="injectmodulehyperlink" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="addcompatiblehttpheader" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="allowuseruiculture" type="xs:string" minOccurs="0" maxOccurs="1" />

DNN Platform/Website/Default.aspx.cs

@@ -606,15 +606,37 @@ private void InitializePage()
                 this.Page.Header.Controls.AddAt(0, new LiteralControl(this.Comment));
             }
 
-            if (this.PortalSettings.ActiveTab.PageHeadText != Null.NullString && !Globals.IsAdminControl())
-            {
-                this.Page.Header.Controls.Add(new LiteralControl(this.PortalSettings.ActiveTab.PageHeadText));
-            }
-
-            if (!string.IsNullOrEmpty(this.PortalSettings.PageHeadText))
-            {
-                this.metaPanel.Controls.Add(new LiteralControl(this.PortalSettings.PageHeadText));
-            }
+            if (this.PortalSettings.ActiveTab.PageHeadText != Null.NullString && !Globals.IsAdminControl())
+            {
+                var tabHeaderTags = PageHeaderTagInfo.Render(PageHeaderTagInfo.GetTabItems(this.PortalSettings.ActiveTab.TabID));
+                this.Page.Header.Controls.Add(new LiteralControl(string.IsNullOrEmpty(tabHeaderTags) ? this.PortalSettings.ActiveTab.PageHeadText : tabHeaderTags));
+            }
+            else if (!Globals.IsAdminControl())
+            {
+                var tabHeaderTags = PageHeaderTagInfo.Render(PageHeaderTagInfo.GetTabItems(this.PortalSettings.ActiveTab.TabID));
+                if (!string.IsNullOrEmpty(tabHeaderTags))
+                {
+                    this.Page.Header.Controls.Add(new LiteralControl(tabHeaderTags));
+                }
+            }
+
+            var portalPageHeadText = string.Equals(this.PortalSettings.PageHeadText, "false", StringComparison.OrdinalIgnoreCase)
+                ? string.Empty
+                : this.PortalSettings.PageHeadText;
+
+            if (!string.IsNullOrEmpty(portalPageHeadText))
+            {
+                var portalHeaderTags = PageHeaderTagInfo.Render(PageHeaderTagInfo.GetPortalItems(this.PortalSettings.PortalId, this.PortalSettings.CultureCode));
+                this.metaPanel.Controls.Add(new LiteralControl(string.IsNullOrEmpty(portalHeaderTags) ? portalPageHeadText : portalHeaderTags));
+            }
+            else
+            {
+                var portalHeaderTags = PageHeaderTagInfo.Render(PageHeaderTagInfo.GetPortalItems(this.PortalSettings.PortalId, this.PortalSettings.CultureCode));
+                if (!string.IsNullOrEmpty(portalHeaderTags))
+                {
+                    this.metaPanel.Controls.Add(new LiteralControl(portalHeaderTags));
+                }
+            }
 
             // set page title
             if (UrlUtils.InPopUp())
@@ -729,13 +751,15 @@ private void InitializePage()
                 this.Copyright = string.Concat("Copyright (c) ", DateTime.Now.Year, " by ", this.PortalSettings.PortalName);
             }
 
-            // META generator
-            this.Generator = string.Empty;
-
-            // META Robots - hide it inside popups and if PageHeadText of current tab already contains a robots meta tag
-            if (!UrlUtils.InPopUp() &&
-                !(HeaderTextRegex.IsMatch(this.PortalSettings.ActiveTab.PageHeadText) ||
-                  HeaderTextRegex.IsMatch(this.PortalSettings.PageHeadText)))
+            // META generator
+            this.Generator = string.Empty;
+
+            var tabLegacyPageHeadText = this.PortalSettings.ActiveTab.PageHeadText ?? string.Empty;
+
+            // META Robots - hide it inside popups and if PageHeadText of current tab already contains a robots meta tag
+            if (!UrlUtils.InPopUp() &&
+                !(HeaderTextRegex.IsMatch(PageHeaderTagInfo.Render(PageHeaderTagInfo.GetTabItems(this.PortalSettings.ActiveTab.TabID)) + tabLegacyPageHeadText) ||
+                  HeaderTextRegex.IsMatch(PageHeaderTagInfo.Render(PageHeaderTagInfo.GetPortalItems(this.PortalSettings.PortalId, this.PortalSettings.CultureCode)) + portalPageHeadText)))
             {
                 this.MetaRobots.Visible = true;
                 var allowIndex = true;

DNN Platform/Website/Portals/_default/Blank Website.template

@@ -24,7 +24,10 @@
     <hostspace>0</hostspace>
     <userquota>0</userquota>
     <pagequota>0</pagequota>
-    <pageheadtext>&lt;meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /&gt;</pageheadtext>
+    <pageheadtext></pageheadtext>
+    <pageheadertags>
+      <pageheadertag name="Default"><![CDATA[<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />]]></pageheadertag>
+    </pageheadertags>
     <injectmodulehyperlink>True</injectmodulehyperlink>
     <addcompatiblehttpheader>IE=edge</addcompatiblehttpheader>
     <sitemapcachedays>1</sitemapcachedays>

DNN Platform/Website/Portals/_default/Default Website.template

@@ -24,7 +24,10 @@
     <hostspace>0</hostspace>
     <userquota>0</userquota>
     <pagequota>0</pagequota>
-    <pageheadtext>&lt;meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /&gt;</pageheadtext>
+    <pageheadtext></pageheadtext>
+    <pageheadertags>
+      <pageheadertag name="Default"><![CDATA[<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />]]></pageheadertag>
+    </pageheadertags>
     <injectmodulehyperlink>True</injectmodulehyperlink>
     <addcompatiblehttpheader>IE=edge</addcompatiblehttpheader>
     <sitemapcachedays>1</sitemapcachedays>