X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=0788a1eaf234f97c47a5767908094bb3eefd8c91;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=61f476f70bd8ea7f4c7ab58595b1ee3e320bf8aa;hpb=a85c2d262d1ab3bf5745a146d905705d0a0b6983;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 61f476f70..0788a1eaf 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
@@ -25,12 +22,8 @@ class HideChans : public ModeHandler
  public:
 	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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!dest->IsModeSet('I'))
@@ -58,59 +51,36 @@ class ModuleHideChans : public Module
 	HideChans* hm;
  public:
 	ModuleHideChans(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		hm = new HideChans(ServerInstance);
-		if (!ServerInstance->AddMode(hm, 'I'))
+		if (!ServerInstance->Modes->AddMode(hm))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnWhoisLine };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhoisLine] = 1;
-	}
 	
 	virtual ~ModuleHideChans()
 	{
 		ServerInstance->Modes->DelMode(hm);
-		DELETE(hm);
+		delete hm;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* Dont display channels if they have +I set and the
 		 * person doing the WHOIS is not an oper
 		 */
-		return ((user != dest) && (!*user->oper) && (numeric == 319) && dest->IsModeSet('I'));
+		return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
 	}
 };
 
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-	ModuleHideChansFactory()
-	{
-	}
-	
-	~ModuleHideChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideChans(Me);
-	}
-	
-};
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)