Fixed ssl clients on trunk. The problem peavey was having was that before ReadBuffer...

[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 d48da17030f8cadb647dfa7c48a2d8b88890060e..6194e502d134f499173bab0db372e83cfa29371b 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -166,8 +166,12 @@ public:
                        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;
                }
        }
@@ -183,14 +187,14 @@ class ModuleSQLLog : public Module
        ModuleSQLLog(InspIRCd* 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 = ServerInstance->FindFeature("SQL");
+               SQLModule = ServerInstance->Modules->FindFeature("SQL");
 
                OnRehash(NULL,"");
                MyMod = this;
@@ -199,8 +203,8 @@ class ModuleSQLLog : public Module
 
        virtual ~ModuleSQLLog()
        {
-               ServerInstance->DoneWithInterface("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
+               ServerInstance->Modules->DoneWithInterface("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
        void Implements(char* List)
@@ -216,7 +220,7 @@ class ModuleSQLLog : public Module
                dbid = Conf.ReadValue("sqllog","dbid",0);       // database id of a database configured in sql module
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadConfig();
        }
@@ -259,23 +263,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** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated)
                {
@@ -284,12 +288,12 @@ 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, 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);
        }
@@ -306,26 +310,4 @@ class ModuleSQLLog : public Module
        
 };
 
-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);