X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_hideoper.cpp;h=b90f3f2343e0652c9147c75808af47ea8f28ece6;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=998a57bb3c59b4d8a5b818a867ad71d15c6f5089;hpb=2ab2de1dda8f2043898b9df8004ba5b6c4df7349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 998a57bb3..b90f3f234 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -21,43 +21,73 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding oper status with user mode +H */
-
 /** Handles user mode +H
  */
 class HideOper : public SimpleUserModeHandler
 {
  public:
+	size_t opercount;
+
 	HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
+		, opercount(0)
 	{
 		oper = true;
 	}
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+	{
+		if (SimpleUserModeHandler::OnModeChange(source, dest, channel, parameter, adding) == MODEACTION_DENY)
+			return MODEACTION_DENY;
+
+		if (adding)
+			opercount++;
+		else
+			opercount--;
+
+		return MODEACTION_ALLOW;
+	}
 };
 
-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)
 	{
-		if (!ServerInstance->Modes->AddMode(&hm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
+	}
 
-	virtual ~ModuleHideOper()
+	void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
 	{
+		if (user->IsModeSet(hm))
+			hm.opercount--;
 	}
 
-	virtual Version GetVersion()
+	ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
-		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
+		if (numeric.GetNumeric() != 252 || active || user->HasPrivPermission("users/auspex"))
+			return MOD_RES_PASSTHRU;
+
+		// If there are no visible operators then we shouldn't send the numeric.
+		size_t opercount = ServerInstance->Users->all_opers.size() - hm.opercount;
+		if (opercount)
+		{
+			active = true;
+			user->WriteNumeric(252, 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, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
 	{
 		/* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
 		 * person doing the WHOIS is not an oper
@@ -65,21 +95,25 @@ class ModuleHideOper : public Module
 		if (numeric != 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)
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
-		if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+		if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex"))
 		{
 			// hide the "*" that marks the user as an oper from the /WHO line
-			std::string::size_type pos = line.find("*");
+			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);
 			if (pos != std::string::npos)
 				line.erase(pos, 1);
 			// hide the line completely if doing a "/who * o" query
@@ -87,7 +121,29 @@ class ModuleHideOper : public Module
 				line.clear();
 		}
 	}
-};
 
+	ModResult OnStats(char symbol, User* user, string_list& results) CXX11_OVERRIDE
+	{
+		if (symbol != 'P')
+			return MOD_RES_PASSTHRU;
+
+		unsigned int count = 0;
+		const UserManager::OperList& opers = ServerInstance->Users->all_opers;
+		for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
+		{
+			User* oper = *i;
+			if (!oper->server->IsULine() && (user->IsOper() || !oper->IsModeSet(hm)))
+			{
+				LocalUser* lu = IS_LOCAL(oper);
+				results.push_back("249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
+						(lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable"));
+				count++;
+			}
+		}
+		results.push_back("249 "+user->nick+" :"+ConvToStr(count)+" OPER(s)");
+
+		return MOD_RES_DENY;
+	}
+};
 
 MODULE_INIT(ModuleHideOper)