X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=41248832df0244bc19227bf4492a6b8b5fbcf0bd;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=dec67b8f6374bd1f74d0b61c93d3741475bf752e;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index dec67b8f6..41248832d 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -14,9 +14,6 @@ * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" @@ -24,37 +21,52 @@ using namespace std; /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ -Server *Srv; - class cmd_swhois : public command_t { + Server* Srv; public: - cmd_swhois () : command_t("SWHOIS",'o',2) + cmd_swhois(Server* server) : command_t("SWHOIS",'o',2) { + this->Srv = server; this->source = "m_swhois.so"; } - void Handle (char **parameters, int pcnt, userrec *user) + void Handle(const char** parameters, int pcnt, userrec* user) { userrec* dest = Srv->FindNick(std::string(parameters[0])); - if (dest) + if(dest) { - std::string line = ""; - for (int i = 1; i < pcnt; i++) + std::string line; + for(int i = 1; i < pcnt; i++) { if (i != 1) - line = line + " "; - line = line + std::string(parameters[i]); + line.append(" "); + + line.append(parameters[i]); } - char* field = dest->GetExt("swhois"); - if (field) + + std::string* text; + dest->GetExt("swhois", text); + + if(text) { - std::string* text = (std::string*)field; + // We already had it set... + + if (!Srv->IsUlined(user->server)) + // Ulines set SWHOISes silently + WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); + dest->Shrink("swhois"); - delete text; + DELETE(text); + } + else if(!Srv->IsUlined(user->server)) + { + // Ulines set SWHOISes silently + WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); } - std::string* text = new std::string(line); - dest->Extend("swhois",(char*)text); + + text = new std::string(line); + dest->Extend("swhois", text); } } }; @@ -62,27 +74,36 @@ class cmd_swhois : public command_t class ModuleSWhois : public Module { cmd_swhois* mycommand; + Server* Srv; + ConfigReader* Conf; + public: - ModuleSWhois(Server* Me) - : Module::Module(Me) + ModuleSWhois(Server* Me) : Module::Module(Me) { Srv = Me; - mycommand = new cmd_swhois(); + Conf = new ConfigReader(); + mycommand = new cmd_swhois(Srv); Srv->AddCommand(mycommand); } + void OnRehash(const std::string ¶meter) + { + DELETE(Conf); + Conf = new ConfigReader(); + } + void Implements(char* List) { - List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = 1; + List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnOper] = 1; } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. virtual void OnWhois(userrec* source, userrec* dest) { - char* desc = dest->GetExt("swhois"); - if (desc) + std::string* swhois; + dest->GetExt("swhois", swhois); + if (swhois) { - std::string* swhois = (std::string*)desc; WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str()); } } @@ -92,17 +113,16 @@ class ModuleSWhois : public Module // this method is called. We should use the ProtoSendMetaData function after we've // corrected decided how the data should look, to send the metadata on its way if // it is ours. - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname) + virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) { // check if the linking module wants to know about OUR metadata if (extname == "swhois") { // check if this user has an swhois field to send - char* field = user->GetExt("swhois"); - if (field) + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - // get our extdata out with a cast - std::string* swhois = (std::string*)field; // call this function in the linking module, let it format the data how it // sees fit, and send it on its way. We dont need or want to know how. proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois); @@ -111,14 +131,14 @@ class ModuleSWhois : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, std::string message) + virtual void OnUserQuit(userrec* user, const std::string &message) { - char* field = user->GetExt("swhois"); - if (field) + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - std::string* swhois = (std::string*)field; user->Shrink("swhois"); - delete swhois; + DELETE(swhois); } } @@ -128,12 +148,12 @@ class ModuleSWhois : public Module if (target_type == TYPE_USER) { userrec* user = (userrec*)item; - char* field = user->GetExt("swhois"); - if (field) + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - std::string* swhois = (std::string*)field; user->Shrink("swhois"); - delete swhois; + DELETE(swhois); } } } @@ -145,23 +165,53 @@ class ModuleSWhois : public Module // In our case we're only sending a single string around, so we just construct a std::string. // Some modules will probably get much more complex and format more detailed structs and classes // in a textual way for sending over the link. - virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) + virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "swhois")) { userrec* dest = (userrec*)target; // if they dont already have an swhois field, accept the remote server's - if (!dest->GetExt("swhois")) + std::string* text; + if (!dest->GetExt("swhois", text)) { std::string* text = new std::string(extdata); - dest->Extend("swhois",(char*)text); + dest->Extend("swhois",text); } } } + virtual void OnOper(userrec* user, const std::string &opertype) + { + for(int i =0; i < Conf->Enumerate("type"); i++) + { + std::string type = Conf->ReadValue("type", "name", i); + + if(strcmp(type.c_str(), user->oper) == 0) + { + std::string swhois = Conf->ReadValue("type", "swhois", i); + + if(swhois.length()) + { + std::string* old; + if(user->GetExt("swhois", old)) + { + user->Shrink("swhois"); + DELETE(old); + } + + std::string* text = new std::string(swhois); + user->Extend("swhois", text); + + break; + } + } + } + } + virtual ~ModuleSWhois() { + DELETE(Conf); } virtual Version GetVersion()