X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=ef5c5c35f14c9c6bddd1ddacabd774dc1e049118;hb=dd36852a52e8541306b76c5b88bce8ab9b36654c;hp=9d0cb70dc365831a50044aa40c7a09642a8876f5;hpb=034f74a23b3d6aff177682c916e18382621f495a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 9d0cb70dc..ef5c5c35f 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -2,124 +2,147 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 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 "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ /** Handle /SWHOIS */ -class cmd_swhois : public command_t +class CommandSwhois : public Command { public: - cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2) + CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2) { this->source = "m_swhois.so"; syntax = " "; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec* user) + CmdResult Handle(const char* const* parameters, int pcnt, User* user) { - userrec* dest = ServerInstance->FindNick(parameters[0]); - if(dest) + User* dest = ServerInstance->FindNick(parameters[0]); + + if (!dest) { - std::string line; - for(int i = 1; i < pcnt; i++) - { - if (i != 1) - line.append(" "); - - line.append(parameters[i]); - } - - std::string* text; - dest->GetExt("swhois", text); - - if(text) - { - // 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()); + user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]); + return CMD_FAILURE; + } + + std::string line; + for (int i = 1; i < pcnt; i++) + { + if (i != 1) + line.append(" "); - dest->Shrink("swhois"); - DELETE(text); - } - else if(!ServerInstance->ULine(user->server)) - { + line.append(parameters[i]); + } + + std::string* text; + dest->GetExt("swhois", text); + + if (text) + { + // 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 to '%s'", user->nick, dest->nick, line.c_str()); - } + ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); - text = new std::string(line); - dest->Extend("swhois", text); + dest->Shrink("swhois"); + delete text; + } + else if (!ServerInstance->ULine(user->server)) + { + // Ulines set SWHOISes silently + ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); + } + + text = new std::string(line); + dest->Extend("swhois", text); - return CMD_SUCCESS; + /* Bug #376 - feature request - + * To cut down on the amount of commands services etc have to recognise, this only sends METADATA across the network now + * not an actual SWHOIS command. Any SWHOIS command sent from services will be automatically translated to METADATA by this. + * Sorry w00t i know this was your fix, but i got bored and wanted to clear down the tracker :) + * -- Brain + */ + std::deque* metadata = new std::deque; + metadata->push_back(dest->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; + + // If it's an empty swhois, unset it (not ideal, but ok) + if (text->empty()) + { + dest->Shrink("swhois"); + delete text; } - return CMD_FAILURE; + return CMD_LOCALONLY; } + }; class ModuleSWhois : public Module { - cmd_swhois* mycommand; + CommandSwhois* mycommand; ConfigReader* Conf; public: - ModuleSWhois(InspIRCd* Me) : Module::Module(Me) + ModuleSWhois(InspIRCd* Me) : Module(Me) { Conf = new ConfigReader(ServerInstance); - mycommand = new cmd_swhois(ServerInstance); + mycommand = new CommandSwhois(ServerInstance); ServerInstance->AddCommand(mycommand); + Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand }; + ServerInstance->Modules->Attach(eventlist, this, 7); } - void OnRehash(const std::string ¶meter) + void OnRehash(User* user, const std::string ¶meter) { - DELETE(Conf); + delete Conf; Conf = new ConfigReader(ServerInstance); } - void Implements(char* List) - { - 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) + int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { - std::string* swhois; - dest->GetExt("swhois", swhois); - if (swhois) + /* We use this and not OnWhois because this triggers for remote, too */ + if (numeric == 312) { - ServerInstance->SendWhoisLine(source, 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 - // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then + // represents (e.g. it is metadata, added to a User or Channel by a module) then // 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, const std::string &extname) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "swhois") @@ -137,14 +160,14 @@ class ModuleSWhois : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { std::string* swhois; user->GetExt("swhois", swhois); if (swhois) { user->Shrink("swhois"); - DELETE(swhois); + delete swhois; } } @@ -153,13 +176,13 @@ class ModuleSWhois : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; std::string* swhois; user->GetExt("swhois", swhois); if (swhois) { user->Shrink("swhois"); - DELETE(swhois); + delete swhois; } } } @@ -176,78 +199,79 @@ class ModuleSWhois : public Module // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "swhois")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; // if they dont already have an swhois field, accept the remote server's std::string* text; if (!dest->GetExt("swhois", text)) { - std::string* text = new std::string(extdata); - dest->Extend("swhois",text); + std::string* text2 = new std::string(extdata); + dest->Extend("swhois",text2); } } } - virtual void OnOper(userrec* user, const std::string &opertype) + virtual void OnPostCommand(const std::string &command, const char* const* params, int pcnt, User *user, CmdResult result, const std::string &original_line) { - for(int i =0; i < Conf->Enumerate("type"); i++) + if ((command != "OPER") || (result != CMD_SUCCESS)) + return; + + std::string swhois; + + for (int i = 0; i < Conf->Enumerate("oper"); i++) { - std::string type = Conf->ReadValue("type", "name", i); + std::string name = Conf->ReadValue("oper", "name", i); - if(strcmp(type.c_str(), user->oper) == 0) + if (name == params[0]) { - std::string swhois = Conf->ReadValue("type", "swhois", i); + 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(swhois.length()) + if (type == user->oper) { - std::string* old; - if(user->GetExt("swhois", old)) - { - user->Shrink("swhois"); - DELETE(old); - } - - std::string* text = new std::string(swhois); - user->Extend("swhois", text); - + 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 ~ModuleSWhois() { - DELETE(Conf); + delete Conf; } virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR,API_VERSION); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; - -class ModuleSWhoisFactory : public ModuleFactory -{ - public: - ModuleSWhoisFactory() - { - } - - ~ModuleSWhoisFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSWhois(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSWhoisFactory; -} - +MODULE_INIT(ModuleSWhois)