X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=281c991e3a2b9c6a7d271fc5539ff717817b5cdb;hb=7aab0d12db670fea68a258d9ae2b05ea5c4615be;hp=c9d20e3ef6b549e5fb337977c3bb0e93d6485be5;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index c9d20e3ef..281c991e3 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -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;
@@ -45,10 +45,10 @@ class ModuleBlockAmsg : public Module
 	SimpleExtItem<BlockedMessage> blockamsg;
 
  public:
-	ModuleBlockAmsg(InspIRCd* Me) : Module(Me), blockamsg("blockamsg", this)
+	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,12 +60,12 @@ 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)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 
 		ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
 
@@ -86,7 +86,7 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
 		// Don't do anything with unregistered users, or remote ones.
 		if(!user || (user->registered != REG_ALL) || !IS_LOCAL(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;
 			}