Add initial query support to m_mysql [patch by Athenon]

[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 425fa90f7f8f1c2d8d3022f8ff1a4fd1b4a52a07..b19ecb97c15529e5c0d99eec750a90582034b157 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,9 @@
 class HideOper : public ModeHandler
 {
  public:
-       HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
+       HideOper(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'H', 0, 0, false, MODETYPE_USER, 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,15 +47,13 @@ class HideOper : public ModeHandler
 
 class ModuleHideOper : public Module
 {
-
-       HideOper* hm;
+       HideOper hm;
  public:
        ModuleHideOper(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), hm(Me, 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);
@@ -64,8 +62,7 @@ class ModuleHideOper : public Module
 
        virtual ~ModuleHideOper()
        {
-               ServerInstance->Modes->DelMode(hm);
-               delete hm;
+               ServerInstance->Modes->DelMode(&hm);
        }
 
        virtual Version GetVersion()
@@ -73,21 +70,21 @@ class ModuleHideOper : public Module
                return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       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;
+                       return MOD_RES_DENY;
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };