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 2a185680d35d9d9e6eeab378712b4af004b61587..a549f89a7a6484b4840a01bb46f5d900e44a5f57 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,17 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
 #include "inspircd.h"
 
@@ -21,18 +28,25 @@ class CommandSamode : public Command
 {
  public:
        bool active;
-       CommandSamode (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAMODE", "o", 2, false, 0)
+       CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
-               syntax = "<target> <modes> {<mode-parameters>}";
+               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;
        }
@@ -42,23 +56,22 @@ class ModuleSaMode : public Module
 {
        CommandSamode cmd;
  public:
-       ModuleSaMode(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       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("$Id$", VF_VENDOR, API_VERSION);
+               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;