HELPMOD2: don't ignore +h clients

[irc/quakenet/newserv.git] / chanserv / newsearch / chanserv_newsearch.c

diff --git a/chanserv/newsearch/chanserv_newsearch.c b/chanserv/newsearch/chanserv_newsearch.c
index b3392e1bbfab5acf728d6981e5ce6fc668c65878..cadeaf38a7abfed99132a15651a51d6e2fdaeaad 100644 (file)
--- a/chanserv/newsearch/chanserv_newsearch.c
+++ b/chanserv/newsearch/chanserv_newsearch.c
@@ -1,32 +1,59 @@
-#include "../../newsearch/newsearch.h"
 #include "../chanserv.h"
+#include "chanserv_newsearch.h"
+#include "../../lib/version.h"
 
-/* formats.c */
-void printnick_auth(searchCtx *, nick *, nick *);
-void printnick_authchans(searchCtx *, nick *, nick *);
-void printchannel_qusers(searchCtx *, nick *, chanindex *);
-
-struct searchNode *qusers_parse(searchCtx *, int type, int argc, char **argv);
+MODULE_VERSION(QVERSION);
 
 int cs_donicksearch(void *source, int cargc, char **cargv);
 int cs_dochansearch(void *source, int cargc, char **cargv);
+int cs_dousersearch(void *source, int cargc, char **cargv);
+int cs_dospewemail(void *source, int cargc, char **cargv);
+int cs_dospewdb(void *source, int cargc, char **cargv);
+
+UserDisplayFunc previousdefault;
 
 void _init() {
-  regnickdisp("auth", printnick_auth);
-  regnickdisp("authchans", printnick_authchans);
-  regchandisp("qusers", printchannel_qusers);
-  registersearchterm("qusers", qusers_parse);
+  regdisp(reg_nicksearch, "auth", printnick_auth, 0, "");
+  regdisp(reg_nicksearch, "authchans", printnick_authchans, 0, "");
+  regdisp(reg_usersearch, "qusers", printchannel_qusers, 0, "");
+  regdisp(reg_usersearch, "auth", printauth, 0, "");
+
+  registersearchterm(reg_chansearch, "qusers", qusers_parse, 0, "");
+  registersearchterm(reg_usersearch, "qlasthost", qlasthost_parse, 0, "");
+  registersearchterm(reg_usersearch, "qemail", qemail_parse, 0, "");
+  registersearchterm(reg_usersearch, "qsuspendreason", qsuspendreason_parse, 0, "");
+  registersearchterm(reg_usersearch, "qusername", qusername_parse, 0, "");
+  registersearchterm(reg_chansearch, "qchanflags", qchanflags_parse, 0, "");
+  registersearchterm(reg_usersearch, "qsuspended", qsuspended_parse, 0, "");
 
   chanservaddcommand("nicksearch", QCMD_OPER, 5, cs_donicksearch, "Wrapper for standard newserv nicksearch command.", "");
   chanservaddcommand("chansearch", QCMD_OPER, 5, cs_dochansearch, "Wrapper for standard newserv chansearch command.", "");
+  chanservaddcommand("usersearch", QCMD_OPER, 5, cs_dousersearch, "Wrapper for standard newserv usersearch command.", "");
+  chanservaddcommand("spewemail", QCMD_OPER, 1, cs_dospewemail, "Search for an e-mail in the database.", "Usage: spewemail <pattern>\nDisplays all users with email addresses that match the supplied pattern.");
+  chanservaddcommand("spewdb", QCMD_OPER, 1, cs_dospewdb, "Search for a user in the database.", "Usage: spewdb <pattern>\nDisplays all users with usernames that match the specified pattern.");
+
+  previousdefault = defaultuserfn;
+  defaultuserfn = printauth;
 }
 
 void _fini() {
-  unregnickdisp("auth", printnick_auth);
-  unregnickdisp("authchans", printnick_authchans);
-  unregchandisp("qusers", printchannel_qusers);
-  deregistersearchterm("qusers", qusers_parse);
+  unregdisp(reg_nicksearch, "auth", printnick_auth);
+  unregdisp(reg_nicksearch, "authchans", printnick_authchans);
+  unregdisp(reg_usersearch, "qusers", printchannel_qusers);
+  unregdisp(reg_usersearch, "auth", printauth);
+
+  deregistersearchterm(reg_chansearch, "qusers", qusers_parse);
+  deregistersearchterm(reg_usersearch, "qlasthost", qlasthost_parse);
+  deregistersearchterm(reg_usersearch, "qemail", qemail_parse);
+  deregistersearchterm(reg_usersearch, "qsuspendreason", qsuspendreason_parse);
+  deregistersearchterm(reg_usersearch, "qusername", qusername_parse);
+  deregistersearchterm(reg_chansearch, "qchanflags", qchanflags_parse);
 
   chanservremovecommand("nicksearch", cs_donicksearch);
   chanservremovecommand("chansearch", cs_dochansearch);
+  chanservremovecommand("usersearch", cs_dousersearch);
+  chanservremovecommand("spewemail", cs_dospewemail);
+  chanservremovecommand("spewdb", cs_dospewdb);
+
+  defaultuserfn = previousdefault;
 }