m_auditorium Handle NULL return from Channel::GetUser() in OnSendWhoLine()

[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 5d088cf12257706544a82084fbb92d199df435df..ea2ae24ab3d525cc5fc56a156e703a8056f9f0c3 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,7 +20,7 @@
  */
 
 
-/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
+/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
 
 #include "inspircd.h"
 
@@ -32,16 +32,27 @@ 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)
        {
+               if (parameters[0].c_str()[0] != '#')
+               {
+                       User* target = ServerInstance->FindNickOnly(parameters[0]);
+                       if ((!target) || (target->registered != REG_ALL))
+                       {
+                               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                               return CMD_FAILURE;
+                       }
+               }
+
                this->active = true;
                ServerInstance->Parser->CallHandler("MODE", 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,7 +65,11 @@ class ModuleSaMode : public Module
        ModuleSaMode()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->Attach(I_OnPreMode, this);
        }
 
@@ -64,7 +79,7 @@ class ModuleSaMode : public Module
 
        Version GetVersion()
        {
-               return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR);
+               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)