Warning: Loads of craq logging in here atm. /connect with openssl is broken, gnutls...

[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 512095f60479ae318dbf34d9e043bdb96131eace..b470f99af3bffe41d8465204fc6ceaef91961192 100644 (file)
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -2,31 +2,22 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *                <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#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 */
@@ -39,8 +30,6 @@ typedef std::list<unsigned long> AssocIdList;
 class ModuleSQLutils : public Module
 {
 private:
-       
-
        IdUserMap iduser;
        IdChanMap idchan;
 
@@ -48,9 +37,14 @@ public:
        ModuleSQLutils(InspIRCd* Me)
        : Module::Module(Me)
        {
-               ServerInstance->Log(DEBUG, "%s 'SQLutils' feature", ServerInstance->PublishFeature("SQLutils", this) ? "Published" : "Couldn't publish");
+               ServerInstance->PublishInterface("SQLutils", this);
        }
 
+       virtual ~ModuleSQLutils()
+       {
+               ServerInstance->UnpublishInterface("SQLutils", this);
+       }       
+
        void Implements(char* List)
        {
                List[I_OnChannelDelete] = List[I_OnUnloadModule] = List[I_OnRequest] =  List[I_OnUserDisconnect] = 1;
@@ -62,8 +56,6 @@ public:
                {
                        AssociateUser* req = (AssociateUser*)request;
                        
-                       ServerInstance->Log(DEBUG, "Associated ID %lu with user %s", req->id, req->user->nick);
-                       
                        iduser.insert(std::make_pair(req->id, req->user));
                        
                        AttachList(req->user, req->id);
@@ -71,8 +63,6 @@ public:
                else if(strcmp(SQLUTILAC, request->GetId()) == 0)
                {
                        AssociateChan* req = (AssociateChan*)request;
-
-                       ServerInstance->Log(DEBUG, "Associated ID %lu with channel %s", req->id, req->chan->name);
                        
                        idchan.insert(std::make_pair(req->id, req->chan));                      
                        
@@ -86,8 +76,6 @@ public:
                         * it is associated with.
                         */
                        
-                       ServerInstance->Log(DEBUG, "Unassociating ID %lu with all users and channels", req->id);
-                       
                        DoUnAssociate(iduser, req->id);
                        DoUnAssociate(idchan, req->id);
                }
@@ -97,11 +85,8 @@ public:
                        
                        IdUserMap::iterator iter = iduser.find(req->id);
                        
-                       ServerInstance->Log(DEBUG, "Looking up user associated with ID %lu", req->id);
-                       
                        if(iter != iduser.end())
                        {
-                               ServerInstance->Log(DEBUG, "Found user %s", iter->second->nick);
                                req->user = iter->second;
                        }
                }
@@ -111,19 +96,11 @@ public:
                        
                        IdChanMap::iterator iter = idchan.find(req->id);
                        
-                       ServerInstance->Log(DEBUG, "Looking up channel associated with ID %lu", req->id);
-                       
                        if(iter != idchan.end())
                        {
-                               ServerInstance->Log(DEBUG, "Found channel %s", iter->second->name);
                                req->chan = iter->second;
                        }
                }
-               else
-               {
-                       ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
-                       return NULL;
-               }
                
                return SQLUTILSUCCESS;
        }
@@ -146,16 +123,12 @@ public:
                        
                                if(iter != iduser.end())
                                {
-                                       if(iter->second == user)
-                                       {
-                                               ServerInstance->Log(DEBUG, "Erased query from map associated with quitting user %s", user->nick);
-                                       }
-                                       else
+                                       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);
                                        }
 
-                                       iduser.erase(iter);                                     
+                                       iduser.erase(iter);
                                }
                                else
                                {
@@ -216,12 +189,6 @@ public:
                         * to the value.
                         */
                        RemoveFromList(iter->second, id);
-                       
-                       ServerInstance->Log(DEBUG, "Removed query %lu from map and removed references to it on value", id);
-               }
-               else
-               {
-                       ServerInstance->Log(DEBUG, "Nothing associated with query %lu", id);
                }
        }
        
@@ -243,15 +210,10 @@ public:
                        
                                if(iter != idchan.end())
                                {
-                                       if(iter->second == chan)
-                                       {
-                                               ServerInstance->Log(DEBUG, "Erased query from map associated with dying channnel %s", chan->name);
-                                       }
-                                       else
+                                       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);
                                        }
-
                                        idchan.erase(iter);                                     
                                }
                                else
@@ -267,33 +229,10 @@ public:
                        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+               return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
        }
        
-       virtual ~ModuleSQLutils()
-       {
-       }       
 };
 
-class ModuleSQLutilsFactory : public ModuleFactory
-{
- public:
-       ModuleSQLutilsFactory()
-       {
-       }
-       
-       ~ModuleSQLutilsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLutils(Me);
-       }
-};
+MODULE_INIT(ModuleSQLutils);
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLutilsFactory;
-}