Removes umbraco settings: ImageTagAllowedAttributes, UploadAllowDirectories, ensureUniqueNaming, ImageTagAllowedAttributes, ScriptEditorDisable, ScriptFolderPath, UploadAllowDirectories

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -11,15 +11,9 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("imaging")]
         internal ContentImagingElement Imaging => (ContentImagingElement) this["imaging"];
 
-        [ConfigurationProperty("scripteditor")]
-        internal ContentScriptEditorElement ScriptEditor => (ContentScriptEditorElement) this["scripteditor"];
-
         [ConfigurationProperty("ResolveUrlsFromTextString")]
         internal InnerTextConfigurationElement<bool> ResolveUrlsFromTextString => GetOptionalTextElement("ResolveUrlsFromTextString", false);
 
-        [ConfigurationProperty("UploadAllowDirectories")]
-        internal InnerTextConfigurationElement<bool> UploadAllowDirectories => GetOptionalTextElement("UploadAllowDirectories", true);
-
         public IEnumerable<IContentErrorPage> Error404Collection => Errors.Error404Collection;
 
         [ConfigurationProperty("errors", IsRequired = true)]
@@ -28,9 +22,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("notifications", IsRequired = true)]
         internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];
 
-        [ConfigurationProperty("ensureUniqueNaming")]
-        internal InnerTextConfigurationElement<bool> EnsureUniqueNaming => GetOptionalTextElement("ensureUniqueNaming", true);
-
         [ConfigurationProperty("XmlCacheEnabled")]
         internal InnerTextConfigurationElement<bool> XmlCacheEnabled => GetOptionalTextElement("XmlCacheEnabled", true);
 
@@ -85,22 +76,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         IEnumerable<string> IContentSection.ImageFileTypes => Imaging.ImageFileTypes;
 
-        IEnumerable<string> IContentSection.ImageTagAllowedAttributes => Imaging.ImageTagAllowedAttributes;
-
         IEnumerable<IImagingAutoFillUploadField> IContentSection.ImageAutoFillProperties => Imaging.ImageAutoFillProperties;
 
-        bool IContentSection.ScriptEditorDisable => ScriptEditor.ScriptEditorDisable;
-
-        string IContentSection.ScriptFolderPath => ScriptEditor.ScriptFolderPath;
-
-        IEnumerable<string> IContentSection.ScriptFileTypes => ScriptEditor.ScriptFileTypes;
-
         bool IContentSection.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
 
-        bool IContentSection.UploadAllowDirectories => UploadAllowDirectories;
-
-        bool IContentSection.EnsureUniqueNaming => EnsureUniqueNaming;
-
         bool IContentSection.XmlCacheEnabled => XmlCacheEnabled;
 
         bool IContentSection.ContinouslyUpdateXmlDiskCache => ContinouslyUpdateXmlDiskCache;

src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs

@@ -22,18 +22,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             return new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
         }
 
-        [ConfigurationProperty("allowedAttributes")]
-        internal CommaDelimitedConfigurationElement ImageTagAllowedAttributes
-        {
-            get
-            {
-                return new OptionalCommaDelimitedConfigurationElement(
-                       (CommaDelimitedConfigurationElement)this["allowedAttributes"],
-                        //set the default
-                       new[] { "src", "alt", "border", "class", "style", "align", "id", "name", "onclick", "usemap" });
-            }
-        }
-
         private ImagingAutoFillPropertiesCollection _defaultImageAutoFill;
 
         [ConfigurationCollection(typeof(ImagingAutoFillPropertiesCollection), AddItemName = "uploadField")]

src/Umbraco.Core/Configuration/UmbracoSettings/ContentScriptEditorElement.cs

@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ContentScriptEditorElement : UmbracoConfigurationElement
-    {
-        [ConfigurationProperty("scriptFolderPath")]
-        internal InnerTextConfigurationElement<string> ScriptFolderPath
-        {
-            get { return GetOptionalTextElement("scriptFolderPath", "/scripts"); }
-        }
-
-        [ConfigurationProperty("scriptFileTypes")]
-        internal OptionalCommaDelimitedConfigurationElement ScriptFileTypes
-        {
-            get { return GetOptionalDelimitedElement("scriptFileTypes", new[] {"js", "xml"}); }
-        }
-
-        [ConfigurationProperty("scriptDisableEditor")]
-        internal InnerTextConfigurationElement<bool> ScriptEditorDisable
-        {
-            get { return GetOptionalTextElement("scriptDisableEditor", false); }
-        }
-
-    }
-}

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -11,24 +11,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         IEnumerable<string> ImageFileTypes { get; }
 
-        IEnumerable<string> ImageTagAllowedAttributes { get; }
-
         IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
         
-        string ScriptFolderPath { get; }
-
-        IEnumerable<string> ScriptFileTypes { get; }
-
-        bool ScriptEditorDisable { get; }
-
         bool ResolveUrlsFromTextString { get; }
 
-        bool UploadAllowDirectories { get; }
-
         IEnumerable<IContentErrorPage> Error404Collection { get; }
 
-        bool EnsureUniqueNaming { get; }
-
         bool XmlCacheEnabled { get; }
 
         bool ContinouslyUpdateXmlDiskCache { get; }