Browse Source

Fixed 'GetLastAccountActivity' throwing an exception if an account portion doesn't exist.

pull/111/head
Teknikode 5 years ago
parent
commit
c6d836dac2
  1. 12
      ServerMaint/Program.cs
  2. 3
      Teknik/App_Data/reservedUsernames.txt
  3. 27
      Teknik/Areas/User/Utility/UserHelper.cs

12
ServerMaint/Program.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
using nClam;
using nClam;
using System;
using System.Collections.Generic;
using System.Data.Entity;
@ -538,7 +538,15 @@ Thank you for your continued use of Teknik! @@ -538,7 +538,15 @@ Thank you for your continued use of Teknik!
}
#region Inactivity Finding
DateTime lastActivity = UserHelper.GetLastAccountActivity(db, config, user);
DateTime lastActivity = DateTime.Now;
try
{
lastActivity = UserHelper.GetLastAccountActivity(db, config, user);
}
catch
{
continue;
}
TimeSpan inactiveTime = DateTime.Now.Subtract(lastActivity);

3
Teknik/App_Data/reservedUsernames.txt

@ -108,6 +108,7 @@ sales @@ -108,6 +108,7 @@ sales
save
search
security
server admin
sessions
settings
sftp
@ -141,4 +142,4 @@ widgets @@ -141,4 +142,4 @@ widgets
wiki
www
xfn
xmpp
xmpp

27
Teknik/Areas/User/Utility/UserHelper.cs

@ -89,17 +89,26 @@ namespace Teknik.Areas.Users.Utility @@ -89,17 +89,26 @@ namespace Teknik.Areas.Users.Utility
{
DateTime lastActive = new DateTime(1900, 1, 1);
DateTime emailLastActive = UserEmailLastActive(config, GetUserEmailAddress(config, user.Username));
if (lastActive < emailLastActive)
lastActive = emailLastActive;
if (UserEmailExists(config, GetUserEmailAddress(config, user.Username)))
{
DateTime emailLastActive = UserEmailLastActive(config, GetUserEmailAddress(config, user.Username));
if (lastActive < emailLastActive)
lastActive = emailLastActive;
}
DateTime gitLastActive = UserGitLastActive(config, user.Username);
if (lastActive < gitLastActive)
lastActive = gitLastActive;
if (UserGitExists(config, user.Username))
{
DateTime gitLastActive = UserGitLastActive(config, user.Username);
if (lastActive < gitLastActive)
lastActive = gitLastActive;
}
DateTime userLastActive = UserLastActive(db, config, user);
if (lastActive < userLastActive)
lastActive = userLastActive;
if (UserExists(db, user.Username))
{
DateTime userLastActive = UserLastActive(db, config, user);
if (lastActive < userLastActive)
lastActive = userLastActive;
}
return lastActive;
}

Loading…
Cancel
Save