X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=9f547d77db0a6e22ca8a23dbe6f1760bbcc7c2d5;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=b2eee3b5713aa98c185eaa387c8b2bf562a6d12e;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index b2eee3b57..9f547d77d 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for hiding oper status with user mode +H */
 
@@ -27,8 +27,7 @@ class HideOper : 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)
@@ -58,11 +57,12 @@ class ModuleHideOper : public Module
 	HideOper* hm;
  public:
 	ModuleHideOper(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		hm = new HideOper(ServerInstance);
-		ServerInstance->AddMode(hm, 'H');
+		if (!ServerInstance->AddMode(hm, 'H'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
@@ -86,30 +86,9 @@ class ModuleHideOper : public Module
 		/* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
 		 * person doing the WHOIS is not an oper
 		 */
-		return ((!*user->oper) && (numeric == 313) && dest->IsModeSet('H'));
-	}
-};
-
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-	ModuleHideOperFactory()
-	{
+		return ((!IS_OPER(user)) && (numeric == 313) && dest->IsModeSet('H'));
 	}
-	
-	~ModuleHideOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideOper(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper)