Add extban types +bb R: and M: - stops matching account masks from joining and speaki...

[user/henk/code/inspircd.git] / src / modules / m_invisible.cpp

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 685dc209afe333af2e04a80b48ef78ac340f8d11..f8aae9cb5a55b32495cef9ad8ae6171cd763c04e 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -74,7 +74,7 @@ class InvisibleMode : public ModeHandler
 
                        if (!ok)
                        {
-                               source->WriteNumeric(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
@@ -140,8 +140,10 @@ class InvisibleDeOper : public ModeWatcher
                /* 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<std::string> newmodes;
+                       newmodes.push_back(dest->nick);
+                       newmodes.push_back("-Q");
+                       ServerInstance->Modes->Process(newmodes, source, true);
                }
                return true;
        }
@@ -185,15 +187,15 @@ class ModuleInvisible : public Module
                return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       
+
        virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
        {
                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->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());
                }
        }
 
@@ -203,13 +205,13 @@ class ModuleInvisible : public Module
                conf = new ConfigReader(ServerInstance);
        }
 
-       void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+       void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
        {
                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,
+                       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<std::string> 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<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++)
                                {
-                                       parameters[0] = n->c_str();
+                                       std::vector<std::string> parameters;
+                                       parameters.push_back(*n);
                                        /* This triggers our OnUserPart, above, making the PART silent */
-                                       parthandler->Handle(parameters, 1, user);
+                                       parthandler->Handle(parameters, user);
                                }
                        }
                }
@@ -243,34 +245,34 @@ 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->WriteNumeric(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;
                        }
                }
                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);
        }
 
        /* 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];
                char tb[MAXBUF];
-       
+
                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();
-               
+
                for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                {
                        /* User only appears to vanish for non-opers */