1.1 --- a/app/main/index/_action/register.lua	Tue Jul 22 22:23:01 2014 +0200
     1.2 +++ b/app/main/index/_action/register.lua	Tue Jul 22 22:57:57 2014 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  local member
     1.5  
     1.6  if app.session.authority == "ldap" then
     1.7 -  if not config.ldap.member or not config.ldap.member.registration == "manual" then
     1.8 +  if not config.ldap.member or config.ldap.member.registration ~= "manual" then
     1.9      error("access denied")
    1.10    end
    1.11    member = ldap.create_member(app.session.authority_uid, true)
    1.12 @@ -176,7 +176,7 @@
    1.13      end
    1.14    end  
    1.15  
    1.16 -  if not member.authority == "ldap" then
    1.17 +  if member.authority ~= "ldap" then
    1.18    
    1.19      local password1 = param.get("password1")
    1.20      local password2 = param.get("password2")
    1.21 @@ -206,6 +206,9 @@
    1.22        slot.put_into("error", _"Passwords must consist of at least 8 characters!")
    1.23        return false
    1.24      end
    1.25 +
    1.26 +    member:set_password(password1)
    1.27 +
    1.28    end
    1.29  
    1.30    if not util.is_profile_field_locked(member, "login") then
    1.31 @@ -224,10 +227,6 @@
    1.32      end
    1.33    end
    1.34    
    1.35 -  if not member.authority == "ldap" then
    1.36 -    member:set_password(password1)
    1.37 -  end
    1.38 -
    1.39    local now = db:query("SELECT now() AS now", "object").now
    1.40  
    1.41    for i, checkbox in ipairs(config.use_terms_checkboxes) do