X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=281c991e3a2b9c6a7d271fc5539ff717817b5cdb;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=89728bdb9fe3b9fdc1b825bc1a7b57bc4e66a52c;hpb=0da6b3a13def40e8fd002b9fc60f955467f6372d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 89728bdb9..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;
@@ -42,13 +42,15 @@ class ModuleBlockAmsg : public Module
 {
 	int ForgetDelay;
 	BlockAction action;
+	SimpleExtItem<BlockedMessage> blockamsg;
 
  public:
-	ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
+	ModuleBlockAmsg() : blockamsg("blockamsg", this)
 	{
 		this->OnRehash(NULL);
-		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_OnCleanup };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Extensions.Register(&blockamsg);
+		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 
@@ -58,12 +60,12 @@ class ModuleBlockAmsg : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",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);
 
@@ -84,11 +86,11 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual int 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))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		// We want case insensitive command comparison.
 		// Add std::string contructor for irc::string :x
@@ -119,14 +121,13 @@ class ModuleBlockAmsg : public Module
 			 */
 			if(targets == 0)
 			{
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 
 			userchans = user->chans.size();
 
 			// Check that this message wasn't already sent within a few seconds.
-			BlockedMessage* m;
-			user->GetExt("amsgblock", m);
+			BlockedMessage* m = blockamsg.get(user);
 
 			// If the message is identical and within the time.
 			// We check the target is *not* identical, that'd straying into the realms of flood control. Which isn't what we're doing...
@@ -140,11 +141,11 @@ 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 1;
+				return MOD_RES_DENY;
 			}
 
 			if(m)
@@ -157,25 +158,10 @@ class ModuleBlockAmsg : public Module
 			else
 			{
 				m = new BlockedMessage(parameters[1], parameters[0].c_str(), ServerInstance->Time());
-				user->Extend("amsgblock", (char*)m);
-			}
-		}
-		return 0;
-	}
-
-	void OnCleanup(int target_type, void* item)
-	{
-		if(target_type == TYPE_USER)
-		{
-			User* user = (User*)item;
-			BlockedMessage* m;
-			user->GetExt("amsgblock", m);
-			if(m)
-			{
-				delete m;
-				user->Shrink("amsgblock");
+				blockamsg.set(user, m);
 			}
 		}
+		return MOD_RES_PASSTHRU;
 	}
 };