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 59b4c6ff44b21b8e7bc317dba94cb63f6ba376f1..f8aae9cb5a55b32495cef9ad8ae6171cd763c04e 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -100,7 +100,7 @@ class InvisibleMode : public ModeHandler
                                CUList *ulist = f->first->GetUsers();
                                char tb[MAXBUF];
 
-                               snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost().c_str(), 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,7 +111,7 @@ 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());
                                        }
                                }
                        }
@@ -187,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().c_str(), 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());
                }
        }
 
@@ -205,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());
                }
@@ -253,7 +253,7 @@ class ModuleInvisible : public Module
                }
                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);
@@ -265,14 +265,14 @@ class ModuleInvisible : public Module
                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++)
                {
                        /* User only appears to vanish for non-opers */