X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=3dcdb10f2bb92e46536cc36585f1d4689d971dc8;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=040845139a2434c3952a916777c9b84b08c9ed6d;hpb=a5a8764bfe85e208a622a86295bdf56da575f21c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 040845139..3dcdb10f2 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -2,84 +2,120 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 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. * * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ -Server *Srv; - +/** Handle /SWHOIS + */ class cmd_swhois : public command_t { + public: - cmd_swhois () : command_t("SWHOIS",'o',2) + cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2) { this->source = "m_swhois.so"; + syntax = " "; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, userrec* user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - if (dest) + userrec* dest = ServerInstance->FindNick(parameters[0]); + 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 (!ServerInstance->ULine(user->server)) + // Ulines set SWHOISes silently + ServerInstance->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(!ServerInstance->ULine(user->server)) + { + // Ulines set SWHOISes silently + ServerInstance->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); + + return CMD_SUCCESS; } + + return CMD_FAILURE; } }; class ModuleSWhois : public Module { cmd_swhois* mycommand; + + ConfigReader* Conf; + public: - ModuleSWhois(Server* Me) - : Module::Module(Me) + ModuleSWhois(InspIRCd* Me) : Module::Module(Me) + { + + Conf = new ConfigReader(ServerInstance); + mycommand = new cmd_swhois(ServerInstance); + ServerInstance->AddCommand(mycommand); + } + + void OnRehash(userrec* user, const std::string ¶meter) { - Srv = Me; - mycommand = new cmd_swhois(); - Srv->AddCommand(mycommand); + DELETE(Conf); + Conf = new ConfigReader(ServerInstance); + } + + void Implements(char* List) + { + List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnPostCommand] = 1; } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - virtual void OnWhois(userrec* source, userrec* dest) + int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { - char* desc = dest->GetExt("swhois"); - if (desc) + /* We use this and not OnWhois because this triggers for remote, too */ + if (numeric == 312) { - std::string* swhois = (std::string*)desc; - WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str()); + /* Insert our numeric before 312 */ + std::string* swhois; + dest->GetExt("swhois", swhois); + if (swhois) + { + ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str()); + } } + /* Dont block anything */ + return 0; } // Whenever the linking module wants to send out data, but doesnt know what the data @@ -87,17 +123,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); @@ -106,14 +141,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, const std::string &oper_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); } } @@ -123,12 +158,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); } } } @@ -140,34 +175,84 @@ 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 ~ModuleSWhois() + virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { + if ((command != "OPER") || (result != CMD_SUCCESS)) + return; + + std::string swhois; + + for (int i = 0; i < Conf->Enumerate("oper"); i++) + { + std::string name = Conf->ReadValue("oper", "name", i); + + if (name == params[0]) + { + swhois = Conf->ReadValue("oper", "swhois", i); + break; + } + } + + if (!swhois.length()) + { + for (int i = 0; i < Conf->Enumerate("type"); i++) + { + std::string type = Conf->ReadValue("type", "name", i); + + if (type == user->oper) + { + swhois = Conf->ReadValue("type", "swhois", i); + break; + } + } + } + + std::string *old; + if (user->GetExt("swhois", old)) + { + user->Shrink("swhois"); + DELETE(old); + } + + if (!swhois.length()) + return; + + std::string *text = new std::string(swhois); + user->Extend("swhois", text); + std::deque* metadata = new std::deque; + metadata->push_back(user->nick); + metadata->push_back("swhois"); // The metadata id + metadata->push_back(*text); // The value to send + Event event((char*)metadata,(Module*)this,"send_metadata"); + event.Send(ServerInstance); + delete metadata; } - - virtual Version GetVersion() + + virtual ~ModuleSWhois() { - return Version(1,0,0,0,VF_VENDOR); + DELETE(Conf); } - virtual void OnUserConnect(userrec* user) + virtual Version GetVersion() { + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - }; @@ -182,7 +267,7 @@ class ModuleSWhoisFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSWhois(Me); }