zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #540: user account events now raised correctly.

Browse source
This commit is contained in:
Dario Solera 2010-05-20 12:30:02 +00:00
parent 5bd3f0e0b4
commit 5f11f2e4ed
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.2.538")] [assembly: AssemblyVersion("3.0.2.539")]
[assembly: AssemblyFileVersion("3.0.2.538")] [assembly: AssemblyFileVersion("3.0.2.539")]

9
Core/Users.cs
View file

@ -209,11 +209,14 @@ namespace ScrewTurn.Wiki {
public static bool ModifyUser(UserInfo user, string displayName, string password, string email, bool active) { public static bool ModifyUser(UserInfo user, string displayName, string password, string email, bool active) {
if(user.Provider.UserAccountsReadOnly) return false; if(user.Provider.UserAccountsReadOnly) return false;
bool done = user.Provider.ModifyUser(user, displayName, password, email, active) != null; UserInfo newUser = user.Provider.ModifyUser(user, displayName, password, email, active);
if(done) { if(newUser != null) {
Log.LogEntry("User " + user.Username + " updated", EntryType.General, Log.SystemUsername); Log.LogEntry("User " + user.Username + " updated", EntryType.General, Log.SystemUsername);
Host.Instance.OnUserAccountActivity(user, UserAccountActivity.AccountModified); Host.Instance.OnUserAccountActivity(newUser, UserAccountActivity.AccountModified);
if(user.Active != newUser.Active) {
Host.Instance.OnUserAccountActivity(newUser, newUser.Active ? UserAccountActivity.AccountActivated : UserAccountActivity.AccountDeactivated);
}
return true; return true;
} }
else { else {