Describe module purpose in /MODULES output

[user/henk/code/inspircd.git] / src / modules / extra / m_sqllog.cpp

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 4f325652446c4a6f3c82f7b0c7093ddcd5c7f7e7..556cc8b31c33f04bd2ee806571b67213de21b392 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "m_sqlv2.h"
 
 static Module* SQLModule;
@@ -32,6 +28,8 @@ std::map<unsigned long,QueryInfo*> active_queries;
 
 class QueryInfo
 {
+private:
+       InspIRCd* ServerInstance;
 public:
        QueryState qs;
        unsigned long id;
@@ -45,8 +43,9 @@ public:
        time_t date;
        bool insert;
 
-       QueryInfo(const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
+       QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
        {
+               ServerInstance = Instance;
                qs = FIND_SOURCE;
                nick = n;
                source = s;
@@ -54,7 +53,7 @@ public:
                id = i;
                category = cat;
                sourceid = nickid = hostid = -1;
-               date = time(NULL);
+               date = ServerInstance->Time();
                insert = false;
        }
 
@@ -182,11 +181,10 @@ public:
 
 class ModuleSQLLog : public Module
 {
-       ConfigReader* Conf;
 
  public:
        ModuleSQLLog(InspIRCd* Me)
-       : Module::Module(Me)
+       : Module(Me)
        {
                ServerInstance->Modules->UseInterface("SQLutils");
                ServerInstance->Modules->UseInterface("SQL");
@@ -197,9 +195,13 @@ class ModuleSQLLog : public Module
 
                SQLModule = ServerInstance->Modules->FindFeature("SQL");
 
-               OnRehash(NULL,"");
+               OnRehash(NULL);
                MyMod = this;
                active_queries.clear();
+
+               Implementation eventlist[] = { I_OnRehash, I_OnOper, I_OnGlobalOper, I_OnKill,
+                       I_OnPreCommand, I_OnUserConnect, I_OnUserQuit, I_OnLoadModule, I_OnRequest };
+               ServerInstance->Modules->Attach(eventlist, this, 9);
        }
 
        virtual ~ModuleSQLLog()
@@ -208,12 +210,6 @@ class ModuleSQLLog : public Module
                ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnOper] = List[I_OnGlobalOper] = List[I_OnKill] = 1;
-               List[I_OnPreCommand] = List[I_OnUserConnect] = 1;
-               List[I_OnUserQuit] = List[I_OnLoadModule] = List[I_OnRequest] = 1;
-       }
 
        void ReadConfig()
        {
@@ -221,12 +217,12 @@ class ModuleSQLLog : public Module
                dbid = Conf.ReadValue("sqllog","dbid",0);       // database id of a database configured in sql module
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ReadConfig();
        }
 
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                if(strcmp(SQLRESID, request->GetId()) == 0)
                {
@@ -239,7 +235,6 @@ class ModuleSQLLog : public Module
                        if (n != active_queries.end())
                        {
                                n->second->Go(res);
-                               std::map<unsigned long, QueryInfo*>::iterator n = active_queries.find(res->id);
                                active_queries.erase(n);
                        }
 
@@ -258,7 +253,7 @@ class ModuleSQLLog : public Module
                SQLrequest req = SQLrequest(this, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
                if(req.Send())
                {
-                       QueryInfo* i = new QueryInfo(nick, source, host, req.id, category);
+                       QueryInfo* i = new QueryInfo(ServerInstance, nick, source, host, req.id, category);
                        i->qs = FIND_SOURCE;
                        active_queries[req.id] = i;
                }
@@ -274,19 +269,19 @@ class ModuleSQLLog : public Module
                AddLogEntry(LT_OPER,user->nick,user->host,user->server);
        }
 
-       virtual int OnKill(User* source, User* dest, const std::string &reason)
+       virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
        {
                AddLogEntry(LT_KILL,dest->nick,dest->host,source->nick);
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated)
                {
-                       AddLogEntry(LT_XLINE,user->nick,command[0]+std::string(":")+std::string(parameters[0]),user->server);
+                       AddLogEntry(LT_XLINE,user->nick,command[0]+std::string(":")+parameters[0],user->server);
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnUserConnect(User* user)
@@ -306,9 +301,9 @@ class ModuleSQLLog : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Logs network-wide data to an SQL database", VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleSQLLog)