Change type of log messages to MODNAME in several modules

[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 9f40d702e98acdae8edd6c35786357c7a4c1f743..3d8f8910cc5c3083c7a1f91f99c90689337900b7 100644 (file)
--- 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,12 +65,34 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
+       void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
+       {
+               if (user->IsModeSet(hm))
+                       hm.opercount--;
+       }
+
+       ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
+       {
+               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(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 (!whois.GetTarget()->IsModeSet(hm))
@@ -64,27 +104,30 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                return MOD_RES_PASSTHRU;
        }
 
-       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, 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))
+                               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) CXX11_OVERRIDE
+       ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
        {
-               if (symbol != 'P')
+               if (stats.GetSymbol() != 'P')
                        return MOD_RES_PASSTHRU;
 
                unsigned int count = 0;
@@ -92,15 +135,15 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
                for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
                {
                        User* oper = *i;
-                       if (!oper->server->IsULine() && (user->IsOper() || !oper->IsModeSet(hm)))
+                       if (!oper->server->IsULine() && (stats.GetSource()->IsOper() || !oper->IsModeSet(hm)))
                        {
                                LocalUser* lu = IS_LOCAL(oper);
-                               results.push_back("249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
+                               stats.AddRow(249, 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)");
+               stats.AddRow(249, ConvToStr(count)+" OPER(s)");
 
                return MOD_RES_DENY;
        }