zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
doctogonzo 2015-05-20 17:20:55 +02:00
commit 6e4437f8b0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Users/UserController.cs
View file

@ -101,7 +101,7 @@ namespace WebsitePanel.EnterpriseServer
// compare user passwords // compare user passwords
if (CryptoUtils.SHA1(user.Password) == password) if ((CryptoUtils.SHA1(user.Password) == password) || (user.Password == password))
{ {
switch (user.OneTimePasswordState) switch (user.OneTimePasswordState)
{ {
@ -172,7 +172,7 @@ namespace WebsitePanel.EnterpriseServer
} }
// compare user passwords // compare user passwords
if (CryptoUtils.SHA1(user.Password) == password) if ((CryptoUtils.SHA1(user.Password) == password) || (user.Password == password))
return new UserInfo(user); return new UserInfo(user);
return null; return null;