X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_blockamsg.cpp;h=9d42571e2b2f586d5ba40aaef0c651fe25880334;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=e4a4eaf4ec556b1ad8df1d31c7ba443b6d7485ad;hpb=d7a0cd3db1e8b64a6f706f1831e645ad69aa7927;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index e4a4eaf4e..9d42571e2 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -42,7 +42,7 @@ class ModuleBlockAmsg : public Module
 {
 	int ForgetDelay;
 	BlockAction action;
-	
+
  public:
 	ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
 	{
@@ -51,27 +51,27 @@ class ModuleBlockAmsg : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	
+
 	virtual ~ModuleBlockAmsg()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
 		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
 	}
-	
+
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
-		
+
 		ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
-		
+
 		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
 			ForgetDelay = -1;
-			
+
 		std::string act = Conf.ReadValue("blockamsg", "action", 0);
-		
+
 		if(act == "notice")
 			action = IBLOCK_NOTICE;
 		else if(act == "noticeopers")
@@ -84,35 +84,35 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *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;
-			
+
 		// We want case insensitive command comparison.
 		// Add std::string contructor for irc::string :x
 		irc::string cmd = command.c_str();
-		
-		if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (pcnt >= 2))
+
+		if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
 		{
 			// parameters[0] should have the target(s) in it.
 			// I think it will be faster to first check if there are any commas, and if there are then try and parse it out.
 			// Most messages have a single target so...
-			
+
 			int targets = 1;
 			int userchans = 0;
-		
-			if(*parameters[0] != '#')
+
+			if(*parameters[0].c_str() != '#')
 			{
 				// Decrement if the first target wasn't a channel.
 				targets--;
 			}
-			
-			for(const char* c = parameters[0]; *c; c++)
+
+			for(const char* c = parameters[0].c_str(); *c; c++)
 				if((*c == ',') && *(c+1) && (*(c+1) == '#'))
 					targets++;
-				
+
 			/* targets should now contain the number of channel targets the msg/notice was pointed at.
 			 * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
 			 * We don't want to block PMs so...
@@ -121,13 +121,13 @@ class ModuleBlockAmsg : public Module
 			{
 				return 0;
 			}
-					
+
 			userchans = user->chans.size();
 
 			// Check that this message wasn't already sent within a few seconds.
 			BlockedMessage* m;
 			user->GetExt("amsgblock", m);
-			
+
 			// 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...
 			// OR
@@ -137,32 +137,32 @@ 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);
+					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");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
-									
+					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str());
+
 				return 1;
 			}
-			
+
 			if(m)
 			{
 				// If there's already a BlockedMessage allocated, use it.
 				m->message = parameters[1];
-				m->target = parameters[0];
+				m->target = parameters[0].c_str();
 				m->sent = ServerInstance->Time();
 			}
 			else
 			{
-				m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time());
+				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)