From f1b168fc46bdd2023af94e1469592fdfa4ff592f Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 30 Jan 2019 23:58:54 +1100 Subject: [PATCH] removes ForceSafeAliases from umbraco settings, etc... --- .../UmbracoSettings/ContentElement.cs | 5 ---- .../UmbracoSettings/IContentSection.cs | 2 -- .../Services/Implement/EntityXmlSerializer.cs | 9 +++----- src/Umbraco.Core/StringExtensions.cs | 23 ------------------- .../Strings/DefaultShortStringHelperConfig.cs | 6 +---- .../UmbracoSettings/ContentElementTests.cs | 6 ----- .../UmbracoSettings/umbracoSettings.config | 2 -- src/Umbraco.Tests/Models/ContentXmlTest.cs | 2 +- src/Umbraco.Tests/Models/MediaXmlTest.cs | 2 +- .../TestHelpers/SettingsForTests.cs | 1 - .../config/umbracoSettings.config | 5 ---- 11 files changed, 6 insertions(+), 57 deletions(-) diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs index d0e80e2c0d..a014718882 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs @@ -25,9 +25,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [ConfigurationProperty("PropertyContextHelpOption")] internal InnerTextConfigurationElement PropertyContextHelpOption => GetOptionalTextElement("PropertyContextHelpOption", "text"); - [ConfigurationProperty("ForceSafeAliases")] - internal InnerTextConfigurationElement ForceSafeAliases => GetOptionalTextElement("ForceSafeAliases", true); - [ConfigurationProperty("PreviewBadge")] internal InnerTextConfigurationElement PreviewBadge => GetOptionalTextElement("PreviewBadge", DefaultPreviewBadge); @@ -73,8 +70,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings string IContentSection.PropertyContextHelpOption => PropertyContextHelpOption; - bool IContentSection.ForceSafeAliases => ForceSafeAliases; - string IContentSection.PreviewBadge => PreviewBadge; MacroErrorBehaviour IContentSection.MacroErrorBehaviour => MacroErrors; diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs index 5fb3ff538e..8e77d9b722 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs @@ -19,8 +19,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings string PropertyContextHelpOption { get; } - bool ForceSafeAliases { get; } - string PreviewBadge { get; } MacroErrorBehaviour MacroErrorBehaviour { get; } diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs index 6a8514f0a0..863ecc0b1b 100644 --- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs +++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs @@ -51,8 +51,7 @@ namespace Umbraco.Core.Services.Implement { if (content == null) throw new ArgumentNullException(nameof(content)); - // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias); - var nodeName = content.ContentType.Alias.ToSafeAliasWithForcingCheck(); + var nodeName = content.ContentType.Alias.ToSafeAlias(); var xml = SerializeContentBase(content, content.GetUrlSegment(_urlSegmentProviders), nodeName, published); @@ -98,8 +97,7 @@ namespace Umbraco.Core.Services.Implement if (media == null) throw new ArgumentNullException(nameof(media)); if (_urlSegmentProviders == null) throw new ArgumentNullException(nameof(_urlSegmentProviders)); - // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias); - var nodeName = media.ContentType.Alias.ToSafeAliasWithForcingCheck(); + var nodeName = media.ContentType.Alias.ToSafeAlias(); const bool published = false; // always false for media var xml = SerializeContentBase(media, media.GetUrlSegment(_urlSegmentProviders), nodeName, published); @@ -134,8 +132,7 @@ namespace Umbraco.Core.Services.Implement /// public XElement Serialize(IMember member) { - // nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias); - var nodeName = member.ContentType.Alias.ToSafeAliasWithForcingCheck(); + var nodeName = member.ContentType.Alias.ToSafeAlias(); const bool published = false; // always false for member var xml = SerializeContentBase(member, "", nodeName, published); diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index 95c8d3e17f..b80149a4ef 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -1108,29 +1108,6 @@ namespace Umbraco.Core return Current.ShortStringHelper.CleanStringForSafeAlias(alias, culture); } - /// - /// Cleans (but only if required) a string to produce a string that can safely be used in an alias. - /// - /// The text to filter. - /// The safe alias. - /// Checks UmbracoSettings.ForceSafeAliases to determine whether it should filter the text. - public static string ToSafeAliasWithForcingCheck(this string alias) - { - return Current.Configs.Settings().Content.ForceSafeAliases ? alias.ToSafeAlias() : alias; - } - - /// - /// Cleans (but only if required) a string, in the context of a specified culture, to produce a string that can safely be used in an alias. - /// - /// The text to filter. - /// The culture. - /// The safe alias. - /// Checks UmbracoSettings.ForceSafeAliases to determine whether it should filter the text. - public static string ToSafeAliasWithForcingCheck(this string alias, string culture) - { - return Current.Configs.Settings().Content.ForceSafeAliases ? alias.ToSafeAlias(culture) : alias; - } - // the new methods to get a url segment /// diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs index f75b8e4d1f..e75e00defb 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs @@ -14,7 +14,6 @@ namespace Umbraco.Core.Strings var config = new DefaultShortStringHelperConfig { DefaultCulture = DefaultCulture, - ForceSafeAliases = ForceSafeAliases, UrlReplaceCharacters = UrlReplaceCharacters }; @@ -31,9 +30,7 @@ namespace Umbraco.Core.Strings public string DefaultCulture { get; set; } = ""; // invariant public Dictionary UrlReplaceCharacters { get; set; } - - public bool ForceSafeAliases { get; set; } - + public DefaultShortStringHelperConfig WithConfig(Config config) { return WithConfig(DefaultCulture, CleanStringType.RoleMask, config); @@ -62,7 +59,6 @@ namespace Umbraco.Core.Strings /// The short string helper. public DefaultShortStringHelperConfig WithDefault(IUmbracoSettingsSection umbracoSettings) { - ForceSafeAliases = umbracoSettings.Content.ForceSafeAliases; UrlReplaceCharacters = umbracoSettings.RequestHandler.CharCollection .Where(x => string.IsNullOrEmpty(x.Char) == false) .ToDictionary(x => x.Char, x => x.Replacement); diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs index 4f34b32164..1933911bb2 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs @@ -79,12 +79,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings { Assert.IsTrue(SettingsSection.Content.CloneXmlContent); } - - [Test] - public void ForceSafeAliases() - { - Assert.IsTrue(SettingsSection.Content.ForceSafeAliases); - } [Test] public void PropertyContextHelpOption() diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config index 85d1321bfb..ee12a66ba8 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config @@ -48,8 +48,6 @@ true - true - In Preview Mode - click to end diff --git a/src/Umbraco.Tests/Models/ContentXmlTest.cs b/src/Umbraco.Tests/Models/ContentXmlTest.cs index 5cc86a4322..fbef2cc103 100644 --- a/src/Umbraco.Tests/Models/ContentXmlTest.cs +++ b/src/Umbraco.Tests/Models/ContentXmlTest.cs @@ -27,7 +27,7 @@ namespace Umbraco.Tests.Models var content = MockedContent.CreateTextpageContent(contentType, "Root Home", -1); ServiceContext.ContentService.Save(content, Constants.Security.SuperUserId); - var nodeName = content.ContentType.Alias.ToSafeAliasWithForcingCheck(); + var nodeName = content.ContentType.Alias.ToSafeAlias(); var urlName = content.GetUrlSegment(new[]{new DefaultUrlSegmentProvider() }); // Act diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs index d0d00c64a6..3ae9414dc1 100644 --- a/src/Umbraco.Tests/Models/MediaXmlTest.cs +++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs @@ -47,7 +47,7 @@ namespace Umbraco.Tests.Models media.SetValue(Constants.Conventions.Media.Bytes, "100"); media.SetValue(Constants.Conventions.Media.Extension, "png"); - var nodeName = media.ContentType.Alias.ToSafeAliasWithForcingCheck(); + var nodeName = media.ContentType.Alias.ToSafeAlias(); var urlName = media.GetUrlSegment(new[] { new DefaultUrlSegmentProvider() }); // Act diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs index ad6699b6d5..df4ec37a19 100644 --- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs +++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs @@ -51,7 +51,6 @@ namespace Umbraco.Tests.TestHelpers settings.Setup(x => x.WebRouting).Returns(routing.Object); //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!! - settings.Setup(x => x.Content.ForceSafeAliases).Returns(true); settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties()); settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes()); settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true); diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config index 9a7d39a5a4..fcc2dd6bfb 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.config @@ -39,11 +39,6 @@ your@email.here - - - - true - text