1 files changed, 37 insertions, 46 deletions

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 32999d9f0..2e0b388cf 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding oper status with user mode +H */
-
 /** Handles user mode +H
  */
 class HideOper : public SimpleUserModeHandler
@@ -36,7 +34,7 @@ class HideOper : public SimpleUserModeHandler
 		oper = true;
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
 		if (SimpleUserModeHandler::OnModeChange(source, dest, channel, parameter, adding) == MODEACTION_DENY)
 			return MODEACTION_DENY;
@@ -50,43 +48,32 @@ class HideOper : public SimpleUserModeHandler
 	}
 };
 
-class ModuleHideOper : public Module
+class ModuleHideOper : public Module, public Whois::LineEventListener
 {
 	HideOper hm;
 	bool active;
  public:
 	ModuleHideOper()
-		: hm(this)
+		: Whois::LineEventListener(this)
+		, hm(this)
 		, active(false)
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(hm);
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine, I_OnStats, I_OnNumeric, I_OnUserQuit };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-
-	virtual ~ModuleHideOper()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
 	}
 
-	void OnUserQuit(User* user, const std::string&, const std::string&)
+	void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
 	{
-		if (user->IsModeSet('H'))
+		if (user->IsModeSet(hm))
 			hm.opercount--;
 	}
 
-	ModResult OnNumeric(User* user, unsigned int numeric, const std::string& text)
+	ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
-		if (numeric != 252 || active || user->HasPrivPermission("users/auspex"))
+		if (numeric.GetNumeric() != RPL_LUSEROP || active || user->HasPrivPermission("users/auspex"))
 			return MOD_RES_PASSTHRU;
 
 		// If there are no visible operators then we shouldn't send the numeric.
@@ -94,68 +81,72 @@ class ModuleHideOper : public Module
 		if (opercount)
 		{
 			active = true;
-			user->WriteNumeric(252, "%s %lu :operator(s) online", user->nick.c_str(),  static_cast<unsigned long>(opercount));
+			user->WriteNumeric(RPL_LUSEROP, opercount, "operator(s) online");
 			active = false;
 		}
 		return MOD_RES_DENY;
 	}
 
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		/* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
 		 * person doing the WHOIS is not an oper
 		 */
-		if (numeric != 313)
+		if (numeric.GetNumeric() != 313)
 			return MOD_RES_PASSTHRU;
 
-		if (!dest->IsModeSet('H'))
+		if (!whois.GetTarget()->IsModeSet(hm))
 			return MOD_RES_PASSTHRU;
 
-		if (!user->HasPrivPermission("users/auspex"))
+		if (!whois.GetSource()->HasPrivPermission("users/auspex"))
 			return MOD_RES_DENY;
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
-		if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+		if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex"))
 		{
+			// Hide the line completely if doing a "/who * o" query
+			if ((params.size() > 1) && (params[1].find('o') != std::string::npos))
+				return MOD_RES_DENY;
+
 			// hide the "*" that marks the user as an oper from the /WHO line
-			std::string::size_type spcolon = line.find(" :");
-			if (spcolon == std::string::npos)
-				return; // Another module hid the user completely
-			std::string::size_type sp = line.rfind(' ', spcolon-1);
-			std::string::size_type pos = line.find('*', sp);
+			// #chan ident localhost insp22.test nick H@ :0 Attila
+			if (numeric.GetParams().size() < 6)
+				return MOD_RES_PASSTHRU;
+
+			std::string& param = numeric.GetParams()[5];
+			const std::string::size_type pos = param.find('*');
 			if (pos != std::string::npos)
-				line.erase(pos, 1);
-			// hide the line completely if doing a "/who * o" query
-			if (params.size() > 1 && params[1].find('o') != std::string::npos)
-				line.clear();
+				param.erase(pos, 1);
 		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnStats(char symbol, User* user, string_list &results)
+	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
 	{
-		if (symbol != 'P')
+		if (stats.GetSymbol() != 'P')
 			return MOD_RES_PASSTHRU;
 
 		unsigned int count = 0;
-		for (std::list<User*>::const_iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); ++i)
+		const UserManager::OperList& opers = ServerInstance->Users->all_opers;
+		for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
 		{
 			User* oper = *i;
-			if (!ServerInstance->ULine(oper->server) && (IS_OPER(user) || !oper->IsModeSet('H')))
+			if (!oper->server->IsULine() && (stats.GetSource()->IsOper() || !oper->IsModeSet(hm)))
 			{
-				results.push_back(ServerInstance->Config->ServerName+" 249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
-						(IS_LOCAL(oper) ? ConvToStr(ServerInstance->Time() - oper->idle_lastmsg) + " secs" : "unavailable"));
+				LocalUser* lu = IS_LOCAL(oper);
+				stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->GetDisplayedHost() + ") Idle: " +
+						(lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable"));
 				count++;
 			}
 		}
-		results.push_back(ServerInstance->Config->ServerName+" 249 "+user->nick+" :"+ConvToStr(count)+" OPER(s)");
+		stats.AddRow(249, ConvToStr(count)+" OPER(s)");
 
 		return MOD_RES_DENY;
 	}
 };
 
-
 MODULE_INIT(ModuleHideOper)