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

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

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 3c8fcd1b55302521f955c0a8226b70b1e16c0619..5ab627c71bedc2964705dfd4a9f4f0c79039b027 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
+               return Version("Attempt to block /amsg or /ame, at least some of the irritating client scripts", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -81,7 +81,7 @@ class ModuleBlockAmsg : public Module
                        action = IBLOCK_KILLOPERS;
        }
 
-       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                // Don't do anything with unregistered users
                if (user->registered != REG_ALL)
@@ -120,12 +120,12 @@ class ModuleBlockAmsg : public Module
                        {
                                // Block it...
                                if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-                                       ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame blocked", user->nick.c_str());
 
                                if (action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
                                        ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
                                else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-                                       user->WriteNotice("Global message (/amsg or /ame) denied");
+                                       user->WriteNotice("Global message (/amsg or /ame) blocked");
 
                                return MOD_RES_DENY;
                        }