- Made registration a button instead of a dropdown.

- Fixed git last seen.
- Changed clean users to only clean inactives without data.

ServerMaint/ArgumentOptions.cs

@@ -34,8 +34,11 @@ namespace ServerMaint
         [Option('d', "days", DefaultValue = 90, Required = false, HelpText = "Days before the user is deleted")]
         public int DaysBeforeDeletion { get; set; }
 
-        [Option('e', "emails", DefaultValue = 2, Required = false, HelpText = "Number of emails to send before deletion")]
+        [Option('l', "last-seen", DefaultValue = false, Required = false, HelpText = "Generate a list of user's last seen stats")]
-        public int EmailsToSend { get; set; }
+        public bool GenerateLastSeen { get; set; }
+
+        [Option('f', "last-seen-file", Required = false, HelpText = "The file in which you want the last seen stats to be saved to")]
+        public string LastSeenFile { get; set; }
 
         // Omitting long name, default --verbose
         [Option(HelpText = "Prints all messages to standard output.")]

ServerMaint/Program.cs

@@ -45,6 +45,8 @@ namespace ServerMaint
                         Config config = Config.Load(configPath);
                         TeknikEntities db = new TeknikEntities();
 
+                        Output(string.Format("[{0}] Started Server Maintenance Process.", DateTime.Now));
+
                         // Scan all the uploads for viruses, and remove the bad ones
                         if (options.ScanUploads && config.UploadConfig.VirusScanEnable)
                         {
@@ -54,7 +56,7 @@ namespace ServerMaint
                         // Cleans all inactive users
                         if (options.CleanUsers)
                         {
-                            CleanUsers(config, db, options.DaysBeforeDeletion, options.EmailsToSend);
+                            CleanUsers(config, db, options.DaysBeforeDeletion);
                         }
 
                         // Cleans the email for unused accounts
@@ -69,7 +71,13 @@ namespace ServerMaint
                             CleanGit(config, db);
                         }
 
-                        Output(string.Format("[{0}] Finished Server Maintainence Process.", DateTime.Now));
+                        // Generates a file for all of the user's last seen dates
+                        if (options.GenerateLastSeen)
+                        {
+                            GenerateLastSeen(config, db, options.LastSeenFile);
+                        }
+
+                        Output(string.Format("[{0}] Finished Server Maintenance Process.", DateTime.Now));
                         return 0;
                     }
                     else
@@ -95,6 +103,7 @@ namespace ServerMaint
 
         public static void ScanUploads(Config config, TeknikEntities db)
         {
+            Output(string.Format("[{0}] Started Virus Scan.", DateTime.Now));
             List<Upload> uploads = db.Uploads.ToList();
 
             int totalCount = uploads.Count();
@@ -158,24 +167,28 @@ namespace ServerMaint
                 }
             }
 
-            // Add to transparency report if any were found
+            if (totalViruses > 0)
-            Takedown report = db.Takedowns.Create();
+            {
-            report.Requester = TAKEDOWN_REPORTER;
+                // Add to transparency report if any were found
-            report.RequesterContact = config.SupportEmail;
+                Takedown report = db.Takedowns.Create();
-            report.DateRequested = DateTime.Now;
+                report.Requester = TAKEDOWN_REPORTER;
-            report.Reason = "Malware Found";
+                report.RequesterContact = config.SupportEmail;
-            report.ActionTaken = string.Format("{0} Uploads removed", totalViruses);
+                report.DateRequested = DateTime.Now;
-            report.DateActionTaken = DateTime.Now;
+                report.Reason = "Malware Found";
-            db.Takedowns.Add(report);
+                report.ActionTaken = string.Format("{0} Uploads removed", totalViruses);
-            db.SaveChanges();
+                report.DateActionTaken = DateTime.Now;
+                db.Takedowns.Add(report);
+                db.SaveChanges();
+            }
 
             Output(string.Format("Scanning Complete.  {0} Scanned | {1} Viruses Found | {2} Total Files", totalScans, totalViruses, totalCount));
         }
 
