Include explicit routing information in Command, will replace CMD_LOCALONLY return...

[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 9503a7562fa210bdcefe67b908a96756bf12598d..c204d51e9952a4d9db3d6c0efce821f57301e091 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -2,38 +2,28 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for hiding oper status with user mode +H */
 
-/** Handles user mode +B
+/** Handles user mode +H
  */
 class HideOper : public ModeHandler
 {
  public:
        HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
-               /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('H'))
@@ -50,69 +40,53 @@ class HideOper : public ModeHandler
                                return MODEACTION_ALLOW;
                        }
                }
-               
+
                return MODEACTION_DENY;
        }
 };
 
 class ModuleHideOper : public Module
 {
-       
-       HideOper* hm;
+       HideOper hm;
  public:
        ModuleHideOper(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me), hm(Me)
        {
-               
-               hm = new HideOper(ServerInstance);
-               ServerInstance->AddMode(hm, 'H');
-       }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = 1;
+               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,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+       int 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
                 */
-               return ((!*user->oper) && (numeric == 313) && dest->IsModeSet('H'));
-       }
-};
+               if (numeric != 313)
+                       return 0;
 
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-       ModuleHideOperFactory()
-       {
-       }
-       
-       ~ModuleHideOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleHideOper(Me);
+               if (!dest->IsModeSet('H'))
+                       return 0;
+
+               if (!user->HasPrivPermission("users/auspex"))
+                       return 1;
+
+               return 0;
        }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper)