Fix some of the include guard names (requested by SaberUK)

[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 7a2448afc6caa70df3a70a4c62422f7980a3c92b..7e919fcc6934ba64cdcd3ddfa48443cda922f229 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,12 @@
 class HideOper : public ModeHandler
 {
  public:
-       HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
+       HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+       {
+               oper = true;
+       }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -47,47 +50,56 @@ class HideOper : public ModeHandler
 
 class ModuleHideOper : public Module
 {
-
-       HideOper* hm;
+       HideOper hm;
  public:
-       ModuleHideOper(InspIRCd* Me)
-               : Module(Me)
+       ModuleHideOper()
+               : hm(this)
        {
-
-               hm = new HideOper(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(hm))
+               if (!ServerInstance->Modes->AddMode(&hm))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
 
        virtual ~ModuleHideOper()
        {
-               ServerInstance->Modes->DelMode(hm);
-               delete hm;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
        {
                /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
                 * person doing the WHOIS is not an oper
                 */
                if (numeric != 313)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (!dest->IsModeSet('H'))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
-               if (user->HasPrivPermission("users/auspex"))
-                       return 1;
+               if (!user->HasPrivPermission("users/auspex"))
+                       return MOD_RES_DENY;
 
-               return 0;
+               return MOD_RES_PASSTHRU;
+       }
+
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+       {
+               if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+               {
+                       // hide the "*" that marks the user as an oper from the /WHO line
+                       std::string::size_type pos = line.find("* ");
+                       if (pos != std::string::npos)
+                               line.erase(pos);
+                       // hide the line completely if doing a "/who * o" query
+                       if (params.size() > 1 && params[1].find('o') != std::string::npos)
+                               line.clear();
+               }
        }
 };