-        public static void CleanUsers(Config config, TeknikEntities db, int maxDays, int numEmails)
+        public static void CleanUsers(Config config, TeknikEntities db, int maxDays)
         {
             int totalUsers = 0;
 
+            Output(string.Format("[{0}] Started Cleaning of Inactive Users.", DateTime.Now));
             List<User> curUsers = db.Users.ToList();
             foreach (User user in curUsers)
             {
@@ -190,67 +203,81 @@ namespace ServerMaint
 
                 TimeSpan inactiveTime = DateTime.Now.Subtract(lastActivity);
 
-                // If older than max days, delete
+                // If older than max days, check their current usage
                 if (inactiveTime >= new TimeSpan(maxDays, 0, 0, 0, 0))
                 {
-                    UserHelper.DeleteUser(db, config, user);
+                    // Check the user's usage of the service.
-                    continue;
+                    bool noData = true;
-                }
 
-                // Otherwise, send an email if they are within +-1 day of email days
+                    // Any blog comments?
-                int daysForEmail = (int)Math.Floor((double)(maxDays / (numEmails + 1)));
+                    var blogCom = db.BlogComments.Include("Users").Where(c => c.UserId == user.UserId);
-                for (int i = daysForEmail; i < maxDays; i = i + daysForEmail)
+                    noData &= !(blogCom != null && blogCom.Any());
-                {
+
-                    if (inactiveTime.Days == i)
+                    // Any blog posts?
+                    var blogPosts = db.BlogPosts.Include("Blog").Include("Blog.Users").Where(p => p.Blog.UserId == user.UserId);
+                    noData &= !(blogPosts != null && blogPosts.Any());
+
+                    // Any podcast comments?
+                    var podCom = db.PodcastComments.Include("Users").Where(p => p.UserId == user.UserId);
+                    noData &= !(podCom != null && podCom.Any());
+
+                    // Any email?
+                    if (config.EmailConfig.Enabled)
                     {
-                        string email = string.Format("{0}@{1}", user.Username, config.EmailConfig.Domain);
+                        var app = new hMailServer.Application();
-                        // Let's send them an email
+                        app.Connect();
-                        SmtpClient client = new SmtpClient();
+                        app.Authenticate(config.EmailConfig.Username, config.EmailConfig.Password);
-                        client.Host = config.ContactConfig.Host;
-                        client.Port = config.ContactConfig.Port;
-                        client.EnableSsl = config.ContactConfig.SSL;
-                        client.DeliveryMethod = SmtpDeliveryMethod.Network;
-                        client.UseDefaultCredentials = true;
-                        client.Credentials = new NetworkCredential(config.ContactConfig.Username, config.ContactConfig.Password);
-                        client.Timeout = 5000;
 
-                        MailMessage mail = new MailMessage(config.SupportEmail, email);
+                        try
-                        mail.Subject = "Inactive Account Notice";
+                        {
-                        mail.Body = string.Format(@"
+                            var domain = app.Domains.ItemByName[config.EmailConfig.Domain];
-The account {0} has not had any activity for {1} days.  After {2} days of inactivity, this account will be deleted permanently.  
+                            var account = domain.Accounts.ItemByAddress[UserHelper.GetUserEmailAddress(config, user.Username)];
-
+                            noData &= ((account.Messages.Count == 0) && ((int)account.Size == 0));
-In order to avoid this, login into your email, or teknik website.
+                        }
-
+                        catch { }
-Thank you for your use of Teknik and I hope you decide to come back.
-
-- Teknik Administration", user.Username, inactiveTime.Days, maxDays);
-                        mail.BodyEncoding = UTF8Encoding.UTF8;
-                        mail.DeliveryNotificationOptions = DeliveryNotificationOptions.Never;
-
-                        client.Send(mail);
-                        break;
                     }
+
+                    // Any git repos?
+                    if (config.GitConfig.Enabled)
+                    {
+
+                    }
+
+                    if (noData)
+                    {
+                        // They have no data, so safe to delete them.
+                        UserHelper.DeleteUser(db, config, user);
+                        totalUsers++;
+                    }
+                    continue;
                 }
                 #endregion
             }
 
-            // Add to transparency report if any users were removed
+            if (totalUsers > 0)
-            Takedown report = db.Takedowns.Create();
+            {
-            report.Requester = TAKEDOWN_REPORTER;
+                // Add to transparency report if any users were removed
-            report.RequesterContact = config.SupportEmail;
+                Takedown report = db.Takedowns.Create();
-            report.DateRequested = DateTime.Now;
+                report.Requester = TAKEDOWN_REPORTER;
-            report.Reason = "User Inactive";
+                report.RequesterContact = config.SupportEmail;
-            report.ActionTaken = string.Format("{0} Users Removed", totalUsers);
+                report.DateRequested = DateTime.Now;
-            report.DateActionTaken = DateTime.Now;
+                report.Reason = "User Inactive";
-            db.Takedowns.Add(report);
+                report.ActionTaken = string.Format("{0} Users Removed", totalUsers);
-            db.SaveChanges();
+                report.DateActionTaken = DateTime.Now;
+                db.Takedowns.Add(report);
+                db.SaveChanges();
+            }
+
+            Output(string.Format("[{0}] Finished Cleaning of Inactive Users.  {1} Users Removed.", DateTime.Now, totalUsers));
         }
 
         public static void CleanEmail(Config config, TeknikEntities db)
         {
             if (config.EmailConfig.Enabled)
             {
+                Output(string.Format("[{0}] Started Cleaning of Orphaned Email Accounts.", DateTime.Now));
                 List<User> curUsers = db.Users.ToList();
+                int totalAccounts = 0;
 
                 // Connect to hmailserver COM
                 var app = new hMailServer.Application();
@@ -269,17 +296,36 @@ Thank you for your use of Teknik and I hope you decide to come back.
                     {
                         // User doesn't exist, and it isn't reserved.  Let's nuke it.
                         UserHelper.DeleteUserEmail(config, account.Address);
+                        totalAccounts++;
                     }
                 }
+
+                if (totalAccounts > 0)
+                {
+                    // Add to transparency report if any users were removed
+                    Takedown report = db.Takedowns.Create();
+                    report.Requester = TAKEDOWN_REPORTER;
+                    report.RequesterContact = config.SupportEmail;
+                    report.DateRequested = DateTime.Now;
+                    report.Reason = "Orphaned Email Account";
+                    report.ActionTaken = string.Format("{0} Accounts Removed", totalAccounts);
+                    report.DateActionTaken = DateTime.Now;
+                    db.Takedowns.Add(report);
+                    db.SaveChanges();
+                }
+
+                Output(string.Format("[{0}] Finished Cleaning of Orphaned Email Accounts.  {1} Accounts Removed.", DateTime.Now, totalAccounts));
             }
         }
 
         public static void CleanGit(Config config, TeknikEntities db)
         {
-            if (config.EmailConfig.Enabled)
+            if (config.GitConfig.Enabled)
             {
+                Output(string.Format("[{0}] Started Cleaning of Orphaned Git Accounts.", DateTime.Now));
                 List<User> curUsers = db.Users.ToList();
-                
+                int totalAccounts = 0;
+
                 // We need to check the actual git database
                 MysqlDatabase mySQL = new MysqlDatabase(config.GitConfig.Database);
                 string sql = @"SELECT gogs.user.login_name AS login_name, gogs.user.lower_name AS username FROM gogs.user";
@@ -294,12 +340,53 @@ Thank you for your use of Teknik and I hope you decide to come back.
                         if (!userExists && !isReserved)
                         {
                             UserHelper.DeleteUserGit(config, account["username"].ToString());
+                            totalAccounts++;
                         }
                     }
                 }
