Add whether the server split with an error to OnServerSplit.

[user/henk/code/inspircd.git] / src / modules / m_hideoper.cpp

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 3d8f8910cc5c3083c7a1f91f99c90689337900b7..d78ed538b64e2046fad85617897f777b734c6b32 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -20,6 +20,9 @@
 
 
 #include "inspircd.h"
+#include "modules/stats.h"
+#include "modules/who.h"
+#include "modules/whois.h"
 
 /** Handles user mode +H
  */
@@ -34,7 +37,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;
@@ -48,13 +51,21 @@ class HideOper : public SimpleUserModeHandler
        }
 };
 
-class ModuleHideOper : public Module, public Whois::LineEventListener
+class ModuleHideOper
+       : public Module
+       , public Stats::EventListener
+       , public Who::EventListener
+       , public Whois::LineEventListener
 {
+ private:
        HideOper hm;
        bool active;
+
  public:
        ModuleHideOper()
-               : Whois::LineEventListener(this)
+               : Stats::EventListener(this)
+               , Who::EventListener(this)
+               , Whois::LineEventListener(this)
                , hm(this)
                , active(false)
        {
@@ -73,7 +84,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
 
        ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
-               if (numeric.GetNumeric() != 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.
@@ -81,7 +92,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                if (opercount)
                {
                        active = true;
-                       user->WriteNumeric(252, opercount, "operator(s) online");
+                       user->WriteNumeric(RPL_LUSEROP, opercount, "operator(s) online");
                        active = false;
                }
                return MOD_RES_DENY;
@@ -104,20 +115,24 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
+       ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
                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))
+                       if (request.flags['o'])
                                return MOD_RES_DENY;
 
+                       size_t flag_index;
+                       if (!request.GetFieldIndex('f', flag_index))
+                               return MOD_RES_PASSTHRU;
+
                        // hide the "*" that marks the user as an oper from the /WHO line
                        // #chan ident localhost insp22.test nick H@ :0 Attila
-                       if (numeric.GetParams().size() < 6)
+                       if (numeric.GetParams().size() <= flag_index)
                                return MOD_RES_PASSTHRU;
 
-                       std::string& param = numeric.GetParams()[5];
+                       std::string& param = numeric.GetParams()[flag_index];
                        const std::string::size_type pos = param.find('*');
                        if (pos != std::string::npos)
                                param.erase(pos, 1);
@@ -138,7 +153,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                        if (!oper->server->IsULine() && (stats.GetSource()->IsOper() || !oper->IsModeSet(hm)))
                        {
                                LocalUser* lu = IS_LOCAL(oper);
-                               stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
+                               stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->GetDisplayedHost() + ") Idle: " +
                                                (lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable"));
                                count++;
                        }