From 038b2c027dcf065755a377b989c11253838e9613 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Mon, 30 Sep 2013 20:32:43 -0400 Subject: [PATCH] Added Registered field to user db. Set all those time based fields to use UtcNow, sortable --- TShockAPI/DB/BanManager.cs | 2 +- TShockAPI/DB/UserManager.cs | 14 ++++++++++---- TShockAPI/Rest/RestManager.cs | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs index c2fef99e..4e7d1f92 100644 --- a/TShockAPI/DB/BanManager.cs +++ b/TShockAPI/DB/BanManager.cs @@ -124,7 +124,7 @@ namespace TShockAPI.DB { try { - return database.Query("INSERT INTO Bans (IP, Name, Reason, BanningUser, Date, Expiration) VALUES (@0, @1, @2, @3, @4, @5);", ip, name, reason, banner, DateTime.Now.ToString("G"), expiration) != 0; + return database.Query("INSERT INTO Bans (IP, Name, Reason, BanningUser, Date, Expiration) VALUES (@0, @1, @2, @3, @4, @5);", ip, name, reason, banner, DateTime.UtcNow.ToString("s"), expiration) != 0; } catch (Exception ex) { diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index c8af324c..8585d907 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -17,6 +17,7 @@ along with this program. If not, see . */ using System; +using System.CodeDom.Compiler; using System.Data; using System.Collections.Generic; using System.Linq; @@ -38,6 +39,7 @@ namespace TShockAPI.DB new SqlColumn("Username", MySqlDbType.VarChar, 32) {Unique = true}, new SqlColumn("Password", MySqlDbType.VarChar, 128), new SqlColumn("Usergroup", MySqlDbType.Text), + new SqlColumn("Registered", MySqlDbType.Text), new SqlColumn("LastAccessed", MySqlDbType.Text), new SqlColumn("KnownIPs", MySqlDbType.Text) ); @@ -60,8 +62,8 @@ namespace TShockAPI.DB int ret; try { - ret = database.Query("INSERT INTO Users (Username, Password, UserGroup) VALUES (@0, @1, @2);", user.Name, - TShock.Utils.HashPassword(user.Password), user.Group); + ret = database.Query("INSERT INTO Users (Username, Password, UserGroup, Registered) VALUES (@0, @1, @2, @3);", user.Name, + TShock.Utils.HashPassword(user.Password), user.Group, DateTime.UtcNow.ToString("s")); } catch (Exception ex) { @@ -146,7 +148,7 @@ namespace TShockAPI.DB { try { - if (database.Query("UPDATE Users SET LastAccessed = @0, KnownIps = @1 WHERE Username = @2;", DateTime.Now.ToString("G"), user.KnownIps, user.Name) == 0) + if (database.Query("UPDATE Users SET LastAccessed = @0, KnownIps = @1 WHERE Username = @2;", DateTime.UtcNow.ToString("s"), user.KnownIps, user.Name) == 0) throw new UserNotExistException(user.Name); } catch (Exception ex) @@ -268,6 +270,7 @@ namespace TShockAPI.DB user.Group = result.Get("Usergroup"); user.Password = result.Get("Password"); user.Name = result.Get("Username"); + user.Registered = result.Get("Registered"); user.LastAccessed = result.Get("LastAccessed"); user.KnownIps = result.Get("KnownIps"); return user; @@ -280,14 +283,16 @@ namespace TShockAPI.DB public string Name { get; set; } public string Password { get; set; } public string Group { get; set; } + public string Registered { get; set; } public string LastAccessed { get; set; } public string KnownIps { get; set; } - public User(string name, string pass, string group, string last, string known) + public User(string name, string pass, string group, string registered, string last, string known) { Name = name; Password = pass; Group = group; + Registered = registered; LastAccessed = last; KnownIps = known; } @@ -297,6 +302,7 @@ namespace TShockAPI.DB Name = ""; Password = ""; Group = ""; + Registered = ""; LastAccessed = ""; KnownIps = ""; } diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 8d872fe2..c14e38d8 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -307,7 +307,7 @@ namespace TShockAPI return RestMissingParam("password"); // NOTE: ip can be blank - User user = new User(username, password, group, "", ""); + User user = new User(username, password, group, "", "", ""); try { TShock.Users.AddUser(user);