var alias = match.Groups[2].Value;
var sb = new StringBuilder("
Xml representation of the passed in
@@ -628,7 +628,7 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
public static XElement ToXml(this IContent content)
{
- return ApplicationContext.Current.Services.PackagingService.Export(content);
+ return ApplicationContext.Current.Services.PackagingService.Export(content, raiseEvents: false);
}
///
@@ -638,7 +638,7 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
public static XElement ToXml(this IMedia media)
{
- return ApplicationContext.Current.Services.PackagingService.Export(media);
+ return ApplicationContext.Current.Services.PackagingService.Export(media, raiseEvents: false);
}
///
@@ -648,7 +648,7 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
internal static XElement ToDeepXml(this IMedia media)
{
- return ApplicationContext.Current.Services.PackagingService.Export(media, true);
+ return ApplicationContext.Current.Services.PackagingService.Export(media, true, raiseEvents: false);
}
///
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 914847aea2..d81f49fc4f 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -107,7 +107,7 @@ namespace Umbraco.Core.Models
private bool _dontRender;
private string _scriptFile;
private string _scriptAssembly;
- private string _python;
+ private string _scriptPath;
private string _xslt;
private readonly MacroPropertyCollection _properties;
private readonly List _addedProperties;
@@ -360,14 +360,14 @@ namespace Umbraco.Core.Models
[DataMember]
public string ScriptPath
{
- get { return _python; }
+ get { return _scriptPath; }
set
{
SetPropertyValueAndDetectChanges(o =>
{
- _python = value;
- return _python;
- }, _python, ScriptPathSelector);
+ _scriptPath = value;
+ return _scriptPath;
+ }, _scriptPath, ScriptPathSelector);
}
}
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 243e5c0e91..ef0a024973 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -155,7 +155,6 @@ namespace Umbraco.Core.Models
///
[DataMember]
public string EditorAlias
-
{
get { return _editorAlias; }
set
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index c361891fa0..b2e3a4dc89 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -15,6 +15,7 @@ namespace Umbraco.Core.Models
{
//Dictionary is divided into string: PropertyTypeAlias, Tuple: MemberCanEdit, VisibleOnProfile, PropertyTypeId
private IDictionary> _memberTypePropertyTypes;
+ private string _alias;
public MemberType(int parentId) : base(parentId)
{
@@ -27,6 +28,29 @@ namespace Umbraco.Core.Models
}
private static readonly PropertyInfo MemberTypePropertyTypesSelector = ExpressionHelper.GetPropertyInfo>>(x => x.MemberTypePropertyTypes);
+ private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo(x => x.Alias);
+
+ ///
+ /// The Alias of the ContentType
+ ///
+ [DataMember]
+ public override string Alias
+ {
+ get { return _alias; }
+ set
+ {
+ //NOTE: WE are overriding this because we don't want to do a ToSafeAlias when the alias is the special case of
+ // "_umbracoSystemDefaultProtectType" which is used internally, currently there is an issue with the safe alias as it strips
+ // leading underscores which we don't want in this case.
+ // see : http://issues.umbraco.org/issue/U4-3968
+
+ SetPropertyValueAndDetectChanges(o =>
+ {
+ _alias = value == "_umbracoSystemDefaultProtectType" ? value : value.ToSafeAlias();
+ return _alias;
+ }, _alias, AliasSelector);
+ }
+ }
///
/// Gets or Sets a Dictionary of Tuples (MemberCanEdit, VisibleOnProfile, PropertyTypeId) by the PropertyTypes' alias.
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
index 295cbdef66..c8bf96be8f 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
@@ -80,11 +80,8 @@ namespace Umbraco.Core.Models.PublishedContent
private void InitializeConverters()
{
- var converters = PropertyValueConvertersResolver.Current.Converters.ToArray();
-
- var defaultConverters = converters
- .Where(x => x.GetType().GetCustomAttribute(false) != null)
- .ToArray();
+ var converters = PropertyValueConvertersResolver.Current.Converters.ToArray();
+ var defaultConvertersWithAttributes = PropertyValueConvertersResolver.Current.DefaultConverters;
_converter = null;
@@ -98,8 +95,14 @@ namespace Umbraco.Core.Models.PublishedContent
else if (foundConverters.Length > 1)
{
//more than one was found, we need to first figure out if one of these is an Umbraco default value type converter
- var nonDefault = foundConverters.Except(defaultConverters).ToArray();
- if (nonDefault.Length > 1)
+ //get the non-default and see if we have one
+ var nonDefault = foundConverters.Except(defaultConvertersWithAttributes.Select(x => x.Item1)).ToArray();
+ if (nonDefault.Length == 1)
+ {
+ //there's only 1 custom converter registered that so use it
+ _converter = nonDefault[0];
+ }
+ else if (nonDefault.Length > 1)
{
//this is not allowed, there cannot be more than 1 custom converter
throw new InvalidOperationException(
@@ -109,9 +112,31 @@ namespace Umbraco.Core.Models.PublishedContent
ContentType.Alias, PropertyTypeAlias,
nonDefault[1].GetType().FullName, nonDefault[0].GetType().FullName));
}
+ else
+ {
+ //we need to remove any converters that have been shadowed by another converter
+ var foundDefaultConvertersWithAttributes = defaultConvertersWithAttributes.Where(x => foundConverters.Contains(x.Item1));
+ var shadowedTypes = foundDefaultConvertersWithAttributes.SelectMany(x => x.Item2.DefaultConvertersToShadow);
+ var shadowedDefaultConverters = foundConverters.Where(x => shadowedTypes.Contains(x.GetType()));
+ var nonShadowedDefaultConverters = foundConverters.Except(shadowedDefaultConverters).ToArray();
- //there's only 1 custom converter registered that so use it
- _converter = nonDefault[0];
+ if (nonShadowedDefaultConverters.Length == 1)
+ {
+ //assign to the single default converter
+ _converter = nonShadowedDefaultConverters[0];
+ }
+ else if (nonShadowedDefaultConverters.Length > 1)
+ {
+ //this is not allowed, there cannot be more than 1 custom converter
+ throw new InvalidOperationException(
+ string.Format("Type '{2}' cannot be an IPropertyValueConverter"
+ + " for property '{1}' of content type '{0}' because type '{3}' has already been detected as a converter"
+ + " for that property, and only one converter can exist for a property.",
+ ContentType.Alias, PropertyTypeAlias,
+ nonShadowedDefaultConverters[1].GetType().FullName, nonShadowedDefaultConverters[0].GetType().FullName));
+ }
+ }
+
}
// get the cache levels, quietely fixing the inconsistencies (no need to throw, really)
diff --git a/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs b/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs
new file mode 100644
index 0000000000..edcc25ade8
--- /dev/null
+++ b/src/Umbraco.Core/Models/UmbracoEntityExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+ internal static class UmbracoEntityExtensions
+ {
+
+ public static object GetAdditionalDataValueIgnoreCase(this IUmbracoEntity entity, string key, object defaultVal)
+ {
+ if (entity.AdditionalData.ContainsKeyIgnoreCase(key) == false) return defaultVal;
+ return entity.AdditionalData.GetValueIgnoreCase(key, defaultVal);
+ }
+
+ public static bool IsContainer(this IUmbracoEntity entity)
+ {
+ if (entity.AdditionalData.ContainsKeyIgnoreCase("IsContainer") == false) return false;
+ var val = entity.AdditionalData.GetValueIgnoreCase("IsContainer", null);
+ if (val is bool && (bool) val)
+ {
+ return true;
+ }
+ return false;
+ }
+
+ }
+}
diff --git a/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs b/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs
index 60e176096f..273d605bef 100644
--- a/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs
+++ b/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs
@@ -151,6 +151,21 @@ namespace Umbraco.Core.Persistence.Caching
_keyTracker.Remove(key);
}
+ public void Delete(Type type, int entityId)
+ {
+ var key = GetCompositeId(type, entityId);
+ if (_memoryCache != null)
+ {
+ _memoryCache.Remove(key);
+ }
+ else
+ {
+ HttpRuntime.Cache.Remove(key);
+ }
+
+ _keyTracker.Remove(key);
+ }
+
///
/// Clear cache by type
///
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
index 9a291194a9..24da2e9848 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
@@ -521,6 +521,10 @@ namespace Umbraco.Core.Persistence.Repositories
totalRecords = Convert.ToInt32(pagedResult.TotalItems);
//now that we have the member dto's we need to construct true members from the list.
+ if (totalRecords == 0)
+ {
+ return Enumerable.Empty();
+ }
var result = GetAll(pagedResult.Items.Select(x => x.NodeId).ToArray());
//now we need to ensure this result is also ordered by the same order by clause
diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
index 4ccb3b73a4..9c6c742170 100644
--- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
@@ -298,6 +298,11 @@ namespace Umbraco.Core.Persistence.Repositories
totalRecords = Convert.ToInt32(pagedResult.TotalItems);
//now that we have the user dto's we need to construct true members from the list.
+ if (totalRecords == 0)
+ {
+ return Enumerable.Empty();
+ }
+
var result = GetAll(pagedResult.Items.Select(x => x.Id).ToArray());
//now we need to ensure this result is also ordered by the same order by clause
diff --git a/src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
index 4857e2bb07..10bdd053a8 100644
--- a/src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/DefaultPropertyValueConverterAttribute.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using System.Linq;
namespace Umbraco.Core.PropertyEditors
{
@@ -8,5 +10,27 @@ namespace Umbraco.Core.PropertyEditors
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
internal class DefaultPropertyValueConverterAttribute : Attribute
{
+ public DefaultPropertyValueConverterAttribute()
+ {
+ DefaultConvertersToShadow = Enumerable.Empty();
+ }
+
+ public DefaultPropertyValueConverterAttribute(params Type[] convertersToShadow)
+ {
+ DefaultConvertersToShadow = convertersToShadow;
+ }
+
+ ///
+ /// A DefaultPropertyValueConverter can 'shadow' other default property value converters so that
+ /// a DefaultPropertyValueConverter can be more specific than another one.
+ ///
+ ///
+ /// An example where this is useful is that both the RelatedLiksEditorValueConverter and the JsonValueConverter
+ /// will be returned as value converters for the Related Links Property editor, however the JsonValueConverter
+ /// is a very generic converter and the RelatedLiksEditorValueConverter is more specific than it, so the RelatedLiksEditorValueConverter
+ /// can specify that it 'shadows' the JsonValueConverter.
+ ///
+ public IEnumerable DefaultConvertersToShadow { get; private set; }
+
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/PropertyEditors/LegacyParameterEditorAliasConverter.cs b/src/Umbraco.Core/PropertyEditors/LegacyParameterEditorAliasConverter.cs
index cc89e7671b..9e2fb5d10a 100644
--- a/src/Umbraco.Core/PropertyEditors/LegacyParameterEditorAliasConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/LegacyParameterEditorAliasConverter.cs
@@ -97,10 +97,7 @@ namespace Umbraco.Core.PropertyEditors
CreateMap("mediaCurrent", Constants.PropertyEditors.MediaPickerAlias);
- CreateMap("number", Constants.PropertyEditors.IntegerAlias);
-
-
-
+ CreateMap("number", Constants.PropertyEditors.IntegerAlias);
}
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
index 53fecdac9d..295fdb4b09 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
using Umbraco.Core.ObjectResolution;
namespace Umbraco.Core.PropertyEditors
@@ -36,5 +38,41 @@ namespace Umbraco.Core.PropertyEditors
{
get { return Values; }
}
+
+ private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
+ private Tuple[] _defaults = null;
+
+ ///
+ /// Caches and gets the default converters with their metadata
+ ///
+ internal Tuple[] DefaultConverters
+ {
+ get
+ {
+ using (var locker = new UpgradeableReadLock(_lock))
+ {
+ if (_defaults == null)
+ {
+ locker.UpgradeToWriteLock();
+
+ var defaultConvertersWithAttributes = Converters
+ .Select(x => new
+ {
+ attribute = x.GetType().GetCustomAttribute(false),
+ converter = x
+ })
+ .Where(x => x.attribute != null)
+ .ToArray();
+
+ _defaults = defaultConvertersWithAttributes
+ .Select(
+ x => new Tuple(x.converter, x.attribute))
+ .ToArray();
+ }
+
+ return _defaults;
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Security/AuthenticationExtensions.cs b/src/Umbraco.Core/Security/AuthenticationExtensions.cs
index b642796932..45c290daba 100644
--- a/src/Umbraco.Core/Security/AuthenticationExtensions.cs
+++ b/src/Umbraco.Core/Security/AuthenticationExtensions.cs
@@ -137,12 +137,19 @@ namespace Umbraco.Core.Security
{
if (response == null) throw new ArgumentNullException("response");
//remove the cookie
- var cookie = new CookieHeaderValue(UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName, "")
+ var authCookie = new CookieHeaderValue(UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName, "")
{
Expires = DateTime.Now.AddYears(-1),
Path = "/"
};
- response.Headers.AddCookies(new[] { cookie });
+ //remove the preview cookie too
+ var prevCookie = new CookieHeaderValue(Constants.Web.PreviewCookieName, "")
+ {
+ Expires = DateTime.Now.AddYears(-1),
+ Path = "/"
+ };
+
+ response.Headers.AddCookies(new[] { authCookie, prevCookie });
}
///
@@ -259,21 +266,27 @@ namespace Umbraco.Core.Security
private static void Logout(this HttpContextBase http, string cookieName)
{
if (http == null) throw new ArgumentNullException("http");
- //remove from the request
- http.Request.Cookies.Remove(cookieName);
+ //clear the preview cookie too
+ var cookies = new[] { cookieName, Constants.Web.PreviewCookieName };
+ foreach (var c in cookies)
+ {
+ //remove from the request
+ http.Request.Cookies.Remove(c);
+
+ //expire from the response
+ var formsCookie = http.Response.Cookies[c];
+ if (formsCookie != null)
+ {
+ //this will expire immediately and be removed from the browser
+ formsCookie.Expires = DateTime.Now.AddYears(-1);
+ }
+ else
+ {
+ //ensure there's def an expired cookie
+ http.Response.Cookies.Add(new HttpCookie(c) { Expires = DateTime.Now.AddYears(-1) });
+ }
+ }
- //expire from the response
- var formsCookie = http.Response.Cookies[cookieName];
- if (formsCookie != null)
- {
- //this will expire immediately and be removed from the browser
- formsCookie.Expires = DateTime.Now.AddYears(-1);
- }
- else
- {
- //ensure there's def an expired cookie
- http.Response.Cookies.Add(new HttpCookie(cookieName) { Expires = DateTime.Now.AddYears(-1) });
- }
}
private static FormsAuthenticationTicket GetAuthTicket(this HttpContextBase http, string cookieName)
diff --git a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
new file mode 100644
index 0000000000..85db27ac97
--- /dev/null
+++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Security;
+using Umbraco.Core.Security;
+
+namespace Umbraco.Core.Security
+{
+ internal static class MembershipProviderExtensions
+ {
+ ///
+ /// Returns true if the provider specified is a built-in Umbraco membership provider
+ ///
+ ///
+ ///
///
- ///
+ ///
///
- void SendNotifications(IEntity entity, IUser user, IAction action);
+ ///
+ ///
+ ///
+ ///
+ void SendNotifications(IUser operatingUser, IUmbracoEntity entity, string action, string actionName, HttpContextBase http,
+ Func createSubject,
+ Func createBody);
///
/// Gets the notifications for the user
@@ -28,6 +36,17 @@ namespace Umbraco.Core.Services
/// GetUserNotifications(IUser user);
+ ///
+ /// Gets the notifications for the user based on the specified node path
+ ///
+ ///
+ ///
+ ///
+ /// Notifications are inherited from the parent so any child node will also have notifications assigned based on it's parent (ancestors)
+ ///
+ IEnumerable GetUserNotifications(IUser user, string path);
+
///
/// Returns the notifications for an entity
///
diff --git a/src/Umbraco.Core/Services/IPackagingService.cs b/src/Umbraco.Core/Services/IPackagingService.cs
index 2f711eb8af..c7e68e6eca 100644
--- a/src/Umbraco.Core/Services/IPackagingService.cs
+++ b/src/Umbraco.Core/Services/IPackagingService.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Services
/// Imports and saves package xml as
/// Xml to import
- /// Optional id of the User performing the operation. Default is zero (admin).
+ /// Optional id of the User performing the operation. Default is zero (admin)
/// Optional parameter indicating whether or not to raise events
/// An enumrable list of generated ContentTypes
IEnumerable ImportContentTypes(XElement element, int userId = 0, bool raiseEvents = true);
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Services
///
/// Xml to import
/// Boolean indicating whether or not to import the
- /// Optional id of the User performing the operation. Default is zero (admin).
+ /// Optional id of the User performing the operation. Default is zero (admin)
/// Optional parameter indicating whether or not to raise events
/// An enumrable list of generated ContentTypes
IEnumerable ImportContentTypes(XElement element, bool importStructure, int userId = 0, bool raiseEvents = true);
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Services
/// Imports and saves package xml as
/// Xml to import
- ///
+ /// Optional id of the User performing the operation. Default is zero (admin).
/// Optional parameter indicating whether or not to raise events
/// An enumrable list of generated DataTypeDefinitions
IEnumerable ImportDataTypeDefinitions(XElement element, int userId = 0, bool raiseEvents = true);
@@ -56,15 +56,25 @@ namespace Umbraco.Core.Services
/// Imports and saves the 'Languages' part of a package xml as a list of
/// Xml to import
+ /// Optional id of the User performing the operation. Default is zero (admin)
/// Optional parameter indicating whether or not to raise events
/// An enumerable list of generated languages
- IEnumerable ImportLanguages(XElement languageElementList, bool raiseEvents = true);
+ IEnumerable ImportLanguages(XElement languageElementList, int userId = 0, bool raiseEvents = true);
+
+ ///
+ /// Imports and saves the 'Macros' part of a package xml as a list of
+ /// Xml to import
+ /// Optional id of the User performing the operation
+ /// Optional parameter indicating whether or not to raise events
+ /// ImportMacros(XElement element, int userId = 0, bool raiseEvents = true);
///
/// Imports and saves package xml as
/// Xml to import
- /// Optional user id
+ /// Optional id of the User performing the operation. Default is zero (admin)
/// Optional parameter indicating whether or not to raise events
/// An enumrable list of generated Templates
IEnumerable ImportTemplates(XElement element, int userId = 0, bool raiseEvents = true);
@@ -74,7 +84,7 @@ namespace Umbraco.Core.Services
///
/// ContentType to export
/// Optional parameter indicating whether or not to raise events
- ///
@@ -144,5 +154,37 @@ namespace Umbraco.Core.Services
/// Optional parameter indicating whether or not to raise events
///
+ /// Exports a list of
+ /// List of Templates to export
+ /// Optional parameter indicating whether or not to raise events
+ /// templates, bool raiseEvents = true);
+
+ ///
+ /// Exports a single
+ /// Template to export
+ /// Optional parameter indicating whether or not to raise events
+ ///
+ /// Exports a list of
+ /// Macros to export
+ /// Optional parameter indicating whether or not to raise events
+ /// macros, bool raiseEvents = true);
+
+ ///
+ /// Exports a single
+ /// Macro to export
+ /// Optional parameter indicating whether or not to raise events
+ /// .Builder.Where(x => x.ContentTypeId == memberTypeId);
var members = repository.GetByQuery(query).ToArray();
@@ -635,7 +635,7 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateMemberRepository(uow))
{
- var query = Query.Builder.Where(x => x.Username == userName);
+ var query = Query.Builder.Where(x => x.Username.Equals(userName));
var member = repository.GetByQuery(query).FirstOrDefault();
return member;
diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index 31c534470b..2e4ff7a9ec 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -1,10 +1,20 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading;
+using System.Web;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Strings;
using umbraco.interfaces;
namespace Umbraco.Core.Services
@@ -12,21 +22,67 @@ namespace Umbraco.Core.Services
internal class NotificationService : INotificationService
{
private readonly IDatabaseUnitOfWorkProvider _uowProvider;
+ private readonly IUserService _userService;
+ private readonly IContentService _contentService;
- public NotificationService(IDatabaseUnitOfWorkProvider provider)
+ public NotificationService(IDatabaseUnitOfWorkProvider provider, IUserService userService, IContentService contentService)
{
_uowProvider = provider;
+ _userService = userService;
+ _contentService = contentService;
}
///
/// Sends the notifications for the specified user regarding the specified node and action.
///
///
- ///
+ ///
///
- public void SendNotifications(IEntity entity, IUser user, IAction action)
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// Currently this will only work for Content entities!
+ ///
+ public void SendNotifications(IUser operatingUser, IUmbracoEntity entity, string action, string actionName, HttpContextBase http,
+ Func createSubject,
+ Func createBody)
{
- throw new NotImplementedException();
+ if ((entity is IContent) == false)
+ {
+ throw new NotSupportedException();
+ }
+ var content = (IContent) entity;
+ //we'll lazily get these if we need to send notifications
+ IContent[] allVersions = null;
+
+ int totalUsers;
+ var allUsers = _userService.GetAllMembers(0, int.MaxValue, out totalUsers);
+ foreach (var u in allUsers)
+ {
+ if (u.IsApproved == false) continue;
+ var userNotifications = GetUserNotifications(u, content.Path).ToArray();
+ var notificationForAction = userNotifications.FirstOrDefault(x => x.Action == action);
+ if (notificationForAction != null)
+ {
+ //lazy load versions if notifications are required
+ if (allVersions == null)
+ {
+ allVersions = _contentService.GetVersions(entity.Id).ToArray();
+ }
+
+ try
+ {
+ SendNotification(operatingUser, u, content, allVersions, actionName, http, createSubject, createBody);
+ LogHelper.Debug(string.Format("Notification type: {0} sent to {1} ({2})", action, u.Name, u.Email));
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("An error occurred sending notification", ex);
+ }
+ }
+ }
}
///
@@ -41,6 +97,23 @@ namespace Umbraco.Core.Services
return repository.GetUserNotifications(user);
}
+ ///
+ /// Gets the notifications for the user based on the specified node path
+ ///
+ ///
+ ///
+ ///
+ /// Notifications are inherited from the parent so any child node will also have notifications assigned based on it's parent (ancestors)
+ ///
+ public IEnumerable GetUserNotifications(IUser user, string path)
+ {
+ var userNotifications = GetUserNotifications(user).ToArray();
+ var pathParts = path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+ var result = userNotifications.Where(r => pathParts.InvariantContains(r.EntityId.ToString(CultureInfo.InvariantCulture))).ToList();
+ return result;
+ }
+
///
/// Deletes notifications by entity
///
@@ -99,5 +172,255 @@ namespace Umbraco.Core.Services
var repository = new NotificationsRepository(uow);
return repository.CreateNotification(user, entity, action);
}
+
+ #region private methods
+
+ ///
+ /// Sends the notification
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The action readable name - currently an action is just a single letter, this is the name associated with the letter
+ ///
+ /// Callback to create the mail subject
+ /// Callback to create the mail body
+ private void SendNotification(IUser performingUser, IUser mailingUser, IContent content, IContent[] allVersions, string actionName, HttpContextBase http,
+ Func createSubject,
+ Func createBody)
+ {
+ if (performingUser == null) throw new ArgumentNullException("performingUser");
+ if (mailingUser == null) throw new ArgumentNullException("mailingUser");
+ if (content == null) throw new ArgumentNullException("content");
+ if (allVersions == null) throw new ArgumentNullException("allVersions");
+ if (http == null) throw new ArgumentNullException("http");
+ if (createSubject == null) throw new ArgumentNullException("createSubject");
+ if (createBody == null) throw new ArgumentNullException("createBody");
+
+ int versionCount = (allVersions.Length > 1) ? (allVersions.Length - 2) : (allVersions.Length - 1);
+ var oldDoc = _contentService.GetByVersion(allVersions[versionCount].Version);
+
+ // build summary
+ var summary = new StringBuilder();
+ var props = content.Properties.ToArray();
+ foreach (var p in props)
+ {
+ var newText = p.Value != null ? p.Value.ToString() : "";
+ var oldText = newText;
+
+ // check if something was changed and display the changes otherwise display the fields
+ if (oldDoc.Properties.Contains(p.PropertyType.Alias))
+ {
+ var oldProperty = oldDoc.Properties[p.PropertyType.Alias];
+ oldText = oldProperty.Value != null ? oldProperty.Value.ToString() : "";
+
+ // replace html with char equivalent
+ ReplaceHtmlSymbols(ref oldText);
+ ReplaceHtmlSymbols(ref newText);
+ }
+
+
+ // make sure to only highlight changes done using TinyMCE editor... other changes will be displayed using default summary
+ // TODO: We should probably allow more than just tinymce??
+ if ((p.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.TinyMCEAlias)
+ && string.CompareOrdinal(oldText, newText) != 0)
+ {
+ summary.Append("");
+ summary.Append(" Note: ");
+ summary.Append(
+ " Red for deleted characters Yellow for inserted characters ");
+ summary.Append(" ");
+ summary.Append("");
+ summary.Append(" New " +
+ p.PropertyType.Name + " ");
+ summary.Append("" +
+ ReplaceLinks(CompareText(oldText, newText, true, false, "", string.Empty), http.Request) +
+ " ");
+ summary.Append(" ");
+ summary.Append("");
+ summary.Append(" Old " +
+ p.PropertyType.Name + " ");
+ summary.Append("" +
+ ReplaceLinks(CompareText(newText, oldText, true, false, "", string.Empty), http.Request) +
+ " ");
+ summary.Append(" ");
+ }
+ else
+ {
+ summary.Append("");
+ summary.Append("" +
+ p.PropertyType.Name + " ");
+ summary.Append("" + newText + " ");
+ summary.Append(" ");
+ }
+ summary.Append(
+ " ("An error occurred sending notification", ex);
+ }
+ });
+ }
+
+ private static string ReplaceLinks(string text, HttpRequestBase request)
+ {
+ string domain = GlobalSettings.UseSSL ? "https://" : "http://";
+ domain += request.ServerVariables["SERVER_NAME"] + ":" + request.Url.Port + "/";
+ text = text.Replace("href=\"/", "href=\"" + domain);
+ text = text.Replace("src=\"/", "src=\"" + domain);
+ return text;
+ }
+
+ ///
+ /// Replaces the HTML symbols with the character equivalent.
+ ///
+ /// The old string.
+ private static void ReplaceHtmlSymbols(ref string oldString)
+ {
+ oldString = oldString.Replace(" ", " ");
+ oldString = oldString.Replace("’", "'");
+ oldString = oldString.Replace("&", "&");
+ oldString = oldString.Replace("“", "“");
+ oldString = oldString.Replace("”", "”");
+ oldString = oldString.Replace(""", "\"");
+ }
+
+ ///
+ /// Compares the text.
+ ///
+ /// The old text.
+ /// The new text.
+ /// if set to true [display inserted text].
+ /// if set to true [display deleted text].
+ /// The inserted style.
+ /// The deleted style.
+ /// (content), this))
- return default(XElement);
- }
-
//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
var nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "node" : content.ContentType.Alias.ToSafeAliasWithForcingCheck();
+ if (raiseEvents)
+ {
+ if (ExportingContent.IsRaisedEventCancelled(new ExportEventArgs(content, nodeName), this))
+ return new XElement(nodeName);
+ }
+
var xml = Export(content, nodeName);
xml.Add(new XAttribute("nodeType", content.ContentType.Id));
xml.Add(new XAttribute("creatorName", content.GetCreatorProfile().Name));
@@ -92,7 +96,7 @@ namespace Umbraco.Core.Services
}
if(raiseEvents)
- ContentExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedContent.RaiseEvent(new ExportEventArgs(content, xml, false), this);
return xml;
}
@@ -110,6 +114,7 @@ namespace Umbraco.Core.Services
var xml = new XElement(nodeName,
new XAttribute("id", contentBase.Id),
+ new XAttribute("key", contentBase.Key.ToString("D")),
new XAttribute("parentID", contentBase.Level > 1 ? contentBase.ParentId : -1),
new XAttribute("level", contentBase.Level),
new XAttribute("creatorID", contentBase.CreatorId),
@@ -163,7 +168,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ImportingContent.IsRaisedEventCancelled(new SaveEventArgs(element), this))
+ if (ImportingContent.IsRaisedEventCancelled(new ImportEventArgs(element), this))
return Enumerable.Empty();
}
@@ -180,7 +185,7 @@ namespace Umbraco.Core.Services
_contentService.Save(contents, userId);
if(raiseEvents)
- ContentImported.RaiseEvent(new SaveEventArgs(contents, false), this);
+ ImportedContent.RaiseEvent(new ImportEventArgs(contents, element, false), this);
return contents;
}
@@ -194,7 +199,7 @@ namespace Umbraco.Core.Services
_contentService.Save(contents, userId);
if(raiseEvents)
- ContentImported.RaiseEvent(new SaveEventArgs(contents, false), this);
+ ImportedContent.RaiseEvent(new ImportEventArgs(contents, element, false), this);
return contents;
}
@@ -299,7 +304,7 @@ namespace Umbraco.Core.Services
if (propertyType != null && propertyType.PropertyEditorAlias == Constants.PropertyEditors.CheckBoxListAlias)
{
var database = ApplicationContext.Current.DatabaseContext.Database;
- var dtos = database.Fetch("WHERE datatypeNo" + "deId = @Id", new { Id = propertyType.DataTypeDefinitionId });
+ var dtos = database.Fetch("WHERE datatypeNodeId = @Id", new { Id = propertyType.DataTypeDefinitionId });
var propertyValueList = new List();
foreach (var preValue in propertyValue.Split(','))
@@ -331,8 +336,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ExportingContentType.IsRaisedEventCancelled(new SaveEventArgs(contentType), this))
- return default(XElement);
+ if (ExportingContentType.IsRaisedEventCancelled(new ExportEventArgs(contentType, "DocumentType"), this))
+ return new XElement("DocumentType");
}
var info = new XElement("Info",
@@ -397,7 +402,7 @@ namespace Umbraco.Core.Services
tabs);
if (raiseEvents)
- ContentTypeExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedContentType.RaiseEvent(new ExportEventArgs(contentType, xml, false), this);
return xml;
}
@@ -426,7 +431,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ImportingContentType.IsRaisedEventCancelled(new SaveEventArgs(element), this))
+ if (ImportingContentType.IsRaisedEventCancelled(new ImportEventArgs(element), this))
return Enumerable.Empty();
}
@@ -477,7 +482,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
- ContentTypeImported.RaiseEvent(new SaveEventArgs(list, false), this);
+ ImportedContentType.RaiseEvent(new ImportEventArgs(list, element, false), this);
return list;
}
@@ -722,6 +727,11 @@ namespace Umbraco.Core.Services
return contentType;
}
+ ///
+ /// Used during Content import to ensure that the ContentType of a content item exists
+ ///
+ ///
+ /// (dataTypeDefinition), this))
- return default(XElement);
+ if (ExportingDataType.IsRaisedEventCancelled(new ExportEventArgs(dataTypeDefinition, "DataType"), this))
+ return new XElement("DataType");
}
var prevalues = new XElement("PreValues");
-
var prevalueList = _dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id)
.FormatAsDictionary();
@@ -803,7 +812,7 @@ namespace Umbraco.Core.Services
xml.Add(new XAttribute("DatabaseType", dataTypeDefinition.DatabaseType.ToString()));
if (raiseEvents)
- DataTypeExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedDataType.RaiseEvent(new ExportEventArgs(dataTypeDefinition, xml, false), this);
return xml;
}
@@ -819,7 +828,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ImportingDataType.IsRaisedEventCancelled(new SaveEventArgs(element), this))
+ if (ImportingDataType.IsRaisedEventCancelled(new ImportEventArgs(element), this))
return Enumerable.Empty();
}
@@ -887,7 +896,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
- DataTypeImported.RaiseEvent(new SaveEventArgs(list, false), this);
+ ImportedDataType.RaiseEvent(new ImportEventArgs(list, element, false), this);
return list;
}
@@ -950,8 +959,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ExportingDictionaryItem.IsRaisedEventCancelled(new SaveEventArgs(dictionaryItem), this))
- return default(XElement);
+ if (ExportingDictionaryItem.IsRaisedEventCancelled(new ExportEventArgs(dictionaryItem, "DictionaryItem"), this))
+ return new XElement("DictionaryItem");
}
var xml = new XElement("DictionaryItem", new XAttribute("Key", dictionaryItem.ItemKey));
@@ -973,7 +982,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
- DictionaryItemExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedDictionaryItem.RaiseEvent(new ExportEventArgs(dictionaryItem, xml, false), this);
return xml;
}
@@ -988,7 +997,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ImportingDictionaryItem.IsRaisedEventCancelled(new SaveEventArgs(dictionaryItemElementList), this))
+ if (ImportingDictionaryItem.IsRaisedEventCancelled(new ImportEventArgs(dictionaryItemElementList), this))
return Enumerable.Empty();
}
@@ -1000,15 +1009,15 @@ namespace Umbraco.Core.Services
{
var items = new List();
foreach (var dictionaryItemElement in dictionaryItemElementList.Elements("DictionaryItem"))
- items.AddRange(ImportDictionaryItem(dictionaryItemElement, languages));
+ items.AddRange(ImportDictionaryItem(dictionaryItemElement, languages, raiseEvents));
if (raiseEvents)
- DictionaryItemImported.RaiseEvent(new SaveEventArgs(items, false), this);
+ ImportedDictionaryItem.RaiseEvent(new ImportEventArgs(items, dictionaryItemElementList, false), this);
return items;
}
- private IEnumerable ImportDictionaryItem(XElement dictionaryItemElement, List languages)
+ private IEnumerable ImportDictionaryItem(XElement dictionaryItemElement, List languages, bool raiseEvents)
{
var items = new List();
@@ -1020,7 +1029,7 @@ namespace Umbraco.Core.Services
dictionaryItem = CreateNewDictionaryItem(key, dictionaryItemElement, languages);
_localizationService.Save(dictionaryItem);
items.Add(dictionaryItem);
- items.AddRange(ImportDictionaryItems(dictionaryItemElement, languages));
+ items.AddRange(ImportDictionaryItems(dictionaryItemElement, languages, raiseEvents));
return items;
}
@@ -1096,8 +1105,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ExportingLanguage.IsRaisedEventCancelled(new SaveEventArgs(language), this))
- return default(XElement);
+ if (ExportingLanguage.IsRaisedEventCancelled(new ExportEventArgs(language, "Language"), this))
+ return new XElement("Language");
}
var xml = new XElement("Language",
@@ -1106,7 +1115,7 @@ namespace Umbraco.Core.Services
new XAttribute("FriendlyName", language.CultureName));
if (raiseEvents)
- LanguageExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedLanguage.RaiseEvent(new ExportEventArgs(language, xml, false), this);
return xml;
}
@@ -1115,13 +1124,14 @@ namespace Umbraco.Core.Services
/// Imports and saves the 'Languages' part of a package xml as a list of
/// Xml to import
+ /// Optional id of the User performing the operation
/// Optional parameter indicating whether or not to raise events
/// An enumerable list of generated languages
- public IEnumerable ImportLanguages(XElement languageElementList, bool raiseEvents = true)
+ public IEnumerable ImportLanguages(XElement languageElementList, int userId = 0, bool raiseEvents = true)
{
if (raiseEvents)
{
- if (ImportingLanguage.IsRaisedEventCancelled(new SaveEventArgs(languageElementList), this))
+ if (ImportingLanguage.IsRaisedEventCancelled(new ImportEventArgs(languageElementList), this))
return Enumerable.Empty();
}
@@ -1142,7 +1152,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
- LanguageImported.RaiseEvent(new SaveEventArgs(list, false), this);
+ ImportedLanguage.RaiseEvent(new ImportEventArgs(list, languageElementList, false), this);
return list;
}
@@ -1150,6 +1160,171 @@ namespace Umbraco.Core.Services
#endregion
#region Macros
+
+ ///
+ /// Imports and saves the 'Macros' part of a package xml as a list of
+ /// Xml to import
+ /// Optional id of the User performing the operation
+ /// Optional parameter indicating whether or not to raise events
+ /// ImportMacros(XElement element, int userId = 0, bool raiseEvents = true)
+ {
+ if (raiseEvents)
+ {
+ if (ImportingMacro.IsRaisedEventCancelled(new ImportEventArgs(element), this))
+ return Enumerable.Empty();
+ }
+
+ var name = element.Name.LocalName;
+ if (name.Equals("Macros") == false && name.Equals("macro") == false)
+ {
+ throw new ArgumentException("The passed in XElement is not valid! It does not contain a root element called 'Macros' for multiple imports or 'macro' for a single import.");
+ }
+
+ var macroElements = name.Equals("Macros")
+ ? (from doc in element.Elements("macro") select doc).ToList()
+ : new List { element };
+
+ var macros = macroElements.Select(ParseMacroElement).ToList();
+
+ foreach (var macro in macros)
+ {
+ _macroService.Save(macro, userId);
+ }
+
+ if (raiseEvents)
+ ImportedMacro.RaiseEvent(new ImportEventArgs(macros, element, false), this);
+
+ return macros;
+ }
+
+ private IMacro ParseMacroElement(XElement macroElement)
+ {
+ var macroName = macroElement.Element("name").Value;
+ var macroAlias = macroElement.Element("alias").Value;
+ var controlType = macroElement.Element("scriptType").Value;
+ var controlAssembly = macroElement.Element("scriptAssembly").Value;
+ var xsltPath = macroElement.Element("xslt").Value;
+ var scriptPath = macroElement.Element("scriptingFile").Value;
+
+ //Following xml elements are treated as nullable properties
+ var useInEditorElement = macroElement.Element("useInEditor");
+ var useInEditor = false;
+ if (useInEditorElement != null && string.IsNullOrEmpty(useInEditorElement.Value) == false)
+ {
+ useInEditor = bool.Parse(useInEditorElement.Value);
+ }
+ var cacheDurationElement = macroElement.Element("refreshRate");
+ var cacheDuration = 0;
+ if (cacheDurationElement != null && string.IsNullOrEmpty(cacheDurationElement.Value) == false)
+ {
+ cacheDuration = int.Parse(cacheDurationElement.Value);
+ }
+ var cacheByMemberElement = macroElement.Element("cacheByMember");
+ var cacheByMember = false;
+ if (cacheByMemberElement != null && string.IsNullOrEmpty(cacheByMemberElement.Value) == false)
+ {
+ cacheByMember = bool.Parse(cacheByMemberElement.Value);
+ }
+ var cacheByPageElement = macroElement.Element("cacheByPage");
+ var cacheByPage = false;
+ if (cacheByPageElement != null && string.IsNullOrEmpty(cacheByPageElement.Value) == false)
+ {
+ cacheByPage = bool.Parse(cacheByPageElement.Value);
+ }
+ var dontRenderElement = macroElement.Element("dontRender");
+ var dontRender = true;
+ if (dontRenderElement != null && string.IsNullOrEmpty(dontRenderElement.Value) == false)
+ {
+ dontRender = bool.Parse(dontRenderElement.Value);
+ }
+
+ var macro = new Macro(macroAlias, macroName, controlType, controlAssembly, xsltPath, scriptPath,
+ cacheByPage, cacheByMember, dontRender, useInEditor, cacheDuration);
+
+ var properties = macroElement.Element("properties");
+ if (properties != null)
+ {
+ int sortOrder = 0;
+ foreach (var property in properties.Elements())
+ {
+ var propertyName = property.Attribute("name").Value;
+ var propertyAlias = property.Attribute("alias").Value;
+ var editorAlias = property.Attribute("propertyType").Value;
+ var sortOrderAttribute = property.Attribute("sortOrder");
+ if (sortOrderAttribute != null)
+ {
+ sortOrder = int.Parse(sortOrderAttribute.Value);
+ }
+
+ macro.Properties.Add(new MacroProperty(propertyAlias, propertyName, sortOrder, editorAlias));
+ sortOrder++;
+ }
+ }
+ return macro;
+ }
+
+ ///
+ /// Exports a list of
+ /// Macros to export
+ /// Optional parameter indicating whether or not to raise events
+ /// macros, bool raiseEvents = true)
+ {
+ var xml = new XElement("Macros");
+ foreach (var item in macros)
+ {
+ xml.Add(Export(item, raiseEvents));
+ }
+ return xml;
+ }
+
+ ///
+ /// Exports a single
+ /// Macro to export
+ /// Optional parameter indicating whether or not to raise events
+ /// (macro, "macro"), this))
+ return new XElement("macro");
+ }
+
+ var xml = new XElement("macro");
+ xml.Add(new XElement("name", macro.Name));
+ xml.Add(new XElement("alias", macro.Alias));
+ xml.Add(new XElement("scriptType", macro.ControlType));
+ xml.Add(new XElement("scriptAssembly", macro.ControlAssembly));
+ xml.Add(new XElement("scriptingFile", macro.ScriptPath));
+ xml.Add(new XElement("xslt", macro.XsltPath));
+ xml.Add(new XElement("useInEditor", macro.UseInEditor.ToString()));
+ xml.Add(new XElement("dontRender", macro.DontRender.ToString()));
+ xml.Add(new XElement("refreshRate", macro.CacheDuration.ToString(CultureInfo.InvariantCulture)));
+ xml.Add(new XElement("cacheByMember", macro.CacheByMember.ToString()));
+ xml.Add(new XElement("cacheByPage", macro.CacheByPage.ToString()));
+
+ var properties = new XElement("properties");
+ foreach (var property in macro.Properties)
+ {
+ properties.Add(new XElement("property",
+ new XAttribute("name", property.Name),
+ new XAttribute("alias", property.Alias),
+ new XAttribute("sortOrder", property.SortOrder),
+ new XAttribute("propertyType", property.EditorAlias)));
+ }
+ xml.Add(properties);
+
+ if (raiseEvents)
+ ExportedMacro.RaiseEvent(new ExportEventArgs(macro, xml, false), this);
+
+ return xml;
+ }
+
#endregion
#region Members
@@ -1170,7 +1345,6 @@ namespace Umbraco.Core.Services
xml.Add(new XAttribute("loginName", member.Username));
xml.Add(new XAttribute("email", member.Email));
- xml.Add(new XAttribute("key", member.Key));
return xml;
}
@@ -1188,15 +1362,15 @@ namespace Umbraco.Core.Services
/// (media), this))
- return default(XElement);
- }
-
//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
var nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "node" : media.ContentType.Alias.ToSafeAliasWithForcingCheck();
+ if (raiseEvents)
+ {
+ if (ExportingMedia.IsRaisedEventCancelled(new ExportEventArgs(media, nodeName), this))
+ return new XElement(nodeName);
+ }
+
var xml = Export(media, nodeName);
xml.Add(new XAttribute("nodeType", media.ContentType.Id));
xml.Add(new XAttribute("writerName", media.GetCreatorProfile().Name));
@@ -1213,7 +1387,7 @@ namespace Umbraco.Core.Services
}
if(raiseEvents)
- MediaExported.RaiseEvent(new SaveEventArgs(xml, false), this);
+ ExportedMedia.RaiseEvent(new ExportEventArgs(media, xml, false), this);
return xml;
}
@@ -1321,7 +1495,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
- if (ImportingTemplate.IsRaisedEventCancelled(new SaveEventArgs(element), this))
+ if (ImportingTemplate.IsRaisedEventCancelled(new ImportEventArgs(element), this))
return Enumerable.Empty();
}
@@ -1394,7 +1568,7 @@ namespace Umbraco.Core.Services
_fileService.SaveTemplate(templates, userId);
if(raiseEvents)
- TemplateImported.RaiseEvent(new SaveEventArgs(templates, false), this);
+ ImportedTemplate.RaiseEvent(new ImportEventArgs(templates, element, false), this);
return templates;
}
@@ -1415,6 +1589,58 @@ namespace Umbraco.Core.Services
return IOHelper.MapPath(SystemDirectories.Masterpages + "/" + alias.Replace(" ", "") + ".master");
}
+ ///
+ /// Exports a list of
+ /// List of Templates to export
+ /// Optional parameter indicating whether or not to raise events
+ /// templates, bool raiseEvents = true)
+ {
+ var xml = new XElement("Templates");
+ foreach (var item in templates)
+ {
+ xml.Add(Export(item, raiseEvents));
+ }
+ return xml;
+ }
+
+ ///
+ /// Exports a single
+ /// Template to export
+ /// Optional parameter indicating whether or not to raise events
+ /// (template, "Template"), this))
+ return new XElement("Template");
+ }
+
+ var xml = new XElement("Template");
+ xml.Add(new XElement("Name", template.Name));
+ xml.Add(new XElement("Alias", template.Alias));
+ xml.Add(new XElement("Design", new XCData(template.Content)));
+
+ var concreteTemplate = template as Template;
+ if (concreteTemplate != null)
+ {
+ if (concreteTemplate.MasterTemplateId.IsValueCreated &&
+ concreteTemplate.MasterTemplateId.Value != default(int))
+ {
+ xml.Add(new XElement("Master", concreteTemplate.MasterTemplateId.ToString()));
+ xml.Add(new XElement("MasterAlias", concreteTemplate.MasterTemplateAlias));
+ }
+ }
+
+ if (raiseEvents)
+ ExportedTemplate.RaiseEvent(new ExportEventArgs(template, xml, false), this);
+
+ return xml;
+ }
+
#endregion
#region Stylesheets
@@ -1424,122 +1650,152 @@ namespace Umbraco.Core.Services
///
/// Occurs before Importing Content
///
- public static event TypedEventHandler> ImportingContent;
+ public static event TypedEventHandler> ImportingContent;
///
/// Occurs after Content is Imported and Saved
///
- public static event TypedEventHandler> ContentImported;
+ public static event TypedEventHandler> ImportedContent;
///
/// Occurs before Exporting Content
///
- public static event TypedEventHandler> ExportingContent;
+ public static event TypedEventHandler> ExportingContent;
///
/// Occurs after Content is Exported to Xml
///
- public static event TypedEventHandler> ContentExported;
+ public static event TypedEventHandler> ExportedContent;
///
/// Occurs before Exporting Media
///
- public static event TypedEventHandler> ExportingMedia;
+ public static event TypedEventHandler> ExportingMedia;
///
/// Occurs after Media is Exported to Xml
///
- public static event TypedEventHandler> MediaExported;
+ public static event TypedEventHandler> ExportedMedia;
///
/// Occurs before Importing ContentType
///
- public static event TypedEventHandler> ImportingContentType;
+ public static event TypedEventHandler> ImportingContentType;
///
/// Occurs after ContentType is Imported and Saved
///
- public static event TypedEventHandler> ContentTypeImported;
+ public static event TypedEventHandler> ImportedContentType;
///
/// Occurs before Exporting ContentType
///
- public static event TypedEventHandler> ExportingContentType;
+ public static event TypedEventHandler> ExportingContentType;
///
/// Occurs after ContentType is Exported to Xml
///
- public static event TypedEventHandler> ContentTypeExported;
+ public static event TypedEventHandler> ExportedContentType;
///
/// Occurs before Importing DataType
///
- public static event TypedEventHandler> ImportingDataType;
+ public static event TypedEventHandler> ImportingDataType;
///
/// Occurs after DataType is Imported and Saved
///
- public static event TypedEventHandler> DataTypeImported;
+ public static event TypedEventHandler> ImportedDataType;
///
/// Occurs before Exporting DataType
///
- public static event TypedEventHandler> ExportingDataType;
+ public static event TypedEventHandler> ExportingDataType;
///
/// Occurs after DataType is Exported to Xml
///
- public static event TypedEventHandler> DataTypeExported;
+ public static event TypedEventHandler> ExportedDataType;
///
/// Occurs before Importing DictionaryItem
///
- public static event TypedEventHandler> ImportingDictionaryItem;
+ public static event TypedEventHandler> ImportingDictionaryItem;
///
/// Occurs after DictionaryItem is Imported and Saved
///
- public static event TypedEventHandler> DictionaryItemImported;
+ public static event TypedEventHandler> ImportedDictionaryItem;
///
/// Occurs before Exporting DictionaryItem
///
- public static event TypedEventHandler> ExportingDictionaryItem;
+ public static event TypedEventHandler> ExportingDictionaryItem;
///
/// Occurs after DictionaryItem is Exported to Xml
///
- public static event TypedEventHandler> DictionaryItemExported;
+ public static event TypedEventHandler> ExportedDictionaryItem;
+
+ ///
+ /// Occurs before Importing Macro
+ ///
+ public static event TypedEventHandler> ImportingMacro;
+
+ ///
+ /// Occurs after Macro is Imported and Saved
+ ///
+ public static event TypedEventHandler> ImportedMacro;
+
+ ///
+ /// Occurs before Exporting Macro
+ ///
+ public static event TypedEventHandler> ExportingMacro;
+
+ ///
+ /// Occurs after Macro is Exported to Xml
+ ///
+ public static event TypedEventHandler> ExportedMacro;
///
/// Occurs before Importing Language
///
- public static event TypedEventHandler> ImportingLanguage;
+ public static event TypedEventHandler> ImportingLanguage;
///
/// Occurs after Language is Imported and Saved
///
- public static event TypedEventHandler> LanguageImported;
+ public static event TypedEventHandler> ImportedLanguage;
///
/// Occurs before Exporting Language
///
- public static event TypedEventHandler> ExportingLanguage;
+ public static event TypedEventHandler> ExportingLanguage;
///
/// Occurs after Language is Exported to Xml
///
- public static event TypedEventHandler> LanguageExported;
+ public static event TypedEventHandler> ExportedLanguage;
///
/// Occurs before Importing Template
///
- public static event TypedEventHandler> ImportingTemplate;
+ public static event TypedEventHandler> ImportingTemplate;
///
/// Occurs after Template is Imported and Saved
///
- public static event TypedEventHandler> TemplateImported;
+ public static event TypedEventHandler> ImportedTemplate;
+
+ ///
+ /// Occurs before Exporting Template
+ ///
+ public static event TypedEventHandler> ExportingTemplate;
+
+ ///
+ /// Occurs after Template is Exported to Xml
+ ///
+ public static event TypedEventHandler> ExportedTemplate;
#endregion
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index 2f82af9fc9..8ae7d80745 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -337,7 +337,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this);
+ SavedRelation.RaiseEvent(new SaveEventArgs(relation, false), this);
return relation;
}
@@ -365,7 +365,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this);
+ SavedRelation.RaiseEvent(new SaveEventArgs(relation, false), this);
return relation;
}
@@ -428,7 +428,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this);
+ SavedRelation.RaiseEvent(new SaveEventArgs(relation, false), this);
}
///
@@ -447,7 +447,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationTypeSaved.RaiseEvent(new SaveEventArgs(relationType, false), this);
+ SavedRelationType.RaiseEvent(new SaveEventArgs(relationType, false), this);
}
///
@@ -466,7 +466,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationDeleted.RaiseEvent(new DeleteEventArgs(relation, false), this);
+ DeletedRelation.RaiseEvent(new DeleteEventArgs(relation, false), this);
}
///
@@ -485,7 +485,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationTypeDeleted.RaiseEvent(new DeleteEventArgs(relationType, false), this);
+ DeletedRelationType.RaiseEvent(new DeleteEventArgs(relationType, false), this);
}
///
@@ -508,7 +508,7 @@ namespace Umbraco.Core.Services
uow.Commit();
}
- RelationDeleted.RaiseEvent(new DeleteEventArgs(relations, false), this);
+ DeletedRelation.RaiseEvent(new DeleteEventArgs(relations, false), this);
}
#region Private Methods
@@ -537,7 +537,7 @@ namespace Umbraco.Core.Services
///
/// Occurs after a Relation is Deleted
///
- public static event TypedEventHandler> RelationDeleted;
+ public static event TypedEventHandler> DeletedRelation;
///
/// Occurs before Saving a Relation
@@ -547,7 +547,7 @@ namespace Umbraco.Core.Services
///
/// Occurs after a Relation is Saved
///
- public static event TypedEventHandler> RelationSaved;
+ public static event TypedEventHandler> SavedRelation;
///
/// Occurs before Deleting a RelationType
@@ -557,7 +557,7 @@ namespace Umbraco.Core.Services
///
/// Occurs after a RelationType is Deleted
///
- public static event TypedEventHandler> RelationTypeDeleted;
+ public static event TypedEventHandler> DeletedRelationType;
///
/// Occurs before Saving a RelationType
@@ -567,7 +567,7 @@ namespace Umbraco.Core.Services
///
/// Occurs after a RelationType is Saved
///
- public static event TypedEventHandler> RelationTypeSaved;
+ public static event TypedEventHandler> SavedRelationType;
#endregion
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index 4bd2f433ba..7b4a3317bb 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -29,6 +29,7 @@ namespace Umbraco.Core.Services
private Lazy _sectionService;
private Lazy _macroService;
private Lazy _memberTypeService;
+ private Lazy _notificationService;
///
/// public ctor - will generally just be used for unit testing
@@ -101,6 +102,9 @@ namespace Umbraco.Core.Services
var provider = dbUnitOfWorkProvider;
var fileProvider = fileUnitOfWorkProvider;
+ if (_notificationService == null)
+ _notificationService = new Lazy(() => new NotificationService(provider, _userService.Value, _contentService.Value));
+
if (_serverRegistrationService == null)
_serverRegistrationService = new Lazy(() => new ServerRegistrationService(provider, repositoryFactory.Value));
@@ -129,7 +133,7 @@ namespace Umbraco.Core.Services
_localizationService = new Lazy(() => new LocalizationService(provider, repositoryFactory.Value));
if (_packagingService == null)
- _packagingService = new Lazy(() => new PackagingService(_contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value, _fileService.Value, _localizationService.Value, repositoryFactory.Value, provider));
+ _packagingService = new Lazy(() => new PackagingService(_contentService.Value, _contentTypeService.Value, _mediaService.Value, _macroService.Value, _dataTypeService.Value, _fileService.Value, _localizationService.Value, repositoryFactory.Value, provider));
if (_entityService == null)
_entityService = new Lazy(() => new EntityService(provider, repositoryFactory.Value, _contentService.Value, _contentTypeService.Value, _mediaService.Value, _dataTypeService.Value));
@@ -153,6 +157,14 @@ namespace Umbraco.Core.Services
_tagService = new Lazy(() => new TagService(provider, repositoryFactory.Value));
}
+ ///
+ /// Gets the
+ internal INotificationService NotificationService
+ {
+ get { return _notificationService.Value; }
+ }
+
///
/// Gets the
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 89f2f9f7de..efa4812055 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -152,7 +152,7 @@ namespace Umbraco.Core.Services
{
using (var repository = _repositoryFactory.CreateUserRepository(_uowProvider.GetUnitOfWork()))
{
- var query = Query.Builder.Where(x => x.Username == login);
+ var query = Query.Builder.Where(x => x.Username.Equals(login));
return repository.GetByQuery(query).FirstOrDefault();
}
}
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 4847df3fc4..0b0c76f620 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -1084,7 +1084,7 @@ namespace Umbraco.Core
var cases2 = cases.ToCleanStringType() & CleanStringType.CaseMask;
return legacy != null
? legacy.LegacyConvertStringCase(phrase, cases2)
- : helper.CleanString(phrase, CleanStringType.Ascii | CleanStringType.Alias | cases2);
+ : helper.CleanString(phrase, CleanStringType.Ascii | CleanStringType.ConvertCase | cases2);
}
// the new methods to clean a string (to alias, url segment...)
diff --git a/src/Umbraco.Core/Strings/CleanStringType.cs b/src/Umbraco.Core/Strings/CleanStringType.cs
index f681c42d4a..4c53be4cb8 100644
--- a/src/Umbraco.Core/Strings/CleanStringType.cs
+++ b/src/Umbraco.Core/Strings/CleanStringType.cs
@@ -14,25 +14,6 @@ namespace Umbraco.Core.Strings
// note: you have 32 bits at your disposal
// 0xffffffff
-
- // masks
-
- ///
- /// Flag mask for casing.
- ///
- CaseMask = 0x3f, // 0xff - 8 possible values
-
- ///
- /// Flag mask for encoding.
- ///
- CodeMask = 0x700, // 0xff00 - 8 possible values
-
- ///
- /// Flag mask for role.
- ///
- RoleMask = 0x070000, // 0xff0000 - 8 possible values
-
-
// no value
///
@@ -43,6 +24,11 @@ namespace Umbraco.Core.Strings
// casing values
+ ///
+ /// Flag mask for casing.
+ ///
+ CaseMask = PascalCase | CamelCase | Unchanged | LowerCase | UpperCase | UmbracoCase,
+
///
/// Pascal casing eg "PascalCase".
///
@@ -78,6 +64,11 @@ namespace Umbraco.Core.Strings
// encoding values
+ ///
+ /// Flag mask for encoding.
+ ///
+ CodeMask = Unicode | Utf8 | Ascii,
+
///
/// Unicode encoding.
///
@@ -97,6 +88,11 @@ namespace Umbraco.Core.Strings
// role values
+ ///
+ /// Flag mask for role.
+ ///
+ RoleMask = UrlSegment | Alias | FileName | ConvertCase,
+
///
/// Url role.
///
@@ -110,6 +106,11 @@ namespace Umbraco.Core.Strings
///
/// FileName role.
///
- FileName = 0x040000
+ FileName = 0x040000,
+
+ ///
+ /// ConvertCase role.
+ ///
+ ConvertCase = 0x080000
}
}
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
index e153a436c0..92d82c9a6b 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
@@ -1,4 +1,8 @@
-using System;
+
+// debugging - define to write cleaning details & steps to console
+#define WRTCONS
+
+using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -142,7 +146,7 @@ namespace Umbraco.Core.Strings
{
PreFilter = ApplyUrlReplaceCharacters,
IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_', // letter, digit or underscore
- StringType = CleanStringType.Utf8 | CleanStringType.LowerCase,
+ StringType = (UmbracoConfig.For.UmbracoSettings().RequestHandler.ConvertUrlsToAscii ? CleanStringType.Ascii : CleanStringType.Utf8) | CleanStringType.LowerCase,
BreakTermsOnUpper = false,
Separator = '-'
}).WithConfig(CleanStringType.FileName, new Config
@@ -160,6 +164,12 @@ namespace Umbraco.Core.Strings
: (char.IsLetterOrDigit(c) || c == '_'), // letter, digit or underscore
StringType = CleanStringType.Ascii | CleanStringType.UmbracoCase,
BreakTermsOnUpper = false
+ }).WithConfig(CleanStringType.ConvertCase, new Config
+ {
+ PreFilter = null,
+ IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_', // letter, digit or underscore
+ StringType = CleanStringType.Ascii,
+ BreakTermsOnUpper = true
});
}
@@ -487,6 +497,10 @@ function validateSafeAlias(id, value, immediate, callback) {{
if (culture == null)
throw new ArgumentNullException("culture");
+#if WRTCONS
+ Console.WriteLine("STRING TYPE {0}", stringType);
+#endif
+
// get config
var config = GetConfig(stringType, culture);
stringType = config.StringTypeExtend(stringType);
@@ -554,6 +568,9 @@ function validateSafeAlias(id, value, immediate, callback) {{
var state = StateBreak;
caseType &= CleanStringType.CaseMask;
+#if WRTCONS
+ Console.WriteLine("CASE {0}", caseType);
+#endif
// if we apply global ToUpper or ToLower to text here
// then we cannot break words on uppercase chars
@@ -579,13 +596,13 @@ function validateSafeAlias(id, value, immediate, callback) {{
var isPair = char.IsSurrogate(c);
if (isPair)
throw new NotSupportedException("Surrogate pairs are not supported.");
-
- //Console.WriteLine("CHAR '{0}' {1} {2} - {3} - {4}/{5} {6}",
- // c,
- // isTerm ? "term" : "!term", isUpper ? "upper" : "!upper",
- // state,
- // i, ipos, leading ? "leading" : "!leading");
-
+#if WRTCONS
+ Console.WriteLine("CHAR '{0}' {1} {2} - {3} - {4}/{5} {6}",
+ c,
+ isTerm ? "term" : "!term", isUpper ? "upper" : "!upper",
+ state,
+ i, ipos, leading ? "leading" : "!leading");
+#endif
switch (state)
{
// within a break
@@ -692,11 +709,12 @@ function validateSafeAlias(id, value, immediate, callback) {{
CleanStringType caseType, CultureInfo culture, bool isAcronym)
{
var term = input.Substring(ipos, len);
- //Console.WriteLine("TERM \"{0}\" {1} {2}",
- // term,
- // isAcronym ? "acronym" : "word",
- // caseType);
-
+#if WRTCONS
+ Console.WriteLine("TERM \"{0}\" {1} {2}",
+ term,
+ isAcronym ? "acronym" : "word",
+ caseType);
+#endif
if (isAcronym)
{
if ((caseType == CleanStringType.CamelCase && len <= 2 && opos > 0) ||
diff --git a/src/Umbraco.Core/Strings/Diff.cs b/src/Umbraco.Core/Strings/Diff.cs
new file mode 100644
index 0000000000..ed381d4f6f
--- /dev/null
+++ b/src/Umbraco.Core/Strings/Diff.cs
@@ -0,0 +1,510 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Strings
+{
+ ///
+ /// This Class implements the Difference Algorithm published in
+ /// "An O(ND) Difference Algorithm and its Variations" by Eugene Myers
+ /// Algorithmica Vol. 1 No. 2, 1986, p 251.
+ ///
+ /// The algorithm itself is comparing 2 arrays of numbers so when comparing 2 text documents
+ /// each line is converted into a (hash) number. See DiffText().
+ ///
+ /// diff.cs: A port of the algorithm to C#
+ /// Copyright (c) by Matthias Hertel, http://www.mathertel.de
+ /// This work is licensed under a BSD style license. See http://www.mathertel.de/License.aspx
+ ///
+ internal class Diff
+ {
+ /// Data on one input file being compared.
+ ///
+ internal class DiffData
+ {
+
+ /// Number of elements (lines).
+ internal int Length;
+
+ /// Buffer of numbers that will be compared.
+ internal int[] Data;
+
+ ///
+ /// Array of booleans that flag for modified data.
+ /// This is the result of the diff.
+ /// This means deletedA in the first Data or inserted in the second Data.
+ ///
+ internal bool[] Modified;
+
+ ///
+ /// Initialize the Diff-Data buffer.
+ ///
+ /// reference to the buffer
+ internal DiffData(int[] initData)
+ {
+ Data = initData;
+ Length = initData.Length;
+ Modified = new bool[Length + 2];
+ } // DiffData
+
+ } // class DiffData
+
+ /// details of one difference.
+ public struct Item
+ {
+ /// Start Line number in Data A.
+ public int StartA;
+ /// Start Line number in Data B.
+ public int StartB;
+
+ /// Number of changes in Data A.
+ public int DeletedA;
+ /// Number of changes in Data B.
+ public int InsertedB;
+ } // Item
+
+ ///
+ /// Shortest Middle Snake Return Data
+ ///
+ private struct Smsrd
+ {
+ internal int X, Y;
+ // internal int u, v; // 2002.09.20: no need for 2 points
+ }
+
+ ///
+ /// Find the difference in 2 texts, comparing by textlines.
+ ///
+ /// A-version of the text (usualy the old one)
+ /// B-version of the text (usualy the new one)
+ /// Returns a array of Items that describe the differences.
+ public static Item[] DiffText(string textA, string textB)
+ {
+ return (DiffText(textA, textB, false, false, false));
+ } // DiffText
+
+ ///
+ /// Find the difference in 2 texts, comparing by textlines.
+ /// This method uses the DiffInt internally by 1st converting the string into char codes
+ /// then uses the diff int method
+ ///
+ /// A-version of the text (usualy the old one)
+ /// B-version of the text (usualy the new one)
+ /// Returns a array of Items that describe the differences.
+ public static Item[] DiffText1(string textA, string textB)
+ {
+ return DiffInt(DiffCharCodes(textA, false), DiffCharCodes(textB, false));
+ }
+
+
+ ///
+ /// Find the difference in 2 text documents, comparing by textlines.
+ /// The algorithm itself is comparing 2 arrays of numbers so when comparing 2 text documents
+ /// each line is converted into a (hash) number. This hash-value is computed by storing all
+ /// textlines into a common hashtable so i can find dublicates in there, and generating a
+ /// new number each time a new textline is inserted.
+ ///
+ /// A-version of the text (usualy the old one)
+ /// B-version of the text (usualy the new one)
+ /// When set to true, all leading and trailing whitespace characters are stripped out before the comparation is done.
+ /// When set to true, all whitespace characters are converted to a single space character before the comparation is done.
+ /// When set to true, all characters are converted to their lowercase equivivalence before the comparation is done.
+ /// Returns a array of Items that describe the differences.
+ public static Item[] DiffText(string textA, string textB, bool trimSpace, bool ignoreSpace, bool ignoreCase)
+ {
+ // prepare the input-text and convert to comparable numbers.
+ var h = new Hashtable(textA.Length + textB.Length);
+
+ // The A-Version of the data (original data) to be compared.
+ var dataA = new DiffData(DiffCodes(textA, h, trimSpace, ignoreSpace, ignoreCase));
+
+ // The B-Version of the data (modified data) to be compared.
+ var dataB = new DiffData(DiffCodes(textB, h, trimSpace, ignoreSpace, ignoreCase));
+
+ h = null; // free up hashtable memory (maybe)
+
+ var max = dataA.Length + dataB.Length + 1;
+ // vector for the (0,0) to (x,y) search
+ var downVector = new int[2 * max + 2];
+ // vector for the (u,v) to (N,M) search
+ var upVector = new int[2 * max + 2];
+
+ Lcs(dataA, 0, dataA.Length, dataB, 0, dataB.Length, downVector, upVector);
+
+ Optimize(dataA);
+ Optimize(dataB);
+ return CreateDiffs(dataA, dataB);
+ } // DiffText
+
+
+ ///
+ /// Diffs the char codes.
+ ///
+ /// A text.
+ /// if set to true [ignore case].
+ ///
+ /// If a sequence of modified lines starts with a line that contains the same content
+ /// as the line that appends the changes, the difference sequence is modified so that the
+ /// appended line and not the starting line is marked as modified.
+ /// This leads to more readable diff sequences when comparing text files.
+ ///
+ /// A Diff data buffer containing the identified changes.
+ private static void Optimize(DiffData data)
+ {
+ var startPos = 0;
+ while (startPos < data.Length)
+ {
+ while ((startPos < data.Length) && (data.Modified[startPos] == false))
+ startPos++;
+ int endPos = startPos;
+ while ((endPos < data.Length) && (data.Modified[endPos] == true))
+ endPos++;
+
+ if ((endPos < data.Length) && (data.Data[startPos] == data.Data[endPos]))
+ {
+ data.Modified[startPos] = false;
+ data.Modified[endPos] = true;
+ }
+ else
+ {
+ startPos = endPos;
+ } // if
+ } // while
+ } // Optimize
+
+
+ ///
+ /// Find the difference in 2 arrays of integers.
+ ///
+ /// A-version of the numbers (usualy the old one)
+ /// B-version of the numbers (usualy the new one)
+ /// Returns a array of Items that describe the differences.
+ public static Item[] DiffInt(int[] arrayA, int[] arrayB)
+ {
+ // The A-Version of the data (original data) to be compared.
+ var dataA = new DiffData(arrayA);
+
+ // The B-Version of the data (modified data) to be compared.
+ var dataB = new DiffData(arrayB);
+
+ var max = dataA.Length + dataB.Length + 1;
+ // vector for the (0,0) to (x,y) search
+ var downVector = new int[2 * max + 2];
+ // vector for the (u,v) to (N,M) search
+ var upVector = new int[2 * max + 2];
+
+ Lcs(dataA, 0, dataA.Length, dataB, 0, dataB.Length, downVector, upVector);
+ return CreateDiffs(dataA, dataB);
+ } // Diff
+
+
+ ///
+ /// This function converts all textlines of the text into unique numbers for every unique textline
+ /// so further work can work only with simple numbers.
+ ///
+ /// the input text
+ /// This extern initialized hashtable is used for storing all ever used textlines.
+ /// ignore leading and trailing space characters
+ ///
+ ///
+ /// a array of integers.
+ private static int[] DiffCodes(string aText, IDictionary h, bool trimSpace, bool ignoreSpace, bool ignoreCase)
+ {
+ // get all codes of the text
+ var lastUsedCode = h.Count;
+
+ // strip off all cr, only use lf as textline separator.
+ aText = aText.Replace("\r", "");
+ var lines = aText.Split('\n');
+
+ var codes = new int[lines.Length];
+
+ for (int i = 0; i < lines.Length; ++i)
+ {
+ string s = lines[i];
+ if (trimSpace)
+ s = s.Trim();
+
+ if (ignoreSpace)
+ {
+ s = Regex.Replace(s, "\\s+", " "); // TODO: optimization: faster blank removal.
+ }
+
+ if (ignoreCase)
+ s = s.ToLower();
+
+ object aCode = h[s];
+ if (aCode == null)
+ {
+ lastUsedCode++;
+ h[s] = lastUsedCode;
+ codes[i] = lastUsedCode;
+ }
+ else
+ {
+ codes[i] = (int)aCode;
+ } // if
+ } // for
+ return (codes);
+ } // DiffCodes
+
+
+ ///
+ /// This is the algorithm to find the Shortest Middle Snake (SMS).
+ ///
+ /// sequence A
+ /// lower bound of the actual range in DataA
+ /// upper bound of the actual range in DataA (exclusive)
+ /// sequence B
+ /// lower bound of the actual range in DataB
+ /// upper bound of the actual range in DataB (exclusive)
+ /// a vector for the (0,0) to (x,y) search. Passed as a parameter for speed reasons.
+ /// a vector for the (u,v) to (N,M) search. Passed as a parameter for speed reasons.
+ /// a MiddleSnakeData record containing x,y and u,v
+ private static Smsrd Sms(DiffData dataA, int lowerA, int upperA, DiffData dataB, int lowerB, int upperB, int[] downVector, int[] upVector)
+ {
+ int max = dataA.Length + dataB.Length + 1;
+
+ int downK = lowerA - lowerB; // the k-line to start the forward search
+ int upK = upperA - upperB; // the k-line to start the reverse search
+
+ int delta = (upperA - lowerA) - (upperB - lowerB);
+ bool oddDelta = (delta & 1) != 0;
+
+ // The vectors in the publication accepts negative indexes. the vectors implemented here are 0-based
+ // and are access using a specific offset: UpOffset UpVector and DownOffset for DownVektor
+ int downOffset = max - downK;
+ int upOffset = max - upK;
+
+ int maxD = ((upperA - lowerA + upperB - lowerB) / 2) + 1;
+
+ // Debug.Write(2, "SMS", String.Format("Search the box: A[{0}-{1}] to B[{2}-{3}]", LowerA, UpperA, LowerB, UpperB));
+
+ // init vectors
+ downVector[downOffset + downK + 1] = lowerA;
+ upVector[upOffset + upK - 1] = upperA;
+
+ for (int d = 0; d <= maxD; d++)
+ {
+
+ // Extend the forward path.
+ Smsrd ret;
+ for (int k = downK - d; k <= downK + d; k += 2)
+ {
+ // Debug.Write(0, "SMS", "extend forward path " + k.ToString());
+
+ // find the only or better starting point
+ int x, y;
+ if (k == downK - d)
+ {
+ x = downVector[downOffset + k + 1]; // down
+ }
+ else
+ {
+ x = downVector[downOffset + k - 1] + 1; // a step to the right
+ if ((k < downK + d) && (downVector[downOffset + k + 1] >= x))
+ x = downVector[downOffset + k + 1]; // down
+ }
+ y = x - k;
+
+ // find the end of the furthest reaching forward D-path in diagonal k.
+ while ((x < upperA) && (y < upperB) && (dataA.Data[x] == dataB.Data[y]))
+ {
+ x++; y++;
+ }
+ downVector[downOffset + k] = x;
+
+ // overlap ?
+ if (oddDelta && (upK - d < k) && (k < upK + d))
+ {
+ if (upVector[upOffset + k] <= downVector[downOffset + k])
+ {
+ ret.X = downVector[downOffset + k];
+ ret.Y = downVector[downOffset + k] - k;
+ // ret.u = UpVector[UpOffset + k]; // 2002.09.20: no need for 2 points
+ // ret.v = UpVector[UpOffset + k] - k;
+ return (ret);
+ } // if
+ } // if
+
+ } // for k
+
+ // Extend the reverse path.
+ for (int k = upK - d; k <= upK + d; k += 2)
+ {
+ // Debug.Write(0, "SMS", "extend reverse path " + k.ToString());
+
+ // find the only or better starting point
+ int x, y;
+ if (k == upK + d)
+ {
+ x = upVector[upOffset + k - 1]; // up
+ }
+ else
+ {
+ x = upVector[upOffset + k + 1] - 1; // left
+ if ((k > upK - d) && (upVector[upOffset + k - 1] < x))
+ x = upVector[upOffset + k - 1]; // up
+ } // if
+ y = x - k;
+
+ while ((x > lowerA) && (y > lowerB) && (dataA.Data[x - 1] == dataB.Data[y - 1]))
+ {
+ x--; y--; // diagonal
+ }
+ upVector[upOffset + k] = x;
+
+ // overlap ?
+ if (!oddDelta && (downK - d <= k) && (k <= downK + d))
+ {
+ if (upVector[upOffset + k] <= downVector[downOffset + k])
+ {
+ ret.X = downVector[downOffset + k];
+ ret.Y = downVector[downOffset + k] - k;
+ // ret.u = UpVector[UpOffset + k]; // 2002.09.20: no need for 2 points
+ // ret.v = UpVector[UpOffset + k] - k;
+ return (ret);
+ } // if
+ } // if
+
+ } // for k
+
+ } // for D
+
+ throw new ApplicationException("the algorithm should never come here.");
+ } // SMS
+
+
+ ///
+ /// This is the divide-and-conquer implementation of the longes common-subsequence (LCS)
+ /// algorithm.
+ /// The published algorithm passes recursively parts of the A and B sequences.
+ /// To avoid copying these arrays the lower and upper bounds are passed while the sequences stay constant.
+ ///
+ /// sequence A
+ /// lower bound of the actual range in DataA
+ /// upper bound of the actual range in DataA (exclusive)
+ /// sequence B
+ /// lower bound of the actual range in DataB
+ /// upper bound of the actual range in DataB (exclusive)
+ /// a vector for the (0,0) to (x,y) search. Passed as a parameter for speed reasons.
+ /// a vector for the (u,v) to (N,M) search. Passed as a parameter for speed reasons.
+ private static void Lcs(DiffData dataA, int lowerA, int upperA, DiffData dataB, int lowerB, int upperB, int[] downVector, int[] upVector)
+ {
+ // Debug.Write(2, "LCS", String.Format("Analyse the box: A[{0}-{1}] to B[{2}-{3}]", LowerA, UpperA, LowerB, UpperB));
+
+ // Fast walkthrough equal lines at the start
+ while (lowerA < upperA && lowerB < upperB && dataA.Data[lowerA] == dataB.Data[lowerB])
+ {
+ lowerA++; lowerB++;
+ }
+
+ // Fast walkthrough equal lines at the end
+ while (lowerA < upperA && lowerB < upperB && dataA.Data[upperA - 1] == dataB.Data[upperB - 1])
+ {
+ --upperA; --upperB;
+ }
+
+ if (lowerA == upperA)
+ {
+ // mark as inserted lines.
+ while (lowerB < upperB)
+ dataB.Modified[lowerB++] = true;
+
+ }
+ else if (lowerB == upperB)
+ {
+ // mark as deleted lines.
+ while (lowerA < upperA)
+ dataA.Modified[lowerA++] = true;
+
+ }
+ else
+ {
+ // Find the middle snakea and length of an optimal path for A and B
+ Smsrd smsrd = Sms(dataA, lowerA, upperA, dataB, lowerB, upperB, downVector, upVector);
+ // Debug.Write(2, "MiddleSnakeData", String.Format("{0},{1}", smsrd.x, smsrd.y));
+
+ // The path is from LowerX to (x,y) and (x,y) to UpperX
+ Lcs(dataA, lowerA, smsrd.X, dataB, lowerB, smsrd.Y, downVector, upVector);
+ Lcs(dataA, smsrd.X, upperA, dataB, smsrd.Y, upperB, downVector, upVector); // 2002.09.20: no need for 2 points
+ }
+ } // LCS()
+
+
+ /// Scan the tables of which lines are inserted and deleted,
+ /// producing an edit script in forward order.
+ ///
+ /// dynamic array
+ private static Item[] CreateDiffs(DiffData dataA, DiffData dataB)
+ {
+ ArrayList a = new ArrayList();
+ Item aItem;
+ Item[] result;
+
+ int lineA = 0;
+ int lineB = 0;
+ while (lineA < dataA.Length || lineB < dataB.Length)
+ {
+ if ((lineA < dataA.Length) && (!dataA.Modified[lineA])
+ && (lineB < dataB.Length) && (!dataB.Modified[lineB]))
+ {
+ // equal lines
+ lineA++;
+ lineB++;
+
+ }
+ else
+ {
+ // maybe deleted and/or inserted lines
+ int startA = lineA;
+ int startB = lineB;
+
+ while (lineA < dataA.Length && (lineB >= dataB.Length || dataA.Modified[lineA]))
+ // while (LineA < DataA.Length && DataA.modified[LineA])
+ lineA++;
+
+ while (lineB < dataB.Length && (lineA >= dataA.Length || dataB.Modified[lineB]))
+ // while (LineB < DataB.Length && DataB.modified[LineB])
+ lineB++;
+
+ if ((startA < lineA) || (startB < lineB))
+ {
+ // store a new difference-item
+ aItem = new Item();
+ aItem.StartA = startA;
+ aItem.StartB = startB;
+ aItem.DeletedA = lineA - startA;
+ aItem.InsertedB = lineB - startB;
+ a.Add(aItem);
+ } // if
+ } // if
+ } // while
+
+ result = new Item[a.Count];
+ a.CopyTo(result);
+
+ return (result);
+ }
+
+ } // class Diff
+
+
+}
diff --git a/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs b/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
index 23ac4e3931..e08defdedd 100644
--- a/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
+++ b/src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs
@@ -3316,6 +3316,243 @@ namespace Umbraco.Core.Strings
output[opos++] = '~';
break;
+ // BEGIN CUSTOM TRANSLITERATION OF CYRILIC CHARS
+
+ #region Cyrilic chars
+
+ // russian uppercase "А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
+ // russian lowercase "а б в г д е ё ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я"
+
+ // notes
+ // read http://www.vesic.org/english/blog/c-sharp/transliteration-easy-way-microsoft-transliteration-utility/
+ // should we look into MS Transliteration Utility (http://msdn.microsoft.com/en-US/goglobal/bb688104.aspx)
+ // also UnicodeSharpFork https://bitbucket.org/DimaStefantsov/unidecodesharpfork
+ // also Transliterator http://transliterator.codeplex.com/
+ //
+ // in any case it would be good to generate all those "case" statements instead of writing them by hand
+ // time for a T4 template?
+ // also we should support extensibility so ppl can register more cases in external code
+
+ // fixme
+ // transliterates Анастасия as Anastasiya, and not Anastasia
+ // Ольга --> Ol'ga, Татьяна --> Tat'yana -- that's bad (?)
+ // Note: should ä (german umlaut) become a or ae ?
+
+ case '\u0410': // А
+ output[opos++] = 'A';
+ break;
+ case '\u0430': // а
+ output[opos++] = 'a';
+ break;
+ case '\u0411': // Б
+ output[opos++] = 'B';
+ break;
+ case '\u0431': // б
+ output[opos++] = 'b';
+ break;
+ case '\u0412': // В
+ output[opos++] = 'V';
+ break;
+ case '\u0432': // в
+ output[opos++] = 'v';
+ break;
+ case '\u0413': // Г
+ output[opos++] = 'G';
+ break;
+ case '\u0433': // г
+ output[opos++] = 'g';
+ break;
+ case '\u0414': // Д
+ output[opos++] = 'D';
+ break;
+ case '\u0434': // д
+ output[opos++] = 'd';
+ break;
+ case '\u0415': // Е
+ output[opos++] = 'E';
+ break;
+ case '\u0435': // е
+ output[opos++] = 'e';
+ break;
+ case '\u0401': // Ё
+ output[opos++] = 'E'; // alt. Yo
+ break;
+ case '\u0451': // ё
+ output[opos++] = 'e'; // alt. yo
+ break;
+ case '\u0416': // Ж
+ output[opos++] = 'Z';
+ output[opos++] = 'h';
+ break;
+ case '\u0436': // ж
+ output[opos++] = 'z';
+ output[opos++] = 'h';
+ break;
+ case '\u0417': // З
+ output[opos++] = 'Z';
+ break;
+ case '\u0437': // з
+ output[opos++] = 'z';
+ break;
+ case '\u0418': // И
+ output[opos++] = 'I';
+ break;
+ case '\u0438': // и
+ output[opos++] = 'i';
+ break;
+ case '\u0419': // Й
+ output[opos++] = 'I'; // alt. Y, J
+ break;
+ case '\u0439': // й
+ output[opos++] = 'i'; // alt. y, j
+ break;
+ case '\u041A': // К
+ output[opos++] = 'K';
+ break;
+ case '\u043A': // к
+ output[opos++] = 'k';
+ break;
+ case '\u041B': // Л
+ output[opos++] = 'L';
+ break;
+ case '\u043B': // л
+ output[opos++] = 'l';
+ break;
+ case '\u041C': // М
+ output[opos++] = 'M';
+ break;
+ case '\u043C': // м
+ output[opos++] = 'm';
+ break;
+ case '\u041D': // Н
+ output[opos++] = 'N';
+ break;
+ case '\u043D': // н
+ output[opos++] = 'n';
+ break;
+ case '\u041E': // О
+ output[opos++] = 'O';
+ break;
+ case '\u043E': // о
+ output[opos++] = 'o';
+ break;
+ case '\u041F': // П
+ output[opos++] = 'P';
+ break;
+ case '\u043F': // п
+ output[opos++] = 'p';
+ break;
+ case '\u0420': // Р
+ output[opos++] = 'R';
+ break;
+ case '\u0440': // р
+ output[opos++] = 'r';
+ break;
+ case '\u0421': // С
+ output[opos++] = 'S';
+ break;
+ case '\u0441': // с
+ output[opos++] = 's';
+ break;
+ case '\u0422': // Т
+ output[opos++] = 'T';
+ break;
+ case '\u0442': // т
+ output[opos++] = 't';
+ break;
+ case '\u0423': // У
+ output[opos++] = 'U';
+ break;
+ case '\u0443': // у
+ output[opos++] = 'u';
+ break;
+ case '\u0424': // Ф
+ output[opos++] = 'F';
+ break;
+ case '\u0444': // ф
+ output[opos++] = 'f';
+ break;
+ case '\u0425': // Х
+ output[opos++] = 'K'; // alt. X
+ output[opos++] = 'h';
+ break;
+ case '\u0445': // х
+ output[opos++] = 'k'; // alt. x
+ output[opos++] = 'h';
+ break;
+ case '\u0426': // Ц
+ output[opos++] = 'F';
+ break;
+ case '\u0446': // ц
+ output[opos++] = 'f';
+ break;
+ case '\u0427': // Ч
+ output[opos++] = 'C'; // alt. Ts, C
+ output[opos++] = 'h';
+ break;
+ case '\u0447': // ч
+ output[opos++] = 'c'; // alt. ts, c
+ output[opos++] = 'h';
+ break;
+ case '\u0428': // Ш
+ output[opos++] = 'S'; // alt. Ch, S
+ output[opos++] = 'h';
+ break;
+ case '\u0448': // ш
+ output[opos++] = 's'; // alt. ch, s
+ output[opos++] = 'h';
+ break;
+ case '\u0429': // Щ
+ output[opos++] = 'S'; // alt. Shch, Sc
+ output[opos++] = 'h';
+ break;
+ case '\u0449': // щ
+ output[opos++] = 's'; // alt. shch, sc
+ output[opos++] = 'h';
+ break;
+ case '\u042A': // Ъ
+ output[opos++] = '"'; // "
+ break;
+ case '\u044A': // ъ
+ output[opos++] = '"'; // "
+ break;
+ case '\u042B': // Ы
+ output[opos++] = 'Y';
+ break;
+ case '\u044B': // ы
+ output[opos++] = 'y';
+ break;
+ case '\u042C': // Ь
+ output[opos++] = '\''; // '
+ break;
+ case '\u044C': // ь
+ output[opos++] = '\''; // '
+ break;
+ case '\u042D': // Э
+ output[opos++] = 'E';
+ break;
+ case '\u044D': // э
+ output[opos++] = 'e';
+ break;
+ case '\u042E': // Ю
+ output[opos++] = 'Y'; // alt. Ju
+ output[opos++] = 'u';
+ break;
+ case '\u044E': // ю
+ output[opos++] = 'y'; // alt. ju
+ output[opos++] = 'u';
+ break;
+ case '\u042F': // Я
+ output[opos++] = 'Y'; // alt. Ja
+ output[opos++] = 'a';
+ break;
+ case '\u044F': // я
+ output[opos++] = 'y'; // alt. ja
+ output[opos++] = 'a';
+ break;
+
+ #endregion
+
// BEGIN EXTRA
/*
case '£':
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ad49b46b54..18cd086cbe 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -287,6 +287,8 @@
Constants.cs
+
+ Constants.cs
+
public static class UriExtensions
{
-
///
/// Checks if the current uri is a back office request
///
///
+ ///
+ /// The current application path or VirtualPath
+ ///
///
+ /// There are some special routes we need to check to properly determine this:
+ ///
+ /// If any route has an extension in the path like .aspx = back office
+ ///
+ /// These are def back office:
+ /// /Umbraco/RestServices = back office
+ /// /Umbraco/BackOffice = back office
+ /// If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
+ /// so we can only assume that it is not back office. This will occur if people use an UmbracoApiController for the backoffice
+ /// but do not inherit from UmbracoAuthorizedApiController and do not use [IsBackOffice] attribute.
+ ///
+ /// These are def front-end:
+ /// /Umbraco/Surface = front-end
+ /// /Umbraco/Api = front-end
+ /// But if we've got this far we'll just have to assume it's front-end anyways.
+ ///
+ ///
+ internal static bool IsBackOfficeRequest(this Uri url, string applicationPath)
{
-
- var authority = url.GetLeftPart(UriPartial.Authority);
- var afterAuthority = url.GetLeftPart(UriPartial.Query)
- .TrimStart(authority)
- .TrimStart("/");
+ applicationPath = applicationPath ?? string.Empty;
+ var fullUrlPath = url.AbsolutePath.TrimStart(new[] {'/'});
+ var appPath = applicationPath.TrimStart(new[] {'/'});
+ var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
-
//check if this is in the umbraco back office
- return afterAuthority.InvariantStartsWith(GlobalSettings.Path.TrimStart("/"));
+ var isUmbracoPath = urlPath.InvariantStartsWith(GlobalSettings.Path.EnsureStartsWith('/'));
+ //if not, then def not back office
+ if (isUmbracoPath == false) return false;
+
+ //if its the normal /umbraco path
+ if (urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea)
+ || urlPath.InvariantEquals("/" + GlobalSettings.UmbracoMvcArea + "/"))
+ {
+ return true;
+ }
+
+ //check for a file extension
+ var extension = Path.GetExtension(url.LocalPath);
+ //has an extension, def back office
+ if (extension.IsNullOrWhiteSpace() == false) return true;
+ //check for special case asp.net calls like:
+ // /umbraco/webservices/legacyAjaxCalls.asmx/js which will return a null file extension but are still considered extension'd requests
+ if (urlPath.InvariantContains(".asmx/")
+ || urlPath.InvariantContains(".aspx/")
+ || urlPath.InvariantContains(".ashx/")
+ || urlPath.InvariantContains(".axd/")
+ || urlPath.InvariantContains(".svc/"))
+ {
+ return true;
+ }
+
+ //check for special back office paths
+ if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/BackOffice/")
+ || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/RestServices/"))
+ {
+ return true;
+ }
+
+ //check for special front-end paths
+ if (urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Surface/")
+ || urlPath.InvariantStartsWith("/" + GlobalSettings.UmbracoMvcArea + "/Api/"))
+ {
+ return false;
+ }
+
+ //if its none of the above, we will have to try to detect if it's a PluginController route, we can detect this by
+ // checking how many parts the route has, for example, all PluginController routes will be routed like
+ // Umbraco/MYPLUGINAREA/MYCONTROLLERNAME/{action}/{id}
+ // so if the path contains at a minimum 3 parts: Umbraco + MYPLUGINAREA + MYCONTROLLERNAME then we will have to assume it is a
+ // plugin controller for the front-end.
+ if (urlPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries).Length >= 3)
+ {
+ return false;
+ }
+
+ //if its anything else we can assume it's back office
+ return true;
}
///
diff --git a/src/Umbraco.Tests/CoreStrings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/CoreStrings/DefaultShortStringHelperTests.cs
index 5beac13d0e..64a432e815 100644
--- a/src/Umbraco.Tests/CoreStrings/DefaultShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/CoreStrings/DefaultShortStringHelperTests.cs
@@ -6,8 +6,12 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
+using Moq;
using NUnit.Framework;
+using umbraco;
using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Strings;
using Umbraco.Core.ObjectResolution;
using Umbraco.Tests.TestHelpers;
@@ -65,6 +69,13 @@ namespace Umbraco.Tests.CoreStrings
PreFilter = WhiteQuotes,
IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii
+ })
+ .WithConfig(CleanStringType.ConvertCase, new DefaultShortStringHelper.Config
+ {
+ PreFilter = null,
+ IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_', // letter, digit or underscore
+ StringType = CleanStringType.Ascii,
+ BreakTermsOnUpper = true
});
ShortStringHelperResolver.Reset();
@@ -98,6 +109,47 @@ namespace Umbraco.Tests.CoreStrings
return s;
}
+ [Test]
+ public void U4_4055_4056()
+ {
+ var settings = SettingsForTests.GenerateMockSettings();
+ var contentMock = Mock.Get(settings.RequestHandler);
+ contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty());
+ contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+ SettingsForTests.ConfigureSettings(settings);
+
+ const string input = "publishedVersion";
+
+ Assert.AreEqual("PublishedVersion", input.ConvertCase(StringAliasCaseType.PascalCase)); // obsolete, use the one below
+ Assert.AreEqual("PublishedVersion", input.ToCleanString(CleanStringType.ConvertCase | CleanStringType.PascalCase | CleanStringType.Ascii)); // role, case and code
+ }
+
+ [Test]
+ public void U4_4056()
+ {
+ var settings = SettingsForTests.GenerateMockSettings();
+ var contentMock = Mock.Get(settings.RequestHandler);
+ contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty());
+ contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+ SettingsForTests.ConfigureSettings(settings);
+
+ const string input = "ÆØÅ and æøå and 中文测试 and אודות האתר and größer БбДдЖж page";
+
+ var helper = new DefaultShortStringHelper().WithDefaultConfig(); // unicode
+ var output = helper.CleanStringForUrlSegment(input);
+ Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", output);
+
+ helper = new DefaultShortStringHelper()
+ .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelper.Config
+ {
+ IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
+ StringType = CleanStringType.LowerCase | CleanStringType.Ascii, // ascii
+ Separator = '-'
+ });
+ output = helper.CleanStringForUrlSegment(input);
+ Assert.AreEqual("aeoa-and-aeoa-and-and-and-grosser-bbddzhzh-page", output);
+ }
+
[Test]
public void CleanStringUnderscoreInTerm()
{
@@ -361,6 +413,12 @@ namespace Umbraco.Tests.CoreStrings
[Test]
public void CleanStringDefaultConfig()
{
+ var settings = SettingsForTests.GenerateMockSettings();
+ var contentMock = Mock.Get(settings.RequestHandler);
+ contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty());
+ contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+ SettingsForTests.ConfigureSettings(settings);
+
var helper = new DefaultShortStringHelper().WithDefaultConfig();
const string input = "0123 中文测试 中文测试 léger ZÔRG (2) a?? *x";
diff --git a/src/Umbraco.Tests/Macros/MacroParserTests.cs b/src/Umbraco.Tests/Macros/MacroParserTests.cs
index b4c17fec18..a8e171df3e 100644
--- a/src/Umbraco.Tests/Macros/MacroParserTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroParserTests.cs
@@ -16,6 +16,29 @@ namespace Umbraco.Tests.Macros
Assert.AreEqual(@"() { { "test1", "value1" }, { "test2", "value2" } });
+
+// Assert.AreEqual(@"(){{"test1", "value1"},{"test2", "value2"}});
+// Assert.AreEqual(@"
hello world
", content); } + [Test] + public void Format_RTE_Data_For_Editor_With_Non_AlphaNumeric_Char_In_Alias() + { + var content = @"asdfasdf
+asdfsadf
+ +asdfasdf
"; + var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); + Assert.AreEqual(@"asdfasdf
+asdfsadf
+
+
+Macro alias: My.Map.isCool
+asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); + } + [Test] public void Format_RTE_Data_For_Editor() { @@ -25,9 +48,16 @@ namespace Umbraco.Tests.Macrosasdfasdf
"; var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); + Assert.AreEqual(@"asdfasdf
asdfsadf
-
+() { { "test1", "value1" }, { "test2", "value2" } });
+// Assert.AreEqual(@"
Macro alias: Map
asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); @@ -42,9 +72,15 @@ namespace Umbraco.Tests.Macrosasdfasdf
"; var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); Assert.AreEqual(@"asdfasdf
asdfsadf
-
+() { { "test1", "value1" }, { "test2", "value2" } });
+// Assert.AreEqual(@"
Macro alias: Map
asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); @@ -59,9 +95,15 @@ namespace Umbraco.Tests.Macrosasdfasdf
"; var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); Assert.AreEqual(@"asdfasdf
asdfsadf
-
+() { { "test1", "value1" }, { "test2", "value2" } });
+// Assert.AreEqual(@"
Macro alias: Map
asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); @@ -76,9 +118,15 @@ namespace Umbraco.Tests.Macrosasdfasdf
"; var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); Assert.AreEqual(@"asdfasdf
asdfsadf
-
+() { { "test1", "value1" }, { "test2", "value2" } });
+// Assert.AreEqual(@"
Macro alias: Map
asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); @@ -93,9 +141,15 @@ namespace Umbraco.Tests.Macrosasdfasdf
"; var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionaryasdfasdf
+//asdfsadf
+//
+//
+//Macro alias: Map
+//asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); Assert.AreEqual(@"asdfasdf
asdfsadf
-
+
Macro alias: Map
asdfasdf
".Replace(Environment.NewLine, string.Empty), result.Replace(Environment.NewLine, string.Empty)); @@ -104,10 +158,26 @@ namespace Umbraco.Tests.Macros [Test] public void Format_RTE_Data_For_Persistence() { +// var content = @" +// +//asdfasdf
+//
+//
+//asdfasdf
+//asdfas
+//asdfasdfasdf
+//
+//asdfdasf
+//asdfasdf
+//
+//asdfsdf
+//
+//
+//";
var content = @"
asdfasdf
-
+
asdfasdf
asdfas
@@ -170,7 +240,15 @@ asdfsdf
[Test]
public void Format_RTE_Data_For_Persistence_Custom_Single_Entry()
{
- var content = @"
+// var content = @"
().Object,
new Mock().Object,
new Mock().Object,
+ new Mock().Object,
new Mock().Object,
new Mock().Object,
new Mock().Object,
@@ -77,6 +78,7 @@ namespace Umbraco.Tests
new Mock().Object,
new Mock().Object,
new Mock().Object,
+ new Mock().Object,
new Mock().Object,
new Mock().Object,
new Mock().Object,
diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
index a53edac3a4..17b092c16b 100644
--- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
+++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
@@ -234,8 +234,7 @@ namespace Umbraco.Tests.Services.Importing
Assert.That(contents.Any(), Is.True);
Assert.That(contents.Count(), Is.EqualTo(numberOfDocs));
}
-
-
+
[Test]
public void PackagingService_Can_Import_CheckboxList_Content_Package_Xml_With_Property_Editor_Aliases()
{
@@ -482,6 +481,51 @@ namespace Umbraco.Tests.Services.Importing
}
}
+ [Test]
+ public void PackagingService_Can_Import_Macros()
+ {
+ // Arrange
+ string strXml = ImportResources.uBlogsy_Package;
+ var xml = XElement.Parse(strXml);
+ var macrosElement = xml.Descendants("Macros").First();
+ var packagingService = ServiceContext.PackagingService;
+
+ // Act
+ var macros = packagingService.ImportMacros(macrosElement).ToList();
+
+ // Assert
+ Assert.That(macros.Any(), Is.True);
+
+ var allMacros = ServiceContext.MacroService.GetAll().ToList();
+ foreach (var macro in macros)
+ {
+ Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
+ }
+ }
+
+ [Test]
+ public void PackagingService_Can_Import_Macros_With_Properties()
+ {
+ // Arrange
+ string strXml = ImportResources.XsltSearch_Package;
+ var xml = XElement.Parse(strXml);
+ var macrosElement = xml.Descendants("Macros").First();
+ var packagingService = ServiceContext.PackagingService;
+
+ // Act
+ var macros = packagingService.ImportMacros(macrosElement).ToList();
+
+ // Assert
+ Assert.That(macros.Any(), Is.True);
+ Assert.That(macros.First().Properties.Any(), Is.True);
+
+ var allMacros = ServiceContext.MacroService.GetAll().ToList();
+ foreach (var macro in macros)
+ {
+ Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
+ }
+ }
+
private void AddLanguages()
{
var norwegian = new Core.Models.Language("nb-NO");
diff --git a/src/Umbraco.Tests/Services/PackagingServiceTests.cs b/src/Umbraco.Tests/Services/PackagingServiceTests.cs
index 0124b4ca1a..f1da377d4d 100644
--- a/src/Umbraco.Tests/Services/PackagingServiceTests.cs
+++ b/src/Umbraco.Tests/Services/PackagingServiceTests.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using NUnit.Framework;
@@ -22,6 +23,23 @@ namespace Umbraco.Tests.Services
base.TearDown();
}
+ [Test]
+ public void PackagingService_Can_Export_Macro()
+ {
+ // Arrange
+ var macro = new Macro("test1", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
+ ServiceContext.MacroService.Save(macro);
+
+ // Act
+ var element = ServiceContext.PackagingService.Export(macro);
+
+ // Assert
+ Assert.That(element, Is.Not.Null);
+ Assert.That(element.Element("name").Value, Is.EqualTo("Test"));
+ Assert.That(element.Element("alias").Value, Is.EqualTo("test1"));
+ Console.Write(element.ToString());
+ }
+
[Test]
public void PackagingService_Can_Export_DictionaryItems()
{
diff --git a/src/Umbraco.Tests/UriExtensionsTests.cs b/src/Umbraco.Tests/UriExtensionsTests.cs
index 61ed49d65d..8e826fc428 100644
--- a/src/Umbraco.Tests/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/UriExtensionsTests.cs
@@ -10,20 +10,33 @@ namespace Umbraco.Tests
[TestFixture]
public class UriExtensionsTests
{
- [TestCase("http://www.domain.com/umbraco", true)]
- [TestCase("http://www.domain.com/Umbraco/", true)]
- [TestCase("http://www.domain.com/umbraco/default.aspx", true)]
- [TestCase("http://www.domain.com/umbraco/test/test", true)]
- [TestCase("http://www.domain.com/Umbraco/test/test.aspx", true)]
- [TestCase("http://www.domain.com/umbraco/test/test.js", true)]
- [TestCase("http://www.domain.com/umbrac", false)]
- [TestCase("http://www.domain.com/test", false)]
- [TestCase("http://www.domain.com/test/umbraco", false)]
- [TestCase("http://www.domain.com/test/umbraco.aspx", false)]
- public void Is_Back_Office_Request(string input, bool expected)
+ [TestCase("http://www.domain.com/umbraco", "", true)]
+ [TestCase("http://www.domain.com/Umbraco/", "", true)]
+ [TestCase("http://www.domain.com/umbraco/default.aspx", "", true)]
+ [TestCase("http://www.domain.com/umbraco/test/test", "", false)]
+ [TestCase("http://www.domain.com/umbraco/test/test/test", "", false)]
+ [TestCase("http://www.domain.com/Umbraco/test/test.aspx", "", true)]
+ [TestCase("http://www.domain.com/umbraco/test/test.js", "", true)]
+ [TestCase("http://www.domain.com/umbrac", "", false)]
+ [TestCase("http://www.domain.com/test", "", false)]
+ [TestCase("http://www.domain.com/test/umbraco", "", false)]
+ [TestCase("http://www.domain.com/test/umbraco.aspx", "", false)]
+ [TestCase("http://www.domain.com/Umbraco/restServices/blah", "", true)]
+ [TestCase("http://www.domain.com/Umbraco/Backoffice/blah", "", true)]
+ [TestCase("http://www.domain.com/Umbraco/anything", "", true)]
+ [TestCase("http://www.domain.com/Umbraco/anything/", "", true)]
+ [TestCase("http://www.domain.com/Umbraco/surface/blah", "", false)]
+ [TestCase("http://www.domain.com/umbraco/api/blah", "", false)]
+ [TestCase("http://www.domain.com/myvdir/umbraco/api/blah", "myvdir", false)]
+ [TestCase("http://www.domain.com/MyVdir/umbraco/api/blah", "/myvdir", false)]
+ [TestCase("http://www.domain.com/MyVdir/Umbraco/", "myvdir", true)]
+ [TestCase("http://www.domain.com/MyVdir/Umbraco/restServices/blah", "/myvdir", true)]
+ [TestCase("http://www.domain.com/umbraco/webservices/legacyAjaxCalls.asmx/js", "", true)]
+ [TestCase("http://www.domain.com/umbraco/test/legacyAjaxCalls.ashx?some=query&blah=js", "", true)]
+ public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
{
- var source = new Uri(input);
- Assert.AreEqual(expected, source.IsBackOfficeRequest());
+ var source = new Uri(input);
+ Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath));
}
[TestCase("http://www.domain.com/install", true)]
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
index 912c624ce4..5db8fc074e 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
@@ -364,6 +364,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
getRootScope().$emit("app.closeDialogs", undefined);
}
},
+ /* This is used for the package installer to call in order to reload all app assets so we don't have to reload the window */
+ _packageInstalled: function() {
+ var injector = getRootInjector();
+ var packageHelper = injector.get("packageHelper");
+ packageHelper.packageInstalled();
+ },
_debug: function(strMsg) {
if (this._isDebug) {
Sys.Debug.trace("UmbClientMgr: " + strMsg);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/editors/cropsy.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/editors/cropsy.directive.js
deleted file mode 100644
index c0e8b6cc0f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/editors/cropsy.directive.js
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbCropsy
-* @restrict E
-* @function
-* @description
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
-**/
-angular.module("umbraco.directives")
- .directive('umbCropsy', function ($timeout, localizationService, $log) {
- return {
- restrict: 'E',
- replace: true,
- templateUrl: 'views/directives/umb-cropsy.html',
- scope: {
- src: '@',
- width: '@',
- height: '@',
- presets: '@',
- crop: "="
- },
- link: function(scope, element, attrs) {
-
- scope.scale = 100;
-
- //if image is over this, we re-calculate the editors global ratio
- //this will not have an effect on the result, since that is returned in percentage
- scope.maxHeight = 500;
- scope.maxWidth = 600;
- scope.width = 400;
- scope.height = 320;
-
- scope.dimensions = {
- image: {},
- cropper:{},
- viewport:{},
- margin: 20,
- ratio: 1
- };
-
- scope.style = function () {
- return {
- 'height': (parseInt(scope.height, 10) + 2 * scope.dimensions.margin) + 'px',
- 'width': (parseInt(scope.width, 10) + 2 * scope.dimensions.margin) + 'px'
- };
- };
-
- //elements
- var $viewport = element.find(".viewport");
- var $image = element.find("img");
- var $overlay = element.find(".overlay");
- var $container = element.find(".crop-container");
-
- //default constraints for drag n drop
- var constraints = {left: {max: 20, min: 20}, top: {max: 20, min: 20}, };
-
- var setDimensions = function(){
- scope.dimensions.image.width = $image.width();
- scope.dimensions.image.height = $image.height();
-
- scope.dimensions.viewport.width = $viewport.width();
- scope.dimensions.viewport.height = $viewport.height();
-
- scope.dimensions.cropper.width = scope.dimensions.viewport.width - 2 * scope.dimensions.margin;
- scope.dimensions.cropper.height = scope.dimensions.viewport.height - 2 * scope.dimensions.margin;
- };
-
- var setImageSize = function(width, height){
- $image.width(width);
- $image.height(height);
- scope.dimensions.image.width = width;
- scope.dimensions.image.height = height;
- };
-
- //when loading an image without any crop info, we center and fit it
- var fitImage = function(){
- fitToViewPort($image);
- centerImage($image);
- syncOverLay();
- setConstraints($image);
- };
-
- //utill for centering scaled image
- var centerImage = function(img) {
- var image_width = img.width(),
- image_height = img.height(),
- mask_width = $viewport.width(),
- mask_height = $viewport.height();
-
- img.css({
- 'position': 'absolute',
- 'left': scope.dimensions.viewport.width / 2 - scope.dimensions.image.width / 2,
- 'top': scope.dimensions.viewport.height / 2 - scope.dimensions.image.height / 2
- });
- };
-
- //utill for scaling image to fit viewport
- var fitToViewPort = function(img) {
- //returns size fitting the cropper
- var size = calculateAspectRatioFit(
- scope.dimensions.image.width,
- scope.dimensions.image.height,
- scope.dimensions.cropper.width,
- scope.dimensions.cropper.height,
- true);
-
- //sets the image size and updates the scope
- setImageSize(size.width, size.height);
-
- scope.minScale = size.ratio;
- scope.maxScale = size.ratio * 3;
- scope.currentScale = scope.minScale;
- scope.scale = scope.currentScale;
- };
-
- var resizeImageToScale = function(img, ratio){
- //do stuff
- var size = calculateSizeToRatio(scope.dimensions.image.originalWidth, scope.dimensions.image.originalHeight, ratio);
-
- setImageSize(size.width, size.height);
- centerImage(img);
- scope.currentScale = scope.scale;
-
- syncOverLay();
- };
-
- //set constaints for cropping drag and drop
- var setConstraints = function(img){
- //do stuff
- var w = img.width(),
- h = img.height(),
- crop_width = $viewport.width() - 2 * 20,
- crop_height = $viewport.height() - 2 * 20;
-
- constraints.left.min = 20 + crop_width - w;
- constraints.top.min = 20 + crop_height - h;
- };
-
- //utill for getting either min/max aspect ratio to scale image after
- var calculateAspectRatioFit = function(srcWidth, srcHeight, maxWidth, maxHeight, maximize) {
- var ratio = [maxWidth / srcWidth, maxHeight / srcHeight ];
-
- if(maximize){
- ratio = Math.max(ratio[0], ratio[1]);
- }else{
- ratio = Math.min(ratio[0], ratio[1]);
- }
-
- return { width:srcWidth*ratio, height:srcHeight*ratio, ratio: ratio};
- };
-
- //utill for scaling width / height given a ratio
- var calculateSizeToRatio= function(srcWidth, srcHeight, ratio) {
- return { width:srcWidth*ratio, height:srcHeight*ratio, ratio: ratio};
- };
-
- var calculateCropBox = function(){
- scope.crop.left = Math.abs($image[0].offsetLeft - scope.dimensions.margin) / scope.dimensions.image.width;
- scope.crop.top = Math.abs($image[0].offsetTop - scope.dimensions.margin) / scope.dimensions.image.height;
-
- scope.crop.right = 1 - Math.abs(scope.dimensions.cropper.width - (scope.dimensions.image.width - scope.crop.left)) / scope.dimensions.image.width;
- scope.crop.bottom = 1 - Math.abs(scope.dimensions.cropper.height - (scope.dimensions.image.height - scope.crop.top)) / scope.dimensions.image.height;
- };
-
- var calculatePosition = function(crop){
-
- var left = (crop.left * scope.dimensions.image.originalWidth);
- var top = (crop.top * scope.dimensions.image.originalHeight);
-
- var cropped_width = scope.dimensions.image.originalWidth - left;
- var ratio = cropped_width / scope.dimensions.image.originalWidth;
-
- scope.scale = ratio;
- resizeImageToScale($image, ratio);
-
- $image.css({
- "top": -top,
- "left": -left
- });
-
- syncOverLay();
- };
-
-
-
- var syncOverLay = function(){
- $overlay.height($image.height());
- $overlay.width($image.width());
-
- $overlay.css({
- "top": $image[0].offsetTop,
- "left": $image[0].offsetLeft
- });
-
- calculateCropBox();
- };
-
- //Drag and drop positioning, using jquery ui draggable
- var onStartDragPosition, top, left;
- $overlay.draggable({
- start: function(event, ui) {
- syncOverLay();
- },
- drag: function(event, ui) {
-
-
- if(ui.position.left <= constraints.left.max && ui.position.left >= constraints.left.min){
- $image.css({
- 'left': ui.position.left
- });
- }
-
- if(ui.position.top <= constraints.top.max && ui.position.top >= constraints.top.min){
- $image.css({
- 'top': ui.position.top
- });
- }
- },
- stop: function() {
- syncOverLay();
- }
- });
-
-
-
-
-
- //// INIT /////
- $image.load(function(){
- $timeout(function(){
- $image.width("auto");
- $image.height("auto");
-
- scope.dimensions.image.originalWidth = $image.width();
- scope.dimensions.image.originalHeight = $image.height();
-
- setDimensions();
-
- if(scope.crop && scope.crop.top){
- calculatePosition(scope.crop);
- }else{
- fitImage();
- }
-
- scope.loaded = true;
- });
- });
-
-
- /// WATCHERS ////
- scope.$watch("scale", function(){
- if(scope.loaded && scope.scale !== scope.currentScale){
- resizeImageToScale($image, scope.scale);
- setConstraints($image);
- }
- });
-
- /// WATCHERS ////
- scope.$watch("crop", function(newVal, oldVal){
- if(scope.loaded && newVal !== oldVal){
- calculatePosition(scope.crop);
- }
- });
- }
- };
- });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
index 142bea84f5..244893fdc1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
@@ -34,15 +34,14 @@ angular.module("umbraco.directives.html")
var fixedRowWidth = Math.max(element.width(), minWidth);
scope.containerStyle = { width: fixedRowWidth + "px" };
-
scope.rows = umbPhotoFolderHelper.buildGrid(photos, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin);
if (attrs.filterBy) {
scope.$watch(attrs.filterBy, function(newVal, oldVal) {
- if (newVal !== oldVal) {
+ if (newVal && newVal !== oldVal) {
var p = $filter('filter')(photos, newVal, false);
scope.baseline = 0;
- var m = umbPhotoFolderHelper.buildGrid(p, fixedRowWidth, 400);
+ var m = umbPhotoFolderHelper.buildGrid(p, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin);
scope.rows = m;
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js
index 349bf0a496..b6b59991b5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js
@@ -65,6 +65,11 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
scope.currentSection = args.value;
}
});
+
+ eventsService.on("app.reInitialize", function (e, args) {
+ //re-load the sections if we're re-initializing (i.e. package installed)
+ loadSections();
+ });
//on page resize
window.onresize = calculateHeight;
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
index 523f9c51f2..1984d4d009 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
@@ -59,8 +59,8 @@ angular.module('umbraco.mocks').
id: 1,
active: true,
properties: [
- { alias: "list", label: "List", view: "listview", value: "", hideLabel: true },
- { alias: "media", label: "Media picker", view: "mediapicker", value: "" }
+ { alias: "list", label: "List", view: "listview", value: "", hideLabel: true, config:{entityType: "content"} },
+ { alias: "media", label: "Media picker", view: "mediapicker", value: "" ,config:{} }
]
},
{
@@ -72,7 +72,7 @@ angular.module('umbraco.mocks').
{ alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
{ alias: "map", label: "Map", view: "googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } },
- { alias: "content", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
+ { alias: "media", label: "Media picker", view: "mediapicker", value: "1234,23242,23232,23231", config: {multiPicker: 1} }
]
},
{
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
index 73504fd19c..2578cdf877 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
@@ -7,6 +7,17 @@ angular.module('umbraco.mocks').
return [200, nodes, null];
}
+ function returnNodebyIds(status, data, headers) {
+ var ids = mocksUtils.getParameterByName(data, "ids") || "1234,1234,4234";
+ var items = [];
+
+ _.each(ids, function(id){
+ items.push(_getNode( parseInt( id, 10 )) );
+ });
+
+ return [200, items, null];
+ }
+
function returnNodebyId(status, data, headers) {
if (!mocksUtils.checkAuth()) {
@@ -16,86 +27,47 @@ angular.module('umbraco.mocks').
var id = mocksUtils.getParameterByName(data, "id") || 1234;
id = parseInt(id, 10);
- var node = {
- name: "My content with id: " + id,
- updateDate: new Date(),
- publishDate: new Date(),
- id: id,
- parentId: 1234,
- icon: "icon-file-alt",
- owner: {name: "Administrator", id: 0},
- updater: {name: "Per Ploug Krogslund", id: 1},
- path: "-1,1234,2455",
- tabs: [
- {
- label: "Child documents",
- alias: "tab00",
- id: 0,
- active: true,
- properties: [
- {
- alias: "list", label: "List", view: "listview", value: "", hideLabel: true }
- ]
- },
- {
- label: "Content",
- alias: "tab01",
- id: 1,
- properties: [
- { alias: "bodyText", label: "Body Text", description:"Here you enter the primary article contents", view: "rte", value: "
+
{{node.name}}
@@ -23,19 +24,6 @@
Choose ...
-
-
-
-
-
-
- Global
- Current
- ...Or pick a node
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 70de53bf24..70a98843b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -3,7 +3,7 @@
angular.module('umbraco')
.controller("Umbraco.PropertyEditors.ContentPickerController",
- function($scope, dialogService, entityResource, editorState, $log, iconHelper){
+ function($scope, dialogService, entityResource, $log, iconHelper){
$scope.renderModel = [];
$scope.ids = $scope.model.value ? $scope.model.value.split(',') : [];
@@ -11,8 +11,6 @@ angular.module('umbraco')
$scope.cfg = {
multiPicker: "0",
entityType: "Document",
- filterCssClass: "not-allowed not-published",
-
startNode:{
type: "content",
id: -1
@@ -33,23 +31,11 @@ angular.module('umbraco')
$scope.cfg.entityType = "Media";
}
- //if we have a query for the startnode, we will use that.
- if($scope.cfg.startNode.query){
- var rootId = -1;
- if($scope.cfg.startNode.scope === "current"){
- rootId = editorState.current.id;
- }
-
- entityResource.getByQuery($scope.cfg.startNode.query, rootId, "Document").then(function(ent){
- $scope.cfg.startNodeId = ent.id;
- });
- }else{
- $scope.cfg.startNodeId = $scope.cfg.startNode.id;
- }
-
$scope.cfg.callback = populate;
$scope.cfg.treeAlias = $scope.cfg.startNode.type;
- $scope.cfg.section = $scope.cfg.startNode.type;
+ $scope.cfg.section = $scope.cfg.startNode.type;
+ $scope.cfg.startNodeId = $scope.cfg.startNode.id;
+ $scope.cfg.filterCssClass = "not-allowed not-published";
//load current data
entityResource.getByIds($scope.ids, $scope.cfg.entityType).then(function(data){
@@ -68,39 +54,36 @@ angular.module('umbraco')
$scope.remove =function(index){
$scope.renderModel.splice(index, 1);
- $scope.ids.splice(index, 1);
- $scope.model.value = trim($scope.ids.join(), ",");
};
$scope.add =function(item){
if($scope.ids.indexOf(item.id) < 0){
item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-
- $scope.ids.push(item.id);
$scope.renderModel.push({name: item.name, id: item.id, icon: item.icon});
- $scope.model.value = trim($scope.ids.join(), ",");
}
};
$scope.clear = function() {
- $scope.model.value = "";
$scope.renderModel = [];
- $scope.ids = [];
- };
-
- $scope.sortableOptions = {
- update: function(e, ui) {
- var r = [];
- angular.forEach($scope.renderModel, function(value, key){
- r.push(value.id);
- });
-
- $scope.ids = r;
- $scope.model.value = trim($scope.ids.join(), ",");
- }
};
+ //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required
+ // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable
+ // occur after the DOM has updated but BEFORE the digest has occured so the model has NOT changed yet - it even states so in the docs.
+ // In their source code there is no event so we need to just subscribe to our model changes here.
+ //This also makes it easier to manage models, we update one and the rest will just work.
+ $scope.$watch(function() {
+ //return the joined Ids as a string to watch
+ return _.map($scope.renderModel, function(i) {
+ return i.id;
+ }).join();
+ }, function (newVal) {
+ $scope.ids = _.map($scope.renderModel, function (i) {
+ return i.id;
+ });
+ $scope.model.value = trim($scope.ids.join(), ",");
+ });
$scope.$on("formSubmitting", function (ev, args) {
$scope.model.value = trim($scope.ids.join(), ",");
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index e22d4cf22b..ecdd82e15a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -1,7 +1,7 @@
+//
";
+ var content = @"
+//
+//
+//
+//null
+//1089
+//null
diff --git a/src/Umbraco.Tests/MockTests.cs b/src/Umbraco.Tests/MockTests.cs index f6d31a2414..07d6837502 100644 --- a/src/Umbraco.Tests/MockTests.cs +++ b/src/Umbraco.Tests/MockTests.cs @@ -38,6 +38,7 @@ namespace Umbraco.Tests new Mockaskjdkasj lasjd
" }, - { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } }, - { alias: "map", label: "Map", view: "googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } }, - { alias: "media", label: "Media picker", view: "mediapicker", value: "" }, - { alias: "content", label: "Content picker", view: "contentpicker", value: "" } - ] - }, - { - label: "Sample Editor", - alias: "tab02", - id: 2, - properties: [ - { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { rows: 7 } }, - { alias: "tags", label: "Tags", view: "tags", value: ""} - ] - }, - { - label: "Grid", - alias: "tab03", - id: 3, - properties: [ - { alias: "grid", label: "Grid", view: "grid", value: "test", hideLabel: true } - ] - },{ - label: "WIP", - alias: "tab04", - id: 4, - properties: [ - { alias: "tes", label: "Stuff", view: "test", value: "", - - config: { - fields: [ - { alias: "embedded", label: "Embbeded", view: "textstring", value: ""}, - { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: ""}, - { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: ""}, - { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: ""} - ] - } - } - ] - } - ] - }; - return [200, node, null]; + + + return [200, _getNode(id), null]; } + function _getNode(id){ + var node = { + name: "My media with id: " + id, + updateDate: new Date(), + publishDate: new Date(), + id: id, + parentId: 1234, + icon: "icon-file-alt", + owner: {name: "Administrator", id: 0}, + updater: {name: "Per Ploug Krogslund", id: 1}, + path: "-1,1234,2455", + tabs: [ + { + label: "Media", + alias: "tab0", + id: 0, + properties: [ + { alias: "umbracoFile", label: "File", description:"Some file", view: "rte", value: "/media/1234/random.jpg" } + ] + } + ] + }; + return node; + } return { register: function() { $httpBackend - .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById')) + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById?')) .respond(returnNodebyId); + $httpBackend + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetByIds?')) + .respond(returnNodebyIds); + $httpBackend .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetChildren')) .respond(returnNodeCollection); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js new file mode 100644 index 0000000000..2ab633d9ef --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js @@ -0,0 +1,20 @@ +angular.module('umbraco.mocks'). + factory('imageHelperMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) { + 'use strict'; + + function returnEntitybyIds(){ + return "hello.jpg"; + } + + + return { + register: function () { + + $httpBackend + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Images/GetBigThumbnail')) + .respond(returnEntitybyIds); + + + } + }; + }]); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js index 220d55a996..2cd9545e6a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js @@ -1,7 +1,7 @@ var umbracoAppDev = angular.module('umbraco.httpbackend', ['umbraco', 'ngMockE2E', 'umbraco.mocks']); -function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks, macroMocks, utilMocks, localizationMocks, prevaluesMocks) { +function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks, macroMocks, utilMocks, localizationMocks, prevaluesMocks, imageHelperMocks) { console.log("httpBackend inited"); @@ -19,6 +19,7 @@ function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMock localizationMocks.register(); prevaluesMocks.register(); + imageHelperMocks.register(); entityMocks.register(); $httpBackend.whenGET(/^views\//).passThrough(); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js index a4c31df259..e0586487fd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js @@ -15,6 +15,8 @@ Umbraco.Sys.ServerVariables = { "authenticationApiBaseUrl": "/umbraco/UmbracoApi/Authentication/", //For this we'll just provide a file that exists during the mock session since we don't really have legay js tree stuff "legacyTreeJs": "/belle/lib/yepnope/empty.js", + "serverVarsJs": "/belle/lib/yepnope/empty.js", + "imagesApiBaseUrl": "/umbraco/UmbracoApi/Images/", "entityApiBaseUrl": "/umbraco/UmbracoApi/Entity/", "dashboardApiBaseUrl": "/umbraco/UmbracoApi/Dashboard/", "updateCheckApiBaseUrl": "/umbraco/Api/UpdateCheck/", diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js index 182b487f11..75d2f47a28 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js @@ -99,16 +99,6 @@ function entityResource($q, $http, umbRequestHelper) { 'Failed to retreive entity data for id ' + id); }, - getByQuery: function (query, rootNodeId, type) { - return umbRequestHelper.resourcePromise( - $http.get( - umbRequestHelper.getApiUrl( - "entityApiBaseUrl", - "GetByQuery", - [{query: query},{ rootNodeId: rootNodeId}, {type: type }])), - 'Failed to retreive entity data for query ' + query); - }, - /** * @ngdoc method * @name umbraco.resources.entityResource#getByIds diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js index ef534fd7b1..e3f86a4b14 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js @@ -41,7 +41,7 @@ * */ angular.module('umbraco.services') -.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope) { +.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http) { var initAssetsLoaded = false; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js index 560b743a29..d050b62961 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js @@ -65,7 +65,7 @@ function eventsService($q, $rootScope) { return $rootScope.$on(name, callback); }, - /** pass in the result of subscribe to this method, or just call the method returned from subscribe to unsubscribe */ + /** pass in the result of 'on' to this method, or just call the method returned from 'on' to unsubscribe */ unsubscribe: function(handle) { if (angular.isFunction(handle)) { handle(); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js index 0c240a294c..0b1f73e696 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js @@ -13,7 +13,7 @@ function macroService() { /** parses the special macro syntax like and returns an object with the macro alias and it's parameters */ parseMacroSyntax: function (syntax) { - var expression = /(<\?UMBRACO_MACRO macroAlias=["'](\w+?)["'].+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/im; + var expression = /(<\?UMBRACO_MACRO macroAlias=["']([\w\.]+?)["'].+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/im; var match = expression.exec(syntax); if (!match || match.length < 3) { return null; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 5abc1116d6..0b416a2753 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -1,5 +1,26 @@ /*Contains multiple services for various helper tasks */ +function packageHelper(assetsService, treeService, eventsService) { + + return { + + /** Called when a package is installed, this resets a bunch of data and ensures the new package assets are loaded in */ + packageInstalled: function () { + //assetsService._reloadApplicationAssets().then(function() { + // treeService.clearCache(); + // //send event + // //eventsService.emit("app.reInitialize"); + + // //TODO: This doesn't work and will end in an infinite browser load loop, we can't really + // // re-bootstrap anyways since that would be the same as loading the whole browser window. + // //angular.bootstrap(document, ['umbraco']); + //}); + } + + }; +} +angular.module('umbraco.services').factory('packageHelper', packageHelper); + function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, umbRequestHelper) { return { /** sets the image's url - will check if it is a folder or a real image */ diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index 0490f3e5e5..6ffde599a6 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -184,51 +184,6 @@ ul.color-picker li a { } -// -// Cropper -// ------------------------------------------------- - -.umb-cropper .crop-container .viewport img { - position: absolute; - top: 0; - left: 0; -} - - -.umb-cropper .overlay { - top: 0; - left: 0; - cursor: move; - z-index: 6001; - border: 1px solid red; -} - -.umb-cropper .viewport { - overflow: hidden; - position: relative; - width: 600px; - height: 400px; - border:1px solid #ccc; - background-image: url('images/viewport_background.gif'); -} - -.umb-cropper .viewport:after { - content: ""; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 5999; - -moz-opacity: .75; - opacity: .75; - filter: alpha(opacity=7); - -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2); - -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2); - box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2); -} - - // // folder-browser // -------------------------------------------------- diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js index 3b31b79b09..c9d911825c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js @@ -1,59 +1,62 @@ angular.module("umbraco") .controller("Umbraco.Editors.Content.CopyController", function ($scope, eventsService, contentResource, navigationService, appState, treeService) { - var dialogOptions = $scope.$parent.dialogOptions; - - $scope.dialogTreeEventHandler = $({}); - var node = dialogOptions.currentNode; - $scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){ - args.event.preventDefault(); - args.event.stopPropagation(); + var dialogOptions = $scope.$parent.dialogOptions; - eventsService.emit("editors.content.copyController.select", args); - - var c = $(args.event.target.parentElement); - if ($scope.selectedEl) { - $scope.selectedEl.find(".temporary").remove(); - $scope.selectedEl.find("i.umb-tree-icon").show(); - } + $scope.relateToOriginal = false; + $scope.dialogTreeEventHandler = $({}); - var temp = ""; - var icon = c.find("i.umb-tree-icon"); - if (icon.length > 0) { - icon.hide().after(temp); - } else { - c.prepend(temp); - } + var node = dialogOptions.currentNode; - $scope.target = args.node; - $scope.selectedEl = c; + $scope.dialogTreeEventHandler.bind("treeNodeSelect", function (ev, args) { + args.event.preventDefault(); + args.event.stopPropagation(); - }); + eventsService.emit("editors.content.copyController.select", args); - $scope.copy = function(){ - contentResource.copy({parentId: $scope.target.id, id: node.id, relateToOriginal: $scope.relate}) - .then(function(path){ - $scope.error = false; - $scope.success = true; + var c = $(args.event.target.parentElement); + if ($scope.selectedEl) { + $scope.selectedEl.find(".temporary").remove(); + $scope.selectedEl.find("i.umb-tree-icon").show(); + } - //get the currently edited node (if any) - var activeNode = appState.getTreeState("selectedNode"); - - //we need to do a double sync here: first sync to the copied content - but don't activate the node, - //then sync to the currenlty edited content (note: this might not be the content that was copied!!) + var temp = ""; + var icon = c.find("i.umb-tree-icon"); + if (icon.length > 0) { + icon.hide().after(temp); + } else { + c.prepend(temp); + } - navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false }).then(function(args) { - if (activeNode) { - var activeNodePath = treeService.getPath(activeNode).join(); - //sync to this node now - depending on what was copied this might already be synced but might not be - navigationService.syncTree({ tree: "content", path: activeNodePath, forceReload: false, activate: true }); - } - }); + $scope.target = args.node; + $scope.selectedEl = c; - },function(err){ - $scope.success = false; - $scope.error = err; - }); - }; -}); \ No newline at end of file + }); + + $scope.copy = function () { + contentResource.copy({ parentId: $scope.target.id, id: node.id, relateToOriginal: $scope.relateToOriginal }) + .then(function (path) { + $scope.error = false; + $scope.success = true; + + //get the currently edited node (if any) + var activeNode = appState.getTreeState("selectedNode"); + + //we need to do a double sync here: first sync to the copied content - but don't activate the node, + //then sync to the currenlty edited content (note: this might not be the content that was copied!!) + + navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false }).then(function (args) { + if (activeNode) { + var activeNodePath = treeService.getPath(activeNode).join(); + //sync to this node now - depending on what was copied this might already be synced but might not be + navigationService.syncTree({ tree: "content", path: activeNodePath, forceReload: false, activate: true }); + } + }); + + }, function (err) { + $scope.success = false; + $scope.error = err; + }); + }; + }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html index 10f9c5c21e..cbdff09b29 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html @@ -1,49 +1,52 @@
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-cropsy.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-cropsy.html
deleted file mode 100644
index 82f83d56d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-cropsy.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Choose where to copy {{currentNode.name}} to in the tree struture below +
-- Choose where to copy {{currentNode.name}} to in the tree struture below -
+
+
- {{error.errorMsg}}
+{{error.data.Message}}
+
-
+ {{error.errorMsg}}
-{{error.data.Message}}
-
+
-
- + {{currentNode.name}} was copied to + {{target.name}} +
-
-
-
- {{currentNode.name}} was copied to - {{target.name}}
+ +
-
-
+
-
+
+
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 87fa2c8724..5850225e68 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -5,6 +5,15 @@ angular.module('umbraco')
function($scope, dialogService, entityResource, $log, iconHelper){
+ if (!$scope.model) {
+ $scope.model = {};
+ }
+ if (!$scope.model.value) {
+ $scope.model.value = {
+ type: "content"
+ };
+ }
+
if($scope.model.value.id && $scope.model.value.type !== "member"){
var ent = "Document";
if($scope.model.value.type === "media"){
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index 080be5cc58..c9fdd8674d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -13,6 +13,7 @@
-
-
-
-
-
- 
-
-
-
- {{dimensions | json}}
-
-
-
- {{box | json}}
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index af5779b9a7..39edcc9590 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -32,14 +32,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.sync();
};
- $scope.edit = function(image){
- $scope.currentImage = image;
- $scope.currentImage.crop ={};
- if(!$scope.currentImage.crop){
- //$scope.currentImage.crop = { "left": 0.31731772342645215, "top": 0.17420325244997603, "right": 0.36246473116627076, "bottom": 0.30226197981593617 };
- }
- }
-
$scope.add = function() {
dialogService.mediaPicker({
multiPicker: multiPicker,
@@ -65,7 +57,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.sortableOptions = {
update: function(e, ui) {
- var r = [];
+ var r = [];
+ //TODO: Instead of doing this with a half second delay would be better to use a watch like we do in the
+ // content picker. THen we don't have to worry about setting ids, render models, models, we just set one and let the
+ // watch do all the rest.
$timeout(function(){
angular.forEach($scope.images, function(value, key){
r.push(value.id);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
index afbb248e5d..21afc87c2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
@@ -33,52 +33,45 @@ angular.module('umbraco')
$scope.remove =function(index){
$scope.renderModel.splice(index, 1);
- $scope.ids.splice(index, 1);
- $scope.model.value = trim($scope.ids.join(), ",");
};
$scope.add =function(item){
if($scope.ids.indexOf(item.id) < 0){
item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-
- $scope.ids.push(item.id);
- $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon});
- $scope.model.value = trim($scope.ids.join(), ",");
+ $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon});
}
};
$scope.clear = function() {
- $scope.model.value = "";
$scope.renderModel = [];
- $scope.ids = [];
};
-
- $scope.sortableOptions = {
- update: function(e, ui) {
- var r = [];
- angular.forEach($scope.renderModel, function(value, key){
- r.push(value.id);
- });
-
- $scope.ids = r;
- $scope.model.value = trim($scope.ids.join(), ",");
- }
- };
-
+ //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required
+ // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable
+ // occur after the DOM has updated but BEFORE the digest has occured so the model has NOT changed yet - it even states so in the docs.
+ // In their source code there is no event so we need to just subscribe to our model changes here.
+ //This also makes it easier to manage models, we update one and the rest will just work.
+ $scope.$watch(function () {
+ //return the joined Ids as a string to watch
+ return _.map($scope.renderModel, function (i) {
+ return i.id;
+ }).join();
+ }, function (newVal) {
+ $scope.ids = _.map($scope.renderModel, function (i) {
+ return i.id;
+ });
+ $scope.model.value = trim($scope.ids.join(), ",");
+ });
$scope.$on("formSubmitting", function (ev, args) {
$scope.model.value = trim($scope.ids.join(), ",");
});
-
-
function trim(str, chr) {
var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^'+chr+'+|'+chr+'+$', 'g');
return str.replace(rgxtrim, '');
}
-
function populate(data){
if(angular.isArray(data)){
_.each(data, function (item, i) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
index 473c5694e8..168b6cdd6d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
@@ -2,7 +2,7 @@