Merge insp20

1 files changed, 40 insertions, 0 deletions

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 9f40d702e..03f6745ee 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -26,19 +26,37 @@
 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, public Whois::LineEventListener
 {
 	HideOper hm;
+	bool active;
  public:
 	ModuleHideOper()
 		: Whois::LineEventListener(this)
 		, hm(this)
+		, active(false)
 	{
 	}
 
@@ -47,6 +65,28 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
 		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
 	}
 
+	void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
+	{
+		if (user->IsModeSet(hm))
+			hm.opercount--;
+	}
+
+	ModResult OnNumeric(User* user, unsigned int numeric, const std::string& text) CXX11_OVERRIDE
+	{
+		if (numeric != 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, "%lu :operator(s) online", opercount);
+			active = false;
+		}
+		return MOD_RES_DENY;
+	}
+
 	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