X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=9ff250cd6349583dc138f5f8a5e52d4653861baa;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=75d086f525866e4ba945b0abb8173b1967a70200;hpb=517a26252a091eaee0149458a86fc43731bce618;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 75d086f52..9ff250cd6 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -20,9 +20,10 @@ class CommandTitle : public Command { public: - CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2) + StringExtItem ctitle; + CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2), + ctitle("ctitle", Creator) { - this->source = "m_customtitle.so"; syntax = " "; TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } @@ -33,7 +34,7 @@ class CommandTitle : public Command std::string xhost; while (hl >> xhost) { - if (InspIRCd::Match(host, xhost) || match(ip,xhost, true)) + if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) { return true; } @@ -43,16 +44,13 @@ class CommandTitle : public Command 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.c_str(), user->host.c_str()); snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString()); - ConfigReader Conf(ServerInstance); + ConfigReader Conf; for (int i=0; iPassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) { - std::string* text; - if (user->GetExt("ctitle", text)) - { - user->Shrink("ctitle"); - delete text; - } - - text = new std::string(title); - user->Extend("ctitle", text); + ctitle.set(user, title); - ServerInstance->PI->SendMetaData(user, TYPE_USER, "ctitle", *text); + ServerInstance->PI->SendMetaData(user, "ctitle", title); 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.c_str(),title.c_str()); - user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str()); return CMD_SUCCESS; } } - 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.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str()); - user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str()); return CMD_SUCCESS; } @@ -101,113 +83,40 @@ class CommandTitle : public Command class ModuleCustomTitle : public Module { - CommandTitle* mycommand; + CommandTitle cmd; public: - ModuleCustomTitle(InspIRCd* Me) : Module(Me) + ModuleCustomTitle() : cmd(this) { - - mycommand = new CommandTitle(ServerInstance); - ServerInstance->AddCommand(mycommand); - Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 5); + ServerInstance->AddCommand(&cmd); + Extensible::Register(&cmd.ctitle); + ServerInstance->Modules->Attach(I_OnWhoisLine, this); } - // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) + ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric == 312) { /* Insert our numeric before 312 */ - std::string* ctitle; - if (dest->GetExt("ctitle", ctitle)) + const std::string* ctitle = cmd.ctitle.get(dest); + if (ctitle) { ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->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 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(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 == "ctitle") - { - // check if this user has an ctitle field to send - std::string* 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. - proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*ctitle); - } - } - } - - // when a user quits, tidy up their metadata - virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) - { - std::string* ctitle; - if (user->GetExt("ctitle", ctitle)) - { - user->Shrink("ctitle"); - delete ctitle; - } - } - - // if the module is unloaded, tidy up all our dangling metadata - virtual void OnCleanup(int target_type, void* item) - { - if (target_type == TYPE_USER) - { - User* user = (User*)item; - std::string* ctitle; - if (user->GetExt("ctitle", ctitle)) - { - user->Shrink("ctitle"); - delete ctitle; - } - } - } - - // Whenever the linking module receives metadata from another server and doesnt know what - // to do with it (of course, hence the 'meta') it calls this method, and it is up to each - // module in turn to figure out if this metadata key belongs to them, and what they want - // to do with it. - // 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, 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 == "ctitle")) - { - User* dest = (User*)target; - // if they dont already have an ctitle field, accept the remote server's - std::string* text; - if (!dest->GetExt("ctitle", text)) - { - std::string* ntext = new std::string(extdata); - dest->Extend("ctitle",ntext); - } - } + /* Don't block anything */ + return MOD_RES_PASSTHRU; } - virtual ~ModuleCustomTitle() + ~ModuleCustomTitle() { } - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Custom Title for users", VF_COMMON | VF_VENDOR); } };