Call ModeParser::Process() directly instead of going through the CommandParser

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index d9c75adf79d394520f8501acff5582ce400a723c..a549f89a7a6484b4840a01bb46f5d900e44a5f57 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,8 +20,6 @@
  */
 
 
-/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
-
 #include "inspircd.h"
 
 /** Handle /SAMODE
@@ -32,16 +30,23 @@ class CommandSamode : public Command
        bool active;
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
                active = false;
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
+               User* target = ServerInstance->FindNick(parameters[0]);
+               if ((target) && (target != user))
+               {
+                       if (!user->HasPrivPermission("users/samode-usermodes", true))
+                               return CMD_FAILURE;
+               }
                this->active = true;
-               ServerInstance->Parser->CallHandler("MODE", parameters, user);
+               ServerInstance->Modes->Process(parameters, user);
                if (ServerInstance->Modes->GetLastParse().length())
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
                this->active = false;
                return CMD_SUCCESS;
        }
@@ -54,20 +59,19 @@ class ModuleSaMode : public Module
        ModuleSaMode()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Modules->Attach(I_OnPreMode, this);
        }
 
-       ~ModuleSaMode()
+       void init() CXX11_OVERRIDE
        {
+               ServerInstance->Modules->AddService(cmd);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
        }
 
-       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
                if (cmd.active)
                        return MOD_RES_ALLOW;