Merge insp20

[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 18db0320c1865a512b87cc4d24b7641bcb6f197a..81b9b888f4fff7724b8e1c8acb0d31bcc0194ff7 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -1,51 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding oper status with user mode +H */
+#include "inspircd.h"
 
 /** Handles user mode +H
  */
-class HideOper : public ModeHandler
+class HideOper : public SimpleUserModeHandler
 {
  public:
-       HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+       HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
        {
                oper = true;
        }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('H'))
-                       {
-                               dest->SetMode('H',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('H'))
-                       {
-                               dest->SetMode('H',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
 };
 
 class ModuleHideOper : public Module
@@ -55,23 +39,14 @@ class ModuleHideOper : public Module
        ModuleHideOper()
                : hm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&hm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
-       virtual ~ModuleHideOper()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* user, User* dest, 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
@@ -79,7 +54,7 @@ class ModuleHideOper : public Module
                if (numeric != 313)
                        return MOD_RES_PASSTHRU;
 
-               if (!dest->IsModeSet('H'))
+               if (!dest->IsModeSet(hm))
                        return MOD_RES_PASSTHRU;
 
                if (!user->HasPrivPermission("users/auspex"))
@@ -88,17 +63,46 @@ class ModuleHideOper : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnSendWhoLine(User* source, User* user, Channel* channel, 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);
+                               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();
                }
        }
-};
 
+       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)