Remove an extern, partly because it's unused, partly because it then gets shadowed...

[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 e19eddb1e8621af322261299a9c39236d9fd72f9..dddd29406702a9eb20d2ff296ff99b1400b9b76a 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,6 +1,7 @@
 using namespace std;
 
 // showwhois module by typobox43
+// Modified by Craig
 
 #include "users.h"
 #include "channels.h"
@@ -9,20 +10,25 @@ using namespace std;
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-Server *Srv;
-
 class ModuleShowwhois : public Module
 {
+               Server* Srv;
+
        public:
-               ModuleShowwhois()
+               ModuleShowwhois(Server* Me)
+                       : Module::Module(Me)
                {
-                       Srv = new Server;
+                       Srv = Me;
                        Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
                }
 
                ~ModuleShowwhois()
                {
-                       delete Srv;
+               }
+
+               void Implements(char* List)
+               {
+                       List[I_OnWhois] = List[I_OnExtendedMode] = 1;
                }
 
                virtual Version GetVersion()
@@ -42,7 +48,7 @@ class ModuleShowwhois : public Module
 
                virtual void OnWhois(userrec* source, userrec* dest)
                {
-                       if(strchr(dest->modes,'W'))
+                       if((strchr(dest->modes,'W')) && (source != dest))
                        {
                                WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
                        }
@@ -61,9 +67,9 @@ class ModuleShowwhoisFactory : public ModuleFactory
                {
                }
 
-               virtual Module* CreateModule()
+               virtual Module* CreateModule(Server* Me)
                {
-                       return new ModuleShowwhois;
+                       return new ModuleShowwhois(Me);
                }
 
 };