Updated SPEWDB to match old Q's functionality.

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index 8fa437b615545f2abefff2aaa4d9bcba6be7b4e2..e0581c3d1ef26d98c35ee003a03a7443d72c17b4 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -139,7 +139,7 @@ BeginMessages() {
   msg(QM_DISCONNECTINGUSER, "Disconnecting $0 (authed as $1)", "ss"),
   msg(QM_USERALREADYSUSPENDED, "User is already suspended.", ""),
   msg(QM_USERNOTSUSPENDED, "User $0 is not suspended.", "s"),
-  msg(QM_SPEWHEADER, "Username:       Suspended: Email:                         Last user@host:", ""),
+  msg(QM_SPEWHEADER, "Username:       Suspended: Email:                         Last auth:      Last user@host:", ""),
   msg(QM_TOOMANYRESULTS, "Found over $0 $1, truncating list.", "ds"),
   msg(QM_RESULTCOUNT, "Found $0 $1$2.", "uss"),
   msg(QM_SUSPENDKILL, "Attention: Your Q account has been suspended. You are being disconnected.", ""),

diff --git a/chanserv/usercmds/spewdb.c b/chanserv/usercmds/spewdb.c
index 04a1e9eb9309b032ea5cc169bcedfedcd3b9a917..bee68325566f3abf728ab46ef28e39a685813466 100644 (file)
--- a/chanserv/usercmds/spewdb.c
+++ b/chanserv/usercmds/spewdb.c
@@ -22,6 +22,9 @@ int csu_dospewdb(void *source, int cargc, char **cargv) {
   reguser *dbrup;
   int i;
   unsigned int count=0;
+  char timebuf[30];
+  struct tm *tmp;
+  char *la;
   
   if (!rup)
     return CMD_ERROR;
@@ -34,8 +37,19 @@ int csu_dospewdb(void *source, int cargc, char **cargv) {
   chanservstdmessage(sender, QM_SPEWHEADER);
   for (i=0;i<REGUSERHASHSIZE;i++) {
     for (dbrup=regusernicktable[i]; dbrup; dbrup=dbrup->nextbyname) {
-      if (!match(cargv[0], dbrup->username)) {
-        chanservsendmessage(sender, "%-15s %-10s %-30s %s", dbrup->username, UHasSuspension(dbrup)?"yes":"no", dbrup->email?dbrup->email->content:"none set", dbrup->lastuserhost?dbrup->lastuserhost->content:"none");
+      if ((!match(cargv[0], dbrup->username)) ||
+          (dbrup->email && !match(cargv[0], dbrup->email->content)) ||
+          (dbrup->lastuserhost && !match(cargv[0], dbrup->lastuserhost->content)) ||
+          (dbrup->suspendreason && !match(cargv[0], dbrup->suspendreason->content))) {
+        if (dbrup->lastauth) {
+          tmp=gmtime(&(dbrup->lastauth));
+          strftime(timebuf,15,"%d/%m/%y %H:%M",tmp);
+          la=timebuf;
+        } else {
+          la="(never)";
+        }
+        
+        chanservsendmessage(sender, "%-15s %-10s %-30s %-15s %s", dbrup->username, UHasSuspension(dbrup)?"yes":"no", dbrup->email?dbrup->email->content:"none set", la, dbrup->lastuserhost?dbrup->lastuserhost->content:"none");
         count++;
         if (count >= 2000) {
           chanservstdmessage(sender, QM_TOOMANYRESULTS, 2000, "users");