m_spanningtree Remove unneeded #includes

[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 10d05e39710d669e0a265a9637b7e85905e18fb2..08cdea4afbf6f3718e37ed6a7efd833a75ad3898 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -32,6 +32,7 @@ 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;
        }
@@ -39,6 +40,12 @@ class CommandSamode : public Command
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                this->active = true;
+               User* target = ServerInstance->FindNick(parameters[0]);
+               if ((target) && (target != user))
+               {
+                       if (!user->HasPrivPermission("users/samode-usermodes", true))
+                               return CMD_FAILURE;
+               }
                ServerInstance->Parser->CallHandler("MODE", parameters, user);
                if (ServerInstance->Modes->GetLastParse().length())
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
@@ -58,14 +65,10 @@ class ModuleSaMode : public Module
 
        void init()
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->Attach(I_OnPreMode, this);
        }
 
-       ~ModuleSaMode()
-       {
-       }
-
        Version GetVersion()
        {
                return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);