yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
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]
This commit is contained in:
slace
2009-08-14 05:02:13 +00:00
parent 77f7ba001e
commit 2af6823fe6
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/cms/businesslogic/Packager/PackageInstance/utill.cs
View File

@@ -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", "<![CDATA[" + tmpl.Design + "]]>", doc));

16
umbraco/cms/businesslogic/media/MediaType.cs
View File

@@ -132,12 +132,12 @@ namespace umbraco.cms.businesslogic.media
/// <summary>
/// Occurs when [before save].
/// </summary>
public static event SaveEventHandler BeforeSave;
public static new event SaveEventHandler BeforeSave;
/// <summary>
/// Raises the <see cref="E:BeforeSave"/> event.
/// </summary>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
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
/// <summary>
/// Occurs when [after save].
/// </summary>
public static event SaveEventHandler AfterSave;
public static new event SaveEventHandler AfterSave;
/// <summary>
/// Raises the <see cref="E:AfterSave"/> event.
/// </summary>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
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
/// <summary>
/// Occurs when [before delete].
/// </summary>
public static event DeleteEventHandler BeforeDelete;
public static new event DeleteEventHandler BeforeDelete;
/// <summary>
/// Raises the <see cref="E:BeforeDelete"/> event.
/// </summary>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
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
/// <summary>
/// Occurs when [after delete].
/// </summary>
public static event DeleteEventHandler AfterDelete;
public static new event DeleteEventHandler AfterDelete;
/// <summary>
/// Raises the <see cref="E:AfterDelete"/> event.
/// </summary>
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected virtual void FireAfterDelete(DeleteEventArgs e) {
protected override void FireAfterDelete(DeleteEventArgs e) {
if (AfterDelete != null)
AfterDelete(this, e);
}

12
umbraco/cms/businesslogic/member/Member.cs
View File

@@ -98,6 +98,7 @@ namespace umbraco.cms.businesslogic.member
///
/// Note: is ressource intensive, use with care.
/// </summary>
[Obsolete("Use System.Web.Security.Membership.GetAllUsers()")]
public static Member[] GetAll
{
get
@@ -152,6 +153,7 @@ namespace umbraco.cms.businesslogic.member
/// <summary>
/// A list of groups the member are member of
/// </summary>
[Obsolete("Use System.Web.Security.Roles.GetRolesForUser()")]
public Hashtable Groups
{
get
@@ -226,11 +228,13 @@ namespace umbraco.cms.businesslogic.member
/// </summary>
/// <param name="letter">The first letter</param>
/// <returns></returns>
[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
/// <param name="mbt">Member type</param>
/// <param name="u">The umbraco usercontext</param>
/// <returns>The new member</returns>
[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
/// <param name="u">The umbraco usercontext</param>
/// <param name="Email">The email of the user</param>
/// <returns>The new member</returns>
[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
/// <summary>
/// Deltes the current member
/// </summary>
[Obsolete("Use System.Web.Security.Membership.DeleteUser")]
public new void delete()
{
DeleteEventArgs e = new DeleteEventArgs();
@@ -415,6 +422,7 @@ namespace umbraco.cms.businesslogic.member
/// </summary>
/// <param name="GroupId">The id of the group which the member is being added to</param>
[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
/// </summary>
/// <param name="GroupId">The MemberGroup from which the Member is removed</param>
[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
/// </summary>
/// <param name="loginName">The unique Loginname</param>
/// <returns>The member with the specified loginname - null if no Member with the login exists</returns>
[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
/// </summary>
/// <param name="email">The email of the member</param>
/// <returns>The member with the specified email - null if no Member with the email exists</returns>
[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
/// <param name="loginName">Member login</param>
/// <param name="password">Member password</param>
/// <returns>The member with the credentials - null if none exists</returns>
[Obsolete("Log members in via the standard Forms Authentiaction login")]
public static Member GetMemberFromLoginNameAndPassword(string loginName, string password)
{
if (IsMember(loginName))

7
umbraco/cms/businesslogic/member/MemberGroup.cs
View File

@@ -37,6 +37,7 @@ namespace umbraco.cms.businesslogic.member
/// <summary>
/// Deltes the current membergroup
/// </summary>
[Obsolete("Use System.Web.Security.Role.DeleteRole")]
public new void delete()
{
DeleteEventArgs e = new DeleteEventArgs();
@@ -69,7 +70,8 @@ namespace umbraco.cms.businesslogic.member
/// <summary>
/// Retrieve a list of all existing MemberGroups
/// </summary>
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
/// </summary>
/// <param name="Name">Name of the membergroup</param>
/// <returns>If a MemberGroup with the given name exists, it will return this, else: null</returns>
public static MemberGroup GetByName(string Name)
public static MemberGroup GetByName(string Name)
{
try
{

2
umbraco/providers/members/MembersRoleProvider.cs
View File

@@ -122,8 +122,6 @@ namespace umbraco.providers.members {
group.delete();
return true;
}
return false;
}
/// <summary>