Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / modules / m_servprotect.cpp

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 22aad400e11e961bc40877463a84432d8308f9c7..96e54f8e7e4434a0bc0a4476fa10c3a1ebf01e5f 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -20,9 +20,9 @@
 class ServProtectMode : public ModeHandler
 {
  public:
-       ServProtectMode(InspIRCd* Instance) : ModeHandler(Instance, 'k', 0, 0, false, MODETYPE_USER, true) { }
+       ServProtectMode(Module* Creator) : ModeHandler(Creator, 'k', 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)
        {
                /* Because this returns MODEACTION_DENY all the time, there is only ONE
                 * way to add this mode and that is at client introduction in the UID command,
@@ -34,17 +34,14 @@ class ServProtectMode : public ModeHandler
                 */
                return MODEACTION_DENY;
        }
-
-       bool NeedsOper() { return true; }
 };
 
 class ModuleServProtectMode : public Module
 {
-
        ServProtectMode bm;
  public:
-       ModuleServProtectMode(InspIRCd* Me)
-               : Module(Me), bm(Me)
+       ModuleServProtectMode()
+               : bm(this)
        {
                if (!ServerInstance->Modes->AddMode(&bm))
                        throw ModuleException("Could not add new modes!");
@@ -53,17 +50,17 @@ class ModuleServProtectMode : public Module
        }
 
 
-       virtual ~ModuleServProtectMode()
+       ~ModuleServProtectMode()
        {
                ServerInstance->Modes->DelMode(&bm);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       virtual void OnWhois(User* src, User* dst)
+       void OnWhois(User* src, User* dst)
        {
                if (dst->IsModeSet('k'))
                {
@@ -71,12 +68,12 @@ class ModuleServProtectMode : public Module
                }
        }
 
-       virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode)
+       ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
        {
                /* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
                 * and the user making the change is not a uline
                 */
-               if (!servermode && !adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
+               if (!adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
                {
                        /* Check if the parameter is a valid nick/uuid
                         */
@@ -91,42 +88,43 @@ class ModuleServProtectMode : public Module
                                {
                                        /* BZZZT, Denied! */
                                        user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network);
-                                       return ACR_DENY;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
                /* Mode allowed */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnKill(User* src, User* dst, const std::string &reason)
+       ModResult OnKill(User* src, User* dst, const std::string &reason)
        {
                if (src == NULL)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (dst->IsModeSet('k'))
                {
                        src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network);
                        ServerInstance->SNO->WriteGlobalSno('a', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")");
-                       return 1;
+                       return MOD_RES_DENY;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreKick(User *src, User *dst, Channel *c, const std::string &reason)
+       ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason)
        {
-               if (dst->IsModeSet('k'))
+               if (memb->user->IsModeSet('k'))
                {
-                       src->WriteNumeric(484, "%s %s :You are not permitted to kick services", src->nick.c_str(), c->name.c_str());
-                       return 1;
+                       src->WriteNumeric(484, "%s %s :You are not permitted to kick services",
+                               src->nick.c_str(), memb->chan->name.c_str());
+                       return MOD_RES_DENY;
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
        {
-               return ((src != dst) && (numeric == 319) && dst->IsModeSet('k'));
+               return ((src != dst) && (numeric == 319) && dst->IsModeSet('k')) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 };