-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Delete Connection
+
+
+ Google Analytics 4 Core Connector
+
+
+ Track for Administrators:
+
+
+ Tracking Code Cannot Be Empty
+
+
+ Measurement ID:
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Connector.css b/DNN Platform/Connectors/GoogleAnalytics4/Connector.css
new file mode 100644
index 00000000000..772981c5bd0
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/Connector.css
@@ -0,0 +1,16 @@
+#connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div, .connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div {
+ width: 100%;
+}
+
+#connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div input[type='text'], #connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div textarea, .connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div input[type='text'] {
+ width: 65% !important;
+}
+
+#connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div label, .connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div label {
+ width: 25% !important;
+}
+
+#connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div span, .connector-CoreGoogleAnalytics4Connector > div.edit-fields > div > div span {
+ font-size:0.75em;
+ font-style:italic;
+}
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Constants.cs b/DNN Platform/Connectors/GoogleAnalytics4/Constants.cs
new file mode 100644
index 00000000000..f086580daeb
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/Constants.cs
@@ -0,0 +1,13 @@
+// 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 DNN.Connectors.GoogleAnalytics4
+{
+ /// Lists constants used across the connector.
+ internal class Constants
+ {
+ /// The path to the resource file used for localization.
+ public const string LocalResourceFile = "~/DesktopModules/Connectors/GoogleAnalytics4/App_LocalResources/SharedResources.resx";
+ }
+}
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj
new file mode 100644
index 00000000000..24798b94e2c
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj
@@ -0,0 +1,137 @@
+
+
+
+ true
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {94E12995-181A-4114-90C7-3F9557F28DE7}
+ Library
+ Properties
+ DNN.Connectors.GoogleAnalytics4
+ DNN.Connectors.GoogleAnalytics4
+ v4.7.2
+ 512
+
+
+ true
+ full
+ false
+ bin
+ DEBUG;TRACE
+ prompt
+ 4
+ bin\DNN.Connectors.GoogleAnalytics4.xml
+ 7
+ 1591
+ true
+
+
+ pdbonly
+ true
+ bin
+ TRACE
+ prompt
+ 4
+ bin\DNN.Connectors.GoogleAnalytics4.xml
+ 1591
+ 7
+
+
+ true
+ full
+ false
+ bin
+ DEBUG;TRACE;CLOUD;CLOUD_DEBUG
+ prompt
+ 4
+ bin\DNN.Connectors.GoogleAnalytics4.xml
+ 7
+ 1591
+
+
+ pdbonly
+ true
+ bin
+ TRACE;CLOUD;CLOUD_RELEASE
+ prompt
+ 4
+ bin\DNN.Connectors.GoogleAnalytics4.xml
+ 1591
+ 7
+
+
+
+ ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll
+ True
+
+
+ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll
+
+
+ ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll
+
+
+
+
+ stylecop.json
+
+
+
+
+ {3cd5f6b8-8360-4862-80b6-f402892db7dd}
+ DotNetNuke.Instrumentation
+
+
+ {ee1329fe-fd88-4e1a-968c-345e394ef080}
+ DotNetNuke.Web
+
+
+ {6b29aded-7b56-4484-bea5-c0e09079535b}
+ DotNetNuke.Library
+
+
+ {b267ce88-dffc-4bd8-9962-319e79c52526}
+ DotNetNuke.Providers.FolderProviders
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4.config b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4.config
new file mode 100644
index 00000000000..ac2a5e390b2
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4.config
@@ -0,0 +1,23 @@
+
+
+
+
+ DotNetNuke.Services.Analytics.GoogleAnalytics4Engine, DotNetNuke
+ Head
+ True
+
+
+
+
+ ]]>
+
+
+
+
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.cs b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.cs
new file mode 100644
index 00000000000..805626b3997
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.cs
@@ -0,0 +1,250 @@
+// 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 DNN.Connectors.GoogleAnalytics4
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Web;
+ using System.Xml;
+
+ using DotNetNuke.Common;
+ using DotNetNuke.Entities.Portals;
+ using DotNetNuke.Services.Analytics.Config;
+ using DotNetNuke.Services.Connections;
+ using DotNetNuke.Services.Exceptions;
+ using DotNetNuke.Services.Localization;
+
+ /// Connector to provide configuration for Google Tag Manager support.
+ public class GoogleAnalytics4Connector : IConnector
+ {
+ private const string DefaultDisplayName = "Google Analytics 4";
+
+ private string displayName;
+
+ /// GetConnectors(int portalId)
+ {
+ return new List { this };
+ }
+
+ /// config = this.GetConfig(portalId);
+
+ return config.ContainsKey("Ga4ID") && !string.IsNullOrEmpty(config["Ga4ID"]);
+ }
+
+ /// GetConfig(int portalId)
+ {
+ var ga4Config = AnalyticsConfiguration.GetConfig("GoogleAnalytics4");
+ var portalSettings = new PortalSettings(portalId);
+
+ // Important, knockout handles empty strings as false and any other string as true
+ // so we need to pass empty strings when we mean false, however it passes us back the string "false"
+ // when saving the settings in the SaveConfig method, so we need to handle that case too
+ var ga4Id = string.Empty;
+ var trackForAdmin = string.Empty;
+
+ if (ga4Config != null)
+ {
+ foreach (AnalyticsSetting setting in ga4Config.Settings)
+ {
+ switch (setting.SettingName.ToLower())
+ {
+ case "ga4id":
+ ga4Id = setting.SettingValue;
+ break;
+ case "trackforadmin":
+ trackForAdmin = this.HandleCustomBoolean(setting.SettingValue);
+ break;
+ }
+ }
+ }
+
+ var configItems = new Dictionary
+ {
+ { "Ga4ID", ga4Id },
+ { "TrackAdministrators", trackForAdmin },
+ { "isDeactivating", this.HandleCustomBoolean("false") },
+ };
+
+ return configItems;
+ }
+
+ /// values, ref bool validated, out string customErrorMessage)
+ {
+ // Delete / Deactivation functionality added into SaveConfig because
+ // As of DNN 9.2.2 you need to support multiple to get access to the Delete Connection functionality
+ customErrorMessage = string.Empty;
+ bool isValid;
+
+ try
+ {
+ var isDeactivating = false;
+
+ bool.TryParse(values["isDeactivating"].ToLowerInvariant(), out isDeactivating);
+
+ string ga4ID;
+ string trackForAdmin;
+
+ isValid = true;
+
+ if (isDeactivating)
+ {
+ ga4ID = null;
+ trackForAdmin = null;
+ }
+ else
+ {
+ ga4ID = values["Ga4ID"] != null ? values["Ga4ID"].ToUpperInvariant().Trim() : string.Empty;
+ trackForAdmin = values["TrackAdministrators"] != null ? values["TrackAdministrators"].ToLowerInvariant().Trim() : string.Empty;
+
+ if (string.IsNullOrEmpty(ga4ID))
+ {
+ isValid = false;
+ customErrorMessage = Localization.GetString("TrackingCodeFormat.ErrorMessage", Constants.LocalResourceFile);
+ }
+ }
+
+ if (isValid)
+ {
+ var config = new AnalyticsConfiguration
+ {
+ Settings = new AnalyticsSettingCollection(),
+ };
+
+ config.Settings.Add(new AnalyticsSetting
+ {
+ SettingName = "Ga4Id",
+ SettingValue = ga4ID,
+ });
+
+ config.Settings.Add(new AnalyticsSetting
+ {
+ SettingName = "TrackForAdmin",
+ SettingValue = trackForAdmin,
+ });
+
+ AnalyticsConfiguration.SaveConfig("GoogleAnalytics4", config);
+
+ if (!isDeactivating)
+ {
+ this.EnsureScriptInConfig();
+ }
+ }
+
+ return isValid;
+ }
+ catch (Exception ex)
+ {
+ Exceptions.LogException(ex);
+ return false;
+ }
+ }
+
+ /// Check if there's an AnalyticsEngine element in siteanalytics.config for this connector. If not, adds the default one.
+ private void EnsureScriptInConfig()
+ {
+ var applicationMappath = HttpContext.Current.Server.MapPath("\\");
+ var file = applicationMappath + "\\SiteAnalytics.config";
+ var xdoc = new XmlDocument();
+ xdoc.Load(file);
+ var found = false;
+ foreach (XmlNode engineTypeNode in xdoc.SelectNodes("/AnalyticsEngineConfig/Engines/AnalyticsEngine/EngineType"))
+ {
+ if (engineTypeNode.InnerText.Contains("DotNetNuke.Services.Analytics.GoogleAnalytics4Engine"))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ var fileGa4 = applicationMappath + "\\DesktopModules\\Connectors\\GoogleAnalytics4\\GoogleAnalytics4.config";
+ var xdocGa4 = new XmlDocument();
+ xdocGa4.Load(fileGa4);
+
+ var enginesElement = xdoc.SelectSingleNode("/AnalyticsEngineConfig/Engines");
+ foreach (XmlNode engineNode in xdocGa4.SelectNodes("/AnalyticsEngineConfig/Engines/AnalyticsEngine"))
+ {
+ var engineFrag = xdoc.CreateDocumentFragment();
+ engineFrag.InnerXml = engineNode.OuterXml;
+ enginesElement.AppendChild(engineFrag);
+ }
+
+ xdoc.Save(file);
+ }
+ }
+
+ ///
+ /// Handles custom conversion from "true" => "true"
+ /// Anything else to "" to support the strange knockout handling of string as booleans.
+ ///
+ /// The string representing a boolean.
+ /// The string representing a boolean after the correction.
+ private string HandleCustomBoolean(string value)
+ {
+ if ((value ?? string.Empty).Trim().Equals("true", StringComparison.OrdinalIgnoreCase))
+ {
+ return "true";
+ }
+
+ return string.Empty;
+ }
+ }
+}
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn
new file mode 100644
index 00000000000..e51e0e3126d
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn
@@ -0,0 +1,39 @@
+
+
+
+ Google Analytics 4 Connector
+ Configure your sites Google Analytics 4 settings.
+ ~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png
+
+ 09.02.00
+
+
+ .NET Foundation and Contributors
+ DNN Community
+ https://dnncommunity.org
+ info@dnncommunity.org
+
+ true
+
+
+
+
+ bin
+ DNN.Connectors.GoogleAnalytics4.dll
+
+
+
+
+
+ DesktopModules\Connectors\GoogleAnalytics4
+
+ Resources.zip
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png b/DNN Platform/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png
new file mode 100644
index 00000000000..d5426ec46af
Binary files /dev/null and b/DNN Platform/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png differ
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/License.txt b/DNN Platform/Connectors/GoogleAnalytics4/License.txt
new file mode 100644
index 00000000000..e17438a2fe5
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/License.txt
@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Module.build b/DNN Platform/Connectors/GoogleAnalytics4/Module.build new file mode 100644 index 00000000000..aaaf830fb29 --- /dev/null +++ b/DNN Platform/Connectors/GoogleAnalytics4/Module.build @@ -0,0 +1,16 @@ +
+
+ $(MSBuildProjectDirectory)\..\..\..
+
+
+ zip
+ GoogleAnalytics4Connector
+ GoogleAnalytics4Connector
+ $(WebsitePath)\DesktopModules\Connectors\GoogleAnalytics4
+ $(WebsiteInstallPath)\Module
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/ReleaseNotes.txt b/DNN Platform/Connectors/GoogleAnalytics4/ReleaseNotes.txt
new file mode 100644
index 00000000000..409844b64bf
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/ReleaseNotes.txt
@@ -0,0 +1 @@
+There are no release notes for this version.
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Scripts/connector.js b/DNN Platform/Connectors/GoogleAnalytics4/Scripts/connector.js
new file mode 100644
index 00000000000..650cacb2d83
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/Scripts/connector.js
@@ -0,0 +1,130 @@
+"use strict";
+define(["jquery", "knockout", "templatePath/scripts/config", "templatePath/scripts/PersonaBarDialog"], function ($, ko, cf) {
+ var helper,
+ bindViewModel,
+ rootFolder,
+ utility,
+ appId,
+ appSecret,
+ container;
+
+ var wasDeactivated = false;
+
+ var init = function (koObject, connectionHelper, pluginFolder, util) {
+
+ helper = connectionHelper;
+ bindViewModel = koObject;
+ rootFolder = pluginFolder;
+ utility = util;
+ koObject.container = ko.observable("");
+
+ if (typeof dnn === "undefined") {
+ window.Sys = !window.Sys ? window.top.Sys : window.Sys;
+ window.dnn = !window.dnn ? window.top.dnn : window.dnn;
+ window.String = !window.String ? window.top.String : window.String;
+ window.String.format = !window.String.format ? window.top.String.format : window.String.format;
+ }
+
+ };
+
+ var onSave = function (conn) {
+
+ // Convert boolean to string as the API requires a dictionary of string values
+ conn.configurations[1].value(conn.configurations[1].value() || 'false');
+ };
+
+ var onSaveComplete = function (conn, id) {
+
+ // Deactivation / delete handled through the save since the delete function as
+ // of v9.2.2 only works with multiple connector support. This should be
+ // considered a temporary workaround until core behaviour updated.
+
+ if (wasDeactivated) {
+
+ // Was this just deactivated? clear the fields
+ conn.onDelete(conn, null, null);
+ wasDeactivated = false;
+ utility.notify(utility.resx.Connectors.txt_Deleted, true);
+ }
+ else {
+
+ conn.connected("true");
+
+ if (bindViewModel.buttons().length === 1) {
+
+ activateDeleteButton(conn);
+ }
+ utility.notify((utility.resx.Connectors || utility.resx.PersonaBar).txt_Saved, true);
+ }
+ };
+
+ var activateDeleteButton = function (conn) {
+
+ if (conn.buttons().length === 1) {
+
+ conn.buttons.push({
+ className: "secondarybtn",
+ text: bindViewModel.resx.btnDelete,
+ action: function (conn, e) {
+
+ // Set the isDeactivating flag to true to override the default save behaviour
+ // Temporary workaround until delete functionality on connectors is improved
+ conn.configurations[2].value("true");
+ wasDeactivated = true;
+ conn.save(conn, e, onSaveComplete.bind(this, conn, conn.id));
+ }
+ });
+
+ }
+
+ };
+
+ var getActionButtons = function () {
+
+
+ if (bindViewModel.connected()) {
+
+ return [
+ {
+ className: "primarybtn",
+ text: utility.resx.Connectors.btn_Save,
+ action: function (conn, e) {
+ conn.save(conn, e, onSaveComplete.bind(this, conn, conn.id));
+ }
+ },
+
+ {
+ className: "secondarybtn",
+ text: bindViewModel.resx.btnDelete,
+ action: function (conn, e) {
+
+ // Set the isDeactivating flag to true to override the default save behaviour
+ // Temporary workaround until delete functionality on connectors is improved
+ conn.configurations[2].value("true");
+ wasDeactivated = true;
+ conn.save(conn, e, onSaveComplete.bind(this, conn, conn.id));
+ }
+ }
+ ];
+
+ } else {
+
+ return [
+ {
+ className: "primarybtn",
+ text: utility.resx.Connectors.btn_Save,
+ action: function (conn, e) {
+ conn.save(conn, e, onSaveComplete.bind(this, conn, conn.id));
+ }
+ }
+ ];
+ }
+ };
+
+ return {
+ init: init,
+ onSave: onSave,
+ getActionButtons: getActionButtons
+ };
+
+});
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/app.config b/DNN Platform/Connectors/GoogleAnalytics4/app.config
new file mode 100644
index 00000000000..6838e65ce66
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/app.config
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/connector.htm b/DNN Platform/Connectors/GoogleAnalytics4/connector.htm
new file mode 100644
index 00000000000..16f0188eb4b
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/connector.htm
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn
index 8e96318da07..6537df34654 100644
--- a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn
+++ b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn
@@ -1,6 +1,6 @@
-
+
Google Tag Manager Connector
Configure your sites Google Tag Manager settings.
~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png
diff --git a/DNN Platform/Connectors/GoogleTagManager/Scripts/connector.js b/DNN Platform/Connectors/GoogleTagManager/Scripts/connector.js
index b607cf30422..3d7c0cd79a6 100644
--- a/DNN Platform/Connectors/GoogleTagManager/Scripts/connector.js
+++ b/DNN Platform/Connectors/GoogleTagManager/Scripts/connector.js
@@ -30,7 +30,7 @@ define(["jquery", "knockout", "templatePath/scripts/config", "templatePath/scrip
var onSave = function (conn) {
// Convert boolean to string as the API requires a dictionary of string values
- conn.configurations[1].value(conn.configurations[1].value().toString());
+ conn.configurations[1].value(conn.configurations[1].value() || 'false');
};
var onSaveComplete = function (conn, id) {
diff --git a/DNN Platform/Connectors/GoogleTagManager/connector.htm b/DNN Platform/Connectors/GoogleTagManager/connector.htm
index 63b6646f85a..9aa0a9e117b 100644
--- a/DNN Platform/Connectors/GoogleTagManager/connector.htm
+++ b/DNN Platform/Connectors/GoogleTagManager/connector.htm
@@ -7,7 +7,7 @@
-
+
DNN JWT Auth Handler
DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients
true
$(MSBuildProjectDirectory)\..\..
bin/$(Configuration)/$(TargetFramework)/DotNetNuke.DependencyInjection.xml
+ latest
diff --git a/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs b/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs
new file mode 100644
index 00000000000..e46e47ef400
--- /dev/null
+++ b/DNN Platform/DotNetNuke.DependencyInjection/LazyWrapper.cs
@@ -0,0 +1,18 @@
+// 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.DependencyInjection;
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+/// A
+/// The type of service to conditionally instantiate.
+public class LazyWrapper : Lazy
+{
+ /// Initializes a new instance of the
+ /// The DI container.
+ public LazyWrapper(IServiceProvider serviceProvider)
+ : base(serviceProvider.GetService)
+ {
+ }
+}
diff --git a/DNN Platform/DotNetNuke.Web/Api/SupportedModulesAttribute.cs b/DNN Platform/DotNetNuke.Web/Api/SupportedModulesAttribute.cs
index c2763301ed9..c2731cde46f 100644
--- a/DNN Platform/DotNetNuke.Web/Api/SupportedModulesAttribute.cs
+++ b/DNN Platform/DotNetNuke.Web/Api/SupportedModulesAttribute.cs
@@ -19,6 +19,11 @@ public SupportedModulesAttribute(string supportedModules)
this.supportedModules = supportedModules.Split(new[] { ',' });
}
+ public SupportedModulesAttribute(params string[] supportedModules)
+ {
+ this.supportedModules = supportedModules;
+ }
+
///
-
+
DotNetNuke ClientAPI
The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.
Library responsible for reflection.
public class Reflection
{
@@ -21,32 +24,65 @@ public class Reflection
/// The type of Object to create (data/navigation).
/// The created Object.
/// Overload for creating an object from a Provider configured in web.config.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType)
{
return CreateObject(objectProviderType, true);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType)
+ {
+ return CreateObject(serviceProvider, objectProviderType, true);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// Caching switch.
/// The created Object.
/// Overload for creating an object from a Provider configured in web.config.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType, bool useCache)
{
return CreateObject(objectProviderType, string.Empty, string.Empty, string.Empty, useCache);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// Caching switch.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, bool useCache)
+ {
+ return CreateObject(serviceProvider, objectProviderType, string.Empty, string.Empty, string.Empty, useCache);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// The namespace of the object to create.
/// The assembly of the object to create.
/// The created Object.
/// Overload for creating an object from a Provider including NameSpace and AssemblyName ( this allows derived providers to share the same config ).
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType, string objectNamespace, string objectAssemblyName)
{
return CreateObject(objectProviderType, string.Empty, objectNamespace, objectAssemblyName, true);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The namespace of the object to create.
+ /// The assembly of the object to create.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, string objectNamespace, string objectAssemblyName)
+ {
+ return CreateObject(serviceProvider, objectProviderType, string.Empty, objectNamespace, objectAssemblyName, true);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// The namespace of the object to create.
@@ -54,11 +90,24 @@ public static object CreateObject(string objectProviderType, string objectNamesp
/// Caching switch.
/// The created Object.
/// Overload for creating an object from a Provider including NameSpace and AssemblyName ( this allows derived providers to share the same config ).
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType, string objectNamespace, string objectAssemblyName, bool useCache)
{
return CreateObject(objectProviderType, string.Empty, objectNamespace, objectAssemblyName, useCache);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The namespace of the object to create.
+ /// The assembly of the object to create.
+ /// Caching switch.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, string objectNamespace, string objectAssemblyName, bool useCache)
+ {
+ return CreateObject(serviceProvider, objectProviderType, string.Empty, objectNamespace, objectAssemblyName, useCache);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// The name of the Provider.
@@ -66,11 +115,24 @@ public static object CreateObject(string objectProviderType, string objectNamesp
/// The assembly of the object to create.
/// The created Object.
/// Overload for creating an object from a Provider including NameSpace, AssemblyName and ProviderName.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName)
{
return CreateObject(objectProviderType, objectProviderName, objectNamespace, objectAssemblyName, true);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The name of the Provider.
+ /// The namespace of the object to create.
+ /// The assembly of the object to create.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName)
+ {
+ return CreateObject(serviceProvider, objectProviderType, objectProviderName, objectNamespace, objectAssemblyName, true);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// The name of the Provider.
@@ -79,11 +141,25 @@ public static object CreateObject(string objectProviderType, string objectProvid
/// Caching switch.
/// The created Object.
/// Overload for creating an object from a Provider including NameSpace, AssemblyName and ProviderName.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName, bool useCache)
{
return CreateObject(objectProviderType, objectProviderName, objectNamespace, objectAssemblyName, useCache, true);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The name of the Provider.
+ /// The namespace of the object to create.
+ /// The assembly of the object to create.
+ /// Caching switch.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName, bool useCache)
+ {
+ return CreateObject(serviceProvider, objectProviderType, objectProviderName, objectNamespace, objectAssemblyName, useCache, true);
+ }
+
/// Creates an object.
/// The type of Object to create (data/navigation).
/// The name of the Provider.
@@ -93,9 +169,38 @@ public static object CreateObject(string objectProviderType, string objectProvid
/// Whether append provider name as part of the assembly name.
/// The created Object.
/// Overload for creating an object from a Provider including NameSpace, AssemblyName and ProviderName.
- public static object CreateObject(string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName, bool useCache, bool fixAssemblyName)
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
+ public static object CreateObject(
+ string objectProviderType,
+ string objectProviderName,
+ string objectNamespace,
+ string objectAssemblyName,
+ bool useCache,
+ bool fixAssemblyName)
{
- string typeName = string.Empty;
+ return CreateObject(
+ Globals.DependencyProvider,
+ objectProviderType,
+ objectProviderName,
+ objectNamespace,
+ objectAssemblyName,
+ useCache,
+ fixAssemblyName);
+ }
+
+ /// Creates an object.
+ /// The DI container.
+ /// The type of Object to create (data/navigation).
+ /// The name of the Provider.
+ /// The namespace of the object to create.
+ /// The assembly of the object to create.
+ /// Caching switch.
+ /// Whether append provider name as part of the assembly name.
+ /// The created Object.
+ /// Overload for creating an object from a Provider including NameSpace, AssemblyName and ProviderName.
+ public static object CreateObject(IServiceProvider serviceProvider, string objectProviderType, string objectProviderName, string objectNamespace, string objectAssemblyName, bool useCache, bool fixAssemblyName)
+ {
+ string typeName;
// get the provider configuration based on the type
ProviderConfiguration objProviderConfiguration = ProviderConfiguration.GetProviderConfiguration(objectProviderType);
@@ -145,7 +250,7 @@ public static object CreateObject(string objectProviderType, string objectProvid
}
}
- return CreateObject(typeName, typeName, useCache);
+ return CreateObject(serviceProvider, typeName, typeName, useCache);
}
/// Creates an object.
@@ -153,55 +258,132 @@ public static object CreateObject(string objectProviderType, string objectProvid
/// The Cache Key.
/// The created Object.
/// Overload that takes a fully-qualified typename and a Cache Key.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string typeName, string cacheKey)
{
return CreateObject(typeName, cacheKey, true);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The fully qualified TypeName.
+ /// The Cache Key.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string typeName, string cacheKey)
+ {
+ return CreateObject(serviceProvider, typeName, cacheKey, true);
+ }
+
/// Creates an object.
/// The fully qualified TypeName.
/// The Cache Key.
/// Caching switch.
/// The created Object.
/// Overload that takes a fully-qualified typename and a Cache Key.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(string typeName, string cacheKey, bool useCache)
{
- return Activator.CreateInstance(CreateType(typeName, cacheKey, useCache));
+ return CreateObject(Globals.DependencyProvider, typeName, cacheKey, useCache);
+ }
+
+ /// Creates an object.
+ /// The DI container.
+ /// The fully qualified TypeName.
+ /// The Cache Key.
+ /// Caching switch.
+ /// The created Object.
+ public static object CreateObject(IServiceProvider serviceProvider, string typeName, string cacheKey, bool useCache)
+ {
+ var type = CreateType(typeName, cacheKey, useCache);
+ return CreateObject(serviceProvider, type);
}
/// Creates an object.
/// The type of object to create.
/// The created object.
/// Generic version.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static T CreateObject()
{
- // dynamically create the object
- return Activator.CreateInstance();
+ return CreateObject(Globals.DependencyProvider);
+ }
+
+ /// Creates an object.
+ /// The type of object to create.
+ /// The DI container.
+ /// The created object.
+ public static T CreateObject(IServiceProvider serviceProvider)
+ {
+ try
+ {
+ return ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider);
+ }
+ catch (InvalidOperationException exception)
+ {
+ Logger.Warn($"Unable to create type via service provider: {typeof(T)}", exception);
+ return Activator.CreateInstance();
+ }
}
/// Creates an object.
/// The type of object to create.
/// The created object.
+ [Obsolete("Deprecated in DotNetNuke 9.11.3. Please use overload with IServiceProvider. Scheduled removal in v11.0.0.")]
public static object CreateObject(Type type)
{
- return Activator.CreateInstance(type);
+ return CreateObject(Globals.DependencyProvider, type);
}
+ /// Creates an object.
+ /// The DI container.
+ /// The type of object to create.
+ /// The created object.
+ public static object CreateObject(IServiceProvider serviceProvider, Type type)
+ {
+ try
+ {
+ return ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider, type);
+ }
+ catch (InvalidOperationException exception)
+ {
+ Logger.Warn($"Unable to create type via service provider: {type}", exception);
+ return Activator.CreateInstance(type);
+ }
+ }
+
+ /// Creates a type. Caches type creation for performance. Errors creating the type are logged.
+ /// The name of the type to create.
+ /// The
public static Type CreateType(string typeName)
{
return CreateType(typeName, string.Empty, true, false);
}
+ /// Creates a type. Caches type creation for performance.
+ /// The name of the type to create.
+ /// Whether to log exceptions.
+ /// The
public static Type CreateType(string typeName, bool ignoreErrors)
{
return CreateType(typeName, string.Empty, true, ignoreErrors);
}
+ /// Creates a type. Errors creating the type are logged.
+ /// The name of the type to create.
+ /// A custom cache key; otherwise The
public static Type CreateType(string typeName, string cacheKey, bool useCache)
{
return CreateType(typeName, cacheKey, useCache, false);
}
+ /// Creates a type.
+ /// The name of the type to create.
+ /// A custom cache key; otherwise The
public static Type CreateType(string typeName, string cacheKey, bool useCache, bool ignoreErrors)
{
if (string.IsNullOrEmpty(cacheKey))
@@ -242,11 +424,18 @@ public static Type CreateType(string typeName, string cacheKey, bool useCache, b
return type;
}
+ /// Dynamically call the empty constructor for a
+ /// The type of object to create.
+ /// An instance of the object, or
public static object CreateInstance(Type type)
{
return CreateInstance(type, null);
}
+ /// Dynamically call a constructor for a
+ /// The type of object to create.
+ /// The constructor arguments.
+ /// An instance of the object, or
public static object CreateInstance(Type type, object[] args)
{
if (type != null)
@@ -259,6 +448,11 @@ public static object CreateInstance(Type type, object[] args)
}
}
+ /// Dynamically get the value of a property.
+ /// The type of The property's value, or
public static object GetProperty(Type type, string propertyName, object target)
{
if (type != null)
@@ -271,6 +465,11 @@ public static object GetProperty(Type type, string propertyName, object target)
}
}
+ /// Dynamically set the value of a property.
+ /// The type of Dynamically invoke a method on an object.
+ /// The type of ();
services.AddSingleton();
services.AddSingleton();
diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
index bff7ef7ef96..e81cab4e8e5 100644
--- a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
+++ b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
@@ -1,6 +1,6 @@
-
+
Message Center
Core Messaging module allows users to message each other.
~/DesktopModules/CoreMessaging/Images/messaging_32X32.png
diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
index 32aee3cc622..d5701be9b03 100644
--- a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
+++ b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
@@ -1,6 +1,6 @@
-
+
DDR Menu
DotNetNuke Navigation Provider.
diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
index 09c9e37f3de..0c820def322 100644
--- a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
+++ b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
@@ -1,6 +1,6 @@
-
+
Site Export Import
DotNetNuke Corporation Site Export Import Library
Images/Files_32x32_Standard.png
diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn
index 8aefaf57873..87a227c79a0 100644
--- a/DNN Platform/Modules/Groups/SocialGroups.dnn
+++ b/DNN Platform/Modules/Groups/SocialGroups.dnn
@@ -1,6 +1,6 @@
-
+
Social Groups
DotNetNuke Corporation Social Groups module
~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png
diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn
index ed7f7e0ca71..1ab7a380b42 100644
--- a/DNN Platform/Modules/HTML/dnn_HTML.dnn
+++ b/DNN Platform/Modules/HTML/dnn_HTML.dnn
@@ -1,6 +1,6 @@
-
+
HTML
This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.
DesktopModules\HTML\Images\html.png
diff --git a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn
index 8375f2fa71e..1ca7585906d 100644
--- a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn
+++ b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn
@@ -1,6 +1,6 @@
-
+
Html Editor Management
Images/HtmlEditorManager_Standard_32x32.png
A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.
diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn
index f214b81e717..57bd7aaae75 100644
--- a/DNN Platform/Modules/Journal/Journal.dnn
+++ b/DNN Platform/Modules/Journal/Journal.dnn
@@ -1,6 +1,6 @@
-
+
Journal
DotNetNuke Corporation Journal module
DesktopModules/Journal/Images/journal_32X32.png
diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
index 8296bbe0d31..c05a110fb45 100644
--- a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
+++ b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
@@ -1,6 +1,6 @@
-
+
Member Directory
The Member Directory module displays a list of Members based on role, profile property or relationship.
~/DesktopModules/MemberDirectory/Images/member_list_32X32.png
diff --git a/DNN Platform/Modules/RazorHost/Manifest.dnn b/DNN Platform/Modules/RazorHost/Manifest.dnn
index 353c2b78cc0..5bacda0243a 100644
--- a/DNN Platform/Modules/RazorHost/Manifest.dnn
+++ b/DNN Platform/Modules/RazorHost/Manifest.dnn
@@ -1,6 +1,6 @@
-
+
{0}
{1}
diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn
index 6901323290c..cdfaecc8b9d 100644
--- a/DNN Platform/Modules/RazorHost/RazorHost.dnn
+++ b/DNN Platform/Modules/RazorHost/RazorHost.dnn
@@ -1,6 +1,6 @@
-
+
Razor Host
The Razor Host module allows developers to host Razor Scripts.
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json
index d9b24952d26..d150254844e 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json
@@ -1,6 +1,6 @@
{
"name": "dnn-resource-manager",
- "version": "9.11.1",
+ "version": "9.12.0",
"description": "Resource Manager",
"private": true,
"main": "dist/index.cjs.js",
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn
index 18966445aec..f0828dbf548 100644
--- a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn
+++ b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn
@@ -1,6 +1,6 @@
-
+
Resource Manager
This module allows you to manage files on the server
~/Images/icon_filemanager_32px.gif
diff --git a/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn b/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn
index 661f0a54d98..e3d23f69c35 100644
--- a/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn
+++ b/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn
@@ -1,6 +1,6 @@
-
+
Telerik Removal
This module allows you to remove the DotNetNuke Telerik Web Components library from your site.
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn
index 88312fe1d70..5fb2baf442a 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Facebook Authentication Project
The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses
Facebook authentication to authenticate users.
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn
index 0bd2927bbef..0697b61c5a7 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Google Authentication Project
The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses
Google authentication to authenticate users.
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn
index 87c47b3dab1..95786b81213 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Live Authentication Project
The DotNetNuke Live Authentication Project is an Authentication provider for DotNetNuke that uses
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn
index ebfc8b746b9..4446512e687 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Twitter Authentication Project
The DotNetNuke Twitter Authentication Project is an Authentication provider for DotNetNuke that uses
diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn
index c602b49e848..0e29628f846 100644
--- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn
+++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Simple Web Farm Caching Provider
DotNetNuke Simple Web Farm Caching Provider
-
+
DotNetNuke ASP.NET Client Capability Provider
ASP.NET Device Detection / Client Capability Provider
~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png
diff --git a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn
index a91d69ad6ef..1810ee12666 100644
--- a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn
+++ b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn
@@ -1,6 +1,6 @@
-
+
DotNetNuke Folder Providers
Azure Folder Providers for DotNetNuke.
-
+
CKEditor Provider
CKEditor Provider for DNN
~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png
diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs
index d22041be3be..a129aafbb8f 100644
--- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs
+++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs
@@ -267,136 +267,158 @@ internal static EditorProviderSettings LoadEditorSettingsByKey(
currentSettings.Config.CodeMirror.Theme = settingValue;
}
}
+
+ // if we don't have portalRoles, we're in host/allPortals mode
+ // so we can't filter for the roles, since they're not available
+ if ((portalRoles?.Count ?? 0) > 0)
+ {
+ List listToolbarRoles = (from RoleInfo objRole in portalRoles
+ where
+ filteredSettings.Any(
+ setting =>
+ setting.Name.Equals(
+ string.Format(
+ "{0}{2}#{1}",
+ key,
+ objRole.RoleID,
+ SettingConstants.TOOLB)))
+ where
+ !string.IsNullOrEmpty(
+ filteredSettings.FirstOrDefault(
+ s =>
+ s.Name.Equals(
+ string.Format(
+ "{0}{2}#{1}",
+ key,
+ objRole.RoleID,
+ SettingConstants.TOOLB)))
+ .Value)
+ let sToolbar =
+ filteredSettings.FirstOrDefault(
+ s =>
+ s.Name.Equals(
+ string.Format(
+ "{0}{2}#{1}",
+ key,
+ objRole.RoleID,
+ SettingConstants.TOOLB)))
+ .Value
+ select
+ new ToolbarRoles { RoleId = objRole.RoleID, Toolbar = sToolbar })
+ .ToList();
+
+ if (
+ filteredSettings.Any(
+ setting => setting.Name.Equals(string.Format("{0}{2}#{1}", key, "-1", SettingConstants.TOOLB))))
+ {
+ var settingValue =
+ filteredSettings.FirstOrDefault(
+ s => s.Name.Equals(string.Format("{0}{2}#{1}", key, "-1", SettingConstants.TOOLB)))
+ .Value;
- List listToolbarRoles = (from RoleInfo objRole in portalRoles
- where
- filteredSettings.Any(
- setting =>
- setting.Name.Equals(
- string.Format(
- "{0}{2}#{1}",
- key,
- objRole.RoleID,
- SettingConstants.TOOLB)))
- where
- !string.IsNullOrEmpty(
- filteredSettings.FirstOrDefault(
- s =>
- s.Name.Equals(
- string.Format(
- "{0}{2}#{1}",
- key,
- objRole.RoleID,
- SettingConstants.TOOLB))).Value)
- let sToolbar =
- filteredSettings.FirstOrDefault(
- s =>
- s.Name.Equals(
- string.Format(
- "{0}{2}#{1}",
- key,
- objRole.RoleID,
- SettingConstants.TOOLB))).Value
- select
- new ToolbarRoles { RoleId = objRole.RoleID, Toolbar = sToolbar })
- .ToList();
-
- if (
- filteredSettings.Any(
- setting => setting.Name.Equals(string.Format("{0}{2}#{1}", key, "-1", SettingConstants.TOOLB))))
- {
- var settingValue =
- filteredSettings.FirstOrDefault(
- s => s.Name.Equals(string.Format("{0}{2}#{1}", key, "-1", SettingConstants.TOOLB))).Value;
-
- if (!string.IsNullOrEmpty(settingValue))
- {
- listToolbarRoles.Add(new ToolbarRoles { RoleId = -1, Toolbar = settingValue });
+ if (!string.IsNullOrEmpty(settingValue))
+ {
+ listToolbarRoles.Add(new ToolbarRoles { RoleId = -1, Toolbar = settingValue });
+ }
}
- }
- currentSettings.ToolBarRoles = listToolbarRoles;
-
- var listUploadSizeRoles = (from RoleInfo objRole in portalRoles
- where
- filteredSettings.Any(
- setting =>
- setting.Name.Equals(
- string.Format(
- "{0}{1}#{2}",
- key,
- objRole.RoleID,
- SettingConstants.UPLOADFILELIMITS)))
- where
- !string.IsNullOrEmpty(
- filteredSettings.FirstOrDefault(
- s =>
- s.Name.Equals(
- string.Format(
- "{0}{1}#{2}",
- key,
- objRole.RoleID,
- SettingConstants.UPLOADFILELIMITS))).Value)
- let uploadFileLimit =
- filteredSettings.FirstOrDefault(
- s =>
- s.Name.Equals(
- string.Format(
- "{0}{1}#{2}",
- key,
- objRole.RoleID,
- SettingConstants.UPLOADFILELIMITS))).Value
- select
- new UploadSizeRoles { RoleId = objRole.RoleID, RoleName = objRole.RoleName, UploadFileLimit = Convert.ToInt32(uploadFileLimit) })
- .ToList();
-
- if (
- filteredSettings.Any(
- setting => setting.Name.Equals(string.Format("{0}{1}#{2}", key, "-1", SettingConstants.UPLOADFILELIMITS))))
- {
- var settingValue =
- filteredSettings.FirstOrDefault(
- s => s.Name.Equals(string.Format("{0}{1}#{2}", key, "-1", SettingConstants.UPLOADFILELIMITS))).Value;
+ currentSettings.ToolBarRoles = listToolbarRoles;
+
+ var listUploadSizeRoles = (from RoleInfo objRole in portalRoles
+ where
+ filteredSettings.Any(
+ setting =>
+ setting.Name.Equals(
+ string.Format(
+ "{0}{1}#{2}",
+ key,
+ objRole.RoleID,
+ SettingConstants.UPLOADFILELIMITS)))
+ where
+ !string.IsNullOrEmpty(
+ filteredSettings.FirstOrDefault(
+ s =>
+ s.Name.Equals(
+ string.Format(
+ "{0}{1}#{2}",
+ key,
+ objRole.RoleID,
+ SettingConstants.UPLOADFILELIMITS)))
+ .Value)
+ let uploadFileLimit =
+ filteredSettings.FirstOrDefault(
+ s =>
+ s.Name.Equals(
+ string.Format(
+ "{0}{1}#{2}",
+ key,
+ objRole.RoleID,
+ SettingConstants.UPLOADFILELIMITS)))
+ .Value
+ select
+ new UploadSizeRoles
+ {
+ RoleId = objRole.RoleID,
+ RoleName = objRole.RoleName,
+ UploadFileLimit = Convert.ToInt32(uploadFileLimit)
+ })
+ .ToList();
+
+ if (
+ filteredSettings.Any(
+ setting => setting.Name.Equals(
+ string.Format("{0}{1}#{2}", key, "-1", SettingConstants.UPLOADFILELIMITS))))
+ {
+ var settingValue =
+ filteredSettings.FirstOrDefault(
+ s => s.Name.Equals(
+ string.Format("{0}{1}#{2}", key, "-1", SettingConstants.UPLOADFILELIMITS)))
+ .Value;
- if (!string.IsNullOrEmpty(settingValue))
- {
- listUploadSizeRoles.Add(new UploadSizeRoles { RoleId = -1, UploadFileLimit = Convert.ToInt32(settingValue) });
+ if (!string.IsNullOrEmpty(settingValue))
+ {
+ listUploadSizeRoles.Add(
+ new UploadSizeRoles { RoleId = -1, UploadFileLimit = Convert.ToInt32(settingValue) });
+ }
}
- }
-
- currentSettings.UploadSizeRoles = listUploadSizeRoles;
- if (
- filteredSettings.Any(
- setting => setting.Name.Equals(string.Format("{0}{1}", key, SettingConstants.ROLES))))
- {
- var settingValue =
- filteredSettings.FirstOrDefault(
- s => s.Name.Equals(string.Format("{0}{1}", key, SettingConstants.ROLES))).Value;
+ currentSettings.UploadSizeRoles = listUploadSizeRoles;
- if (!string.IsNullOrEmpty(settingValue))
+ if (
+ filteredSettings.Any(
+ setting => setting.Name.Equals(string.Format("{0}{1}", key, SettingConstants.ROLES))))
{
- string sRoles = settingValue;
+ var settingValue =
+ filteredSettings.FirstOrDefault(
+ s => s.Name.Equals(string.Format("{0}{1}", key, SettingConstants.ROLES)))
+ .Value;
- currentSettings.BrowserRoles = sRoles;
+ if (!string.IsNullOrEmpty(settingValue))
+ {
+ string sRoles = settingValue;
- string[] rolesA = sRoles.Split(';');
+ currentSettings.BrowserRoles = sRoles;
- foreach (string sRoleName in rolesA)
- {
- if (Utility.IsNumeric(sRoleName))
+ string[] rolesA = sRoles.Split(';');
+
+ foreach (string sRoleName in rolesA)
{
- RoleInfo roleInfo = RoleController.Instance.GetRoleById(portalSettings.PortalId, int.Parse(sRoleName));
+ if (Utility.IsNumeric(sRoleName))
+ {
+ RoleInfo roleInfo = RoleController.Instance.GetRoleById(
+ portalSettings.PortalId,
+ int.Parse(sRoleName));
- if (roleInfo != null)
+ if (roleInfo != null)
+ {
+ roles.Add(roleInfo.RoleName);
+ }
+ }
+ else
{
- roles.Add(roleInfo.RoleName);
+ roles.Add(sRoleName);
}
}
- else
- {
- roles.Add(sRoleName);
- }
}
}
}
diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
index 5cc9fe699ec..2dc3547005b 100644
--- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
+++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
@@ -1,6 +1,6 @@
-
+
Xcillion
-
+
Xcillion
-
..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll
-
- ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
@@ -143,7 +143,7 @@
+
+
diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config
index a9088b21258..52935cfafa9 100644
--- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config
+++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config
@@ -9,8 +9,8 @@
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config
index 4331fbdb811..9bd1f3aaa66 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config
@@ -14,6 +14,10 @@
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj
index 144835bf063..dc4eee72287 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj
+++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj
@@ -1,6 +1,6 @@
-
Debug
@@ -58,8 +58,8 @@
- ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
@@ -118,7 +118,7 @@
Dear [User:DisplayName],
-You have requested a Password Reset Token from [Portal:PortalName], but Your account is pending approval.
-
-Password can be reset after account is approved.
+You have requested a Password Reset Token from [Portal:PortalName], but your account is pending approval.
+The administrator for [Portal:PortalName] has been notified for review and will issue another password reset email if your account is approved.
Sincerely,
[Portal:PortalName]
@@ -1374,6 +1373,18 @@ Sincerely,
[Portal:PortalName] Password Reminder
+
+
+The following user has requested a Password Reset Token from [Portal:PortalName], but the user account is pending approval.
+User Name: [User:UserName]
+Display Name: [User:DisplayName]
+
+After reviewing this user, if the account is authorized, resend the user a password reset email.
+
+
+
+ [Portal:PortalName] Password Reminder requested for unapproved User [User:Username]
+
{0} - 503 Service Unavailable
diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.12.00.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.12.00.SqlDataProvider
new file mode 100644
index 00000000000..343b722cfe1
--- /dev/null
+++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.12.00.SqlDataProvider
@@ -0,0 +1,9 @@
+/************************************************************/
+/***** SqlDataProvider *****/
+/***** *****/
+/***** *****/
+/***** Note: To manually execute this script you must *****/
+/***** perform a search and replace operation *****/
+/***** for {databaseOwner} and {objectQualifier} *****/
+/***** *****/
+/************************************************************/
diff --git a/DNN Platform/Website/admin/Containers/Icon.ascx.cs b/DNN Platform/Website/admin/Containers/Icon.ascx.cs
index 5734a6e8678..8d70bb90167 100644
--- a/DNN Platform/Website/admin/Containers/Icon.ascx.cs
+++ b/DNN Platform/Website/admin/Containers/Icon.ascx.cs
@@ -11,17 +11,16 @@ namespace DotNetNuke.UI.Containers
using DotNetNuke.Services.FileSystem;
using DotNetNuke.UI.Skins;
- /// Project : DotNetNuke
- /// Class : DotNetNuke.UI.Containers.Icon
- ///
///
/// Contains the attributes of an Icon.
/// These are read into the PortalModuleBase collection as attributes for the icons within the module controls.
///
public partial class Icon : SkinObjectBase
{
+ /// Gets or sets the border width of the icon.
public string BorderWidth { get; set; }
+ /// Gets or sets the CSS class on the img element.
public string CssClass { get; set; }
/// x.index===5).size} className={"user-names" + (user.isDeleted ? " deleted" : "") }>
-
-
- {user.displayName !== "-" && x.index===5).size} className={"user-names" + (user.isDeleted ? " deleted" : "") }>
+
},
{
index: 10,
content: x.index===10).size} className={"user-emails" + (user.isDeleted ? " deleted" : "") } >
-
+
},
{
index: 15,
@@ -185,7 +193,8 @@ class DetailsRow extends Component {
this.rootElement = node}>
- {(!props.addIsOpened || props.addIsOpened === "add-opened") &&
+ {(!props.addIsOpened || props.addIsOpened === "add-opened") &&
+
{userColumns}
}
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
index bb693ffa257..2d8cf5fd7cb 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/DetailRow/style.less
@@ -39,6 +39,16 @@
}
}
.user-names {
+ .user-name{
+ display: flex;
+ gap: 0.5rem;
+ align-items: center;
+ img{
+ max-width: 32px;
+ max-height: 32px;
+ border-radius: 50%;
+ }
+ }
padding-left: 2px !important;
h6 {
font-size: 15px;
diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
index d1a07db2450..f58fead40ef 100644
--- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
@@ -1,11 +1,11 @@
{
"name": "taxonomy",
- "version": "9.11.1",
+ "version": "9.12.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
- "watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
+ "watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer",
"lint": "eslint --fix"
},
@@ -14,7 +14,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
- "@dnnsoftware/dnn-react-common": "9.11.1",
+ "@dnnsoftware/dnn-react-common": "9.12.0",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-loader": "^8.0.6",
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
index ff8d61f1c50..ee5a0c3ae23 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserBasicDto.cs
@@ -36,6 +36,11 @@ public UserBasicDto(UserInfo user)
this.IsSuperUser = user.IsSuperUser;
this.IsAdmin = user.Roles.Contains(this.PortalSettings.AdministratorRoleName);
this.AvatarUrl = Utilities.GetProfileAvatar(this.UserId);
+ }
+
+ public void PopulateAvatarUrl()
+ {
+ this.AvatarUrl = Utilities.GetProfileAvatar(this.UserId);
}
[DataMember(Name = "avatar")]
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
index 0ff76bcc37a..5233d955434 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Users/UsersController.cs
@@ -581,6 +581,11 @@ private IEnumerable GetUsers(GetUsersContract usersContract, bool?
hasAgreedToTerms,
requestsRemoval));
+ foreach (var user in records)
+ {
+ user.PopulateAvatarUrl();
+ }
+
totalRecords = records.Count == 0 ? 0 : records[0].TotalCount;
return records;
}
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
index 68326ae6e42..1a9076fd0df 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
@@ -1,6 +1,6 @@
-
+
Dnn.PersonaBar.Extensions
~/Images/icon-personabarapp-32px.png
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
index 052fca2afa0..142d9767bb6 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Connectors/css/Connectors.css
@@ -51,10 +51,6 @@ table#connectionstbl span.socialnetwork-favicon div {
right: -4px;
}
-table#connectionstbl span.socialnetwork-favicon.connected {
- background-position: 0 -37px;
-}
-
table#connectionstbl span.socialnetwork-name {
text-transform: uppercase;
}
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
index 2fa948fe4dc..75c8a6534c8 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
@@ -1323,6 +1323,9 @@
Host
+
+ Site
+
The page where you show the terms of use for this site. If left unselected a default text will be shown when a user clicks on the terms of use link.
diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
index 6634c7beffa..1b4bf9894ce 100644
--- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
+++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
@@ -1,6 +1,6 @@
-
+
Dnn.EditBar.UI
-
+
Dnn.PersonaBar.UI
-
@@ -39,8 +39,11 @@
7
-
- ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
+
+
+ ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll
@@ -48,20 +51,18 @@
..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
- ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
-
- ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
-
@@ -111,7 +112,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
@@ -39,14 +39,24 @@
7
-
- ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
+
+
+ ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
index 8fcff5793a0..9dd43d2a7a8 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
@@ -22,6 +22,10 @@
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config
index 19a8461030d..50be2a31776 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config
@@ -1,7 +1,10 @@
-
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
index 825d6030991..840661940e0 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
@@ -1,6 +1,6 @@
-
@@ -39,8 +39,11 @@
7
-
- ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
+
+
+ ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll
@@ -50,11 +53,18 @@
..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll
+
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll
@@ -118,6 +128,6 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
index 8fcff5793a0..9dd43d2a7a8 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
@@ -22,6 +22,10 @@
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config
index 3cb666d12de..9cdf2a8a1cc 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config
@@ -1,10 +1,13 @@
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
index 14f8ffe1e68..0b4dea7e552 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
@@ -1,6 +1,6 @@
-
@@ -40,14 +40,24 @@
7
-
- ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
+
+
+ ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
index 17af53ce56d..e08ed98a2b2 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
@@ -14,6 +14,10 @@
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config
index 19a8461030d..50be2a31776 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config
@@ -1,7 +1,10 @@
-
\ No newline at end of file
diff --git a/README.md b/README.md
index 21970f32013..5fd2ac2ae6a 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
# Project Description
-DNN® ( formerly DotNetNuke® ) is the leading open source web content management platform (CMS) in the Microsoft ecosystem. The product is used to build professional looking and easy-to-use commercial websites, social intranets, community portals, or partner extranets. Containing dynamic content of all types, DNN sites are easy to deploy and update. The DNN Platform has been downloaded more than 8 million times and powers more than 750,000 websites globally. A community of more than 1 million members forms a powerful support network.
+DNN® ( formerly DotNetNuke® ) is the leading open-source web content management platform (CMS) in the Microsoft ecosystem. The product is used to build professional-looking and easy-to-use commercial websites, social intranets, community portals, or partner extranets. Containing dynamic content of all types, DNN sites are easy to deploy and update. The DNN Platform has been downloaded more than 8 million times and powers over 750,000 websites globally. A community of more than 1 million members forms a powerful support network.
-Thousands of free and commercial extensions, apps and skins are available at the [DNN Store](http://store.dnnsoftware.com/) that make extending a DNN site fast and affordable.
+Thousands of free and commercial extensions, apps, and skins are available at the [DNN Store](http://store.dnnsoftware.com/), which makes extending a DNN site fast and affordable.
In addition to robust content management, the free, open source DNN Platform includes the following built-in features:
diff --git a/SolutionInfo.cs b/SolutionInfo.cs
index b09ee9125b9..9529ddac286 100644
--- a/SolutionInfo.cs
+++ b/SolutionInfo.cs
@@ -13,6 +13,6 @@
[assembly: AssemblyProduct("https://dnncommunity.org")]
[assembly: AssemblyCopyright("DNN Platform is copyright 2002-2020 by .NET Foundation. All Rights Reserved.")]
[assembly: AssemblyTrademark("DNN")]
-[assembly: AssemblyVersion("9.11.1")]
-[assembly: AssemblyFileVersion("9.11.1.0")]
-[assembly: AssemblyInformationalVersion("9.11.1 Custom build")]
+[assembly: AssemblyVersion("9.12.0")]
+[assembly: AssemblyFileVersion("9.12.0.0")]
+[assembly: AssemblyInformationalVersion("9.12.0 Custom build")]
diff --git a/package.json b/package.json
index 1e04fde4268..307c4f39539 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "dnn-platform",
- "version": "9.11.1",
+ "version": "9.11.2",
"private": true,
"workspaces": [
"Dnn.AdminExperience/ClientSide/AdminLogs.Web",
diff --git a/yarn.lock b/yarn.lock
index ca7a8f0b3b5..5f8fde21e7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1797,7 +1797,7 @@ __metadata:
languageName: node
linkType: hard
-"@dnnsoftware/dnn-react-common@9.11.1, @dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common":
+"@dnnsoftware/dnn-react-common@9.12.0, @dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common":
version: 0.0.0-use.local
resolution: "@dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common"
dependencies:
@@ -5127,7 +5127,7 @@ __metadata:
"@babel/plugin-transform-object-assign": ^7.0.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: 8.0.6
@@ -9908,7 +9908,7 @@ __metadata:
"@babel/plugin-transform-object-assign": 7.12.13
"@babel/preset-env": 7.1.6
"@babel/preset-react": 7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
babel-plugin-transform-react-remove-prop-types: 0.4.24
babel-polyfill: 6.26.0
@@ -9944,7 +9944,7 @@ __metadata:
"@babel/plugin-transform-object-assign": 7.12.13
"@babel/preset-env": 7.1.6
"@babel/preset-react": 7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.4
babel-plugin-transform-react-remove-prop-types: 0.4.20
babel-polyfill: 6.26.0
@@ -9981,7 +9981,7 @@ __metadata:
"@babel/plugin-transform-react-jsx": ^7.1.6
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
create-react-class: ^15.6.3
css-loader: 2.1.1
@@ -11324,7 +11324,7 @@ __metadata:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: ^8.0.6
@@ -11466,7 +11466,7 @@ __metadata:
"@babel/core": ^7.2.0
"@babel/preset-env": ^7.2.0
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
babel-plugin-transform-object-assign: 6.22.0
babel-plugin-transform-object-rest-spread: 6.26.0
@@ -15887,7 +15887,7 @@ fsevents@^1.2.7:
"@babel/core": ^7.1.6
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: 8.0.6
@@ -18630,7 +18630,7 @@ fsevents@^1.2.7:
"@babel/plugin-proposal-object-rest-spread": ^7.0.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
"@types/knockout": ^3.4.66
"@types/redux": 3.6.31
babel-eslint: ^10.0.1
@@ -19755,7 +19755,7 @@ fsevents@^1.2.7:
"@babel/core": ^7.1.6
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-eslint: ^10.0.1
@@ -21959,7 +21959,7 @@ resolve@^1.20.0:
"@babel/core": ^7.1.6
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: ^2.0.0
array.prototype.findindex: ^2.0.0
babel-loader: ^8.0.6
@@ -22266,7 +22266,7 @@ resolve@^1.20.0:
"@babel/plugin-transform-react-jsx": ^7.2.0
"@babel/preset-env": ^7.2.0
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
babel-plugin-transform-react-remove-prop-types: 0.4.24
create-react-class: ^15.6.3
@@ -22401,7 +22401,7 @@ resolve@^1.20.0:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: 8.0.6
@@ -22499,7 +22499,7 @@ resolve@^1.20.0:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
"@types/redux": ^3.6.31
babel-loader: 8.0.6
babel-plugin-transform-object-assign: 6.22.0
@@ -22768,7 +22768,7 @@ resolve@^1.20.0:
"@babel/plugin-transform-react-jsx": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-eslint: ^10.0.1
babel-loader: 8.0.6
babel-plugin-transform-class-properties: ^6.22.0
@@ -22823,7 +22823,7 @@ resolve@^1.20.0:
"@babel/plugin-transform-react-jsx": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: ^8.0.6
@@ -22870,7 +22870,7 @@ resolve@^1.20.0:
"@babel/plugin-transform-object-assign": 7.12.13
"@babel/preset-env": 7.1.6
"@babel/preset-react": 7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
babel-plugin-transform-react-remove-prop-types: 0.4.24
babel-polyfill: 6.26.0
@@ -23949,7 +23949,7 @@ resolve@^1.20.0:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: 8.0.6
@@ -23991,7 +23991,7 @@ resolve@^1.20.0:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
array.prototype.find: 2.0.4
array.prototype.findindex: 2.0.2
babel-loader: ^8.0.6
@@ -24195,7 +24195,7 @@ resolve@^1.20.0:
"@babel/plugin-proposal-object-rest-spread": ^7.2.0
"@babel/preset-env": ^7.2.0
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: 8.0.6
babel-plugin-transform-object-assign: 6.22.0
babel-plugin-transform-object-rest-spread: 6.26.0
@@ -25102,7 +25102,7 @@ resolve@^1.20.0:
"@babel/plugin-transform-react-jsx": ^7.1.6
"@babel/preset-env": ^7.1.6
"@babel/preset-react": ^7.0.0
- "@dnnsoftware/dnn-react-common": 9.11.1
+ "@dnnsoftware/dnn-react-common": 9.12.0
babel-loader: ^8.0.6
create-react-class: ^15.6.3
css-loader: 2.1.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/App_LocalResources/SharedResources.resx b/DNN Platform/Connectors/GoogleAnalytics4/App_LocalResources/SharedResources.resx
new file mode 100644
index 00000000000..94e41e34443
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/App_LocalResources/SharedResources.resx
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Copyright (c) .NET Foundation and Contributors
+
+All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Module.build b/DNN Platform/Connectors/GoogleAnalytics4/Module.build new file mode 100644 index 00000000000..aaaf830fb29 --- /dev/null +++ b/DNN Platform/Connectors/GoogleAnalytics4/Module.build @@ -0,0 +1,16 @@ +
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics4/packages.config b/DNN Platform/Connectors/GoogleAnalytics4/packages.config
new file mode 100644
index 00000000000..0500291e746
--- /dev/null
+++ b/DNN Platform/Connectors/GoogleAnalytics4/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
index c213439dda9..de8574700fa 100644
--- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
+++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
@@ -1,6 +1,6 @@
-
-
- {user.displayName !== "-" && {user.userName}
} + content: +
+ {user.avatar !== "-" &&
+ 
+ }
+
+
+
+ {user.displayName !== "-" &&
+
+
+
+ {user.displayName !== "-" && {user.userName}
} +