Merge branch 'v9/dev' into v9/bugfix/dont-reload-page-with-edit-user-…

…button

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html

build/templates/UmbracoProject/appsettings.json

@@ -17,6 +17,7 @@
     "CMS": {
       //#if (HasNoNodesViewPath || UseHttpsRedirect)
       "Global": {
+        "SanitizeTinyMce": true,
         //#if (!HasNoNodesViewPath && UseHttpsRedirect)
         "UseHttps": true
         //#elseif (UseHttpsRedirect)
@@ -25,10 +26,16 @@
         //#if (HasNoNodesViewPath)
         "NoNodesViewPath": "NO_NODES_VIEW_PATH_FROM_TEMPLATE"
         //#endif
+
       },
       //#endif
       "Hosting": {
         "Debug": false
+      },
+      "Content": {
+        "ContentVersionCleanupPolicy": {
+          "EnableCleanup": true
+        }
       }
     }
   }

src/Umbraco.Core/Collections/StackQueue.cs

@@ -3,58 +3,37 @@
 namespace Umbraco.Core.Collections
 {
     /// <summary>
-    /// Collection that can be both a queue and a stack.
+    ///     Collection that can be both a queue and a stack.
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public class StackQueue<T>
     {
-        private readonly LinkedList<T> _linkedList = new LinkedList<T>();
+        private readonly LinkedList<T> _linkedList = new();
 
-        public void Clear()
-        {
-            _linkedList.Clear();
-        }
+        public int Count => _linkedList.Count;
 
-        public void Push(T obj)
-        {
-            _linkedList.AddFirst(obj);
-        }
+        public void Clear() => _linkedList.Clear();
 
-        public void Enqueue(T obj)
-        {
-            _linkedList.AddFirst(obj);
-        }
+        public void Push(T obj) => _linkedList.AddFirst(obj);
+
+        public void Enqueue(T obj) => _linkedList.AddFirst(obj);
 
         public T Pop()
         {
-            var obj = _linkedList.First.Value;
+            T obj = _linkedList.First.Value;
             _linkedList.RemoveFirst();
             return obj;
         }
 
         public T Dequeue()
         {
-            var obj = _linkedList.Last.Value;
+            T obj = _linkedList.Last.Value;
             _linkedList.RemoveLast();
             return obj;
         }
 
-        public T PeekStack()
-        {
-            return _linkedList.First.Value;
-        }
+        public T PeekStack() => _linkedList.First.Value;
 
-        public T PeekQueue()
-        {
-            return _linkedList.Last.Value;
-        }
-
-        public int Count
-        {
-            get
-            {
-                return _linkedList.Count;
-            }
-        }
+        public T PeekQueue() => _linkedList.Last.Value;
     }
 }

src/Umbraco.Core/Configuration/Models/ContentSettings.cs

@@ -219,6 +219,9 @@ @keyframes umbraco-preview-badge--effect {{
         [DefaultValue(StaticLoginLogoImage)]
         public string LoginLogoImage { get; set; } = StaticLoginLogoImage;
 
-
+        /// <summary>
+        /// Get or sets the model representing the global content version cleanup policy
+        /// </summary>
+        public ContentVersionCleanupPolicySettings ContentVersionCleanupPolicy { get; set; } = new ContentVersionCleanupPolicySettings();
     }
 }

src/Umbraco.Core/Configuration/Models/ContentVersionCleanupPolicySettings.cs

@@ -0,0 +1,33 @@
+using System.ComponentModel;
+
+namespace Umbraco.Cms.Core.Configuration.Models
+{
+    /// <summary>
+    /// Model representing the global content version cleanup policy
+    /// </summary>
+    public class ContentVersionCleanupPolicySettings
+    {
+        private const bool StaticEnableCleanup = false;
+        private const int StaticKeepAllVersionsNewerThanDays = 7;
+        private const int StaticKeepLatestVersionPerDayForDays = 90;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the cleanup job should be executed.
+        /// </summary>
+        [DefaultValue(StaticEnableCleanup)]
+        public bool EnableCleanup { get; set; } = StaticEnableCleanup;
+
+        /// <summary>
+        /// Gets or sets the number of days where all historical content versions are kept.
+        /// </summary>
+        [DefaultValue(StaticKeepAllVersionsNewerThanDays)]
+        public int KeepAllVersionsNewerThanDays { get; set; } = StaticKeepAllVersionsNewerThanDays;
+
+        /// <summary>
+        /// Gets or sets the number of days where the latest historical content version for that day are kept.
+        /// </summary>
+        [DefaultValue(StaticKeepLatestVersionPerDayForDays)]
+        public int KeepLatestVersionPerDayForDays { get; set; } = StaticKeepLatestVersionPerDayForDays;
+
+    }
+}

src/Umbraco.Core/Configuration/Models/GlobalSettings.cs

