Convert more modules

[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 ee6334f5e6f221ef7cbd87dbb48e2b72aa2fac3f..96bc705b33c82cad3720b64f20ae9edea8613955 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -11,10 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
+#include <stdarg.h>
 
 /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
 
@@ -57,7 +58,7 @@ class InvisibleMode : public ModeHandler
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if ((source != dest) && (!*source->oper))
+               if (source != dest)
                        return MODEACTION_DENY;
 
                if (dest->IsModeSet('Q') != adding)
@@ -146,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);
@@ -173,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)
@@ -182,7 +183,7 @@ class ModuleInvisible : public Module
                {
                        silent = true;
                        /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */
-                       user->WriteFrom(user, "JOIN %s", channel->name);
+                       this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
                        ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
                }
        }
@@ -199,7 +200,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) */
-                       user->WriteFrom(user, "PART %s%s%s", channel->name,
+                       this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name,
                                        partmessage.empty() ? "" : " :",
                                        partmessage.empty() ? "" : partmessage.c_str());
                }
@@ -226,6 +227,51 @@ 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, ...)
+       {
+               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);
+               
+               CUList *ulist = channel->GetUsers();
+               
+               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               {
+                       /* User only appears to vanish for non-opers */
+                       if (IS_LOCAL(i->first) && IS_OPER(i->first))
+                       {
+                               i->first->Write(std::string(tb));
+                       }
+               }
+       }
+
 };
 
 class ModuleInvisibleFactory : public ModuleFactory
@@ -246,7 +292,7 @@ class ModuleInvisibleFactory : public ModuleFactory
        
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleInvisibleFactory;
 }