X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_invisible.cpp;h=32e09ab57d836a2f09c33b08820606603a65c424;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=03fdee091ae27a6c45922c16708f18a15618e6dd;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 03fdee091..32e09ab57 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -47,13 +47,13 @@ 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; @@ -74,7 +74,7 @@ class InvisibleMode : public ModeHandler if (!ok) { - source->WriteServ("481 %s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick); + source->WriteNumeric(481, "%s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick.c_str()); return MODEACTION_DENY; } @@ -100,7 +100,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 +111,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->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-"); } + + ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost().c_str(), adding ? "in" : "", adding ? "+" : "-"); return MODEACTION_ALLOW; } else @@ -135,13 +135,15 @@ class InvisibleDeOper : public ModeWatcher { } - 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,14 +161,14 @@ 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"); + 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 }; ServerInstance->Modules->Attach(eventlist, this, 6); } @@ -182,7 +184,7 @@ class ModuleInvisible : public Module virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } @@ -192,8 +194,8 @@ class ModuleInvisible : public Module { 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->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name); + 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()); } } @@ -209,7 +211,7 @@ class ModuleInvisible : public Module { 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, + this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str()); } @@ -221,7 +223,6 @@ class ModuleInvisible : public Module { 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++) @@ -229,9 +230,10 @@ class ModuleInvisible : public Module /* 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(); + std::vector parameters; + parameters.push_back(*n); /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); + parthandler->Handle(parameters, user); } } } @@ -243,9 +245,9 @@ class ModuleInvisible : public Module if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { User* target = (User*)dest; - if(target->IsModeSet('Q') && !*user->oper) + if(target->IsModeSet('Q') && !IS_OPER(user)) { - user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick); + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str()); return 1; } } @@ -258,7 +260,7 @@ class ModuleInvisible : public Module } /* Fix by Eric @ neowin.net, thanks :) -- Brain */ - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) + void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4,5) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -267,7 +269,7 @@ class ModuleInvisible : public Module va_start(argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer); + snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer); CUList *ulist = channel->GetUsers();