+
+                if (totalAccounts > 0)
+                {
+                    // Add to transparency report if any users were removed
+                    Takedown report = db.Takedowns.Create();
+                    report.Requester = TAKEDOWN_REPORTER;
+                    report.RequesterContact = config.SupportEmail;
+                    report.DateRequested = DateTime.Now;
+                    report.Reason = "Orphaned Git Account";
+                    report.ActionTaken = string.Format("{0} Accounts Removed", totalAccounts);
+                    report.DateActionTaken = DateTime.Now;
+                    db.Takedowns.Add(report);
+                    db.SaveChanges();
+                }
+
+                Output(string.Format("[{0}] Finished Cleaning of Orphaned Git Accounts.  {1} Accounts Removed.", DateTime.Now, totalAccounts));
             }
         }
 
+        public static void GenerateLastSeen(Config config, TeknikEntities db, string fileName)
+        {
+            Output(string.Format("[{0}] Started Generation of Last Activity List.", DateTime.Now));
+            List<User> curUsers = db.Users.ToList();
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine("Username,Last Activity,Creation Date,Last Website Activity,Last Email Activity,Last Git Activity");
+            foreach (User user in curUsers)
+            {
+                sb.AppendLine(string.Format("{0},{1},{2},{3},{4},{5}",
+                                user.Username,
+                                UserHelper.GetLastActivity(db, config, user).ToString("g"),
+                                user.JoinDate.ToString("g"),
+                                user.LastSeen.ToString("g"),
+                                UserHelper.UserEmailLastActive(config, UserHelper.GetUserEmailAddress(config, user.Username)).ToString("g"),
+                                UserHelper.UserGitLastActive(config, user.Username).ToString("g")));
+            }
+            string dir = Path.GetDirectoryName(fileName);
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            File.WriteAllText(fileName, sb.ToString());
+            Output(string.Format("[{0}] Finished Generating Last Activity List.", DateTime.Now));
+        }
+
         public static void Output(string message)
         {
             Console.WriteLine(message);

ServerMaint/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Teknik Server Maintainence")]
+[assembly: AssemblyTitle("Teknik Server Maintenance")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Teknik")]

Teknik/Areas/User/Utility/UserHelper.cs

@@ -402,16 +402,22 @@ namespace Teknik.Areas.Users.Utility
                 string email = GetUserEmailAddress(config, username);
                 // We need to check the actual git database
                 MysqlDatabase mySQL = new MysqlDatabase(config.GitConfig.Database);
-                string sql = @"SELECT MAX(gogs.repository.updated) AS LastUpdate 
+                string sql = @"SELECT 
-                                FROM gogs.repository
+	                                CASE
-                                INNER JOIN gogs.user
+		                                WHEN MAX(gogs.action.created) >= MAX(gogs.user.updated) THEN MAX(gogs.action.created)
-                                WHERE gogs.user.login_name = {0} AND gogs.user.id = gogs.repository.owner_id";
+		                                WHEN MAX(gogs.user.updated) >= MAX(gogs.action.created) THEN MAX(gogs.user.updated)
-                object result = mySQL.ScalarQuery(sql, new object[] { email });
+		                                ELSE MAX(gogs.user.updated)
+	                                END AS LastUpdate
+                                FROM gogs.user
+                                LEFT JOIN gogs.action ON gogs.user.id = gogs.action.act_user_id
+                                WHERE gogs.user.login_name = {0}";
+                var results = mySQL.Query(sql, new object[] { email });
 
-                if (result != null)
+                if (results != null && results.Any())
                 {
+                    var result = results.First();
                     DateTime tmpLast = lastActive;
-                    DateTime.TryParse(result.ToString(), out tmpLast);
+                    DateTime.TryParse(result["LastUpdate"].ToString(), out tmpLast);
                     if (lastActive < tmpLast)
                         lastActive = tmpLast;
                 }

Teknik/Areas/User/Views/User/Register.cshtml

@@ -13,6 +13,9 @@
     <div class="form-group">
         <input type="password" class="form-control" id="ConfirmPassword" value="" placeholder="Confirm Password" name="ConfirmPassword" data-val-required="The Confirm Password field is required." data-val="true" />
     </div>
+    <p>
+        By registering for Teknik, you agree to the <a href="@Url.SubRouteUrl("tos", "TOS.Index")">Terms of Service</a>.
+    </p>
     <div class="form-group text-center">
         <button class="btn btn-primary" id="reg_submit" type="submit" name="submit">Sign Up</button>
     </div>

Teknik/Areas/User/Views/User/ViewRegistration.cshtml

@@ -5,7 +5,6 @@
         <div class="col-md-12">
             <div class="text-center">
                 <h1>Teknik Registration</h1>
-                <h3>By regsitering, you agree to Teknik's <a href="@Url.SubRouteUrl("tos", "Terms")">Terms of Service</a></h3>
                 <div class="col-md-4 col-md-offset-4">
                     @Html.Partial("../../Areas/User/Views/User/Register", Model)
                 </div>

Teknik/Views/Shared/_LoginPartial.cshtml

@@ -11,10 +11,10 @@
             <a href="#" id="user_menu" class="dropdown-toggle" data-toggle="dropdown">@User.Identity.Name <strong class="caret"></strong></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="user_menu">
                 <li>
-                    <a href="@Url.SubRouteUrl("user", "User.Index", new { username = User.Identity.Name })">Profile</a>
+                    <a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = User.Identity.Name })">Blog</a>
                 </li>
                 <li>
