Remove spanningtree override of /LUSERS

[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 7c4d6341958da3d65f903fe112a6dff9e70e3b15..41701f3a6da27e12a66f7c27a38b8d5a32c48a73 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -25,7 +25,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
 
 /** Holds a blocked message's details
  */
-class BlockedMessage : public classbase
+class BlockedMessage
 {
 public:
        std::string message;
@@ -48,7 +48,7 @@ class ModuleBlockAmsg : public Module
        ModuleBlockAmsg() : blockamsg("blockamsg", this)
        {
                this->OnRehash(NULL);
-               Extensible::Register(&blockamsg);
+               ServerInstance->Extensions.Register(&blockamsg);
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR,API_VERSION);
+               return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
        }
 
        virtual void OnRehash(User* user)
@@ -141,9 +141,9 @@ class ModuleBlockAmsg : public Module
                                        ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
 
                                if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-                                       ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected");
+                                       ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
                                else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-                                       user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str());
+                                       user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str());
 
                                return MOD_RES_DENY;
                        }