X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=7e919fcc6934ba64cdcd3ddfa48443cda922f229;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=c322fdf3f67d48f8e7804b03075497d8bf2e22ff;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index c322fdf3f..7e919fcc6 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,24 +12,21 @@
  */
 
 #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, 'o', false, MODETYPE_USER, true) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
 	{
-		if (source != dest)
-			return MODEACTION_DENY;
+		oper = true;
+	}
 
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	{
 		if (adding)
 		{
 			if (!dest->IsModeSet('H'))
@@ -46,70 +43,65 @@ class HideOper : public ModeHandler
 				return MODEACTION_ALLOW;
 			}
 		}
-		
+
 		return MODEACTION_DENY;
 	}
 };
 
 class ModuleHideOper : public Module
 {
-	
-	HideOper* hm;
+	HideOper hm;
  public:
-	ModuleHideOper(InspIRCd* Me)
-		: Module(Me)
+	ModuleHideOper()
+		: hm(this)
 	{
-		
-		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, I_OnSendWhoLine };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhoisLine] = 1;
-	}
-	
+
 	virtual ~ModuleHideOper()
 	{
-		ServerInstance->Modes->DelMode(hm);
-		DELETE(hm);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	ModResult 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
 		 */
-		return ((!IS_OPER(user)) && (numeric == 313) && dest->IsModeSet('H'));
-	}
-};
+		if (numeric != 313)
+			return MOD_RES_PASSTHRU;
 
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-	ModuleHideOperFactory()
-	{
-	}
-	
-	~ModuleHideOperFactory()
-	{
+		if (!dest->IsModeSet('H'))
+			return MOD_RES_PASSTHRU;
+
+		if (!user->HasPrivPermission("users/auspex"))
+			return MOD_RES_DENY;
+
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
 	{
-		return new ModuleHideOper(Me);
+		if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+		{
+			// hide the "*" that marks the user as an oper from the /WHO line
+			std::string::size_type pos = line.find("* ");
+			if (pos != std::string::npos)
+				line.erase(pos);
+			// hide the line completely if doing a "/who * o" query
+			if (params.size() > 1 && params[1].find('o') != std::string::npos)
+				line.clear();
+		}
 	}
-	
 };
 
 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper)