X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=50f6578dbc104fd73f0d695d536d075314874a0b;hb=8a0a8ce160dbc623350b80f8f6e06afb9c7a1f86;hp=98ed007d0ae2dc497e5fe3448461f20aab57ef66;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 98ed007d0..50f6578db 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -2,12 +2,9 @@ * | 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-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. * @@ -17,23 +14,25 @@ #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 */ +/** Handle /SWHOIS + */ class cmd_swhois : public command_t { - Server* Srv; + public: - cmd_swhois(Server* server) : command_t("SWHOIS",'o',2) + cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2) { - this->Srv = server; 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])); + userrec* dest = ServerInstance->FindNick(parameters[0]); if(dest) { std::string line; @@ -45,66 +44,78 @@ class cmd_swhois : public command_t line.append(parameters[i]); } - std::string* text = (std::string*)dest->GetExt("swhois"); + std::string* text; + dest->GetExt("swhois", text); if(text) { // We already had it set... - if (!Srv->IsUlined(user->server)) + if (!ServerInstance->ULine(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()); + 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); } - else if(!Srv->IsUlined(user->server)) + else if(!ServerInstance->ULine(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()); + ServerInstance->WriteOpers("*** %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", (char*)text); + dest->Extend("swhois", text); + + return CMD_SUCCESS; } + + return CMD_FAILURE; } }; class ModuleSWhois : public Module { cmd_swhois* mycommand; - Server* Srv; + ConfigReader* Conf; public: - ModuleSWhois(Server* Me) : Module::Module(Me) + ModuleSWhois(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - Conf = new ConfigReader(); - mycommand = new cmd_swhois(Srv); - Srv->AddCommand(mycommand); + + Conf = new ConfigReader(ServerInstance); + mycommand = new cmd_swhois(ServerInstance); + ServerInstance->AddCommand(mycommand); } void OnRehash(const std::string ¶meter) { DELETE(Conf); - Conf = new ConfigReader(); + 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; + 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 @@ -118,11 +129,10 @@ class ModuleSWhois : public Module 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); @@ -133,10 +143,10 @@ class ModuleSWhois : public Module // when a user quits, tidy up their metadata 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); } @@ -148,10 +158,10 @@ 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); } @@ -172,41 +182,68 @@ class ModuleSWhois : public Module { 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) + virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *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) { - if(std::string* old = (std::string*)user->GetExt("swhois")) - { - user->Shrink("swhois"); - DELETE(old); - } - - std::string* text = new std::string(swhois); - user->Extend("swhois", (char*)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); @@ -214,7 +251,7 @@ class ModuleSWhois : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } }; @@ -230,7 +267,7 @@ class ModuleSWhoisFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSWhois(Me); }