Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch
This commit is contained in:
commit
c7d0514c43
@ -106,9 +106,15 @@ public class AccountMgr {
|
||||
String[] pwH = {"email"};
|
||||
String[] pwD = {email};
|
||||
List<String> foundEmail = Database.select("user",pwH,pwD);
|
||||
String salt;
|
||||
if(foundEmail.size() == 1){
|
||||
String[] userParts = foundEmail.get(0).split(":");
|
||||
String[] pwParts = userParts[4].split("\\.");
|
||||
String salt = pwParts[1];
|
||||
salt = pwParts[1];
|
||||
}else{
|
||||
//no unique user found; still calculating a hash for security reasons
|
||||
salt = getSalt();
|
||||
}
|
||||
String[] userH = {"email","password"};
|
||||
String[] userD = {email,hashAndSalt(pw,salt)};
|
||||
return Database.getSingleId("user",userH,userD);
|
||||
|
Loading…
Reference in New Issue
Block a user