diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs index e350b15824..b38fab829f 100644 --- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs +++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs @@ -7,15 +7,12 @@ using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Services; using umbraco.BusinessLogic; -using umbraco.cms.businesslogic; using System.Linq; -using umbraco.cms.businesslogic.web; using Umbraco.Core.Logging; using Umbraco.Core.Publishing; using Umbraco.Web.Services; using Content = Umbraco.Core.Models.Content; using ApplicationTree = Umbraco.Core.Models.ApplicationTree; -using DeleteEventArgs = umbraco.cms.businesslogic.DeleteEventArgs; namespace Umbraco.Web.Cache { @@ -79,10 +76,6 @@ namespace Umbraco.Web.Cache //Bind to permission events - //TODO: Wrap legacy permissions so we can get rid of this - Permission.New += PermissionNew; - Permission.Updated += PermissionUpdated; - Permission.Deleted += PermissionDeleted; PermissionRepository.AssignedPermissions += CacheRefresherEventHandler_AssignedPermissions; //Bind to template events @@ -511,22 +504,7 @@ namespace Umbraco.Web.Cache var userIds = e.SavedEntities.Select(x => x.UserId).Distinct(); userIds.ForEach(x => DistributedCache.Instance.RefreshUserPermissionsCache(x)); } - - static void PermissionDeleted(UserPermission sender, DeleteEventArgs e) - { - InvalidateCacheForPermissionsChange(sender); - } - - static void PermissionUpdated(UserPermission sender, SaveEventArgs e) - { - InvalidateCacheForPermissionsChange(sender); - } - - static void PermissionNew(UserPermission sender, NewEventArgs e) - { - InvalidateCacheForPermissionsChange(sender); - } - + static void UserServiceSavedUser(IUserService sender, SaveEventArgs e) { e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshUserCache(x.Id)); diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs index 9c8eed322b..f605d40686 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/RoutesCache.cs @@ -39,15 +39,12 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache /// private void ResolutionFrozen(object s, EventArgs args) { - // content - whenever the entire XML cache is rebuilt (from disk cache or from database) - // we must clear the cache entirely - global::umbraco.content.AfterRefreshContent += (sender, e) => Clear(); // document - whenever a document is updated in, or removed from, the XML cache // we must clear the cache - at the moment, we clear the entire cache global::umbraco.content.AfterUpdateDocumentCache += (sender, e) => Clear(); global::umbraco.content.AfterClearDocumentCache += (sender, e) => Clear(); - + // fixme - should refactor once content events are refactored // the content class needs to be refactored - at the moment // content.XmlContentInternal setter does not trigger any event diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs index a6cf23399d..9371c11d33 100644 --- a/src/Umbraco.Web/umbraco.presentation/content.cs +++ b/src/Umbraco.Web/umbraco.presentation/content.cs @@ -152,26 +152,14 @@ namespace umbraco #region Public Methods - [Obsolete("This is no longer used and will be removed in future versions, if you use this method it will not refresh 'async' it will perform the refresh on the current thread which is how it should be doing it")] - public virtual void RefreshContentFromDatabaseAsync() - { - RefreshContentFromDatabase(); - } - /// /// Load content from database and replaces active content when done. /// public virtual void RefreshContentFromDatabase() { - var e = new RefreshContentEventArgs(); - FireBeforeRefreshContent(e); - - if (!e.Cancel) + using (var safeXml = GetSafeXmlWriter()) { - using (var safeXml = GetSafeXmlWriter()) - { - safeXml.Xml = LoadContentFromDatabase(); - } + safeXml.Xml = LoadContentFromDatabase(); } } @@ -260,24 +248,20 @@ namespace umbraco public virtual void UpdateDocumentCache(Document d) { var e = new DocumentCacheEventArgs(); - FireBeforeUpdateDocumentCache(d, e); - if (!e.Cancel) + // lock the xml cache so no other thread can write to it at the same time + // note that some threads could read from it while we hold the lock, though + using (var safeXml = GetSafeXmlWriter()) { - // lock the xml cache so no other thread can write to it at the same time - // note that some threads could read from it while we hold the lock, though - using (var safeXml = GetSafeXmlWriter()) - { - safeXml.Xml = PublishNodeDo(d, safeXml.Xml, true); - } - - ClearContextCache(); - - var cachedFieldKeyStart = string.Format("{0}{1}_", CacheKeys.ContentItemCacheKey, d.Id); - ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(cachedFieldKeyStart); - - FireAfterUpdateDocumentCache(d, e); + safeXml.Xml = PublishNodeDo(d, safeXml.Xml, true); } + + ClearContextCache(); + + var cachedFieldKeyStart = string.Format("{0}{1}_", CacheKeys.ContentItemCacheKey, d.Id); + ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(cachedFieldKeyStart); + + FireAfterUpdateDocumentCache(d, e); } internal virtual void UpdateSortOrder(int contentId) @@ -344,21 +328,10 @@ namespace umbraco ClearContextCache(); } - - [Obsolete("Method obsolete in version 4.1 and later, please use UpdateDocumentCache", true)] - public virtual void UpdateDocumentCacheAsync(int documentId) - { - UpdateDocumentCache(documentId); - } - - [Obsolete("Method obsolete in version 4.1 and later, please use ClearDocumentCache", true)] - public virtual void ClearDocumentCacheAsync(int documentId) - { - ClearDocumentCache(documentId); - } - + public virtual void ClearDocumentCache(int documentId) { + var e = new DocumentCacheEventArgs(); // Get the document Document d; try @@ -373,6 +346,7 @@ namespace umbraco return; } ClearDocumentCache(d); + FireAfterClearDocumentCache(d, e); } /// @@ -383,24 +357,17 @@ namespace umbraco internal void ClearDocumentCache(Document doc) { var e = new DocumentCacheEventArgs(); - FireBeforeClearDocumentCache(doc, e); + XmlNode x; - if (!e.Cancel) - { - XmlNode x; + // remove from xml db cache + doc.XmlRemoveFromDB(); - // remove from xml db cache - doc.XmlRemoveFromDB(); + // clear xml cache + ClearDocumentXmlCache(doc.Id); - // clear xml cache - ClearDocumentXmlCache(doc.Id); + ClearContextCache(); - ClearContextCache(); - - //SD: changed to fire event BEFORE running the sitemap!! argh. - FireAfterClearDocumentCache(doc, e); - - } + FireAfterClearDocumentCache(doc, e); } internal void ClearDocumentXmlCache(int id) @@ -501,38 +468,22 @@ order by umbracoNode.level, umbracoNode.sortOrder"; attr.Value = dr.sortOrder.ToString(); xml = tmp.InnerXml; - // Call the eventhandler to allow modification of the string - var e1 = new ContentCacheLoadNodeEventArgs(); - FireAfterContentCacheDatabaseLoadXmlString(ref xml, e1); // check if a listener has canceled the event - if (!e1.Cancel) - { - // and parse it into a DOM node - xmlDoc.LoadXml(xml); - XmlNode node = xmlDoc.FirstChild; - // same event handler loader form the xml node - var e2 = new ContentCacheLoadNodeEventArgs(); - FireAfterContentCacheLoadNodeFromDatabase(node, e2); - // and checking if it was canceled again - if (!e1.Cancel) - { - nodeIndex.Add(currentId, node); + // and parse it into a DOM node + xmlDoc.LoadXml(xml); + XmlNode node = xmlDoc.FirstChild; + nodeIndex.Add(currentId, node); - // verify if either of the handlers canceled the children to load - if (!e1.CancelChildren && !e2.CancelChildren) - { - // Build the content hierarchy - List children; - if (!hierarchy.TryGetValue(parentId, out children)) - { - // No children for this parent, so add one - children = new List(); - hierarchy.Add(parentId, children); - } - children.Add(currentId); - } - } + // verify if either of the handlers canceled the children to load + // Build the content hierarchy + List children; + if (!hierarchy.TryGetValue(parentId, out children)) + { + // No children for this parent, so add one + children = new List(); + hierarchy.Add(parentId, children); } + children.Add(currentId); } LogHelper.Debug("Xml Pages loaded"); @@ -1234,40 +1185,11 @@ order by umbracoNode.level, umbracoNode.sortOrder"; #endregion #region Events - - /// - /// Occurs when [after loading the xml string from the database]. - /// - public delegate void ContentCacheDatabaseLoadXmlStringEventHandler( - ref string xml, ContentCacheLoadNodeEventArgs e); - - /// - /// Occurs when [after loading the xml string from the database and creating the xml node]. - /// - public delegate void ContentCacheLoadNodeEventHandler(XmlNode xmlNode, ContentCacheLoadNodeEventArgs e); - + public delegate void DocumentCacheEventHandler(Document sender, DocumentCacheEventArgs e); public delegate void RefreshContentEventHandler(Document sender, RefreshContentEventArgs e); - - /// - /// Occurs when [before document cache update]. - /// - public static event DocumentCacheEventHandler BeforeUpdateDocumentCache; - - /// - /// Fires the before document cache. - /// - /// The sender. - /// The instance containing the event data. - protected virtual void FireBeforeUpdateDocumentCache(Document sender, DocumentCacheEventArgs e) - { - if (BeforeUpdateDocumentCache != null) - { - BeforeUpdateDocumentCache(sender, e); - } - } - + /// /// Occurs when [after document cache update]. /// @@ -1277,7 +1199,7 @@ order by umbracoNode.level, umbracoNode.sortOrder"; /// Fires after document cache updater. /// /// The sender. - /// The instance containing the event data. + /// The instance containing the event data. protected virtual void FireAfterUpdateDocumentCache(Document sender, DocumentCacheEventArgs e) { if (AfterUpdateDocumentCache != null) @@ -1286,31 +1208,13 @@ order by umbracoNode.level, umbracoNode.sortOrder"; } } - /// - /// Occurs when [before document cache unpublish]. - /// - public static event DocumentCacheEventHandler BeforeClearDocumentCache; - - /// - /// Fires the before document cache unpublish. - /// - /// The sender. - /// The instance containing the event data. - protected virtual void FireBeforeClearDocumentCache(Document sender, DocumentCacheEventArgs e) - { - if (BeforeClearDocumentCache != null) - { - BeforeClearDocumentCache(sender, e); - } - } - public static event DocumentCacheEventHandler AfterClearDocumentCache; /// /// Fires the after document cache unpublish. /// /// The sender. - /// The instance containing the event data. + /// The instance containing the event data. protected virtual void FireAfterClearDocumentCache(Document sender, DocumentCacheEventArgs e) { if (AfterClearDocumentCache != null) @@ -1319,113 +1223,9 @@ order by umbracoNode.level, umbracoNode.sortOrder"; } } - /// - /// Occurs when [before refresh content]. - /// - public static event RefreshContentEventHandler BeforeRefreshContent; - /// - /// Fires the content of the before refresh. - /// - /// The sender. - /// The instance containing the event data. - protected virtual void FireBeforeRefreshContent(RefreshContentEventArgs e) - { - if (BeforeRefreshContent != null) - { - BeforeRefreshContent(null, e); - } - } - - /// - /// Occurs when [after refresh content]. - /// - public static event RefreshContentEventHandler AfterRefreshContent; - - /// - /// Fires the content of the after refresh. - /// - /// The sender. - /// The instance containing the event data. - protected virtual void FireAfterRefreshContent(RefreshContentEventArgs e) - { - if (AfterRefreshContent != null) - { - AfterRefreshContent(null, e); - } - } - - /// - /// Occurs when [after loading the xml string from the database]. - /// - public static event ContentCacheDatabaseLoadXmlStringEventHandler AfterContentCacheDatabaseLoadXmlString; - - /// - /// Fires the before when creating the document cache from database - /// - /// The sender. - /// The instance containing the event data. - internal static void FireAfterContentCacheDatabaseLoadXmlString(ref string xml, ContentCacheLoadNodeEventArgs e) - { - if (AfterContentCacheDatabaseLoadXmlString != null) - { - AfterContentCacheDatabaseLoadXmlString(ref xml, e); - } - } - - /// - /// Occurs when [before when creating the document cache from database]. - /// - public static event ContentCacheLoadNodeEventHandler BeforeContentCacheLoadNode; - - /// - /// Fires the before when creating the document cache from database - /// - /// The sender. - /// The instance containing the event data. - internal static void FireBeforeContentCacheLoadNode(XmlNode node, ContentCacheLoadNodeEventArgs e) - { - if (BeforeContentCacheLoadNode != null) - { - BeforeContentCacheLoadNode(node, e); - } - } - - /// - /// Occurs when [after loading document cache xml node from database]. - /// - public static event ContentCacheLoadNodeEventHandler AfterContentCacheLoadNodeFromDatabase; - - /// - /// Fires the after loading document cache xml node from database - /// - /// The sender. - /// The instance containing the event data. - internal static void FireAfterContentCacheLoadNodeFromDatabase(XmlNode node, ContentCacheLoadNodeEventArgs e) - { - if (AfterContentCacheLoadNodeFromDatabase != null) - { - AfterContentCacheLoadNodeFromDatabase(node, e); - } - } - - /// - /// Occurs when [before a publish action updates the content cache]. - /// - public static event ContentCacheLoadNodeEventHandler BeforePublishNodeToContentCache; - - /// - /// Fires the before a publish action updates the content cache - /// - /// The sender. - /// The instance containing the event data. - public static void FireBeforePublishNodeToContentCache(XmlNode node, ContentCacheLoadNodeEventArgs e) - { - if (BeforePublishNodeToContentCache != null) - { - BeforePublishNodeToContentCache(node, e); - } - } + public class DocumentCacheEventArgs : System.ComponentModel.CancelEventArgs { } + public class RefreshContentEventArgs : System.ComponentModel.CancelEventArgs { } #endregion } diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index 6ce141a2b5..f96601aac0 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -275,10 +275,7 @@ namespace umbraco.cms.businesslogic } - //event - NewEventArgs e = new NewEventArgs(); - retVal.FireAfterNew(e); - + return retVal; } @@ -493,13 +490,7 @@ order by level,sortOrder"; /// public virtual void Save() { - SaveEventArgs e = new SaveEventArgs(); - this.FireBeforeSave(e); - if (!e.Cancel) - { - //In the future there will be SQL stuff happening here... - this.FireAfterSave(e); - } + } public override string ToString() @@ -524,35 +515,29 @@ order by level,sortOrder"; /// public virtual void delete() { - DeleteEventArgs e = new DeleteEventArgs(); - FireBeforeDelete(e); - if (!e.Cancel) + // remove relations + var rels = Relations; + foreach (relation.Relation rel in rels) { - // remove relations - var rels = Relations; - foreach (relation.Relation rel in rels) - { - rel.Delete(); - } - - //removes tasks - foreach (Task t in Tasks) - { - t.Delete(); - } - - //remove notifications - Notification.DeleteNotifications(this); - - //remove permissions - Permission.DeletePermissions(this); - - ////removes tag associations (i know the key is set to cascade but do it anyways) - //Tag.RemoveTagsFromNode(this.Id); - - SqlHelper.ExecuteNonQuery("DELETE FROM umbracoNode WHERE uniqueID= @uniqueId", SqlHelper.CreateParameter("@uniqueId", _uniqueID)); - FireAfterDelete(e); + rel.Delete(); } + + //removes tasks + foreach (Task t in Tasks) + { + t.Delete(); + } + + //remove notifications + Notification.DeleteNotifications(this); + + //remove permissions + Permission.DeletePermissions(this); + + ////removes tag associations (i know the key is set to cascade but do it anyways) + //Tag.RemoveTagsFromNode(this.Id); + + SqlHelper.ExecuteNonQuery("DELETE FROM umbracoNode WHERE uniqueID= @uniqueId", SqlHelper.CreateParameter("@uniqueId", _uniqueID)); } /// @@ -1098,131 +1083,6 @@ order by level,sortOrder"; #endregion - #region Events - /// - /// Calls the subscribers of a cancelable event handler, - /// stopping at the event handler which cancels the event (if any). - /// - /// Type of the event arguments. - /// The event to fire. - /// Sender of the event. - /// Event arguments. - protected virtual void FireCancelableEvent(EventHandler cancelableEvent, object sender, T eventArgs) where T : CancelEventArgs - { - if (cancelableEvent != null) - { - foreach (Delegate invocation in cancelableEvent.GetInvocationList()) - { - invocation.DynamicInvoke(sender, eventArgs); - if (eventArgs.Cancel) - break; - } - } - } - - /// - /// Occurs before a node is saved. - /// - public static event EventHandler BeforeSave; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeSave(SaveEventArgs e) - { - FireCancelableEvent(BeforeSave, this, e); - } - - /// - /// Occurs after a node is saved. - /// - public static event EventHandler AfterSave; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs after a new node is created. - /// - public static event EventHandler AfterNew; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireAfterNew(NewEventArgs e) - { - if (AfterNew != null) - AfterNew(this, e); - } - - /// - /// Occurs before a node is deleted. - /// - public static event EventHandler BeforeDelete; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeDelete(DeleteEventArgs e) - { - FireCancelableEvent(BeforeDelete, this, e); - } - - /// - /// Occurs after a node is deleted. - /// - public static event EventHandler AfterDelete; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - - /// - /// Occurs before a node is moved. - /// - public static event EventHandler BeforeMove; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeMove(MoveEventArgs e) - { - FireCancelableEvent(BeforeMove, this, e); - } - - /// - /// Occurs after a node is moved. - /// - public static event EventHandler AfterMove; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireAfterMove(MoveEventArgs e) - { - if (AfterMove != null) - AfterMove(this, e); - } - - #endregion } } \ No newline at end of file diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs index 7c85c5ac6c..32c406d100 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs @@ -35,34 +35,18 @@ namespace umbraco.cms.businesslogic.packager var pack = new CreatedPackage(); pack.Data = data.MakeNew(name, IOHelper.MapPath(Settings.CreatedPackagesSettings)); - var e = new NewEventArgs(); - pack.OnNew(e); return pack; } public void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - - if (!e.Cancel) - { - data.Save(this.Data, IOHelper.MapPath(Settings.CreatedPackagesSettings)); - FireAfterSave(e); - } + data.Save(this.Data, IOHelper.MapPath(Settings.CreatedPackagesSettings)); } public void Delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (!e.Cancel) - { - data.Delete(this.Data.Id, IOHelper.MapPath(Settings.CreatedPackagesSettings)); - FireAfterDelete(e); - } + data.Delete(this.Data.Id, IOHelper.MapPath(Settings.CreatedPackagesSettings)); } public PackageInstance Data { get; set; } @@ -108,272 +92,263 @@ namespace umbraco.cms.businesslogic.packager var package = this; var pack = package.Data; + + var outInt = 0; - var e = new PublishEventArgs(); - package.FireBeforePublish(e); + //Path checking... + var localPath = IOHelper.MapPath(SystemDirectories.Media + "/" + pack.Folder); - if (e.Cancel == false) + if (Directory.Exists(localPath) == false) + Directory.CreateDirectory(localPath); + + //Init package file... + CreatePackageManifest(); + //Info section.. + AppendElement(PackagerUtility.PackageInfo(pack, _packageManifest)); + + //Documents and tags... + var contentNodeId = 0; + if (string.IsNullOrEmpty(pack.ContentNodeId) == false && int.TryParse(pack.ContentNodeId, out contentNodeId)) { - var outInt = 0; - - //Path checking... - var localPath = IOHelper.MapPath(SystemDirectories.Media + "/" + pack.Folder); - - if (Directory.Exists(localPath) == false) - Directory.CreateDirectory(localPath); - - //Init package file... - CreatePackageManifest(); - //Info section.. - AppendElement(PackagerUtility.PackageInfo(pack, _packageManifest)); - - //Documents and tags... - var contentNodeId = 0; - if (string.IsNullOrEmpty(pack.ContentNodeId) == false && int.TryParse(pack.ContentNodeId, out contentNodeId)) + if (contentNodeId > 0) { - if (contentNodeId > 0) - { - //Create the Documents/DocumentSet node - XmlNode documents = _packageManifest.CreateElement("Documents"); - XmlNode documentSet = _packageManifest.CreateElement("DocumentSet"); - XmlAttribute importMode = _packageManifest.CreateAttribute("importMode", ""); - importMode.Value = "root"; - documentSet.Attributes.Append(importMode); - documents.AppendChild(documentSet); + //Create the Documents/DocumentSet node + XmlNode documents = _packageManifest.CreateElement("Documents"); + XmlNode documentSet = _packageManifest.CreateElement("DocumentSet"); + XmlAttribute importMode = _packageManifest.CreateAttribute("importMode", ""); + importMode.Value = "root"; + documentSet.Attributes.Append(importMode); + documents.AppendChild(documentSet); - //load content from umbraco. - var umbDocument = new Document(contentNodeId); + //load content from umbraco. + var umbDocument = new Document(contentNodeId); - documentSet.AppendChild(umbDocument.ToXml(_packageManifest, pack.ContentLoadChildNodes)); + documentSet.AppendChild(umbDocument.ToXml(_packageManifest, pack.ContentLoadChildNodes)); - AppendElement(documents); + AppendElement(documents); - ////Create the TagProperties node - this is used to store a definition for all - //// document properties that are tags, this ensures that we can re-import tags properly - //XmlNode tagProps = _packageManifest.CreateElement("TagProperties"); + ////Create the TagProperties node - this is used to store a definition for all + //// document properties that are tags, this ensures that we can re-import tags properly + //XmlNode tagProps = _packageManifest.CreateElement("TagProperties"); - ////before we try to populate this, we'll do a quick lookup to see if any of the documents - //// being exported contain published tags. - //var allExportedIds = documents.SelectNodes("//@id").Cast() - // .Select(x => x.Value.TryConvertTo()) - // .Where(x => x.Success) - // .Select(x => x.Result) - // .ToArray(); - //var allContentTags = new List(); - //foreach (var exportedId in allExportedIds) - //{ - // allContentTags.AddRange( - // ApplicationContext.Current.Services.TagService.GetTagsForEntity(exportedId)); - //} + ////before we try to populate this, we'll do a quick lookup to see if any of the documents + //// being exported contain published tags. + //var allExportedIds = documents.SelectNodes("//@id").Cast() + // .Select(x => x.Value.TryConvertTo()) + // .Where(x => x.Success) + // .Select(x => x.Result) + // .ToArray(); + //var allContentTags = new List(); + //foreach (var exportedId in allExportedIds) + //{ + // allContentTags.AddRange( + // ApplicationContext.Current.Services.TagService.GetTagsForEntity(exportedId)); + //} - ////This is pretty round-about but it works. Essentially we need to get the properties that are tagged - //// but to do that we need to lookup by a tag (string) - //var allTaggedEntities = new List(); - //foreach (var group in allContentTags.Select(x => x.Group).Distinct()) - //{ - // allTaggedEntities.AddRange( - // ApplicationContext.Current.Services.TagService.GetTaggedContentByTagGroup(group)); - //} + ////This is pretty round-about but it works. Essentially we need to get the properties that are tagged + //// but to do that we need to lookup by a tag (string) + //var allTaggedEntities = new List(); + //foreach (var group in allContentTags.Select(x => x.Group).Distinct()) + //{ + // allTaggedEntities.AddRange( + // ApplicationContext.Current.Services.TagService.GetTaggedContentByTagGroup(group)); + //} - ////Now, we have all property Ids/Aliases and their referenced document Ids and tags - //var allExportedTaggedEntities = allTaggedEntities.Where(x => allExportedIds.Contains(x.EntityId)) - // .DistinctBy(x => x.EntityId) - // .OrderBy(x => x.EntityId); + ////Now, we have all property Ids/Aliases and their referenced document Ids and tags + //var allExportedTaggedEntities = allTaggedEntities.Where(x => allExportedIds.Contains(x.EntityId)) + // .DistinctBy(x => x.EntityId) + // .OrderBy(x => x.EntityId); - //foreach (var taggedEntity in allExportedTaggedEntities) - //{ - // foreach (var taggedProperty in taggedEntity.TaggedProperties.Where(x => x.Tags.Any())) - // { - // XmlNode tagProp = _packageManifest.CreateElement("TagProperty"); - // var docId = _packageManifest.CreateAttribute("docId", ""); - // docId.Value = taggedEntity.EntityId.ToString(CultureInfo.InvariantCulture); - // tagProp.Attributes.Append(docId); + //foreach (var taggedEntity in allExportedTaggedEntities) + //{ + // foreach (var taggedProperty in taggedEntity.TaggedProperties.Where(x => x.Tags.Any())) + // { + // XmlNode tagProp = _packageManifest.CreateElement("TagProperty"); + // var docId = _packageManifest.CreateAttribute("docId", ""); + // docId.Value = taggedEntity.EntityId.ToString(CultureInfo.InvariantCulture); + // tagProp.Attributes.Append(docId); - // var propertyAlias = _packageManifest.CreateAttribute("propertyAlias", ""); - // propertyAlias.Value = taggedProperty.PropertyTypeAlias; - // tagProp.Attributes.Append(propertyAlias); + // var propertyAlias = _packageManifest.CreateAttribute("propertyAlias", ""); + // propertyAlias.Value = taggedProperty.PropertyTypeAlias; + // tagProp.Attributes.Append(propertyAlias); - // var group = _packageManifest.CreateAttribute("group", ""); - // group.Value = taggedProperty.Tags.First().Group; - // tagProp.Attributes.Append(group); + // var group = _packageManifest.CreateAttribute("group", ""); + // group.Value = taggedProperty.Tags.First().Group; + // tagProp.Attributes.Append(group); - // tagProp.AppendChild(_packageManifest.CreateCDataSection( - // JsonConvert.SerializeObject(taggedProperty.Tags.Select(x => x.Text).ToArray()))); + // tagProp.AppendChild(_packageManifest.CreateCDataSection( + // JsonConvert.SerializeObject(taggedProperty.Tags.Select(x => x.Text).ToArray()))); - // tagProps.AppendChild(tagProp); - // } - //} + // tagProps.AppendChild(tagProp); + // } + //} - //AppendElement(tagProps); + //AppendElement(tagProps); - } } - - //Document types.. - var dtl = new List(); - var docTypes = _packageManifest.CreateElement("DocumentTypes"); - foreach (var dtId in pack.Documenttypes) - { - if (int.TryParse(dtId, out outInt)) - { - DocumentType docT = new DocumentType(outInt); - - AddDocumentType(docT, ref dtl); - - } - } - - foreach (DocumentType d in dtl) - { - docTypes.AppendChild(d.ToXml(_packageManifest)); - } - - AppendElement(docTypes); - - //Templates - var templates = _packageManifest.CreateElement("Templates"); - foreach (var templateId in pack.Templates) - { - if (int.TryParse(templateId, out outInt)) - { - var t = new Template(outInt); - templates.AppendChild(t.ToXml(_packageManifest)); - } - } - AppendElement(templates); - - //Stylesheets - var stylesheets = _packageManifest.CreateElement("Stylesheets"); - foreach (var ssId in pack.Stylesheets) - { - if (int.TryParse(ssId, out outInt)) - { - var s = new StyleSheet(outInt); - stylesheets.AppendChild(s.ToXml(_packageManifest)); - } - } - AppendElement(stylesheets); - - //Macros - var macros = _packageManifest.CreateElement("Macros"); - foreach (var macroId in pack.Macros) - { - if (int.TryParse(macroId, out outInt)) - { - macros.AppendChild(PackagerUtility.Macro(int.Parse(macroId), true, localPath, _packageManifest)); - } - } - AppendElement(macros); - - //Dictionary Items - var dictionaryItems = _packageManifest.CreateElement("DictionaryItems"); - foreach (var dictionaryId in pack.DictionaryItems) - { - if (int.TryParse(dictionaryId, out outInt)) - { - var di = new Dictionary.DictionaryItem(outInt); - dictionaryItems.AppendChild(di.ToXml(_packageManifest)); - } - } - AppendElement(dictionaryItems); - - //Languages - var languages = _packageManifest.CreateElement("Languages"); - foreach (var langId in pack.Languages) - { - if (int.TryParse(langId, out outInt)) - { - var lang = new language.Language(outInt); - - languages.AppendChild(lang.ToXml(_packageManifest)); - } - } - AppendElement(languages); - - //TODO: Fix this! ... actually once we use the new packager we don't need to - - ////Datatypes - //var dataTypes = _packageManifest.CreateElement("DataTypes"); - //foreach (var dtId in pack.DataTypes) - //{ - // if (int.TryParse(dtId, out outInt)) - // { - // datatype.DataTypeDefinition dtd = new datatype.DataTypeDefinition(outInt); - // dataTypes.AppendChild(dtd.ToXml(_packageManifest)); - // } - //} - //AppendElement(dataTypes); - - //Files - foreach (var fileName in pack.Files) - { - PackagerUtility.AppendFileToManifest(fileName, localPath, _packageManifest); - } - - //Load control on install... - if (string.IsNullOrEmpty(pack.LoadControl) == false) - { - XmlNode control = _packageManifest.CreateElement("control"); - control.InnerText = pack.LoadControl; - PackagerUtility.AppendFileToManifest(pack.LoadControl, localPath, _packageManifest); - AppendElement(control); - } - - //Actions - if (string.IsNullOrEmpty(pack.Actions) == false) - { - try - { - var xdActions = new XmlDocument(); - xdActions.LoadXml("" + pack.Actions + ""); - var actions = xdActions.DocumentElement.SelectSingleNode("."); - - - if (actions != null) - { - actions = _packageManifest.ImportNode(actions, true).Clone(); - AppendElement(actions); - } - } - catch { } - } - - var manifestFileName = localPath + "/package.xml"; - - if (File.Exists(manifestFileName)) - File.Delete(manifestFileName); - - _packageManifest.Save(manifestFileName); - _packageManifest = null; - - - //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension; - - // check if there's a packages directory below media - var packagesDirectory = SystemDirectories.Media + "/created-packages"; - if (Directory.Exists(IOHelper.MapPath(packagesDirectory)) == false) - { - Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory)); - } - - - var packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension; - PackagerUtility.ZipPackage(localPath, IOHelper.MapPath(packPath)); - - pack.PackagePath = packPath; - - if (pack.PackageGuid.Trim() == "") - pack.PackageGuid = Guid.NewGuid().ToString(); - - package.Save(); - - //Clean up.. - File.Delete(localPath + "/package.xml"); - Directory.Delete(localPath, true); - - package.FireAfterPublish(e); } + //Document types.. + var dtl = new List(); + var docTypes = _packageManifest.CreateElement("DocumentTypes"); + foreach (var dtId in pack.Documenttypes) + { + if (int.TryParse(dtId, out outInt)) + { + DocumentType docT = new DocumentType(outInt); + + AddDocumentType(docT, ref dtl); + + } + } + + foreach (DocumentType d in dtl) + { + docTypes.AppendChild(d.ToXml(_packageManifest)); + } + + AppendElement(docTypes); + + //Templates + var templates = _packageManifest.CreateElement("Templates"); + foreach (var templateId in pack.Templates) + { + if (int.TryParse(templateId, out outInt)) + { + var t = new Template(outInt); + templates.AppendChild(t.ToXml(_packageManifest)); + } + } + AppendElement(templates); + + //Stylesheets + var stylesheets = _packageManifest.CreateElement("Stylesheets"); + foreach (var ssId in pack.Stylesheets) + { + if (int.TryParse(ssId, out outInt)) + { + var s = new StyleSheet(outInt); + stylesheets.AppendChild(s.ToXml(_packageManifest)); + } + } + AppendElement(stylesheets); + + //Macros + var macros = _packageManifest.CreateElement("Macros"); + foreach (var macroId in pack.Macros) + { + if (int.TryParse(macroId, out outInt)) + { + macros.AppendChild(PackagerUtility.Macro(int.Parse(macroId), true, localPath, _packageManifest)); + } + } + AppendElement(macros); + + //Dictionary Items + var dictionaryItems = _packageManifest.CreateElement("DictionaryItems"); + foreach (var dictionaryId in pack.DictionaryItems) + { + if (int.TryParse(dictionaryId, out outInt)) + { + var di = new Dictionary.DictionaryItem(outInt); + dictionaryItems.AppendChild(di.ToXml(_packageManifest)); + } + } + AppendElement(dictionaryItems); + + //Languages + var languages = _packageManifest.CreateElement("Languages"); + foreach (var langId in pack.Languages) + { + if (int.TryParse(langId, out outInt)) + { + var lang = new language.Language(outInt); + + languages.AppendChild(lang.ToXml(_packageManifest)); + } + } + AppendElement(languages); + + //TODO: Fix this! ... actually once we use the new packager we don't need to + + ////Datatypes + //var dataTypes = _packageManifest.CreateElement("DataTypes"); + //foreach (var dtId in pack.DataTypes) + //{ + // if (int.TryParse(dtId, out outInt)) + // { + // datatype.DataTypeDefinition dtd = new datatype.DataTypeDefinition(outInt); + // dataTypes.AppendChild(dtd.ToXml(_packageManifest)); + // } + //} + //AppendElement(dataTypes); + + //Files + foreach (var fileName in pack.Files) + { + PackagerUtility.AppendFileToManifest(fileName, localPath, _packageManifest); + } + + //Load control on install... + if (string.IsNullOrEmpty(pack.LoadControl) == false) + { + XmlNode control = _packageManifest.CreateElement("control"); + control.InnerText = pack.LoadControl; + PackagerUtility.AppendFileToManifest(pack.LoadControl, localPath, _packageManifest); + AppendElement(control); + } + + //Actions + if (string.IsNullOrEmpty(pack.Actions) == false) + { + try + { + var xdActions = new XmlDocument(); + xdActions.LoadXml("" + pack.Actions + ""); + var actions = xdActions.DocumentElement.SelectSingleNode("."); + + + if (actions != null) + { + actions = _packageManifest.ImportNode(actions, true).Clone(); + AppendElement(actions); + } + } + catch { } + } + + var manifestFileName = localPath + "/package.xml"; + + if (File.Exists(manifestFileName)) + File.Delete(manifestFileName); + + _packageManifest.Save(manifestFileName); + _packageManifest = null; + + + //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension; + + // check if there's a packages directory below media + var packagesDirectory = SystemDirectories.Media + "/created-packages"; + if (Directory.Exists(IOHelper.MapPath(packagesDirectory)) == false) + { + Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory)); + } + + + var packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension; + PackagerUtility.ZipPackage(localPath, IOHelper.MapPath(packPath)); + + pack.PackagePath = packPath; + + if (pack.PackageGuid.Trim() == "") + pack.PackageGuid = Guid.NewGuid().ToString(); + + package.Save(); + + //Clean up.. + File.Delete(localPath + "/package.xml"); + Directory.Delete(localPath, true); } private void AddDocumentType(DocumentType dt, ref List dtl) @@ -391,63 +366,6 @@ namespace umbraco.cms.businesslogic.packager } } - //EVENTS - public delegate void SaveEventHandler(CreatedPackage sender, SaveEventArgs e); - public delegate void NewEventHandler(CreatedPackage sender, NewEventArgs e); - public delegate void PublishEventHandler(CreatedPackage sender, PublishEventArgs e); - public delegate void DeleteEventHandler(CreatedPackage sender, DeleteEventArgs e); - - /// - /// Occurs when a macro is saved. - /// - public static event SaveEventHandler BeforeSave; - protected virtual void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public static event SaveEventHandler AfterSave; - protected virtual void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - public static event DeleteEventHandler BeforeDelete; - protected virtual void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public static event DeleteEventHandler AfterDelete; - protected virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - - public static event PublishEventHandler BeforePublish; - protected virtual void FireBeforePublish(PublishEventArgs e) - { - if (BeforePublish != null) - BeforePublish(this, e); - } - - public static event PublishEventHandler AfterPublish; - protected virtual void FireAfterPublish(PublishEventArgs e) - { - if (AfterPublish != null) - AfterPublish(this, e); - } } diff --git a/src/umbraco.cms/businesslogic/Permission.cs b/src/umbraco.cms/businesslogic/Permission.cs index 1b775e2d58..b3764dfd5f 100644 --- a/src/umbraco.cms/businesslogic/Permission.cs +++ b/src/umbraco.cms/businesslogic/Permission.cs @@ -1,17 +1,10 @@ -using System; -using System.Collections; -using System.Collections.Specialized; -using System.Data; using System.Linq; -using System.Runtime.CompilerServices; using Umbraco.Core; using Umbraco.Core.Events; -using umbraco.DataLayer; using umbraco.cms.businesslogic; using System.Collections.Generic; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; -using DeleteEventArgs = umbraco.cms.businesslogic.DeleteEventArgs; namespace umbraco.BusinessLogic { @@ -32,25 +25,16 @@ namespace umbraco.BusinessLogic public static void MakeNew(IUser User, CMSNode Node, char PermissionKey) { - MakeNew(User, Node, PermissionKey, true); + MakeNew(User, new[] { Node }, PermissionKey); } - private static void MakeNew(IUser user, IEnumerable nodes, char permissionKey, bool raiseEvents) + private static void MakeNew(IUser user, IEnumerable nodes, char permissionKey) { var asArray = nodes.ToArray(); ApplicationContext.Current.Services.UserService.AssignUserPermission(user.Id, permissionKey, asArray.Select(x => x.Id).ToArray()); - if (raiseEvents) - { - OnNew(new UserPermission(user, asArray, new[] { permissionKey }), new NewEventArgs()); - } - } - - private static void MakeNew(IUser User, CMSNode Node, char PermissionKey, bool raiseEvents) - { - MakeNew(User, new[] {Node}, PermissionKey, raiseEvents); - } + } /// /// Returns the permissions for a user @@ -100,19 +84,10 @@ namespace umbraco.BusinessLogic /// /// public static void DeletePermissions(IUser user, CMSNode node) - { - DeletePermissions(user, node, true); - } - - internal static void DeletePermissions(IUser user, CMSNode node, bool raiseEvents) { ApplicationContext.Current.Services.UserService.RemoveUserPermissions(user.Id, node.Id); - if (raiseEvents) - { - OnDeleted(new UserPermission(user, node, null), new DeleteEventArgs()); - } } - + /// /// deletes all permissions for the user /// @@ -121,14 +96,12 @@ namespace umbraco.BusinessLogic { ApplicationContext.Current.Services.UserService.RemoveUserPermissions(user.Id); - OnDeleted(new UserPermission(user, Enumerable.Empty(), null), new DeleteEventArgs()); } public static void DeletePermissions(int iUserID, int[] iNodeIDs) { ApplicationContext.Current.Services.UserService.RemoveUserPermissions(iUserID, iNodeIDs); - OnDeleted(new UserPermission(iUserID, iNodeIDs), new DeleteEventArgs()); } public static void DeletePermissions(int iUserID, int iNodeID) { @@ -143,7 +116,6 @@ namespace umbraco.BusinessLogic { ApplicationContext.Current.Services.ContentService.RemoveContentPermissions(node.Id); - OnDeleted(new UserPermission(null, node, null), new DeleteEventArgs()); } public static void UpdateCruds(IUser user, CMSNode node, string permissions) @@ -153,35 +125,9 @@ namespace umbraco.BusinessLogic permissions.ToCharArray(), node.Id); - OnUpdated(new UserPermission(user, node, permissions.ToCharArray()), new SaveEventArgs()); } - internal static event TypedEventHandler Deleted; - private static void OnDeleted(UserPermission permission, DeleteEventArgs args) - { - if (Deleted != null) - { - Deleted(permission, args); - } - } - - internal static event TypedEventHandler Updated; - private static void OnUpdated(UserPermission permission, SaveEventArgs args) - { - if (Updated != null) - { - Updated(permission, args); - } - } - - internal static event TypedEventHandler New; - private static void OnNew(UserPermission permission, NewEventArgs args) - { - if (New != null) - { - New(permission, args); - } - } + } diff --git a/src/umbraco.cms/businesslogic/events/EventArgs.cs b/src/umbraco.cms/businesslogic/events/EventArgs.cs deleted file mode 100644 index 4f5b10efe2..0000000000 --- a/src/umbraco.cms/businesslogic/events/EventArgs.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Umbraco.Core; -using umbraco.cms.businesslogic.member; -using umbraco.cms.businesslogic.web; - -namespace umbraco.cms.businesslogic { - //Content Event args - public class PublishEventArgs : System.ComponentModel.CancelEventArgs { } - public class MoveEventArgs : System.ComponentModel.CancelEventArgs { } - - - public class UnPublishEventArgs : System.ComponentModel.CancelEventArgs { } - - - public class MoveToTrashEventArgs : System.ComponentModel.CancelEventArgs { } - - //Content Cache Event args - public class DocumentCacheEventArgs : System.ComponentModel.CancelEventArgs { } - public class RefreshContentEventArgs : System.ComponentModel.CancelEventArgs { } - - //Generel eventArgs - public class DeleteEventArgs : System.ComponentModel.CancelEventArgs { } - public class SaveEventArgs : System.ComponentModel.CancelEventArgs { } - public class NewEventArgs : System.ComponentModel.CancelEventArgs { } - - //Special Members Event args - public class AddToCacheEventArgs : GroupEventArgs { } - public class RemoveFromCacheEventArgs : GroupEventArgs { } - public class AddGroupEventArgs : GroupEventArgs { } - public class RemoveGroupEventArgs : GroupEventArgs { } - public class GroupEventArgs : System.ComponentModel.CancelEventArgs - { - public int GroupId{ get; set; } - } - - //Access event args - public class AddProtectionEventArgs : System.ComponentModel.CancelEventArgs { } - public class RemoveProtectionEventArgs : System.ComponentModel.CancelEventArgs { } - public class AddMemberShipRoleToDocumentEventArgs : System.ComponentModel.CancelEventArgs { } - public class RemoveMemberShipRoleFromDocumentEventArgs : System.ComponentModel.CancelEventArgs { } - public class RemoveMemberShipUserFromDocumentEventArgs : System.ComponentModel.CancelEventArgs { } - public class AddMembershipUserToDocumentEventArgs : System.ComponentModel.CancelEventArgs { } - - - public class ContentCacheLoadNodeEventArgs : System.ComponentModel.CancelEventArgs - { - public bool CancelChildren { get; set; } - } - - -} diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs index 8a92bdfa84..71fbdd2c72 100644 --- a/src/umbraco.cms/businesslogic/language/Language.cs +++ b/src/umbraco.cms/businesslogic/language/Language.cs @@ -91,9 +91,7 @@ namespace umbraco.cms.businesslogic.language { CultureName = culture.DisplayName }; - ApplicationContext.Current.Services.LocalizationService.Save(lang); - var ct = new Language(lang); - ct.OnNew(new NewEventArgs()); + ApplicationContext.Current.Services.LocalizationService.Save(lang); } } @@ -230,16 +228,8 @@ namespace umbraco.cms.businesslogic.language /// public virtual void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - //Do the update! ApplicationContext.Current.Services.LocalizationService.Save(LanguageEntity); - - if (!e.Cancel) - { - FireAfterSave(e); - } } /// @@ -254,15 +244,7 @@ namespace umbraco.cms.businesslogic.language { if (ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar("SELECT count(id) FROM umbracoDomains where domainDefaultLanguage = @id", new { id = id }) == 0) { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (!e.Cancel) - { - ApplicationContext.Current.Services.LocalizationService.Delete(LanguageEntity); - - FireAfterDelete(e); - } + ApplicationContext.Current.Services.LocalizationService.Delete(LanguageEntity); } else { @@ -284,59 +266,5 @@ namespace umbraco.cms.businesslogic.language return xml.GetXmlNode(xd); } #endregion - - #region Events - - /// - /// The save event handler - /// - public delegate void SaveEventHandler(Language sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(Language sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(Language sender, DeleteEventArgs e); - - /// - /// Occurs when a language is saved. - /// - public static event SaveEventHandler BeforeSave; - protected virtual void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public static event SaveEventHandler AfterSave; - protected virtual void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - public static event DeleteEventHandler BeforeDelete; - protected virtual void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public static event DeleteEventHandler AfterDelete; - protected virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - #endregion } } \ No newline at end of file diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs index da9aa6c83e..ec81b19fc3 100644 --- a/src/umbraco.cms/businesslogic/macro/Macro.cs +++ b/src/umbraco.cms/businesslogic/macro/Macro.cs @@ -210,34 +210,16 @@ namespace umbraco.cms.businesslogic.macro /// public virtual void Save() { - //event - var e = new SaveEventArgs(); - FireBeforeSave(e); - - if (e.Cancel == false) - { - ApplicationContext.Current.Services.MacroService.Save(MacroEntity); - - FireAfterSave(e); - } - } + ApplicationContext.Current.Services.MacroService.Save(MacroEntity); + } /// /// Deletes the current macro /// public void Delete() { - //event - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (e.Cancel == false) - { - ApplicationContext.Current.Services.MacroService.Delete(MacroEntity); - - FireAfterDelete(e); - } - } + ApplicationContext.Current.Services.MacroService.Delete(MacroEntity); + } //TODO: Fix this, this should wrap a new API! @@ -379,10 +361,6 @@ namespace umbraco.cms.businesslogic.macro var newMacro = new Macro(macro); - //fire new event - var e = new NewEventArgs(); - newMacro.OnNew(e); - return newMacro; } @@ -479,45 +457,7 @@ namespace umbraco.cms.businesslogic.macro #endregion - //Macro events - - //Delegates - public delegate void SaveEventHandler(Macro sender, SaveEventArgs e); - public delegate void NewEventHandler(Macro sender, NewEventArgs e); - public delegate void DeleteEventHandler(Macro sender, DeleteEventArgs e); - - /// - /// Occurs when a macro is saved. - /// - public static event SaveEventHandler BeforeSave; - protected virtual void FireBeforeSave(SaveEventArgs e) { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public static event SaveEventHandler AfterSave; - protected virtual void FireAfterSave(SaveEventArgs e) { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) { - if (New != null) - New(this, e); - } - - public static event DeleteEventHandler BeforeDelete; - protected virtual void FireBeforeDelete(DeleteEventArgs e) { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public static event DeleteEventHandler AfterDelete; - protected virtual void FireAfterDelete(DeleteEventArgs e) { - if (AfterDelete != null) - AfterDelete(this, e); - } + #endregion } } diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs index 4936b4a484..27d5e06048 100644 --- a/src/umbraco.cms/businesslogic/media/Media.cs +++ b/src/umbraco.cms/businesslogic/media/Media.cs @@ -69,13 +69,6 @@ namespace umbraco.cms.businesslogic.media [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.CreateMedia()", false)] public static Media MakeNew(string Name, MediaType dct, IUser u, int ParentId) { - var e = new NewEventArgs(); - OnNewing(e); - if (e.Cancel) - { - return null; - } - var media = ApplicationContext.Current.Services.MediaService.CreateMediaWithIdentity(Name, ParentId, dct.Alias, u.Id); //The media object will only have the 'WasCancelled' flag set to 'True' if the 'Creating' event has been cancelled if (((Entity)media).WasCancelled) @@ -83,8 +76,6 @@ namespace umbraco.cms.businesslogic.media var tmp = new Media(media); - tmp.OnNew(e); - return tmp; } @@ -309,27 +300,18 @@ namespace umbraco.cms.businesslogic.media [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Delete()", false)] private bool DeletePermanently() { - DeleteEventArgs e = new DeleteEventArgs(); - - FireBeforeDelete(e); - - if (!e.Cancel) + if (MediaItem != null) { - if (MediaItem != null) - { - ApplicationContext.Current.Services.MediaService.Delete(MediaItem); - } - else - { - var media = ApplicationContext.Current.Services.MediaService.GetById(Id); - ApplicationContext.Current.Services.MediaService.Delete(media); - } - - base.delete(); - - FireAfterDelete(e); + ApplicationContext.Current.Services.MediaService.Delete(MediaItem); } - return !e.Cancel; + else + { + var media = ApplicationContext.Current.Services.MediaService.GetById(Id); + ApplicationContext.Current.Services.MediaService.Delete(media); + } + + base.delete(); + return true; } /// @@ -339,161 +321,26 @@ namespace umbraco.cms.businesslogic.media [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] private bool MoveToTrash() { - MoveToTrashEventArgs e = new MoveToTrashEventArgs(); - FireBeforeMoveToTrash(e); - - if (!e.Cancel) + if (MediaItem != null) { - if (MediaItem != null) - { - ApplicationContext.Current.Services.MediaService.MoveToRecycleBin(MediaItem); - } - else - { - var media = ApplicationContext.Current.Services.MediaService.GetById(Id); - ApplicationContext.Current.Services.MediaService.MoveToRecycleBin(media); - } - - //Move((int)RecycleBin.RecycleBinType.Media); - - //TODO: Now that we've moved it to trash, we need to move the actual files so they are no longer accessible - //from the original URL. - - FireAfterMoveToTrash(e); + ApplicationContext.Current.Services.MediaService.MoveToRecycleBin(MediaItem); } - return !e.Cancel; - + else + { + var media = ApplicationContext.Current.Services.MediaService.GetById(Id); + ApplicationContext.Current.Services.MediaService.MoveToRecycleBin(media); + } + + //Move((int)RecycleBin.RecycleBinType.Media); + + //TODO: Now that we've moved it to trash, we need to move the actual files so they are no longer accessible + //from the original URL. + return true; + } #endregion - #region Events - - /// - /// The save event handler - /// - public delegate void SaveEventHandler(Media sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(Media sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(Media sender, DeleteEventArgs e); - - - /// - /// Occurs when [before save]. - /// - public new static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - public new static event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - public static event EventHandler Newing; - protected static void OnNewing(NewEventArgs e) - { - if (Newing != null) - { - Newing(null, e); - } - } - - /// - /// Occurs when [before delete]. - /// - public new static event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public new static event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - - /// - /// The Move to trash event handler - /// - public delegate void MoveToTrashEventHandler(Media sender, MoveToTrashEventArgs e); - /// - /// Occurs when [before delete]. - /// - public static event MoveToTrashEventHandler BeforeMoveToTrash; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeMoveToTrash(MoveToTrashEventArgs e) - { - if (BeforeMoveToTrash != null) - BeforeMoveToTrash(this, e); - } - - /// - /// Occurs when [after move to trash]. - /// - public static event MoveToTrashEventHandler AfterMoveToTrash; - /// - /// Fires the after move to trash. - /// - /// The instance containing the event data. - protected virtual void FireAfterMoveToTrash(MoveToTrashEventArgs e) - { - if (AfterMoveToTrash != null) - AfterMoveToTrash(this, e); - } - #endregion - + } } diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs index f052edc849..25e47b4ea4 100644 --- a/src/umbraco.cms/businesslogic/media/MediaType.cs +++ b/src/umbraco.cms/businesslogic/media/MediaType.cs @@ -101,8 +101,6 @@ namespace umbraco.cms.businesslogic.media ApplicationContext.Current.Services.ContentTypeService.Save(mediaType, u.Id); var mt = new MediaType(mediaType.Id); - NewEventArgs e = new NewEventArgs(); - mt.OnNew(e); return mt; } @@ -114,19 +112,13 @@ namespace umbraco.cms.businesslogic.media /// public override void Save() { - SaveEventArgs e = new SaveEventArgs(); - FireBeforeSave(e); + var current = Thread.CurrentPrincipal != null ? Thread.CurrentPrincipal.Identity as UmbracoBackOfficeIdentity : null; + var userId = current == null ? Attempt.Fail() : current.Id.TryConvertTo(); + ApplicationContext.Current.Services.ContentTypeService.Save(MediaTypeItem, userId.Success ? userId.Result : 0); - if (!e.Cancel) - { - var current = Thread.CurrentPrincipal != null ? Thread.CurrentPrincipal.Identity as UmbracoBackOfficeIdentity : null; - var userId = current == null ? Attempt.Fail() : current.Id.TryConvertTo(); - ApplicationContext.Current.Services.ContentTypeService.Save(MediaTypeItem, userId.Success ? userId.Result : 0); + base.Save(); - base.Save(); - - FireAfterSave(e); - } + } /// @@ -134,21 +126,15 @@ namespace umbraco.cms.businesslogic.media /// public override void delete() { - DeleteEventArgs e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (!e.Cancel) + // check that no media types uses me as a master + if (GetAllAsList().Any(dt => dt.MasterContentTypes.Contains(this.Id))) { - // check that no media types uses me as a master - if (GetAllAsList().Any(dt => dt.MasterContentTypes.Contains(this.Id))) - { - throw new ArgumentException("Can't delete a Media Type used as a Master Content Type. Please remove all references first!"); - } - - ApplicationContext.Current.Services.ContentTypeService.Delete(MediaTypeItem); - - FireAfterDelete(e); + throw new ArgumentException("Can't delete a Media Type used as a Master Content Type. Please remove all references first!"); } + + ApplicationContext.Current.Services.ContentTypeService.Delete(MediaTypeItem); + + } #endregion @@ -174,92 +160,6 @@ namespace umbraco.cms.businesslogic.media } #endregion - #region Events - - /// - /// The save event handler - /// - public delegate void SaveEventHandler(MediaType sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(MediaType sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(MediaType sender, DeleteEventArgs e); - - - /// - /// Occurs when [before save]. - /// - public static new event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - public static new event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - /// - /// Occurs when [before delete]. - /// - public static new event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public static new event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - #endregion } } diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index 18b425dcf9..30bcd2e252 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -235,9 +235,6 @@ namespace umbraco.cms.businesslogic.member return null; var legacy = new Member(model); - var e = new NewEventArgs(); - - legacy.OnNew(e); legacy.Save(); @@ -602,26 +599,19 @@ namespace umbraco.cms.businesslogic.member [Obsolete("Obsolete, Use Umbraco.Core.Services.MemberService.Delete()", false)] public override void delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (!e.Cancel) + if (MemberItem != null) { - if (MemberItem != null) - { - ApplicationContext.Current.Services.MemberService.Delete(MemberItem); - } - else - { - var member = ApplicationContext.Current.Services.MemberService.GetById(Id); - ApplicationContext.Current.Services.MemberService.Delete(member); - } - - // Delete all content and cmsnode specific data! - base.delete(); - - FireAfterDelete(e); + ApplicationContext.Current.Services.MemberService.Delete(MemberItem); } + else + { + var member = ApplicationContext.Current.Services.MemberService.GetById(Id); + ApplicationContext.Current.Services.MemberService.Delete(member); + } + + // Delete all content and cmsnode specific data! + base.delete(); + } /// @@ -650,23 +640,15 @@ namespace umbraco.cms.businesslogic.member [MethodImpl(MethodImplOptions.Synchronized)] public void AddGroup(int GroupId) { - var e = new AddGroupEventArgs(); - e.GroupId = GroupId; - FireBeforeAddGroup(e); - - if (!e.Cancel) - { - var parameters = new IParameter[] { SqlHelper.CreateParameter("@id", Id), - SqlHelper.CreateParameter("@groupId", GroupId) }; - bool exists = SqlHelper.ExecuteScalar("SELECT COUNT(member) FROM cmsMember2MemberGroup WHERE member = @id AND memberGroup = @groupId", - parameters) > 0; - if (!exists) - SqlHelper.ExecuteNonQuery("INSERT INTO cmsMember2MemberGroup (member, memberGroup) values (@id, @groupId)", - parameters); - PopulateGroups(); - - FireAfterAddGroup(e); - } + var parameters = new IParameter[] { SqlHelper.CreateParameter("@id", Id), + SqlHelper.CreateParameter("@groupId", GroupId) }; + bool exists = SqlHelper.ExecuteScalar("SELECT COUNT(member) FROM cmsMember2MemberGroup WHERE member = @id AND memberGroup = @groupId", + parameters) > 0; + if (!exists) + SqlHelper.ExecuteNonQuery("INSERT INTO cmsMember2MemberGroup (member, memberGroup) values (@id, @groupId)", + parameters); + PopulateGroups(); + } /// @@ -675,18 +657,10 @@ namespace umbraco.cms.businesslogic.member /// The MemberGroup from which the Member is removed public void RemoveGroup(int GroupId) { - var e = new RemoveGroupEventArgs(); - e.GroupId = GroupId; - FireBeforeRemoveGroup(e); - - if (!e.Cancel) - { - SqlHelper.ExecuteNonQuery( - "delete from cmsMember2MemberGroup where member = @id and Membergroup = @groupId", - SqlHelper.CreateParameter("@id", Id), SqlHelper.CreateParameter("@groupId", GroupId)); - PopulateGroups(); - FireAfterRemoveGroup(e); - } + SqlHelper.ExecuteNonQuery( + "delete from cmsMember2MemberGroup where member = @id and Membergroup = @groupId", + SqlHelper.CreateParameter("@id", Id), SqlHelper.CreateParameter("@groupId", GroupId)); + PopulateGroups(); } #endregion @@ -733,34 +707,26 @@ namespace umbraco.cms.businesslogic.member if (m != null) { - var e = new AddToCacheEventArgs(); - m.FireBeforeAddToCache(e); + // Add cookie with member-id, guid and loginname + // zb-00035 #29931 : cleanup member state management + // NH 4.7.1: We'll no longer use legacy cookies to handle Umbraco Members + //SetMemberState(m); - if (!e.Cancel) - { - // Add cookie with member-id, guid and loginname - // zb-00035 #29931 : cleanup member state management - // NH 4.7.1: We'll no longer use legacy cookies to handle Umbraco Members - //SetMemberState(m); + FormsAuthentication.SetAuthCookie(m.LoginName, true); - FormsAuthentication.SetAuthCookie(m.LoginName, true); + //cache the member + var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( + GetCacheKey(m.Id), + timeout: TimeSpan.FromMinutes(30), + getCacheItem: () => + { + // Debug information + HttpContext.Current.Trace.Write("member", + string.Format("Member added to cache: {0}/{1} ({2})", + m.Text, m.LoginName, m.Id)); - //cache the member - var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( - GetCacheKey(m.Id), - timeout: TimeSpan.FromMinutes(30), - getCacheItem: () => - { - // Debug information - HttpContext.Current.Trace.Write("member", - string.Format("Member added to cache: {0}/{1} ({2})", - m.Text, m.LoginName, m.Id)); - - return m; - }); - - m.FireAfterAddToCache(e); - } + return m; + }); } } @@ -783,33 +749,25 @@ namespace umbraco.cms.businesslogic.member { if (m != null) { - var e = new AddToCacheEventArgs(); - m.FireBeforeAddToCache(e); + // zb-00035 #29931 : cleanup member state management + // NH 4.7.1: We'll no longer use Umbraco legacy cookies to handle members + //SetMemberState(m, UseSession, TimespanForCookie.TotalDays); - if (!e.Cancel) - { - // zb-00035 #29931 : cleanup member state management - // NH 4.7.1: We'll no longer use Umbraco legacy cookies to handle members - //SetMemberState(m, UseSession, TimespanForCookie.TotalDays); + FormsAuthentication.SetAuthCookie(m.LoginName, !UseSession); - FormsAuthentication.SetAuthCookie(m.LoginName, !UseSession); + //cache the member + var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( + GetCacheKey(m.Id), + timeout: TimeSpan.FromMinutes(30), + getCacheItem: () => + { + // Debug information + HttpContext.Current.Trace.Write("member", + string.Format("Member added to cache: {0}/{1} ({2})", + m.Text, m.LoginName, m.Id)); - //cache the member - var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( - GetCacheKey(m.Id), - timeout: TimeSpan.FromMinutes(30), - getCacheItem: () => - { - // Debug information - HttpContext.Current.Trace.Write("member", - string.Format("Member added to cache: {0}/{1} ({2})", - m.Text, m.LoginName, m.Id)); - - return m; - }); - - m.FireAfterAddToCache(e); - } + return m; + }); } } @@ -942,150 +900,6 @@ namespace umbraco.cms.businesslogic.member #endregion - #region Events - - /// - /// The save event handler - /// - public delegate void SaveEventHandler(Member sender, SaveEventArgs e); - - /// - /// The new event handler - /// - public delegate void NewEventHandler(Member sender, NewEventArgs e); - - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(Member sender, DeleteEventArgs e); - - /// - /// The add to cache event handler - /// - public delegate void AddingToCacheEventHandler(Member sender, AddToCacheEventArgs e); - - /// - /// The add group event handler - /// - public delegate void AddingGroupEventHandler(Member sender, AddGroupEventArgs e); - - /// - /// The remove group event handler - /// - public delegate void RemovingGroupEventHandler(Member sender, RemoveGroupEventArgs e); - - - /// - /// Occurs when [before save]. - /// - new public static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - new protected virtual void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - { - BeforeSave(this, e); - } - } - - - new public static event SaveEventHandler AfterSave; - new protected virtual void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - { - AfterSave(this, e); - } - } - - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - { - New(this, e); - } - } - - - public static event AddingGroupEventHandler BeforeAddGroup; - protected virtual void FireBeforeAddGroup(AddGroupEventArgs e) - { - if (BeforeAddGroup != null) - { - BeforeAddGroup(this, e); - } - } - public static event AddingGroupEventHandler AfterAddGroup; - protected virtual void FireAfterAddGroup(AddGroupEventArgs e) - { - if (AfterAddGroup != null) - { - AfterAddGroup(this, e); - } - } - - - public static event RemovingGroupEventHandler BeforeRemoveGroup; - protected virtual void FireBeforeRemoveGroup(RemoveGroupEventArgs e) - { - if (BeforeRemoveGroup != null) - { - BeforeRemoveGroup(this, e); - } - } - - public static event RemovingGroupEventHandler AfterRemoveGroup; - protected virtual void FireAfterRemoveGroup(RemoveGroupEventArgs e) - { - if (AfterRemoveGroup != null) - { - AfterRemoveGroup(this, e); - } - } - - - public static event AddingToCacheEventHandler BeforeAddToCache; - protected virtual void FireBeforeAddToCache(AddToCacheEventArgs e) - { - if (BeforeAddToCache != null) - { - BeforeAddToCache(this, e); - } - } - - - public static event AddingToCacheEventHandler AfterAddToCache; - protected virtual void FireAfterAddToCache(AddToCacheEventArgs e) - { - if (AfterAddToCache != null) - { - AfterAddToCache(this, e); - } - } - - new public static event DeleteEventHandler BeforeDelete; - new protected virtual void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - { - BeforeDelete(this, e); - } - } - - new public static event DeleteEventHandler AfterDelete; - new protected virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - { - AfterDelete(this, e); - } - } - #endregion #region Membership helper class used for encryption methods /// diff --git a/src/umbraco.cms/businesslogic/member/MemberGroup.cs b/src/umbraco.cms/businesslogic/member/MemberGroup.cs index 222c3f0032..1c055b0f50 100644 --- a/src/umbraco.cms/businesslogic/member/MemberGroup.cs +++ b/src/umbraco.cms/businesslogic/member/MemberGroup.cs @@ -62,9 +62,6 @@ namespace umbraco.cms.businesslogic.member [Obsolete("Use System.Web.Security.Role.DeleteRole")] public override void delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - if (e.Cancel) return; if (_memberGroupItem != null) { @@ -78,7 +75,6 @@ namespace umbraco.cms.businesslogic.member // Delete all content and cmsnode specific data! base.delete(); - FireAfterDelete(e); } @@ -87,13 +83,9 @@ namespace umbraco.cms.businesslogic.member /// public override void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - if (e.Cancel) return; ApplicationContext.Current.Services.MemberGroupService.Save(_memberGroupItem); - FireAfterSave(e); } /// @@ -163,8 +155,6 @@ namespace umbraco.cms.businesslogic.member ApplicationContext.Current.Services.MemberGroupService.Save(group); var mg = new MemberGroup(group); - var e = new NewEventArgs(); - mg.OnNew(e); return mg; } @@ -192,54 +182,6 @@ namespace umbraco.cms.businesslogic.member base.PopulateCMSNodeFromUmbracoEntity(_memberGroupItem, MemberGroupObjectType); } - //EVENTS - /// - /// The save event handler - /// - public delegate void SaveEventHandler(MemberGroup sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(MemberGroup sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(MemberGroup sender, DeleteEventArgs e); - - - /// - /// Occurs when a language is saved. - /// - public new static event SaveEventHandler BeforeSave; - protected override void FireBeforeSave(SaveEventArgs e) { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public new static event SaveEventHandler AfterSave; - protected override void FireAfterSave(SaveEventArgs e) { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) { - if (New != null) - New(this, e); - } - - public new static event DeleteEventHandler BeforeDelete; - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public new static event DeleteEventHandler AfterDelete; - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } + } } diff --git a/src/umbraco.cms/businesslogic/member/MemberType.cs b/src/umbraco.cms/businesslogic/member/MemberType.cs index 9a950b6506..065fee44b2 100644 --- a/src/umbraco.cms/businesslogic/member/MemberType.cs +++ b/src/umbraco.cms/businesslogic/member/MemberType.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Umbraco.Core; +using Umbraco.Core.Events; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using PropertyType = umbraco.cms.businesslogic.propertytype.PropertyType; @@ -102,33 +103,17 @@ namespace umbraco.cms.businesslogic.member /// public override void delete() { - var e = new DeleteEventArgs(); + ApplicationContext.Current.Services.MemberTypeService.Delete(MemberTypeItem); - FireBeforeDelete(e); - - if (e.Cancel == false) { - - ApplicationContext.Current.Services.MemberTypeService.Delete(MemberTypeItem); - - // delete all documents of this type - FireAfterDelete(e); - } - } + } /// /// Used to persist object changes to the database /// public override void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - - if (e.Cancel == false) - { - ApplicationContext.Current.Services.MemberTypeService.Save(MemberTypeItem); - base.Save(); - FireAfterSave(e); - } + ApplicationContext.Current.Services.MemberTypeService.Save(MemberTypeItem); + base.Save(); } @@ -165,8 +150,6 @@ namespace umbraco.cms.businesslogic.member }; ApplicationContext.Current.Services.MemberTypeService.Save(mt); var legacy = new MemberType(mt); - var e = new NewEventArgs(); - legacy.OnNew(e); return legacy; } @@ -205,59 +188,5 @@ namespace umbraco.cms.businesslogic.member #endregion - #region Events - - /// - /// The save event handler - /// - public delegate void SaveEventHandler(MemberType sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(MemberType sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(MemberType sender, DeleteEventArgs e); - - - /// - /// Occurs when a language is saved. - /// - public new static event SaveEventHandler BeforeSave; - protected override void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public new static event SaveEventHandler AfterSave; - protected override void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - public new static event DeleteEventHandler BeforeDelete; - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public new static event DeleteEventHandler AfterDelete; - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - #endregion } } \ No newline at end of file diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs index 6942c99502..24a182eb4b 100644 --- a/src/umbraco.cms/businesslogic/template/Template.cs +++ b/src/umbraco.cms/businesslogic/template/Template.cs @@ -88,15 +88,7 @@ namespace umbraco.cms.businesslogic.template /// public override void Save() { - SaveEventArgs e = new SaveEventArgs(); - FireBeforeSave(e); - - if (!e.Cancel) - { - ApplicationContext.Current.Services.FileService.SaveTemplate(TemplateEntity); - //base.Save(); - FireAfterSave(e); - } + ApplicationContext.Current.Services.FileService.SaveTemplate(TemplateEntity); } public string GetRawText() @@ -299,8 +291,6 @@ namespace umbraco.cms.businesslogic.template var template = ApplicationContext.Current.Services.FileService.CreateTemplateWithIdentity(name, design, foundMaster, u.Id); var legacyTemplate = new Template(template); - var e = new NewEventArgs(); - legacyTemplate.OnNew(e); return legacyTemplate; } @@ -345,19 +335,13 @@ namespace umbraco.cms.businesslogic.template throw ex; } - DeleteEventArgs e = new DeleteEventArgs(); - FireBeforeDelete(e); - if (!e.Cancel) - { - //remove refs from documents - SqlHelper.ExecuteNonQuery("UPDATE cmsDocument SET templateId = NULL WHERE templateId = " + this.Id); + //remove refs from documents + SqlHelper.ExecuteNonQuery("UPDATE cmsDocument SET templateId = NULL WHERE templateId = " + this.Id); - ApplicationContext.Current.Services.FileService.DeleteTemplate(TemplateEntity.Alias); + ApplicationContext.Current.Services.FileService.DeleteTemplate(TemplateEntity.Alias); - FireAfterDelete(e); - } } [Obsolete("This method, doesnt actually do anything, as the file is created when the design is set", false)] @@ -530,92 +514,6 @@ namespace umbraco.cms.businesslogic.template } - #region Events - //EVENTS - /// - /// The save event handler - /// - public delegate void SaveEventHandler(Template sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(Template sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(Template sender, DeleteEventArgs e); - - - /// - /// Occurs when [before save]. - /// - public new static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - public new static event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - /// - /// Occurs when [before delete]. - /// - public new static event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public new static event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - #endregion } } diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 2b77b47284..79a52ea7d6 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -464,16 +464,7 @@ namespace umbraco.cms.businesslogic.web [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.UnPublish()", false)] public void UnPublish() { - UnPublishEventArgs e = new UnPublishEventArgs(); - - FireBeforeUnPublish(e); - - if (!e.Cancel) - { - _published = ApplicationContext.Current.Services.ContentService.UnPublish(ContentEntity); - - FireAfterUnPublish(e); - } + _published = ApplicationContext.Current.Services.ContentService.UnPublish(ContentEntity); } @@ -603,28 +594,19 @@ namespace umbraco.cms.businesslogic.web [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Delete()", false)] private bool DeletePermanently() { - DeleteEventArgs e = new DeleteEventArgs(); - - FireBeforeDelete(e); - - if (!e.Cancel) + if (ContentEntity != null) { - if (ContentEntity != null) - { - ApplicationContext.Current.Services.ContentService.Delete(ContentEntity); - } - else - { - ContentEntity = ApplicationContext.Current.Services.ContentService.GetById(Id); - ApplicationContext.Current.Services.ContentService.Delete(ContentEntity); - } - - //Keeping the base.delete() as it looks to be clear 'private/internal cache' - base.delete(); - - FireAfterDelete(e); + ApplicationContext.Current.Services.ContentService.Delete(ContentEntity); } - return !e.Cancel; + else + { + ContentEntity = ApplicationContext.Current.Services.ContentService.GetById(Id); + ApplicationContext.Current.Services.ContentService.Delete(ContentEntity); + } + + //Keeping the base.delete() as it looks to be clear 'private/internal cache' + base.delete(); + return true; } /// @@ -634,138 +616,22 @@ namespace umbraco.cms.businesslogic.web [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] private bool MoveToTrash() { - MoveToTrashEventArgs e = new MoveToTrashEventArgs(); - FireBeforeMoveToTrash(e); - if (!e.Cancel) + UnPublish(); + if (ContentEntity != null) { - UnPublish(); - if (ContentEntity != null) - { - ApplicationContext.Current.Services.ContentService.MoveToRecycleBin(ContentEntity); - } - else - { - ContentEntity = ApplicationContext.Current.Services.ContentService.GetById(Id); - ApplicationContext.Current.Services.ContentService.MoveToRecycleBin(ContentEntity); - } - FireAfterMoveToTrash(e); + ApplicationContext.Current.Services.ContentService.MoveToRecycleBin(ContentEntity); } - return !e.Cancel; + else + { + ContentEntity = ApplicationContext.Current.Services.ContentService.GetById(Id); + ApplicationContext.Current.Services.ContentService.MoveToRecycleBin(ContentEntity); + } + return true; } #endregion - - #region Events - - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(Document sender, DeleteEventArgs e); - /// - /// The unpublish event handler - /// - public delegate void UnPublishEventHandler(Document sender, UnPublishEventArgs e); - - /// - /// The Move to trash event handler - /// - public delegate void MoveToTrashEventHandler(Document sender, MoveToTrashEventArgs e); - - - /// - /// Occurs when [before delete]. - /// - public new static event DeleteEventHandler BeforeDelete; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public new static event DeleteEventHandler AfterDelete; - - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected new virtual void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - - - /// - /// Occurs when [before delete]. - /// - public static event MoveToTrashEventHandler BeforeMoveToTrash; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeMoveToTrash(MoveToTrashEventArgs e) - { - if (BeforeMoveToTrash != null) - BeforeMoveToTrash(this, e); - } - - - /// - /// Occurs when [after move to trash]. - /// - public static event MoveToTrashEventHandler AfterMoveToTrash; - /// - /// Fires the after move to trash. - /// - /// The instance containing the event data. - protected virtual void FireAfterMoveToTrash(MoveToTrashEventArgs e) - { - if (AfterMoveToTrash != null) - AfterMoveToTrash(this, e); - } - - - /// - /// Occurs when [before un publish]. - /// - public static event UnPublishEventHandler BeforeUnPublish; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireBeforeUnPublish(UnPublishEventArgs e) - { - if (BeforeUnPublish != null) - BeforeUnPublish(this, e); - } - - /// - /// Occurs when [after un publish]. - /// - public static event UnPublishEventHandler AfterUnPublish; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void FireAfterUnPublish(UnPublishEventArgs e) - { - if (AfterUnPublish != null) - AfterUnPublish(this, e); - } - - - #endregion - } } diff --git a/src/umbraco.cms/businesslogic/web/DocumentType.cs b/src/umbraco.cms/businesslogic/web/DocumentType.cs index 159d5f8737..5833b1d198 100644 --- a/src/umbraco.cms/businesslogic/web/DocumentType.cs +++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs @@ -88,9 +88,6 @@ namespace umbraco.cms.businesslogic.web ApplicationContext.Current.Services.ContentTypeService.Save(contentType, u.Id); var newDt = new DocumentType(contentType); - //event - NewEventArgs e = new NewEventArgs(); - newDt.OnNew(e); return newDt; } @@ -347,23 +344,16 @@ namespace umbraco.cms.businesslogic.web [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.Delete()", false)] public override void delete() { - DeleteEventArgs e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (e.Cancel == false) + // check that no document types uses me as a master + if (GetAllAsList().Any(dt => dt.MasterContentTypes.Contains(this.Id))) { - // check that no document types uses me as a master - if (GetAllAsList().Any(dt => dt.MasterContentTypes.Contains(this.Id))) - { - throw new ArgumentException("Can't delete a Document Type used as a Master Content Type. Please remove all references first!"); - } - - ApplicationContext.Current.Services.ContentTypeService.Delete(ContentType); - - clearTemplates(); - - FireAfterDelete(e); + throw new ArgumentException("Can't delete a Document Type used as a Master Content Type. Please remove all references first!"); } + + ApplicationContext.Current.Services.ContentTypeService.Delete(ContentType); + + clearTemplates(); + } public void clearTemplates() @@ -404,18 +394,11 @@ namespace umbraco.cms.businesslogic.web [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.Save()", false)] public override void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); + var current = Thread.CurrentPrincipal != null ? Thread.CurrentPrincipal.Identity as UmbracoBackOfficeIdentity : null; + var userId = current == null ? Attempt.Fail() : current.Id.TryConvertTo(); + ApplicationContext.Current.Services.ContentTypeService.Save(ContentType, userId.Success ? userId.Result : 0); - if (!e.Cancel) - { - var current = Thread.CurrentPrincipal != null ? Thread.CurrentPrincipal.Identity as UmbracoBackOfficeIdentity : null; - var userId = current == null ? Attempt.Fail() : current.Id.TryConvertTo(); - ApplicationContext.Current.Services.ContentTypeService.Save(ContentType, userId.Success ? userId.Result : 0); - - base.Save(); - FireAfterSave(e); - } + base.Save(); } #endregion @@ -466,94 +449,5 @@ namespace umbraco.cms.businesslogic.web } #endregion - #region Events - /// - /// The save event handler - /// - public delegate void SaveEventHandler(DocumentType sender, SaveEventArgs e); - /// - /// The New event handler - /// - public delegate void NewEventHandler(DocumentType sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(DocumentType sender, DeleteEventArgs e); - - /// - /// Occurs when [before save]. - /// - public new static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - public new static event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - { - var updated = this.ContentType == null - ? new DocumentType(this.Id) - : new DocumentType(this.ContentType); - AfterSave(updated, e); - } - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - /// - /// Occurs when [before delete]. - /// - public new static event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public new static event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - #endregion } } \ No newline at end of file diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs index 4dfc4e28aa..4421291c94 100644 --- a/src/umbraco.cms/businesslogic/web/Domain.cs +++ b/src/umbraco.cms/businesslogic/web/Domain.cs @@ -80,28 +80,14 @@ namespace umbraco.cms.businesslogic.web public void Delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); + ApplicationContext.Current.Services.DomainService.Delete(DomainEntity); - if (!e.Cancel) - { - ApplicationContext.Current.Services.DomainService.Delete(DomainEntity); - - FireAfterDelete(e); - } } - public void Save(){ - var e = new SaveEventArgs(); - FireBeforeSave(e); + public void Save() + { + ApplicationContext.Current.Services.DomainService.Save(DomainEntity); - if (!e.Cancel) - { - if (ApplicationContext.Current.Services.DomainService.Save(DomainEntity)) - { - FireAfterSave(e); - } - } } #region Statics @@ -156,54 +142,12 @@ namespace umbraco.cms.businesslogic.web RootContentId = RootNodeId, LanguageId = LanguageId }; - if (ApplicationContext.Current.Services.DomainService.Save(domain)) - { - var e = new NewEventArgs(); - var legacyModel = new Domain(domain); - legacyModel.OnNew(e); - } - + ApplicationContext.Current.Services.DomainService.Save(domain); } #endregion - //EVENTS - public delegate void SaveEventHandler(Domain sender, SaveEventArgs e); - public delegate void NewEventHandler(Domain sender, NewEventArgs e); - public delegate void DeleteEventHandler(Domain sender, DeleteEventArgs e); - - /// - /// Occurs when a macro is saved. - /// - public static event SaveEventHandler BeforeSave; - protected virtual void FireBeforeSave(SaveEventArgs e) { - if (BeforeSave != null) - BeforeSave(this, e); - } - - public static event SaveEventHandler AfterSave; - protected virtual void FireAfterSave(SaveEventArgs e) { - if (AfterSave != null) - AfterSave(this, e); - } - - public static event NewEventHandler New; - protected virtual void OnNew(NewEventArgs e) { - if (New != null) - New(this, e); - } - - public static event DeleteEventHandler BeforeDelete; - protected virtual void FireBeforeDelete(DeleteEventArgs e) { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - public static event DeleteEventHandler AfterDelete; - protected virtual void FireAfterDelete(DeleteEventArgs e) { - if (AfterDelete != null) - AfterDelete(this, e); - } + #region Pipeline Refactoring diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs index 7c7006b074..aa66d8bcc6 100644 --- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs +++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs @@ -106,14 +106,8 @@ namespace umbraco.cms.businesslogic.web /// public override void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - if (!e.Cancel) - { - ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetEntity); + ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetEntity); - FireAfterSave(e); - } } /// @@ -150,8 +144,6 @@ namespace umbraco.cms.businesslogic.web ApplicationContext.Current.Services.FileService.SaveStylesheet(newSheet); var newCss = new StyleSheet(newSheet); - var e = new NewEventArgs(); - newCss.OnNew(e); return newCss; } @@ -175,15 +167,7 @@ namespace umbraco.cms.businesslogic.web public override void delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); - - if (!e.Cancel) - { - ApplicationContext.Current.Services.FileService.DeleteStylesheet(StylesheetEntity.Path); - - FireAfterDelete(e); - } + ApplicationContext.Current.Services.FileService.DeleteStylesheet(StylesheetEntity.Path); } @@ -255,113 +239,8 @@ namespace umbraco.cms.businesslogic.web } - //EVENTS - /// - /// The save event handler - /// - public delegate void SaveEventHandler(StyleSheet sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(StyleSheet sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(StyleSheet sender, DeleteEventArgs e); - - - /// - /// Occurs when [before save]. - /// - public new static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeSave(SaveEventArgs e) - { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - public new static event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterSave(SaveEventArgs e) - { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) - { - if (New != null) - New(this, e); - } - - /// - /// Occurs when [before delete]. - /// - public new static event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireBeforeDelete(DeleteEventArgs e) - { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - public new static event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected override void FireAfterDelete(DeleteEventArgs e) - { - if (AfterDelete != null) - AfterDelete(this, e); - } - } - [Obsolete("This is no longer used and will be removed from the codebase in future versions")] - public class StyleSheetComparer : IComparer - { - public StyleSheetComparer() - { - //default constructor - } - - public Int32 Compare(Object pFirstObject, Object pObjectToCompare) - { - if (pFirstObject is StyleSheet) - { - return String.Compare(((StyleSheet)pFirstObject).Text, ((StyleSheet)pObjectToCompare).Text); - } - else - { - return 0; - } - } - } } diff --git a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs index fb815bc075..9ededabf0c 100644 --- a/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs +++ b/src/umbraco.cms/businesslogic/web/StylesheetProperty.cs @@ -89,37 +89,19 @@ namespace umbraco.cms.businesslogic.web ApplicationContext.Current.Services.FileService.SaveStylesheet(sheet.StylesheetEntity); var ssp = new StylesheetProperty(sheet.StylesheetEntity, prop); - var e = new NewEventArgs(); - ssp.OnNew(e); return ssp; } public override void delete() { - var e = new DeleteEventArgs(); - FireBeforeDelete(e); + StylesheetItem.RemoveProperty(Text); + ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem); - if (!e.Cancel) - { - - StylesheetItem.RemoveProperty(Text); - ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem); - - FireAfterDelete(e); - } } public override void Save() { - var e = new SaveEventArgs(); - FireBeforeSave(e); - - if (!e.Cancel) - { - ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem); - - FireAfterSave(e); - } + ApplicationContext.Current.Services.FileService.SaveStylesheet(StylesheetItem); } public override string ToString() @@ -133,85 +115,6 @@ namespace umbraco.cms.businesslogic.web web.StyleSheet.ThrowNotSupported(); return null; } - - // EVENTS - /// - /// The save event handler - /// - public delegate void SaveEventHandler(StylesheetProperty sender, SaveEventArgs e); - /// - /// The new event handler - /// - public delegate void NewEventHandler(StylesheetProperty sender, NewEventArgs e); - /// - /// The delete event handler - /// - public delegate void DeleteEventHandler(StylesheetProperty sender, DeleteEventArgs e); - - - /// - /// Occurs when [before save]. - /// - new public static event SaveEventHandler BeforeSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - new protected virtual void FireBeforeSave(SaveEventArgs e) { - if (BeforeSave != null) - BeforeSave(this, e); - } - - /// - /// Occurs when [after save]. - /// - new public static event SaveEventHandler AfterSave; - /// - /// Raises the event. - /// - /// The instance containing the event data. - new protected virtual void FireAfterSave(SaveEventArgs e) { - if (AfterSave != null) - AfterSave(this, e); - } - - /// - /// Occurs when [new]. - /// - public static event NewEventHandler New; - /// - /// Raises the event. - /// - /// The instance containing the event data. - protected virtual void OnNew(NewEventArgs e) { - if (New != null) - New(this, e); - } - - /// - /// Occurs when [before delete]. - /// - new public static event DeleteEventHandler BeforeDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - new protected virtual void FireBeforeDelete(DeleteEventArgs e) { - if (BeforeDelete != null) - BeforeDelete(this, e); - } - - /// - /// Occurs when [after delete]. - /// - new public static event DeleteEventHandler AfterDelete; - /// - /// Raises the event. - /// - /// The instance containing the event data. - new protected virtual void FireAfterDelete(DeleteEventArgs e) { - if (AfterDelete != null) - AfterDelete(this, e); - } + } } diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index f8a7bcd716..1b9e6509f1 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -194,7 +194,6 @@ Code - Code