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

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

diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 131e20e5e13a45a974d763a88515879a5687fdfa..b53186f71d6b3620e7adace64374f0ad66a0b06b 100644 (file)
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -11,25 +11,20 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <sstream>
-#include <string>
-#include <map>
 #include <list>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
-#include "inspircd.h"
 #include "configreader.h"
-
 #include "m_sqlutils.h"
 
 /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */
 /* $ModDep: m_sqlutils.h */
 
-typedef std::map<unsigned long, userrec*> IdUserMap;
-typedef std::map<unsigned long, chanrec*> IdChanMap;
+typedef std::map<unsigned long, User*> IdUserMap;
+typedef std::map<unsigned long, Channel*> IdChanMap;
 typedef std::list<unsigned long> AssocIdList;
 
 class ModuleSQLutils : public Module
@@ -42,12 +37,12 @@ public:
        ModuleSQLutils(InspIRCd* Me)
        : Module::Module(Me)
        {
-               ServerInstance->PublishInterface("SQLutils", this);
+               ServerInstance->Modules->PublishInterface("SQLutils", this);
        }
 
        virtual ~ModuleSQLutils()
        {
-               ServerInstance->UnpublishInterface("SQLutils", this);
+               ServerInstance->Modules->UnpublishInterface("SQLutils", this);
        }       
 
        void Implements(char* List)
@@ -110,7 +105,7 @@ public:
                return SQLUTILSUCCESS;
        }
        
-       virtual void OnUserDisconnect(userrec* user)
+       virtual void OnUserDisconnect(User* user)
        {
                /* A user is disconnecting, first we need to check if they have a list of queries associated with them.
                 * Then, if they do, we need to erase each of them from our IdUserMap (iduser) so when the module that
@@ -130,7 +125,7 @@ public:
                                {
                                        if(iter->second != user)
                                        {
-                                               ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same userrec* associated with it in the map (erasing anyway)", user->nick);
+                                               ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same User* associated with it in the map (erasing anyway)", user->nick);
                                        }
 
                                        iduser.erase(iter);
@@ -197,7 +192,7 @@ public:
                }
        }
        
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                /* A channel is being destroyed, first we need to check if it has a list of queries associated with it.
                 * Then, if it does, we need to erase each of them from our IdChanMap (idchan) so when the module that
@@ -217,7 +212,7 @@ public:
                                {
                                        if(iter->second != chan)
                                        {
-                                               ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same chanrec* associated with it in the map (erasing anyway)", chan->name);
+                                               ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same Channel* associated with it in the map (erasing anyway)", chan->name);
                                        }
                                        idchan.erase(iter);                                     
                                }
@@ -239,25 +234,4 @@ public:
        
 };
 
-class ModuleSQLutilsFactory : public ModuleFactory
-{
- public:
-       ModuleSQLutilsFactory()
-       {
-       }
-       
-       ~ModuleSQLutilsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLutils(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLutilsFactory;
-}
+MODULE_INIT(ModuleSQLutils);