Remove unnecessary header traffic

[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 0f9578666b3d7ce6df210e522687eb05bd2c147c..e8d9127b2944ea34883b322c8aa8f2cbb215eebe 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -11,11 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
-#include "stdarg.h"
+#include <stdarg.h>
 
 /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
 
@@ -83,9 +80,20 @@ class InvisibleMode : public ModeHandler
 
                        dest->SetMode('Q', adding);
 
+                       /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */
+                       Module* m = ServerInstance->FindModule("m_watch.so");
+
+                       /* This must come before setting/unsetting the handler */
+                       if (m && adding)
+                               m->OnUserQuit(dest, "Connection closed", "Connection closed");
+
                        /* Set visibility handler object */
                        dest->Visibility = adding ? qo : NULL;
 
+                       /* This has to come after setting/unsetting the handler */
+                       if (m && !adding)
+                               m->OnPostConnect(dest);
+
                        /* User appears to vanish or appear from nowhere */
                        for (UCListIter f = dest->chans.begin(); f != dest->chans.end(); f++)
                        {
@@ -147,7 +155,7 @@ class ModuleInvisible : public Module
        InvisibleDeOper* ido;
  public:
        ModuleInvisible(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                conf = new ConfigReader(ServerInstance);
                qm = new InvisibleMode(ServerInstance);
@@ -156,6 +164,9 @@ class ModuleInvisible : public Module
                ido = new InvisibleDeOper(ServerInstance);
                if (!ServerInstance->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");
        }
 
        virtual ~ModuleInvisible()
@@ -274,26 +285,4 @@ class ModuleInvisible : public Module
 
 };
 
-class ModuleInvisibleFactory : public ModuleFactory
-{
- public:
-       ModuleInvisibleFactory()
-       {
-       }
-       
-       ~ModuleInvisibleFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleInvisible(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleInvisibleFactory;
-}
-
+MODULE_INIT(ModuleInvisible)