X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=0ddaddd34445097aceaab6639b0718f30300c0f2;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=bb95127544b492c3a2790cd9afbdb504bd88ccd9;hpb=68da120812b1e593c76ea75d0d591f47b6a4f402;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index bb9512754..0ddaddd34 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -32,7 +32,7 @@ extern time_t TIME;
 
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 
-class BlockedMessage
+class BlockedMessage : public classbase
 {
 public:
 	std::string message;
@@ -70,7 +70,7 @@ public:
 		return Version(1,0,0,0,VF_VENDOR);
 	}
 	
-	virtual void OnRehash(std::string parameter)
+	virtual void OnRehash(const std::string &parameter)
 	{
 		ConfigReader* Conf = new ConfigReader;
 		
@@ -91,10 +91,10 @@ public:
 		else
 			action = IBLOCK_KILLOPERS;
 
-		delete Conf;
+		DELETE(Conf);
 	}
 
-	virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
 	{
 		// Don't do anything with unregistered users, or remote ones.
 		if(!user || (user->registered != 7) || !IS_LOCAL(user))
@@ -117,7 +117,7 @@ public:
 			if(*parameters[0] != '#')
 				targets--;
 			
-			for(char* c = parameters[0]; *c; c++)
+			for(const char* c = parameters[0]; *c; c++)
 				if((*c == ',') && *(c+1) && (*(c+1) == '#'))
 					targets++;
 					
@@ -126,7 +126,8 @@ public:
 					userchans++;
 
 			// Check that this message wasn't already sent within a few seconds.
-			BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock");
+			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...
@@ -168,10 +169,11 @@ public:
 		if(target_type == TYPE_USER)
 		{
 			userrec* user = (userrec*)item;
-			BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock");
+			BlockedMessage* m;
+			user->GetExt("amsgblock", m);
 			if(m)
 			{
-				delete m;
+				DELETE(m);
 				user->Shrink("amsgblock");
 			}
 		}