* ---------------------------------------------------
*/
+#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;
break;
case DONE:
- delete active_queries[req.id];
- active_queries[req.id] = NULL;
+ std::map<unsigned long,QueryInfo*>::iterator x = active_queries.find(req.id);
+ if (x != active_queries.end())
+ {
+ delete x->second;
+ active_queries.erase(x);
+ }
break;
}
}
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;
virtual ~ModuleSQLLog()
{
- ServerInstance->DoneWithInterface("SQL");
- ServerInstance->DoneWithInterface("SQLutils");
+ ServerInstance->Modules->DoneWithInterface("SQL");
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
}
void Implements(char* List)
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 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** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
{
if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated)
{
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, const std::string &oper_message)
+ 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()
};
-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)