Merge default.

[irc/quakenet/newserv.git] / chanserv / chanservdb_updates.c

diff --git a/chanserv/chanservdb_updates.c b/chanserv/chanservdb_updates.c
index 43de9571e6dc460004aaaa0f5389bb8cc2c07bff..3403dbe057a34695a877fd326c24b37616775f36 100644 (file)
--- a/chanserv/chanservdb_updates.c
+++ b/chanserv/chanservdb_updates.c
@@ -216,9 +216,11 @@ void csdb_updateuser(reguser *rup) {
 
   dbquery("UPDATE chanserv.users SET lastauth=%lu, lastemailchng=%lu, flags=%u,"
                  "language=%u, suspendby=%u, suspendexp=%lu, suspendtime=%lu, lockuntil=%lu, password='%s', email='%s',"
-                 "lastuserhost='%s', suspendreason='%s', comment='%s', info='%s', lastemail='%s' WHERE ID=%u",
+                 "lastuserhost='%s', suspendreason='%s', comment='%s', info='%s', lastemail='%s', lastpasschng=%lu "
+                  " WHERE ID=%u",
                  rup->lastauth, rup->lastemailchange, rup->flags, rup->languageid, rup->suspendby, rup->suspendexp,
                  rup->suspendtime, rup->lockuntil, escpassword, escemail, esclastuserhost, escreason, esccomment, escinfo, esclastemail,
+                  rup->lastpasschange,
                  rup->ID);
 }  
 
@@ -267,11 +269,12 @@ void csdb_createuser(reguser *rup) {
 
   dbquery("INSERT INTO chanserv.users (ID, username, created, lastauth, lastemailchng, "
                  "flags, language, suspendby, suspendexp, suspendtime, lockuntil, password, email, lastuserhost, "
-                 "suspendreason, comment, info, lastemail) VALUES (%u,'%s',%lu,%lu,%lu,%u,%u,%u,%lu,%lu,%lu,'%s','%s',"
-                 "'%s','%s','%s','%s','%s')",
+                 "suspendreason, comment, info, lastemail, lastpasschng)"
+                 "VALUES (%u,'%s',%lu,%lu,%lu,%u,%u,%u,%lu,%lu,%lu,'%s','%s','%s','%s','%s','%s','%s',%lu)",
                  rup->ID, escusername, rup->created, rup->lastauth, rup->lastemailchange, rup->flags, 
                  rup->languageid, rup->suspendby, rup->suspendexp, rup->suspendtime, rup->lockuntil,
-                 escpassword, escemail, esclastuserhost, escreason, esccomment, escinfo, esclastemail);
+                 escpassword, escemail, esclastuserhost, escreason, esccomment, escinfo, esclastemail,
+                  rup->lastpasschange);
 }  
 
 
@@ -422,13 +425,11 @@ void csdb_accounthistory_insert(nick *np, char *oldpass, char *newpass, char *ol
     escoldemail, escnewemail);
 }
 
-void csdb_cleanuphistories() {
-  time_t expire_time=getnettime()-604800;
-
+void csdb_cleanuphistories(time_t expire_time) {
   Error("chanserv", ERR_INFO, "Cleaning histories.");
-  dbquery("DELETE FROM chanserv.authhistory WHERE authtime < %lu", expire_time);
-  dbquery("DELETE FROM chanserv.chanlevhistory WHERE changetime < %lu", expire_time);
-  dbquery("DELETE FROM chanserv.accounthistory WHERE changetime < %lu", expire_time);
+  dbquery("DELETE FROM chanserv.authhistory WHERE disconnecttime < %lu AND disconnecttime <> 0", expire_time);
+  dbquery("DELETE FROM chanserv.chanlevhistory WHERE authtime < %lu", expire_time);
+  dbquery("DELETE FROM chanserv.accounthistory WHERE authtime < %lu", expire_time);
 }
 
 void csdb_deletemaillock(maillock *mlp) {