@@ -28,6 +28,7 @@ public class GlobalSettings
         internal const bool StaticDisableElectionForSingleServer = false;
         internal const string StaticNoNodesViewPath = "~/umbraco/UmbracoWebsite/NoNodes.cshtml";
         internal const string StaticSqlWriteLockTimeOut = "00:00:05";
+        internal const bool StaticSanitizeTinyMce = false;
 
         /// <summary>
         /// Gets or sets a value for the reserved URLs.
@@ -157,6 +158,12 @@ public class GlobalSettings
         /// </summary>
         public bool IsSmtpServerConfigured => !string.IsNullOrWhiteSpace(Smtp?.Host);
 
+        /// <summary>
+        /// Gets a value indicating whether TinyMCE scripting sanitization should be applied
+        /// </summary>
+        [DefaultValue(StaticSanitizeTinyMce)]
+        public bool SanitizeTinyMce => StaticSanitizeTinyMce;
+
         /// <summary>
         /// An int value representing the time in milliseconds to lock the database for a write operation
         /// </summary>

src/Umbraco.Core/Constants-Sql.cs

@@ -0,0 +1,18 @@
+namespace Umbraco.Cms.Core
+{
+    public static partial class Constants
+    {
+        public static class Sql
+        {
+            /// <summary>
+            ///     The maximum amount of parameters that can be used in a query.
+            /// </summary>
+            /// <remarks>
+            ///     The actual limit is 2100
+            ///     (https://docs.microsoft.com/en-us/sql/sql-server/maximum-capacity-specifications-for-sql-server),
+            ///     but we want to ensure there's room for additional parameters if this value is used to create groups/batches.
+            /// </remarks>
+            public const int MaxParameterCount = 2000;
+        }
+    }
+}

src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs

@@ -79,7 +79,7 @@ protected async Task<HealthCheckStatus> CheckForHeader()
             var success = false;
 
             // Access the site home page and check for the click-jack protection header or meta tag
-            Uri url = _hostingEnvironment.ApplicationMainUrl;
+            var url = _hostingEnvironment.ApplicationMainUrl.GetLeftPart(UriPartial.Authority);
 
             try
             {

src/Umbraco.Core/Models/ContentEditing/ContentTypeSave.cs

@@ -29,6 +29,9 @@ protected ContentTypeSave()
         [DataMember(Name = "allowedContentTypes")]
         public IEnumerable<int> AllowedContentTypes { get; set; }
 
+        [DataMember(Name = "historyCleanup")]
+        public HistoryCleanupViewModel HistoryCleanup { get; set; }
+
         /// <summary>
         /// Custom validation
         /// </summary>

src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs

@@ -1,16 +1,14 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Cms.Core.Models.ContentEditing
 {
     [DataContract(Name = "contentType", Namespace = "")]
     public class DocumentTypeDisplay : ContentTypeCompositionDisplay<PropertyTypeDisplay>
     {
-        public DocumentTypeDisplay()
-        {
+        public DocumentTypeDisplay() =>
             //initialize collections so at least their never null
             AllowedTemplates = new List<EntityBasic>();
-        }
 
         //name, alias, icon, thumb, desc, inherited from the content type
 
@@ -29,5 +27,8 @@ public DocumentTypeDisplay()
 
         [DataMember(Name = "apps")]
         public IEnumerable<ContentApp> ContentApps { get; set; }
+
+        [DataMember(Name = "historyCleanup")]
+        public HistoryCleanupViewModel HistoryCleanup { get; set; }
     }
 }

src/Umbraco.Core/Models/ContentEditing/HistoryCleanup.cs

@@ -0,0 +1,17 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Cms.Core.Models.ContentEditing
+{
+    [DataContract(Name = "historyCleanup", Namespace = "")]
+    public class HistoryCleanup
+    {
+        [DataMember(Name = "preventCleanup")]
+        public bool PreventCleanup { get; set; }
+
+        [DataMember(Name = "keepAllVersionsNewerThanDays")]
+        public int? KeepAllVersionsNewerThanDays { get; set; }
+
+        [DataMember(Name = "keepLatestVersionPerDayForDays")]
+        public int? KeepLatestVersionPerDayForDays { get; set; }
+    }
+}

src/Umbraco.Core/Models/ContentEditing/HistoryCleanupViewModel.cs

@@ -0,0 +1,18 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Cms.Core.Models.ContentEditing
+{
+    [DataContract(Name = "historyCleanup", Namespace = "")]
+    public class HistoryCleanupViewModel : HistoryCleanup
+    {
+
+        [DataMember(Name = "globalEnableCleanup")]
+        public bool GlobalEnableCleanup { get; set; }
+
+        [DataMember(Name = "globalKeepAllVersionsNewerThanDays")]
+        public int? GlobalKeepAllVersionsNewerThanDays { get; set; }
+
+        [DataMember(Name = "globalKeepLatestVersionPerDayForDays")]
+        public int? GlobalKeepLatestVersionPerDayForDays { get; set; }
+    }
+}