|
- <%=umbraco.ui.Text("preview", base.getUser())%>:
+ <%=umbraco.ui.Text("preview", UmbracoUser)%>:
|
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
index 3761c316a9..ddd51059a7 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
@@ -44,10 +44,10 @@
submitSucces: function(t) {
if (t != 'true') {
- top.UmbSpeechBubble.ShowMessage('error', this._opts.text.fileErrorHeader, this._opts.text.fileErrorText);
+ top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText));
}
else {
- top.UmbSpeechBubble.ShowMessage('save', this._opts.text.fileSavedHeader, this._opts.text.fileSavedText);
+ top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText));
}
@@ -60,7 +60,7 @@
},
submitFailure: function(t) {
- top.UmbSpeechBubble.ShowMessage('error', this._opts.text.fileErrorHeader, this._opts.text.fileErrorText);
+ top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText));
}
});
})(jQuery);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js
index b68cc7e2ac..3fce5e3987 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js
@@ -44,10 +44,10 @@
submitSucces: function(t) {
if (t != 'true') {
- top.UmbSpeechBubble.ShowMessage('error', this._opts.text.cssErrorHeader, this._opts.text.cssErrorText);
+ top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText));
}
else {
- top.UmbSpeechBubble.ShowMessage('save', this._opts.text.cssSavedHeader, this._opts.text.cssSavedText);
+ top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.cssSavedHeader), unescape(this._opts.text.cssSavedText));
}
UmbClientMgr.mainTree().setActiveTreeType('stylesheets');
@@ -58,7 +58,7 @@
},
submitFailure: function(t) {
- top.UmbSpeechBubble.ShowMessage('error', this._opts.text.cssErrorHeader, this._opts.text.cssErrorText);
+ top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText));
}
});
})(jQuery);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/ui/default.css b/src/Umbraco.Web.UI/umbraco_client/ui/default.css
index ecc1163290..576bd0d0ce 100644
--- a/src/Umbraco.Web.UI/umbraco_client/ui/default.css
+++ b/src/Umbraco.Web.UI/umbraco_client/ui/default.css
@@ -743,7 +743,12 @@ table.tabs-table tr.propertyContent td
}
table.tabs-table input[type=text] { width: 200px; }
table.tabs-table input[type=submit] { text-align: right; }
-table.tabs-table tr.propertyContent input.sort-order {display: none;}
+
+table.tabs-table tr.propertyContent input.sort-order {
+ width: 20px;
+ background-color: lightgray;
+ padding: 0px 5px 0px 5px;
+}
li.no-properties-on-tab {background: none; background-color: #fff; cursor: default; }
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index 1ba153e45e..5c5a33545d 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -25,7 +25,16 @@
-
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI/web.Template.Release.config b/src/Umbraco.Web.UI/web.Template.Release.config
index 3a244ea9f6..388480b0c3 100644
--- a/src/Umbraco.Web.UI/web.Template.Release.config
+++ b/src/Umbraco.Web.UI/web.Template.Release.config
@@ -23,6 +23,16 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/ApplicationCacheRefresher.cs b/src/Umbraco.Web/Cache/ApplicationCacheRefresher.cs
index a9e52fbb2f..8b742b1b2c 100644
--- a/src/Umbraco.Web/Cache/ApplicationCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ApplicationCacheRefresher.cs
@@ -27,16 +27,19 @@ namespace Umbraco.Web.Cache
public override void RefreshAll()
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.ApplicationsCacheKey);
+ base.RefreshAll();
}
public override void Refresh(int id)
{
Remove(id);
+ base.Refresh(id);
}
public override void Remove(int id)
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.ApplicationsCacheKey);
+ base.Remove(id);
}
}
diff --git a/src/Umbraco.Web/Cache/ApplicationTreeCacheRefresher.cs b/src/Umbraco.Web/Cache/ApplicationTreeCacheRefresher.cs
index ba2306bfe4..e267b441a2 100644
--- a/src/Umbraco.Web/Cache/ApplicationTreeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ApplicationTreeCacheRefresher.cs
@@ -27,16 +27,19 @@ namespace Umbraco.Web.Cache
public override void RefreshAll()
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.ApplicationTreeCacheKey);
+ base.RefreshAll();
}
public override void Refresh(int id)
{
Remove(id);
+ base.Refresh(id);
}
public override void Remove(int id)
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(CacheKeys.ApplicationTreeCacheKey);
+ base.Remove(id);
}
}
diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index a9b01fb6e5..469463d7a2 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -131,19 +131,40 @@ namespace Umbraco.Web.Cache
MediaService.Moving += MediaServiceMoving;
MediaService.Trashing += MediaServiceTrashing;
- ContentService.Created += ContentServiceCreated;
+ //Bind to content events - this is for unpublished content syncing across servers (primarily for examine)
+
+ ContentService.Saved += ContentServiceSaved;
+ ContentService.Deleted += ContentServiceDeleted;
ContentService.Copied += ContentServiceCopied;
+ //NOTE: we do not listen for the trashed event because there is no cache to update for content in that case since
+ // the unpublishing event handles that, and for examine with unpublished content indexes, we want to keep that data
+ // in the index, it's not until it's complete deleted that we want to remove it.
+
+ //public access events
+ Access.AfterSave += Access_AfterSave;
}
+ #region Public access event handlers
+
+ static void Access_AfterSave(Access sender, SaveEventArgs e)
+ {
+ DistributedCache.Instance.RefreshPublicAccess();
+ }
+
+ #endregion
+
#region Content service event handlers
///
- /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the
- /// case then we need to clear all user permissions cache.
+ /// Handles cache refreshgi for when content is copied
///
///
///
- static void ContentServiceCopied(IContentService sender, Core.Events.CopyEventArgs e)
+ ///
+ /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the
+ /// case then we need to clear all user permissions cache.
+ ///
+ static void ContentServiceCopied(IContentService sender, CopyEventArgs e)
{
//check if permissions have changed
var permissionsChanged = ((Content)e.Copy).WasPropertyDirty("PermissionsChanged");
@@ -151,23 +172,63 @@ namespace Umbraco.Web.Cache
{
DistributedCache.Instance.RefreshAllUserPermissionsCache();
}
+
+ //run the un-published cache refresher
+ DistributedCache.Instance.RefreshUnpublishedPageCache(e.Copy);
}
///
- /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the
- /// case then we need to clear all user permissions cache.
+ /// Handles cache refreshing for when content is deleted (not unpublished)
///
///
///
- static void ContentServiceCreated(IContentService sender, Core.Events.NewEventArgs e)
+ static void ContentServiceDeleted(IContentService sender, DeleteEventArgs e)
{
- //check if permissions have changed
- var permissionsChanged = ((Content)e.Entity).WasPropertyDirty("PermissionsChanged");
- if (permissionsChanged)
+ DistributedCache.Instance.RemoveUnpublishedPageCache(e.DeletedEntities.ToArray());
+ }
+
+ ///
+ /// Handles cache refreshing for when content is saved (not published)
+ ///
+ ///
+ ///
+ ///
+ /// When an entity is saved we need to notify other servers about the change in order for the Examine indexes to
+ /// stay up-to-date for unpublished content.
+ ///
+ /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the
+ /// case then we need to clear all user permissions cache.
+ ///
+ static void ContentServiceSaved(IContentService sender, SaveEventArgs e)
+ {
+ var clearUserPermissions = false;
+ e.SavedEntities.ForEach(x =>
+ {
+ //check if it is new
+ if (x.IsNewEntity())
+ {
+ //check if permissions have changed
+ var permissionsChanged = ((Content)x).WasPropertyDirty("PermissionsChanged");
+ if (permissionsChanged)
+ {
+ clearUserPermissions = true;
+ }
+ }
+ });
+
+ if (clearUserPermissions)
{
DistributedCache.Instance.RefreshAllUserPermissionsCache();
}
- }
+
+ //filter out the entities that have only been saved (not newly published) since
+ // newly published ones will be synced with the published page cache refresher
+ var unpublished = e.SavedEntities.Where(x => x.JustPublished() == false);
+ //run the un-published cache refresher
+ DistributedCache.Instance.RefreshUnpublishedPageCache(unpublished.ToArray());
+ }
+
+
#endregion
#region ApplicationTree event handlers
@@ -451,12 +512,12 @@ namespace Umbraco.Web.Cache
InvalidateCacheForPermissionsChange(sender);
}
- void UserServiceSavedUser(IUserService sender, Core.Events.SaveEventArgs e)
+ static void UserServiceSavedUser(IUserService sender, SaveEventArgs e)
{
e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshUserCache(x.Id));
}
- void UserServiceDeletedUser(IUserService sender, Core.Events.DeleteEventArgs e)
+ static void UserServiceDeletedUser(IUserService sender, DeleteEventArgs e)
{
e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveUserCache(x.Id));
}
@@ -545,22 +606,22 @@ namespace Umbraco.Web.Cache
#endregion
#region Media event handlers
- static void MediaServiceTrashing(IMediaService sender, Core.Events.MoveEventArgs e)
+ static void MediaServiceTrashing(IMediaService sender, MoveEventArgs e)
{
- DistributedCache.Instance.RemoveMediaCache(e.Entity);
+ DistributedCache.Instance.RemoveMediaCache(false, e.Entity);
}
- static void MediaServiceMoving(IMediaService sender, Core.Events.MoveEventArgs e)
+ static void MediaServiceMoving(IMediaService sender, MoveEventArgs e)
{
DistributedCache.Instance.RefreshMediaCache(e.Entity);
}
- static void MediaServiceDeleting(IMediaService sender, Core.Events.DeleteEventArgs e)
+ static void MediaServiceDeleting(IMediaService sender, DeleteEventArgs e)
{
- DistributedCache.Instance.RemoveMediaCache(e.DeletedEntities.ToArray());
+ DistributedCache.Instance.RemoveMediaCache(true, e.DeletedEntities.ToArray());
}
- static void MediaServiceSaved(IMediaService sender, Core.Events.SaveEventArgs e)
+ static void MediaServiceSaved(IMediaService sender, SaveEventArgs e)
{
DistributedCache.Instance.RefreshMediaCache(e.SavedEntities.ToArray());
}
@@ -568,27 +629,21 @@ namespace Umbraco.Web.Cache
#region Member event handlers
- static void MemberServiceDeleted(IMemberService sender, Core.Events.DeleteEventArgs e)
+ static void MemberServiceDeleted(IMemberService sender, DeleteEventArgs e)
{
- foreach (var m in e.DeletedEntities.ToArray())
- {
- DistributedCache.Instance.RemoveMemberCache(m.Id);
- }
+ DistributedCache.Instance.RemoveMemberCache(e.DeletedEntities.ToArray());
}
- static void MemberServiceSaved(IMemberService sender, Core.Events.SaveEventArgs e)
+ static void MemberServiceSaved(IMemberService sender, SaveEventArgs e)
{
- foreach (var m in e.SavedEntities.ToArray())
- {
- DistributedCache.Instance.RefreshMemberCache(m.Id);
- }
+ DistributedCache.Instance.RefreshMemberCache(e.SavedEntities.ToArray());
}
#endregion
#region Member group event handlers
- static void MemberGroupService_Deleted(IMemberGroupService sender, Core.Events.DeleteEventArgs e)
+ static void MemberGroupService_Deleted(IMemberGroupService sender, DeleteEventArgs e)
{
foreach (var m in e.DeletedEntities.ToArray())
{
@@ -596,7 +651,7 @@ namespace Umbraco.Web.Cache
}
}
- static void MemberGroupService_Saved(IMemberGroupService sender, Core.Events.SaveEventArgs e)
+ static void MemberGroupService_Saved(IMemberGroupService sender, SaveEventArgs e)
{
foreach (var m in e.SavedEntities.ToArray())
{
diff --git a/src/Umbraco.Web/Cache/DistributedCache.cs b/src/Umbraco.Web/Cache/DistributedCache.cs
index b66dd2174a..c993129859 100644
--- a/src/Umbraco.Web/Cache/DistributedCache.cs
+++ b/src/Umbraco.Web/Cache/DistributedCache.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Cache
public const string ApplicationCacheRefresherId = "B15F34A1-BC1D-4F8B-8369-3222728AB4C8";
public const string TemplateRefresherId = "DD12B6A0-14B9-46e8-8800-C154F74047C8";
public const string PageCacheRefresherId = "27AB3022-3DFA-47b6-9119-5945BC88FD66";
+ public const string UnpublishedPageCacheRefresherId = "55698352-DFC5-4DBE-96BD-A4A0F6F77145";
public const string MemberCacheRefresherId = "E285DF34-ACDC-4226-AE32-C0CB5CF388DA";
public const string MemberGroupCacheRefresherId = "187F236B-BD21-4C85-8A7C-29FBA3D6C00C";
public const string MediaCacheRefresherId = "B29286DD-2D40-4DDB-B325-681226589FEC";
@@ -53,6 +54,7 @@ namespace Umbraco.Web.Cache
public const string StylesheetPropertyCacheRefresherId = "2BC7A3A4-6EB1-4FBC-BAA3-C9E7B6D36D38";
public const string DataTypeCacheRefresherId = "35B16C25-A17E-45D7-BC8F-EDAB1DCC28D2";
public const string DictionaryCacheRefresherId = "D1D7E227-F817-4816-BFE9-6C39B6152884";
+ public const string PublicAccessCacheRefresherId = "1DB08769-B104-4F8B-850E-169CAC1DF2EC";
#endregion
@@ -220,4 +222,4 @@ namespace Umbraco.Web.Cache
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index faede0bffc..7263776ae5 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -13,6 +13,17 @@ namespace Umbraco.Web.Cache
///
internal static class DistributedCacheExtensions
{
+ #region Public access
+
+ public static void RefreshPublicAccess(this DistributedCache dc)
+ {
+ dc.RefreshByJson(new Guid(DistributedCache.PublicAccessCacheRefresherId),
+ PublicAccessCacheRefresher.SerializeToJsonPayload(
+ Access.GetXmlDocumentCopy()));
+ }
+
+ #endregion
+
#region Application tree cache
public static void RefreshAllApplicationTreeCache(this DistributedCache dc)
{
@@ -123,8 +134,7 @@ namespace Umbraco.Web.Cache
}
#endregion
-
-
+
#region Data type cache
///
/// Refreshes the cache amongst servers for a data type
@@ -232,15 +242,58 @@ namespace Umbraco.Web.Cache
public static void RemovePageCache(this DistributedCache dc, int documentId)
{
dc.Remove(new Guid(DistributedCache.PageCacheRefresherId), documentId);
- }
+ }
+
+ ///
+ /// invokes the unpublished page cache refresher
+ ///
+ ///
+ ///
+ public static void RefreshUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
+ {
+ dc.Refresh(new Guid(DistributedCache.UnpublishedPageCacheRefresherId), x => x.Id, content);
+ }
+
+ ///
+ /// invokes the unpublished page cache refresher
+ ///
+ ///
+ ///
+ public static void RemoveUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
+ {
+ dc.Remove(new Guid(DistributedCache.UnpublishedPageCacheRefresherId), x => x.Id, content);
+ }
+
#endregion
#region Member cache
+
+ ///
+ /// Refreshes the cache among servers for a member
+ ///
+ ///
+ ///
+ public static void RefreshMemberCache(this DistributedCache dc, params IMember[] members)
+ {
+ dc.Refresh(new Guid(DistributedCache.MemberCacheRefresherId), x => x.Id, members);
+ }
+
+ ///
+ /// Removes the cache among servers for a member
+ ///
+ ///
+ ///
+ public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
+ {
+ dc.Remove(new Guid(DistributedCache.MemberCacheRefresherId), x => x.Id, members);
+ }
+
///
/// Refreshes the cache among servers for a member
///
///
///
+ [Obsolete("Use the RefreshMemberCache with strongly typed IMember objects instead")]
public static void RefreshMemberCache(this DistributedCache dc, int memberId)
{
dc.Refresh(new Guid(DistributedCache.MemberCacheRefresherId), memberId);
@@ -251,6 +304,7 @@ namespace Umbraco.Web.Cache
///
///
///
+ [Obsolete("Use the RemoveMemberCache with strongly typed IMember objects instead")]
public static void RemoveMemberCache(this DistributedCache dc, int memberId)
{
dc.Remove(new Guid(DistributedCache.MemberCacheRefresherId), memberId);
@@ -291,7 +345,7 @@ namespace Umbraco.Web.Cache
public static void RefreshMediaCache(this DistributedCache dc, params IMedia[] media)
{
dc.RefreshByJson(new Guid(DistributedCache.MediaCacheRefresherId),
- MediaCacheRefresher.SerializeToJsonPayload(media));
+ MediaCacheRefresher.SerializeToJsonPayload(MediaCacheRefresher.OperationType.Saved, media));
}
///
@@ -304,6 +358,7 @@ namespace Umbraco.Web.Cache
/// to clear all of the cache but the media item will be removed before the other servers can
/// look it up. Only here for legacy purposes.
///
+ [Obsolete("Ensure to clear with other RemoveMediaCache overload")]
public static void RemoveMediaCache(this DistributedCache dc, int mediaId)
{
dc.Remove(new Guid(DistributedCache.MediaCacheRefresherId), mediaId);
@@ -313,11 +368,14 @@ namespace Umbraco.Web.Cache
/// Removes the cache amongst servers for media items
///
///
+ ///
///
- public static void RemoveMediaCache(this DistributedCache dc, params IMedia[] media)
+ public static void RemoveMediaCache(this DistributedCache dc, bool isPermanentlyDeleted, params IMedia[] media)
{
- dc.RefreshByJson(new Guid(DistributedCache.MediaCacheRefresherId),
- MediaCacheRefresher.SerializeToJsonPayload(media));
+ dc.RefreshByJson(new Guid(DistributedCache.MediaCacheRefresherId),
+ MediaCacheRefresher.SerializeToJsonPayload(
+ isPermanentlyDeleted ? MediaCacheRefresher.OperationType.Deleted : MediaCacheRefresher.OperationType.Trashed,
+ media));
}
#endregion
diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
index 53abacc7a5..a2de17626f 100644
--- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
@@ -1,15 +1,16 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.Web.Script.Serialization;
using Umbraco.Core;
using Umbraco.Core.Cache;
+using Umbraco.Core.IO;
using Umbraco.Core.Models;
using umbraco.interfaces;
using System.Linq;
namespace Umbraco.Web.Cache
{
-
///
/// A cache refresher to ensure media cache is updated
///
@@ -19,13 +20,13 @@ namespace Umbraco.Web.Cache
public class MediaCacheRefresher : JsonCacheRefresherBase
{
#region Static helpers
-
+
///
/// Converts the json to a JsonPayload object
///
///
///
- private static JsonPayload[] DeserializeFromJsonPayload(string json)
+ internal static JsonPayload[] DeserializeFromJsonPayload(string json)
{
var serializer = new JavaScriptSerializer();
var jsonObject = serializer.Deserialize(json);
@@ -35,12 +36,13 @@ namespace Umbraco.Web.Cache
///
/// Creates the custom Json payload used to refresh cache amongst the servers
///
+ ///
///
///
- internal static string SerializeToJsonPayload(params IMedia[] media)
+ internal static string SerializeToJsonPayload(OperationType operation, params IMedia[] media)
{
var serializer = new JavaScriptSerializer();
- var items = media.Select(FromMedia).ToArray();
+ var items = media.Select(x => FromMedia(x, operation)).ToArray();
var json = serializer.Serialize(items);
return json;
}
@@ -49,15 +51,17 @@ namespace Umbraco.Web.Cache
/// Converts a macro to a jsonPayload object
///
///
+ ///
///
- private static JsonPayload FromMedia(IMedia media)
+ internal static JsonPayload FromMedia(IMedia media, OperationType operation)
{
if (media == null) return null;
var payload = new JsonPayload
{
Id = media.Id,
- Path = media.Path
+ Path = media.Path,
+ Operation = operation
};
return payload;
}
@@ -66,10 +70,18 @@ namespace Umbraco.Web.Cache
#region Sub classes
- private class JsonPayload
+ internal enum OperationType
+ {
+ Saved,
+ Trashed,
+ Deleted
+ }
+
+ internal class JsonPayload
{
public string Path { get; set; }
public int Id { get; set; }
+ public OperationType Operation { get; set; }
}
#endregion
@@ -97,13 +109,15 @@ namespace Umbraco.Web.Cache
public override void Refresh(int id)
{
- ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id)));
+ ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id), OperationType.Saved));
base.Refresh(id);
}
public override void Remove(int id)
- {
- ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id)));
+ {
+ ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id),
+ //NOTE: we'll just default to trashed for this one.
+ OperationType.Trashed));
base.Remove(id);
}
@@ -121,7 +135,7 @@ namespace Umbraco.Web.Cache
string.Format("{0}_{1}_True", CacheKeys.MediaCacheKey, idPart));
// Also clear calls that only query this specific item!
- if (idPart == payload.Id.ToString())
+ if (idPart == payload.Id.ToString(CultureInfo.InvariantCulture))
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(
string.Format("{0}_{1}", CacheKeys.MediaCacheKey, payload.Id));
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 2b740e826d..97afd092a7 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Web.Cache
///
/// This is not intended to be used directly in your code and it should be sealed but due to legacy code we cannot seal it.
///
- public class MemberCacheRefresher : CacheRefresherBase
+ public class MemberCacheRefresher : TypedCacheRefresherBase
{
protected override MemberCacheRefresher Instance
@@ -44,6 +44,18 @@ namespace Umbraco.Web.Cache
base.Remove(id);
}
+ public override void Refresh(IMember instance)
+ {
+ ClearCache(instance.Id);
+ base.Refresh(instance);
+ }
+
+ public override void Remove(IMember instance)
+ {
+ ClearCache(instance.Id);
+ base.Remove(instance);
+ }
+
private void ClearCache(int id)
{
ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
diff --git a/src/Umbraco.Web/Cache/PublicAccessCacheRefresher.cs b/src/Umbraco.Web/Cache/PublicAccessCacheRefresher.cs
new file mode 100644
index 0000000000..0c700e9dfa
--- /dev/null
+++ b/src/Umbraco.Web/Cache/PublicAccessCacheRefresher.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Xml;
+using Newtonsoft.Json;
+using umbraco.cms.businesslogic.web;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+
+namespace Umbraco.Web.Cache
+{
+ public sealed class PublicAccessCacheRefresher : JsonCacheRefresherBase
+ {
+ #region Static helpers
+
+ internal static JsonPayload DeserializeFromJsonPayload(string json)
+ {
+ return JsonConvert.DeserializeObject(json);
+ }
+
+ internal static string SerializeToJsonPayload(XmlDocument doc)
+ {
+ return JsonConvert.SerializeObject(FromXml(doc));
+ }
+
+ internal static JsonPayload FromXml(XmlDocument doc)
+ {
+ if (doc == null) return null;
+
+ var payload = new JsonPayload
+ {
+ XmlContent = doc.OuterXml
+ };
+ return payload;
+ }
+
+ #endregion
+
+ #region Sub classes
+
+ internal class JsonPayload
+ {
+ public string XmlContent { get; set; }
+ }
+
+ #endregion
+
+ protected override PublicAccessCacheRefresher Instance
+ {
+ get { return this; }
+ }
+
+ public override Guid UniqueIdentifier
+ {
+ get { return new Guid(DistributedCache.PublicAccessCacheRefresherId); }
+ }
+
+ public override string Name
+ {
+ get { return "Public access cache refresher"; }
+ }
+
+ public override void Refresh(string jsonPayload)
+ {
+ if (jsonPayload.IsNullOrWhiteSpace()) return;
+ var deserialized = DeserializeFromJsonPayload(jsonPayload);
+ if (deserialized == null) return;
+ var xDoc = new XmlDocument();
+ xDoc.LoadXml(deserialized.XmlContent);
+ ClearCache(xDoc);
+ base.Refresh(jsonPayload);
+ }
+
+ private void ClearCache(XmlDocument xDoc)
+ {
+ Access.UpdateInMemoryDocument(xDoc);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs b/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
new file mode 100644
index 0000000000..4413a61e9b
--- /dev/null
+++ b/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
@@ -0,0 +1,33 @@
+using System;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Web.Cache
+{
+ ///
+ /// A cache refresher used for non-published content, this is primarily to notify Examine indexes to update
+ ///
+ public sealed class UnpublishedPageCacheRefresher : TypedCacheRefresherBase
+ {
+ protected override UnpublishedPageCacheRefresher Instance
+ {
+ get { return this; }
+ }
+
+ public override Guid UniqueIdentifier
+ {
+ get { return new Guid(DistributedCache.UnpublishedPageCacheRefresherId); }
+ }
+
+ public override string Name
+ {
+ get { return "Unpublished Page Refresher"; }
+ }
+
+ //NOTE: There is no functionality for this cache refresher, it is here simply to emit events on each server for which examine
+ // binds to. We could put the Examine index functionality in here but we've kept it all in the ExamineEvents class so that all of
+ // the logic is in one place. In the future we may put the examine logic in a cache refresher instead (that would make sense) but we'd
+ // want to get this done before making more cache refreshers:
+ // http://issues.umbraco.org/issue/U4-2633
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/UserCacheRefresher.cs b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
index dda11ee2c4..deb36ae894 100644
--- a/src/Umbraco.Web/Cache/UserCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
@@ -32,11 +32,13 @@ namespace Umbraco.Web.Cache
RuntimeCacheProvider.Current.Clear(typeof(IUser));
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.UserPermissionsCacheKey);
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.UserContextCacheKey);
+ base.RefreshAll();
}
public override void Refresh(int id)
{
Remove(id);
+ base.Refresh(id);
}
public override void Remove(int id)
@@ -48,6 +50,8 @@ namespace Umbraco.Web.Cache
//we need to clear all UserContextCacheKey since we cannot invalidate based on ID since the cache is done so based
//on the current contextId stored in the database
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.UserContextCacheKey);
+
+ base.Remove(id);
}
}
diff --git a/src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs b/src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
index fdafdedb09..e61ea0d7e0 100644
--- a/src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
@@ -31,17 +31,20 @@ namespace Umbraco.Web.Cache
public override void RefreshAll()
{
- ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.UserPermissionsCacheKey);
+ ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.UserPermissionsCacheKey);
+ base.RefreshAll();
}
public override void Refresh(int id)
{
Remove(id);
+ base.Refresh(id);
}
public override void Remove(int id)
{
ApplicationContext.Current.ApplicationCache.ClearCacheItem(string.Format("{0}{1}", CacheKeys.UserPermissionsCacheKey, id));
+ base.Remove(id);
}
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/UserTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/UserTypeCacheRefresher.cs
index 7c4628dbe3..1a726da815 100644
--- a/src/Umbraco.Web/Cache/UserTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserTypeCacheRefresher.cs
@@ -29,16 +29,19 @@ namespace Umbraco.Web.Cache
public override void RefreshAll()
{
RuntimeCacheProvider.Current.Clear(typeof (IUserType));
+ base.RefreshAll();
}
public override void Refresh(int id)
{
RuntimeCacheProvider.Current.Delete(typeof(IUserType), id);
+ base.Refresh(id);
}
public override void Remove(int id)
{
RuntimeCacheProvider.Current.Delete(typeof(IUserType), id);
+ base.Remove(id);
}
}
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 33d657cc3f..0d4ad8aa4a 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -32,9 +32,9 @@ namespace Umbraco.Web.Controllers
}
//redirect to current page by default
- TempData.Add("LoginSuccess", true);
- //return RedirectToCurrentUmbracoPage();
- return RedirectToCurrentUmbracoUrl();
+ TempData["LoginSuccess"] = true;
+ return RedirectToCurrentUmbracoPage();
+ //return RedirectToCurrentUmbracoUrl();
}
}
}
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index a4081413c3..e1d9a7aab1 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Controllers
}
//redirect to current page by default
- TempData.Add("LogoutSuccess", true);
+ TempData["LogoutSuccess"] = true;
return RedirectToCurrentUmbracoPage();
}
}
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index 03c5ee91ff..dfcf17a543 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -16,7 +16,8 @@ namespace Umbraco.Web.Controllers
[HttpPost]
public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
{
- if (Membership.Provider.IsUmbracoMembershipProvider() == false)
+ var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+ if (provider.IsUmbracoMembershipProvider() == false)
{
throw new NotSupportedException("Profile editing with the " + typeof(UmbProfileController) + " is not supported when not using the default Umbraco membership provider");
}
@@ -41,7 +42,7 @@ namespace Umbraco.Web.Controllers
}
//redirect to current page by default
- TempData.Add("ProfileUpdateSuccess", true);
+ TempData["ProfileUpdateSuccess"] = true;
return RedirectToCurrentUmbracoPage();
}
}
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index c661c24f69..dea1135131 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Controllers
return Redirect(model.RedirectUrl);
}
//redirect to current page by default
- TempData.Add("FormSuccess", true);
+ TempData["FormSuccess"] = true;
return RedirectToCurrentUmbracoPage();
case MembershipCreateStatus.InvalidUserName:
ModelState.AddModelError((model.UsernameIsEmail || model.Username == null)
diff --git a/src/Umbraco.Web/Install/Steps/Database.cs b/src/Umbraco.Web/Install/Steps/Database.cs
index ff3363947a..a20c07a122 100644
--- a/src/Umbraco.Web/Install/Steps/Database.cs
+++ b/src/Umbraco.Web/Install/Steps/Database.cs
@@ -1,8 +1,9 @@
using System;
+using System.Linq;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
-using Umbraco.Web.Install;
+using Umbraco.Core.Logging;
namespace Umbraco.Web.Install.Steps
{
@@ -32,22 +33,39 @@ namespace Umbraco.Web.Install.Steps
//here we determine if the installer should skip this step...
public override bool Completed()
{
+
// Fresh installs don't have a version number so this step cannot be complete yet
- if (string.IsNullOrEmpty(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
+ if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus))
{
//Even though the ConfigurationStatus is blank we try to determine the version if we can connect to the database
var result = ApplicationContext.Current.DatabaseContext.ValidateDatabaseSchema();
var determinedVersion = result.DetermineInstalledVersion();
if (determinedVersion.Equals(new Version(0, 0, 0)))
- return false;
+ {
+ // Now that we know this is a brand new Umbraco install, turn membership providers' "useLegacyEncoding" off
+ DisableMembershipProviderLegacyEncoding();
+ return false;
+ }
return UmbracoVersion.Current < determinedVersion;
}
- var configuredVersion = new Version(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus);
+ var configuredVersion = new Version(GlobalSettings.ConfigurationStatus);
var targetVersion = UmbracoVersion.Current;
return targetVersion < configuredVersion;
}
+
+ private static void DisableMembershipProviderLegacyEncoding()
+ {
+ if (GlobalSettings.UmbracoMembershipProviderLegacyEncoding)
+ GlobalSettings.UmbracoMembershipProviderLegacyEncoding = false;
+
+ if (GlobalSettings.UmbracoUsersMembershipProviderLegacyEncoding)
+ GlobalSettings.UmbracoUsersMembershipProviderLegacyEncoding = false;
+
+
+ LogHelper.Info("Updated Umbraco membership providers, set useLegacyEncoding to false.");
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/DynamicPublishedContent.cs b/src/Umbraco.Web/Models/DynamicPublishedContent.cs
index ea0b12b97b..eb476f50a0 100644
--- a/src/Umbraco.Web/Models/DynamicPublishedContent.cs
+++ b/src/Umbraco.Web/Models/DynamicPublishedContent.cs
@@ -329,37 +329,9 @@ namespace Umbraco.Web.Models
// can handle properties only when using the proper casing. So what this
// does is ensure that any casing is supported.
- Func> getMember =
- memberAlias =>
- {
- try
- {
- return Attempt |