X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=cb6a0ffb028ec26733f49c655c562f1aa5635e8d;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=7c35fe08e669589398b3e55d4626dae846b3287e;hpb=97d1b1791c4af29212cd647c2a327e63f05ab008;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 7c35fe08e..cb6a0ffb0 100644
--- 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)