Fix sending DEL for caps which have not been advertised yet.

[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 db3345b98920f95f39bd21424c0b5f6ec3a55d48..b1642e47085b9ce4b3a61b096ce9a37460a7b556 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -33,7 +33,7 @@ class CommandSamode : public Command
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}";
+               flags_needed = 'o'; syntax = "<target> (+|-)<modes> [<mode-parameters>]";
                active = false;
        }
 
@@ -49,8 +49,11 @@ class CommandSamode : public Command
                        }
 
                        // Changing the modes of another user requires a special permission
-                       if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes", true)))
+                       if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes")))
+                       {
+                               user->WriteNotice("*** You are not allowed to /SAMODE other users (the privilege users/samode-usermodes is needed to /SAMODE others).");
                                return CMD_FAILURE;
+                       }
                }
 
                // XXX: Make ModeParser clear LastParse
@@ -93,7 +96,7 @@ class ModuleSaMode : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
+               return Version("Provides the SAMODE command, allows opers to change modes on channels and users", VF_VENDOR);
        }
 
        ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
@@ -124,8 +127,8 @@ class ModuleSaMode : public Module
 
        void Prioritize() CXX11_OVERRIDE
        {
-               Module* disabled = ServerInstance->Modules->Find("m_disabled.so");
-               ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disabled);
+               Module* disable = ServerInstance->Modules->Find("m_disable.so");
+               ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
 
                Module *override = ServerInstance->Modules->Find("m_override.so");
                ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);