Allow commands to optionally route themselves using ENCAP

[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 72290436094700cf6fedaa3e60962003d2e8ba32..c204d51e9952a4d9db3d6c0efce821f57301e091 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -40,37 +40,34 @@ class HideOper : public ModeHandler
                                return MODEACTION_ALLOW;
                        }
                }
-               
+
                return MODEACTION_DENY;
        }
 };
 
 class ModuleHideOper : public Module
 {
-       
-       HideOper* hm;
+       HideOper hm;
  public:
        ModuleHideOper(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), hm(Me)
        {
-               
-               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);
        }
 
-       
+
        virtual ~ModuleHideOper()
        {
-               ServerInstance->Modes->DelMode(hm);
-               delete hm;
+               ServerInstance->Modes->DelMode(&hm);
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -78,7 +75,16 @@ class ModuleHideOper : public Module
                /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
                 * person doing the WHOIS is not an oper
                 */
-               return ((!IS_OPER(user)) && (numeric == 313) && dest->IsModeSet('H'));
+               if (numeric != 313)
+                       return 0;
+
+               if (!dest->IsModeSet('H'))
+                       return 0;
+
+               if (!user->HasPrivPermission("users/auspex"))
+                       return 1;
+
+               return 0;
        }
 };