-                    <a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = User.Identity.Name })">Blog</a>
+                    <a href="@Url.SubRouteUrl("user", "User.Index", new { username = User.Identity.Name })">Profile</a>
                 </li>
                 <li>
                     <a href="@Url.SubRouteUrl("user", "User.Settings")">Settings</a>
@@ -35,11 +35,14 @@
     {
         if (Model.Config.UserConfig.RegistrationEnabled)
         {
-        <li class="dropdown">
+        <li>
-            <a class="dropdown-toggle" href="#" data-toggle="dropdown" id="reg_dropdown">Sign Up <strong class="caret"></strong></a>
+            <p class="navbar-btn">
-            <div class="dropdown-menu" style="padding: 15px; padding-bottom: 0px;">
+                <a href="@Url.SubRouteUrl("user", "User.Register", new { returnUrl = Request.Url.AbsoluteUri })" class="btn btn-default">Sign Up</a>
+            </p>
+            @*<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="reg_dropdown">Sign Up <strong class="caret"></strong></a>
+            <div class="dropdown-menu" style="padding: 15px; padding-bottom: 0px; min-width: 100px;">
                 @Html.Partial("../../Areas/User/Views/User/Register", new Teknik.Areas.Users.ViewModels.RegisterViewModel())
-            </div>
+            </div>*@
         </li>
         }
         if (Model.Config.UserConfig.LoginEnabled)