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

fixes some logic with the protect page if it's already protected

Browse Source
This commit is contained in:
Shannon
2014-01-14 16:53:32 +11:00
parent 08c837602f
commit bf24e101d3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
View File

@@ -183,7 +183,9 @@ namespace umbraco.presentation.umbraco.dialogs
if (e.CommandName == "simple")
{
var member = Membership.GetUser(simpleLogin.Text);
var memberLogin = simpleLogin.Visible ? simpleLogin.Text : SimpleLoginLabel.Text;
var member = Membership.GetUser(memberLogin);
if (member == null)
{
var tempEmail = "u" + Guid.NewGuid().ToString("N") + "@example.com";
@@ -191,7 +193,7 @@ namespace umbraco.presentation.umbraco.dialogs
// this needs to work differently depending on umbraco members or external membership provider
if (Membership.Provider.IsUmbracoMembershipProvider() == false)
{
member = Membership.CreateUser(simpleLogin.Text, simplePassword.Text, tempEmail);
member = Membership.CreateUser(memberLogin, simplePassword.Text, tempEmail);
}
else
{
@@ -203,11 +205,12 @@ namespace umbraco.presentation.umbraco.dialogs
var provider = Membership.Provider.AsUmbracoMembershipProvider();
MembershipCreateStatus status;
member = provider.CreateUser(Constants.Conventions.MemberTypes.SystemDefaultProtectType,
simpleLogin.Text, simplePassword.Text, tempEmail, null, null, true, null, out status);
memberLogin, simplePassword.Text, tempEmail, null, null, true, null, out status);
if (status != MembershipCreateStatus.Success)
{
SimpleLoginNameValidator.IsValid = false;
SimpleLoginNameValidator.ErrorMessage = "Could not create user: " + status;
SimpleLoginNameValidator.Text = "Could not create user: " + status;
return;
}
}
@@ -216,14 +219,14 @@ namespace umbraco.presentation.umbraco.dialogs
{
SimpleLoginNameValidator.IsValid = false;
SimpleLoginLabel.Visible = true;
SimpleLoginLabel.Text = simpleLogin.Text;
SimpleLoginLabel.Text = memberLogin;
simpleLogin.Visible = false;
pp_pass.Visible = false;
return;
}
// Create or find a memberGroup
string simpleRoleName = "__umbracoRole_" + simpleLogin.Text;
var simpleRoleName = "__umbracoRole_" + member.UserName;
if (Roles.RoleExists(simpleRoleName) == false)
{
Roles.CreateRole(simpleRoleName);