Mirrors/Teknik
1
0
Fork 0
mirror of https://git.teknik.io/Teknikode/Teknik.git synced 2023-08-02 14:16:22 +02:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Uncled1023 2018-01-22 21:54:35 -08:00
parent ec6cedbba2
commit c6d836dac2
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ServerMaint/Program.cs
View File

@ -1,4 +1,4 @@
using nClam; using nClam;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.Entity; using System.Data.Entity;
@ -538,7 +538,15 @@ Thank you for your continued use of Teknik!
} }
#region Inactivity Finding #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); TimeSpan inactiveTime = DateTime.Now.Subtract(lastActivity);

3
Teknik/App_Data/reservedUsernames.txt
View File

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

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

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