X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqllog.cpp;h=ddcd9e4d21fdf7d27c0fd176f756f69c334643ad;hb=b07868e77c0527642ed72bce84bf5895bf921e87;hp=1202ac2d312a3f4d483dc5e9e9e441b763ee61e3;hpb=76bf72f8c2c5b1524bf20a523fe1cf0d79d29742;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index 1202ac2d3..ddcd9e4d2 100644 --- 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 @@ -11,14 +11,13 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" #include "configreader.h" -#include "inspircd.h" #include "m_sqlv2.h" - static Module* SQLModule; static Module* MyMod; static std::string dbid; @@ -61,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; @@ -78,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; @@ -88,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; @@ -102,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; @@ -112,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; @@ -122,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; @@ -136,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; @@ -146,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; @@ -156,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; @@ -167,8 +167,12 @@ public: break; case DONE: - delete active_queries[req.id]; - active_queries[req.id] = NULL; + std::map::iterator x = active_queries.find(req.id); + if (x != active_queries.end()) + { + delete x->second; + active_queries.erase(x); + } break; } } @@ -178,52 +182,48 @@ public: class ModuleSQLLog : public Module { - InspIRCd* Srv; - ConfigReader* Conf; public: ModuleSQLLog(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + : Module::Module(Me) { - ServerInstance->UseInterface("SQLutils"); - ServerInstance->UseInterface("SQL"); + ServerInstance->Modules->UseInterface("SQLutils"); + ServerInstance->Modules->UseInterface("SQL"); - Module* SQLutils = ServerInstance->FindModule("m_sqlutils.so"); + Module* SQLutils = ServerInstance->Modules->Find("m_sqlutils.so"); if (!SQLutils) throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so."); - SQLModule = Srv->FindFeature("SQL"); + SQLModule = ServerInstance->Modules->FindFeature("SQL"); 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() { - ServerInstance->DoneWithInterface("SQL"); - ServerInstance->DoneWithInterface("SQLutils"); + ServerInstance->Modules->DoneWithInterface("SQL"); + 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() { - ConfigReader Conf(Srv); + ConfigReader Conf(ServerInstance); dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConfig(); } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { if(strcmp(SQLRESID, request->GetId()) == 0) { @@ -236,7 +236,6 @@ class ModuleSQLLog : public Module if (n != active_queries.end()) { n->second->Go(res); - std::map::iterator n = active_queries.find(res->id); active_queries.erase(n); } @@ -252,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); @@ -261,23 +260,23 @@ class ModuleSQLLog : public Module } } - virtual void OnOper(userrec* user, const std::string &opertype) + virtual void OnOper(User* user, const std::string &opertype) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual void OnGlobalOper(userrec* user) + virtual void OnGlobalOper(User* user) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual int OnKill(userrec* source, userrec* dest, const std::string &reason) + virtual int OnKill(User* source, User* dest, const std::string &reason) { AddLogEntry(LT_KILL,dest->nick,dest->host,source->nick); return 0; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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) { @@ -286,48 +285,26 @@ class ModuleSQLLog : public Module return 0; } - virtual void OnUserConnect(userrec* user) + virtual void OnUserConnect(User* user) { AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); } - virtual void OnUserQuit(userrec* user, const std::string &reason) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server); } virtual void OnLoadModule(Module* mod, const std::string &name) { - AddLogEntry(LT_LOADMODULE,name,Srv->Config->ServerName, Srv->Config->ServerName); + AddLogEntry(LT_LOADMODULE,name,ServerInstance->Config->ServerName, ServerInstance->Config->ServerName); } virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version(1,2,0,1,VF_VENDOR,API_VERSION); } }; -class ModuleSQLLogFactory : public ModuleFactory -{ - public: - ModuleSQLLogFactory() - { - } - - ~ModuleSQLLogFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLLog(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSQLLogFactory; -} +MODULE_INIT(ModuleSQLLog)