X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlutils.cpp;h=bec8a4450bfee013e6523647b98e903afd643cb8;hb=59bd18f2a0b43b71ee32124add9d40d1d3a54919;hp=6ce57db454a81517c0826212fd5179567d6e0089;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 6ce57db45..bec8a4450 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -2,13 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * - * 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. * @@ -23,15 +19,14 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.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 */ - -extern InspIRCd* ServerInstance; +/* $ModDep: m_sqlutils.h */ typedef std::map IdUserMap; typedef std::map IdChanMap; @@ -40,8 +35,6 @@ typedef std::list AssocIdList; class ModuleSQLutils : public Module { private: - Server* Srv; - IdUserMap iduser; IdChanMap idchan; @@ -49,9 +42,14 @@ public: ModuleSQLutils(InspIRCd* Me) : Module::Module(Me) { - 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; @@ -63,7 +61,7 @@ public: { AssociateUser* req = (AssociateUser*)request; - log(DEBUG, "Associated ID %lu with user %s", req->id, req->user->nick); + ServerInstance->Log(DEBUG, "Associated ID %lu with user %s", req->id, req->user->nick); iduser.insert(std::make_pair(req->id, req->user)); @@ -73,7 +71,7 @@ public: { AssociateChan* req = (AssociateChan*)request; - log(DEBUG, "Associated ID %lu with channel %s", req->id, req->chan->name); + ServerInstance->Log(DEBUG, "Associated ID %lu with channel %s", req->id, req->chan->name); idchan.insert(std::make_pair(req->id, req->chan)); @@ -87,7 +85,7 @@ public: * it is associated with. */ - log(DEBUG, "Unassociating ID %lu with all users and channels", req->id); + ServerInstance->Log(DEBUG, "Unassociating ID %lu with all users and channels", req->id); DoUnAssociate(iduser, req->id); DoUnAssociate(idchan, req->id); @@ -98,11 +96,11 @@ public: IdUserMap::iterator iter = iduser.find(req->id); - log(DEBUG, "Looking up user associated with ID %lu", req->id); + ServerInstance->Log(DEBUG, "Looking up user associated with ID %lu", req->id); if(iter != iduser.end()) { - log(DEBUG, "Found user %s", iter->second->nick); + ServerInstance->Log(DEBUG, "Found user %s", iter->second->nick); req->user = iter->second; } } @@ -112,17 +110,17 @@ public: IdChanMap::iterator iter = idchan.find(req->id); - log(DEBUG, "Looking up channel associated with ID %lu", req->id); + ServerInstance->Log(DEBUG, "Looking up channel associated with ID %lu", req->id); if(iter != idchan.end()) { - log(DEBUG, "Found channel %s", iter->second->name); + ServerInstance->Log(DEBUG, "Found channel %s", iter->second->name); req->chan = iter->second; } } else { - log(DEBUG, "Got unsupported API version string: %s", request->GetId()); + ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); return NULL; } @@ -149,18 +147,18 @@ public: { if(iter->second == user) { - log(DEBUG, "Erased query from map associated with quitting user %s", user->nick); + ServerInstance->Log(DEBUG, "Erased query from map associated with quitting user %s", user->nick); } else { - 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 userrec* associated with it in the map (erasing anyway)", user->nick); } iduser.erase(iter); } else { - log(DEBUG, "BUG: user %s was extended with sqlutils_queryids but there was nothing matching in the map", user->nick); + ServerInstance->Log(DEBUG, "BUG: user %s was extended with sqlutils_queryids but there was nothing matching in the map", user->nick); } } @@ -218,11 +216,11 @@ public: */ RemoveFromList(iter->second, id); - log(DEBUG, "Removed query %lu from map and removed references to it on value", id); + ServerInstance->Log(DEBUG, "Removed query %lu from map and removed references to it on value", id); } else { - log(DEBUG, "Nothing associated with query %lu", id); + ServerInstance->Log(DEBUG, "Nothing associated with query %lu", id); } } @@ -246,18 +244,18 @@ public: { if(iter->second == chan) { - log(DEBUG, "Erased query from map associated with dying channnel %s", chan->name); + ServerInstance->Log(DEBUG, "Erased query from map associated with dying channnel %s", chan->name); } else { - 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 chanrec* associated with it in the map (erasing anyway)", chan->name); } idchan.erase(iter); } else { - log(DEBUG, "BUG: channel %s was extended with sqlutils_queryids but there was nothing matching in the map", chan->name); + ServerInstance->Log(DEBUG, "BUG: channel %s was extended with sqlutils_queryids but there was nothing matching in the map", chan->name); } } @@ -268,12 +266,9 @@ public: virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); + return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); } - virtual ~ModuleSQLutils() - { - } }; class ModuleSQLutilsFactory : public ModuleFactory