The rest of the server protocol interface and fix a warning in m_rline

[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 9376ad265a279cd8ad519d9d5901f60274895a84..ddcd9e4d21fdf7d27c0fd176f756f69c334643ad 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -60,14 +60,14 @@ public:
 
        void Go(SQLresult* res)
        {
-               SQLrequest req = SQLreq(MyMod, SQLModule, dbid, "", "");
+               SQLrequest req = SQLrequest(MyMod, SQLModule, dbid, SQLquery(""));
                switch (qs)
                {
                        case FIND_SOURCE:
                                if (res->Rows() && sourceid == -1 && !insert)
                                {
                                        sourceid = atoi(res->GetValue(0,0).d.c_str());
-                                       req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % nick);
                                        if(req.Send())
                                        {
                                                insert = false;
@@ -77,7 +77,7 @@ public:
                                }
                                else if (res->Rows() && sourceid == -1 && insert)
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", source);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
                                        if(req.Send())
                                        {
                                                insert = false;
@@ -87,7 +87,7 @@ public:
                                }
                                else
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors (actor) VALUES('?')", source);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("INSERT INTO ircd_log_actors (actor) VALUES('?')") % source);
                                        if(req.Send())
                                        {
                                                insert = true;
@@ -101,7 +101,7 @@ public:
                                if (res->Rows() && nickid == -1 && !insert)
                                {
                                        nickid = atoi(res->GetValue(0,0).d.c_str());
-                                       req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'", hostname);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'") % hostname);
                                        if(req.Send())
                                        {
                                                insert = false;
@@ -111,7 +111,7 @@ public:
                                }
                                else if (res->Rows() && nickid == -1 && insert)
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % nick);
                                        if(req.Send())
                                        {
                                                insert = false;
@@ -121,7 +121,7 @@ public:
                                }
                                else
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors (actor) VALUES('?')",nick);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("INSERT INTO ircd_log_actors (actor) VALUES('?')") % nick);
                                        if(req.Send())
                                        {
                                                insert = true;
@@ -135,7 +135,8 @@ public:
                                if (res->Rows() && hostid == -1 && !insert)
                                {
                                        hostid = atoi(res->GetValue(0,0).d.c_str());
-                                       req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES("+ConvToStr(category)+","+ConvToStr(nickid)+","+ConvToStr(hostid)+","+ConvToStr(sourceid)+","+ConvToStr(date)+")");
+                                       req = SQLrequest(MyMod, SQLModule, dbid,
+                                                       SQLquery("INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES('?','?','?','?','?')") % category % nickid % hostid % sourceid % date);
                                        if(req.Send())
                                        {
                                                insert = true;
@@ -145,7 +146,7 @@ public:
                                }
                                else if (res->Rows() && hostid == -1 && insert)
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'", hostname);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'") % hostname);
                                        if(req.Send())
                                        {
                                                insert = false;
@@ -155,7 +156,7 @@ public:
                                }
                                else
                                {
-                                       req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_hosts (hostname) VALUES('?')", hostname);
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("INSERT INTO ircd_log_hosts (hostname) VALUES('?')") % hostname);
                                        if(req.Send())
                                        {
                                                insert = true;
@@ -181,7 +182,6 @@ public:
 
 class ModuleSQLLog : public Module
 {
-       ConfigReader* Conf;
 
  public:
        ModuleSQLLog(InspIRCd* Me)
@@ -199,6 +199,10 @@ class ModuleSQLLog : public Module
                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()
@@ -207,12 +211,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()
        {
@@ -225,7 +223,7 @@ class ModuleSQLLog : public Module
                ReadConfig();
        }
 
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                if(strcmp(SQLRESID, request->GetId()) == 0)
                {
@@ -238,7 +236,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);
                        }
 
@@ -254,7 +251,7 @@ class ModuleSQLLog : public Module
                if (!SQLModule)
                        return;
 
-               SQLrequest req = SQLreq(this, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", source);
+               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);
@@ -279,7 +276,7 @@ class ModuleSQLLog : public Module
                return 0;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated)
                {
@@ -305,7 +302,7 @@ class ModuleSQLLog : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
        
 };