Add names for all modes (part 1 of named channel mode list)

[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 0785fd185442327be83097b7f5dbb9e0096fd373..b18172786304e49add14d62c68cf65da13fe465b 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-2007 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.
@@ -11,25 +11,22 @@
  * ---------------------------------------------------
  */
 
-#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, 'o', false, MODETYPE_USER, true) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
        {
-               if (source != dest)
-                       return MODEACTION_DENY;
+               oper = true;
+       }
 
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       {
                if (adding)
                {
                        if (!dest->IsModeSet('H'))
@@ -46,70 +43,63 @@ 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)
+       ModuleHideOper()
+               : hm(this)
        {
-               
-               hm = new HideOper(ServerInstance);
-               if (!ServerInstance->AddMode(hm, 'H'))
+
+               if (!ServerInstance->Modes->AddMode(&hm))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnWhoisLine };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhoisLine] = 1;
-       }
-       
+
        virtual ~ModuleHideOper()
        {
-               ServerInstance->Modes->DelMode(hm);
-               DELETE(hm);
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       int OnWhoisLine(userrec* user, userrec* 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
                 */
-               return ((!*user->oper) && (numeric == 313) && dest->IsModeSet('H'));
-       }
-};
+               if (numeric != 313)
+                       return MOD_RES_PASSTHRU;
 
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-       ModuleHideOperFactory()
-       {
-       }
-       
-       ~ModuleHideOperFactory()
-       {
+               if (!dest->IsModeSet('H'))
+                       return MOD_RES_PASSTHRU;
+
+               if (!user->HasPrivPermission("users/auspex"))
+                       return MOD_RES_DENY;
+
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
        {
-               return new ModuleHideOper(Me);
+               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);
+               }
        }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper)