Implement feature in bug #395 reported by stealth, and tidy up a bit

[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 7c35fe08e669589398b3e55d4626dae846b3287e..cb6a0ffb028ec26733f49c655c562f1aa5635e8d 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);
@@ -106,25 +106,4 @@ class ModuleShowwhois : public Module
 
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-       public:
-               ModuleShowwhoisFactory()
-               {
-               }
-
-               ~ModuleShowwhoisFactory()
-               {
-               }
-
-               virtual Module* CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleShowwhois(Me);
-               }
-
-};
-
-extern "C" void* init_module()
-{
-       return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)