and a little tweak to remote MOTD too.

[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 3d1592b4890fb68548edca5fa7f05914507fd1db..96bc705b33c82cad3720b64f20ae9edea8613955 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #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 */
 
@@ -147,7 +147,7 @@ class ModuleInvisible : public Module
        InvisibleDeOper* ido;
  public:
        ModuleInvisible(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                conf = new ConfigReader(ServerInstance);
                qm = new InvisibleMode(ServerInstance);
@@ -174,7 +174,7 @@ class ModuleInvisible : public Module
 
        void Implements(char* List)
        {
-               List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
        }
        
        virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
@@ -228,6 +228,26 @@ class ModuleInvisible : public Module
                }
        }
 
+       /* No privmsg response when hiding - submitted by Eric at neowin */
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       {
+               if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
+               {
+                       userrec* target = (userrec*)dest;
+                       if(target->IsModeSet('Q') && !*user->oper)
+                       {
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
+                               return 1;
+                       }
+               }
+               return 0;
+       }
+       
+       virtual int OnUserPreMessage(userrec* 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(userrec *user, chanrec* channel, const char* text, ...)
        {
@@ -272,7 +292,7 @@ class ModuleInvisibleFactory : public ModuleFactory
        
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleInvisibleFactory;
 }