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

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 54207db55..7e919fcc6 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -55,11 +55,10 @@ class ModuleHideOper : public Module
 	ModuleHideOper()
 		: hm(this)
 	{
-
 		if (!ServerInstance->Modes->AddMode(&hm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 
@@ -69,7 +68,7 @@ class ModuleHideOper : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR);
+		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
 	}
 
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -89,7 +88,7 @@ class ModuleHideOper : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
 	{
 		if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
 		{
@@ -97,6 +96,9 @@ class ModuleHideOper : public Module
 			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();
 		}
 	}
 };