X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=4cfbeb7151a30b3b7dce1533fb728bacb83b18fa;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=6bde81c67a60b748219a4e54c067f22ef98839da;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 6bde81c67..4cfbeb715 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,7 +12,6 @@ */ #include "inspircd.h" -#include "wildcard.h" /* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */ @@ -20,7 +19,6 @@ */ class CommandTitle : public Command { - public: CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2) { @@ -29,30 +27,30 @@ class CommandTitle : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } -bool OneOfMatches(const char* host, const char* ip, const char* hostlist) -{ - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) - { - if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true)) - { - return true; - } - } - return false; -} - - CmdResult Handle(const char** parameters, int pcnt, User* user) + bool OneOfMatches(const char* host, const char* ip, const char* hostlist) + { + std::stringstream hl(hostlist); + std::string xhost; + while (hl >> xhost) + { + if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) + { + return true; + } + } + return false; + } + + CmdResult Handle(const std::vector ¶meters, User* user) { if (!IS_LOCAL(user)) return CMD_LOCALONLY; - + char TheHost[MAXBUF]; char TheIP[MAXBUF]; - snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host); - snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString()); + snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str()); + snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString()); ConfigReader Conf(ServerInstance); for (int i=0; iPassCompare(user, pass.c_str(), parameters[1], hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) + if (!strcmp(name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) { std::string* text; - user->GetExt("ctitle", text); - - if (text) + if (user->GetExt("ctitle", text)) { user->Shrink("ctitle"); delete text; @@ -78,22 +74,16 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) text = new std::string(title); user->Extend("ctitle", text); - std::deque* metadata = new std::deque; - metadata->push_back(user->nick); - metadata->push_back("ctitle"); // The metadata id - metadata->push_back(*text); // The value to send - Event event((char*)metadata,(Module*)this,"send_metadata"); - event.Send(ServerInstance); - delete metadata; - + ServerInstance->PI->SendMetaData(user, TYPE_USER, "ctitle", *text); + if (!vhost.empty()) user->ChangeDisplayedHost(vhost.c_str()); if (!ServerInstance->ULine(user->server)) // Ulines set TITLEs silently - ServerInstance->SNO->WriteToSnoMask('A', "%s used TITLE to set custom title '%s'",user->nick,title.c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "%s used TITLE to set custom title '%s'",user->nick.c_str(),title.c_str()); - user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick, title.c_str()); + user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str()); return CMD_SUCCESS; } @@ -101,9 +91,9 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) if (!ServerInstance->ULine(user->server)) // Ulines also fail TITLEs silently - ServerInstance->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'",user->nick,user->ident,user->host,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str()); - user->WriteServ("NOTICE %s :Invalid title credentials",user->nick); + user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str()); return CMD_SUCCESS; } @@ -112,11 +102,11 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) class ModuleCustomTitle : public Module { CommandTitle* mycommand; - + public: ModuleCustomTitle(InspIRCd* Me) : Module(Me) { - + mycommand = new CommandTitle(ServerInstance); ServerInstance->AddCommand(mycommand); Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup }; @@ -132,10 +122,9 @@ class ModuleCustomTitle : public Module { /* Insert our numeric before 312 */ std::string* ctitle; - dest->GetExt("ctitle", ctitle); - if (ctitle) + if (dest->GetExt("ctitle", ctitle)) { - ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,ctitle->c_str()); + ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str()); } } /* Dont block anything */ @@ -154,8 +143,7 @@ class ModuleCustomTitle : public Module { // check if this user has an ctitle field to send std::string* ctitle; - user->GetExt("ctitle", ctitle); - if (ctitle) + if (user->GetExt("ctitle", ctitle)) { // 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. @@ -168,8 +156,7 @@ class ModuleCustomTitle : public Module virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { std::string* ctitle; - user->GetExt("ctitle", ctitle); - if (ctitle) + if (user->GetExt("ctitle", ctitle)) { user->Shrink("ctitle"); delete ctitle; @@ -183,8 +170,7 @@ class ModuleCustomTitle : public Module { User* user = (User*)item; std::string* ctitle; - user->GetExt("ctitle", ctitle); - if (ctitle) + if (user->GetExt("ctitle", ctitle)) { user->Shrink("ctitle"); delete ctitle; @@ -214,14 +200,14 @@ class ModuleCustomTitle : public Module } } } - + virtual ~ModuleCustomTitle() { } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };