X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=97cb53c763b6294c390fc910c9fbfd82db80286d;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=cf9e9b06237d053eedff1799d3381a0aa3796b7d;hpb=c9235e50f471e5071c0601dde62bb741d9b6f05c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index cf9e9b062..97cb53c76 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.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
@@ -12,24 +12,18 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for hiding oper status with user mode +H */
 
-/** Handles user mode +B
+/** Handles user mode +H
  */
 class HideOper : public ModeHandler
 {
  public:
 	HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
 
-	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)
 	{
-		if (source != dest)
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!dest->IsModeSet('H'))
@@ -46,42 +40,40 @@ class HideOper : public ModeHandler
 				return MODEACTION_ALLOW;
 			}
 		}
-		
+
 		return MODEACTION_DENY;
 	}
 };
 
 class ModuleHideOper : public Module
 {
-	
+
 	HideOper* hm;
  public:
 	ModuleHideOper(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		hm = new HideOper(ServerInstance);
-		if (!ServerInstance->AddMode(hm, 'H'))
+		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 ~ModuleHideOper()
 	{
 		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 numeric 313 (RPL_WHOISOPER) if they have +H set and the
 		 * person doing the WHOIS is not an oper
@@ -90,26 +82,5 @@ class ModuleHideOper : public Module
 	}
 };
 
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-	ModuleHideOperFactory()
-	{
-	}
-	
-	~ModuleHideOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideOper(Me);
-	}
-	
-};
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper)