lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing that the technical names of widgets couldn't contain hyphens, see #4981

Browse Source
This commit is contained in:
Lombiq
2015-05-11 16:52:54 +02:00
committed by Zoltán Lehóczky
parent 73336e19ba
commit 91e040e684
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
View File

@@ -53,7 +53,7 @@ namespace Orchard.Widgets.Drivers {
// if there is a name, ensure it's unique
if(!string.IsNullOrWhiteSpace(widgetPart.Name)) {
widgetPart.Name = widgetPart.Name.ToSafeName();
widgetPart.Name = widgetPart.Name.ToHtmlName();
var widgets = _contentManager.Query<WidgetPart, WidgetPartRecord>().Where(x => x.Name == widgetPart.Name && x.Id != widgetPart.Id).Count();
if(widgets > 0) {

28
src/Orchard/Utility/Extensions/StringExtensions.cs
View File

@@ -191,6 +191,34 @@ namespace Orchard.Utility.Extensions {
return name;
}
/// <summary>
/// Generates a valid Html name.
/// </summary>
/// <remarks>
/// Uses a white list set of chars.
/// </remarks>
public static string ToHtmlName(this string name) {
if (String.IsNullOrWhiteSpace(name))
return String.Empty;
name = RemoveDiacritics(name);
name = name.Strip(c =>
c != '-'
&& c != '_'
&& !c.IsLetter()
&& !Char.IsDigit(c)
);
name = name.Trim();
// don't allow non A-Z chars as first letter, as they are not allowed in prefixes
while (name.Length > 0 && !IsLetter(name[0])) {
name = name.Substring(1);
}
return name;
}
/// <summary>
/// Whether the char is a letter between A and Z or not
/// </summary>