We were already sending FMODE +nt after each channel creation to keep services happy...

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 7dcfebdf627c0dadea88ecc34bf8c81d6ab56ce9..d2324eb7362f1c628b50fd830d768ea4a4ded6b3 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
@@ -28,7 +28,7 @@ class SeeWhois : public ModeHandler
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
                /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
+               if (source != dest)
                        return MODEACTION_DENY;
 
                if (adding)
@@ -59,7 +59,7 @@ class ModuleShowwhois : public Module
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
                
                sw = new SeeWhois(ServerInstance);
@@ -87,7 +87,20 @@ class ModuleShowwhois : public Module
        {
                if ((dest->IsModeSet('W')) && (source != dest))
                {
-                       dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+                       if (IS_LOCAL(dest))
+                       {
+                               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+                       }
+                       else
+                       {
+                               std::deque<std::string> params;
+                               params.push_back(dest->nick);
+                               std::string msg = ":";
+                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
+                               params.push_back(msg);
+                               Event ev((char *) &params, NULL, "send_push");
+                               ev.Send(ServerInstance);
+                       }
                }
        }
 
@@ -111,7 +124,7 @@ class ModuleShowwhoisFactory : public ModuleFactory
 
 };
 
-extern "C" void* init_module()
+extern "C" DllExport void* init_module()
 {
        return new ModuleShowwhoisFactory;
 }