X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_invisible.cpp;h=2e34b4f5d13b22dd83d25b7b74b86bda3084035d;hb=819147178db00008a215670992d0f532dd57f9e5;hp=3b419350ddcb783b97b955ee90d28c14d8ea8524;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 3b419350d..2e34b4f5d 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -47,37 +47,16 @@ class InvisibleMode : public ModeHandler ~InvisibleMode() { - for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) + for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) if (i->second->Visibility == qo) i->second->Visibility = NULL; delete qo; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { - if (source != dest) - return MODEACTION_DENY; - if (dest->IsModeSet('Q') != adding) { - bool ok = false; - - for (int j = 0; j < conf->Enumerate("type"); j++) - { - std::string opertype = conf->ReadValue("type","name",j); - if (opertype == source->oper) - { - ok = conf->ReadFlag("type", "canquiet", j); - break; - } - } - - if (!ok) - { - source->WriteServ("481 %s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick); - return MODEACTION_DENY; - } - dest->SetMode('Q', adding); /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */ @@ -100,7 +79,7 @@ class InvisibleMode : public ModeHandler CUList *ulist = f->first->GetUsers(); char tb[MAXBUF]; - snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost(), adding ? "PART" : "JOIN", f->first->name); + snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost().c_str(), adding ? "PART" : "JOIN", f->first->name.c_str()); std::string out = tb; std::string n = this->ServerInstance->Modes->ModeString(dest, f->first); @@ -111,12 +90,12 @@ class InvisibleMode : public ModeHandler { i->first->Write(out); if (!n.empty() && !adding) - i->first->WriteServ("MODE %s +%s", f->first->name, n.c_str()); + i->first->WriteServ("MODE %s +%s", f->first->name.c_str(), n.c_str()); } } - - ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-"); } + + ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has become %svisible (%cQ)", dest->GetFullHost().c_str(), adding ? "in" : "", adding ? '+' : '-'); return MODEACTION_ALLOW; } else @@ -128,20 +107,20 @@ class InvisibleMode : public ModeHandler class InvisibleDeOper : public ModeWatcher { - private: - InspIRCd* Srv; public: - InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER), Srv(Instance) + InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER) { } - bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type, bool) { /* Users who are opers and have +Q get their +Q removed when they deoper */ if ((!adding) && (dest->IsModeSet('Q'))) { - const char* newmodes[] = { dest->nick, "-Q" }; - ServerInstance->Modes->Process(newmodes, 2, source, true); + std::vector newmodes; + newmodes.push_back(dest->nick); + newmodes.push_back("-Q"); + ServerInstance->Modes->Process(newmodes, source, true); } return true; } @@ -159,17 +138,17 @@ class ModuleInvisible : public Module { conf = new ConfigReader(ServerInstance); qm = new InvisibleMode(ServerInstance); - if (!ServerInstance->AddMode(qm)) + if (!ServerInstance->Modes->AddMode(qm)) throw ModuleException("Could not add new modes!"); ido = new InvisibleDeOper(ServerInstance); - if (!ServerInstance->AddModeWatcher(ido)) + if (!ServerInstance->Modes->AddModeWatcher(ido)) throw ModuleException("Could not add new mode watcher on usermode +o!"); /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */ - ServerInstance->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible"); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 6); - } + ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible"); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash, I_OnHostCycle }; + ServerInstance->Modules->Attach(eventlist, this, 7); + }; virtual ~ModuleInvisible() { @@ -178,109 +157,124 @@ class ModuleInvisible : public Module delete qm; delete ido; delete conf; - } + }; + + virtual Version GetVersion(); + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent); + virtual void OnRehash(User* user); + void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent); + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); + bool OnHostCycle(User* user); + /* No privmsg response when hiding - submitted by Eric at neowin */ + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + /* Fix by Eric @ neowin.net, thanks :) -- Brain */ + void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5); +}; - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } +Version ModuleInvisible::GetVersion() +{ + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); +} - - virtual void OnUserJoin(User* user, Channel* channel, bool &silent) +void ModuleInvisible::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - this->WriteCommonFrom(user, channel, "JOIN %s", channel->name); - ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name); - } + silent = true; + /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); } +} - virtual void OnRehash(User* user, const std::string ¶meter) - { - delete conf; - conf = new ConfigReader(ServerInstance); - } +void ModuleInvisible::OnRehash(User* user) +{ + delete conf; + conf = new ConfigReader(ServerInstance); +} - void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) +void ModuleInvisible::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name, - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - } + silent = true; + /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ + this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name.c_str(), + partmessage.empty() ? "" : " :", + partmessage.empty() ? "" : partmessage.c_str()); } +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +void ModuleInvisible::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); + std::vector to_leave; + if (parthandler) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - const char* parameters[2]; - if (parthandler) + for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + to_leave.push_back(f->first->name); + /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ + for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - to_leave.push_back(f->first->name); - /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ - for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) - { - parameters[0] = n->c_str(); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); - } + std::vector parameters; + parameters.push_back(*n); + /* This triggers our OnUserPart, above, making the PART silent */ + parthandler->Handle(parameters, user); } } } +} - /* No privmsg response when hiding - submitted by Eric at neowin */ - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +bool ModuleInvisible::OnHostCycle(User* user) +{ + return user->IsModeSet('Q'); +} + +/* No privmsg response when hiding - submitted by Eric at neowin */ +int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +{ + if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { - if ((target_type == TYPE_USER) && (IS_LOCAL(user))) + User* target = (User*)dest; + if(target->IsModeSet('Q') && !IS_OPER(user)) { - User* target = (User*)dest; - if(target->IsModeSet('Q') && !*user->oper) - { - user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick); - return 1; - } + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str()); + return 1; } - return 0; - } - - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); } + return 0; +} - /* Fix by Eric @ neowin.net, thanks :) -- Brain */ - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) +int ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +{ + return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); +} + +/* Fix by Eric @ neowin.net, thanks :) -- Brain */ +void ModuleInvisible::WriteCommonFrom(User *user, Channel* channel, const char* text, ...) +{ + va_list argsPtr; + char textbuffer[MAXBUF]; + char tb[MAXBUF]; + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer); + + CUList *ulist = channel->GetUsers(); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer); - - CUList *ulist = channel->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + /* User only appears to vanish for non-opers */ + if (IS_LOCAL(i->first) && IS_OPER(i->first)) { - /* User only appears to vanish for non-opers */ - if (IS_LOCAL(i->first) && IS_OPER(i->first)) - { - i->first->Write(std::string(tb)); - } + i->first->Write(std::string(tb)); } } - -}; +} MODULE_INIT(ModuleInvisible)