From 2af6823fe69fcbb2c3a78ea6ad04f60f6b22e71d Mon Sep 17 00:00:00 2001 From: slace Date: Fri, 14 Aug 2009 05:02:13 +0000 Subject: [PATCH] DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB Tweaking the packager Setting obsolete flags on the Member classes to get people to use the new ASP.NET Membership provider way [TFS Changeset #58039] --- .../Packager/PackageInstance/utill.cs | 2 +- umbraco/cms/businesslogic/media/MediaType.cs | 16 ++++++++-------- umbraco/cms/businesslogic/member/Member.cs | 12 ++++++++++++ umbraco/cms/businesslogic/member/MemberGroup.cs | 7 +++++-- umbraco/providers/members/MembersRoleProvider.cs | 2 -- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/umbraco/cms/businesslogic/Packager/PackageInstance/utill.cs b/umbraco/cms/businesslogic/Packager/PackageInstance/utill.cs index 14c9091efd..1d2a155e8f 100644 --- a/umbraco/cms/businesslogic/Packager/PackageInstance/utill.cs +++ b/umbraco/cms/businesslogic/Packager/PackageInstance/utill.cs @@ -80,7 +80,7 @@ namespace umbraco.cms.businesslogic.packager { template.AppendChild(_node("Name", tmpl.Text, doc)); template.AppendChild(_node("Alias", tmpl.Alias, doc)); - if (tmpl.MasterTemplate != null && tmpl.MasterTemplate != 0) { + if (tmpl.MasterTemplate != 0) { template.AppendChild(_node("Master", new Template(tmpl.MasterTemplate).Alias, doc)); } template.AppendChild(_node("Design", "", doc)); diff --git a/umbraco/cms/businesslogic/media/MediaType.cs b/umbraco/cms/businesslogic/media/MediaType.cs index c1291a3400..af0331d3f6 100644 --- a/umbraco/cms/businesslogic/media/MediaType.cs +++ b/umbraco/cms/businesslogic/media/MediaType.cs @@ -132,12 +132,12 @@ namespace umbraco.cms.businesslogic.media /// /// Occurs when [before save]. /// - public static event SaveEventHandler BeforeSave; + public static new event SaveEventHandler BeforeSave; /// /// Raises the event. /// /// The instance containing the event data. - protected virtual void FireBeforeSave(SaveEventArgs e) { + protected override void FireBeforeSave(SaveEventArgs e) { if (BeforeSave != null) BeforeSave(this, e); } @@ -145,12 +145,12 @@ namespace umbraco.cms.businesslogic.media /// /// Occurs when [after save]. /// - public static event SaveEventHandler AfterSave; + public static new event SaveEventHandler AfterSave; /// /// Raises the event. /// /// The instance containing the event data. - protected virtual void FireAfterSave(SaveEventArgs e) { + protected override void FireAfterSave(SaveEventArgs e) { if (AfterSave != null) AfterSave(this, e); } @@ -171,12 +171,12 @@ namespace umbraco.cms.businesslogic.media /// /// Occurs when [before delete]. /// - public static event DeleteEventHandler BeforeDelete; + public static new event DeleteEventHandler BeforeDelete; /// /// Raises the event. /// /// The instance containing the event data. - protected virtual void FireBeforeDelete(DeleteEventArgs e) { + protected override void FireBeforeDelete(DeleteEventArgs e) { if (BeforeDelete != null) BeforeDelete(this, e); } @@ -184,12 +184,12 @@ namespace umbraco.cms.businesslogic.media /// /// Occurs when [after delete]. /// - public static event DeleteEventHandler AfterDelete; + public static new event DeleteEventHandler AfterDelete; /// /// Raises the event. /// /// The instance containing the event data. - protected virtual void FireAfterDelete(DeleteEventArgs e) { + protected override void FireAfterDelete(DeleteEventArgs e) { if (AfterDelete != null) AfterDelete(this, e); } diff --git a/umbraco/cms/businesslogic/member/Member.cs b/umbraco/cms/businesslogic/member/Member.cs index 313bf52bd5..fe2549def9 100644 --- a/umbraco/cms/businesslogic/member/Member.cs +++ b/umbraco/cms/businesslogic/member/Member.cs @@ -98,6 +98,7 @@ namespace umbraco.cms.businesslogic.member /// /// Note: is ressource intensive, use with care. /// + [Obsolete("Use System.Web.Security.Membership.GetAllUsers()")] public static Member[] GetAll { get @@ -152,6 +153,7 @@ namespace umbraco.cms.businesslogic.member /// /// A list of groups the member are member of /// + [Obsolete("Use System.Web.Security.Roles.GetRolesForUser()")] public Hashtable Groups { get @@ -226,11 +228,13 @@ namespace umbraco.cms.businesslogic.member /// /// The first letter /// + [Obsolete("Use System.Web.Security.Membership.FindUsersByName(string letter)")] public static Member[] getMemberFromFirstLetter(char letter) { return GetMemberByName(letter.ToString(), true); } + [Obsolete("Use System.Web.Security.Membership.FindUsersByName(string letter)")] public static Member[] GetMemberByName(string usernameToMatch, bool matchByNameInsteadOfLogin) { string field = matchByNameInsteadOfLogin ? "text" : "loginName"; @@ -262,6 +266,7 @@ namespace umbraco.cms.businesslogic.member /// Member type /// The umbraco usercontext /// The new member + [Obsolete("Use System.Web.Security.Membership.CreateUser")] public static Member MakeNew(string Name, MemberType mbt, User u) { return MakeNew(Name, "", mbt, u); @@ -292,6 +297,7 @@ namespace umbraco.cms.businesslogic.member /// The umbraco usercontext /// The email of the user /// The new member + [Obsolete("Use System.Web.Security.Membership.CreateUser")] public static Member MakeNew(string Name, string Email, MemberType mbt, User u) { // Test for e-mail @@ -354,6 +360,7 @@ namespace umbraco.cms.businesslogic.member /// /// Deltes the current member /// + [Obsolete("Use System.Web.Security.Membership.DeleteUser")] public new void delete() { DeleteEventArgs e = new DeleteEventArgs(); @@ -415,6 +422,7 @@ namespace umbraco.cms.businesslogic.member /// /// The id of the group which the member is being added to [MethodImpl(MethodImplOptions.Synchronized)] + [Obsolete("Use System.Web.Security.Roles.AddUserToRole")] public void AddGroup(int GroupId) { AddGroupEventArgs e = new AddGroupEventArgs(); @@ -439,6 +447,7 @@ namespace umbraco.cms.businesslogic.member /// Removes the member from the MemberGroup specified /// /// The MemberGroup from which the Member is removed + [Obsolete("Use System.Web.Security.Roles.RemoveUserFromRole")] public void RemoveGroup(int GroupId) { RemoveGroupEventArgs e = new RemoveGroupEventArgs(); @@ -475,6 +484,7 @@ namespace umbraco.cms.businesslogic.member /// /// The unique Loginname /// The member with the specified loginname - null if no Member with the login exists + [Obsolete("Use System.Web.Security.Membership.GetUser")] public static Member GetMemberFromLoginName(string loginName) { if (IsMember(loginName)) @@ -505,6 +515,7 @@ namespace umbraco.cms.businesslogic.member /// /// The email of the member /// The member with the specified email - null if no Member with the email exists + [Obsolete("Use System.Web.Security.Membership.GetUserNameByEmail")] public static Member GetMemberFromEmail(string email) { if (string.IsNullOrEmpty(email)) @@ -532,6 +543,7 @@ namespace umbraco.cms.businesslogic.member /// Member login /// Member password /// The member with the credentials - null if none exists + [Obsolete("Log members in via the standard Forms Authentiaction login")] public static Member GetMemberFromLoginNameAndPassword(string loginName, string password) { if (IsMember(loginName)) diff --git a/umbraco/cms/businesslogic/member/MemberGroup.cs b/umbraco/cms/businesslogic/member/MemberGroup.cs index 7deec1ddcb..0e26157590 100644 --- a/umbraco/cms/businesslogic/member/MemberGroup.cs +++ b/umbraco/cms/businesslogic/member/MemberGroup.cs @@ -37,6 +37,7 @@ namespace umbraco.cms.businesslogic.member /// /// Deltes the current membergroup /// + [Obsolete("Use System.Web.Security.Role.DeleteRole")] public new void delete() { DeleteEventArgs e = new DeleteEventArgs(); @@ -69,7 +70,8 @@ namespace umbraco.cms.businesslogic.member /// /// Retrieve a list of all existing MemberGroups /// - public static MemberGroup[] GetAll + [Obsolete("Use System.Web.Security.Role.GetAllRoles")] + public static MemberGroup[] GetAll { get { @@ -98,6 +100,7 @@ namespace umbraco.cms.businesslogic.member return (int[])retval.ToArray(typeof(int)); } + [Obsolete("Use System.Web.Security.Roles.FindUsersInRole")] public Member[] GetMembers() { ArrayList retval = new ArrayList(); IRecordsReader dr = SqlHelper.ExecuteReader("select member from cmsMember2MemberGroup where memberGroup = @memberGroup", @@ -133,7 +136,7 @@ namespace umbraco.cms.businesslogic.member /// /// Name of the membergroup /// If a MemberGroup with the given name exists, it will return this, else: null - public static MemberGroup GetByName(string Name) + public static MemberGroup GetByName(string Name) { try { diff --git a/umbraco/providers/members/MembersRoleProvider.cs b/umbraco/providers/members/MembersRoleProvider.cs index 3bc3acca0b..41a6da6568 100644 --- a/umbraco/providers/members/MembersRoleProvider.cs +++ b/umbraco/providers/members/MembersRoleProvider.cs @@ -122,8 +122,6 @@ namespace umbraco.providers.members { group.delete(); return true; } - - return false; } ///