X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=2c3769f7ada7989fb61b462c70139ec75b0784b9;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=2545db187f87879b6a9c8428501f99ac53ae0d78;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 2545db187..2c3769f7a 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -11,24 +11,24 @@
  * ---------------------------------------------------
  */
 
+#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 +I */
+/* $ModDesc: Provides support for hiding channels with user mode +I */
 
 /** Handles user mode +I
  */
 class HideChans : public ModeHandler
 {
  public:
-	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, true) { }
+	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
 
 	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 +58,12 @@ class ModuleHideChans : public Module
 	HideChans* hm;
  public:
 	ModuleHideChans(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		hm = new HideChans(ServerInstance);
-		ServerInstance->AddMode(hm, 'I');
+		if (!ServerInstance->AddMode(hm, 'I'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
@@ -86,30 +87,9 @@ class ModuleHideChans : public Module
 		/* Dont display channels if they have +I set and the
 		 * person doing the WHOIS is not an oper
 		 */
-		return ((!*user->oper) && (numeric == 319) && dest->IsModeSet('I'));
-	}
-};
-
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-	ModuleHideChansFactory()
-	{
+		return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
 	}
-	
-	~ModuleHideChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideChans(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)