From 081a0a9a81f2f1187b64e2e443da02263fff8201 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 15 Aug 2007 18:13:49 +0000
Subject: [PATCH] Merge 7719, 7720

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@7721 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_messageflood.cpp | 27 ++++++++++++++++-----------
 src/modules/m_nicklock.cpp     |  6 +++---
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 2d0cd43fd..1a89ea428 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -216,11 +216,11 @@ class ModuleMsgFlood : public Module
 			throw ModuleException("Could not add new modes!");
 	}
 	
-	void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
+	int ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
 	{
 		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
 		{
-			return;
+			return 0;
 		}
 
 		floodsettings *f;
@@ -254,25 +254,30 @@ class ModuleMsgFlood : public Module
 				char kickmessage[MAXBUF];
 				snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
 				if (!dest->ServerKickUser(user, kickmessage, true))
+				{
 					delete dest;
+					return 1;
+				}
 			}
 		}
+		
+		return 0;
 	}
 
-	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+	virtual int OnUserPreMessage(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-		{
-			ProcessMessages(user,(chanrec*)dest,text);
-		}
+			return ProcessMessages(user,(chanrec*)dest,text);
+		
+		return 0;
 	}
 
-	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+	virtual int OnUserPreNotice(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-		{
-			ProcessMessages(user,(chanrec*)dest,text);
-		}
+			return ProcessMessages(user,(chanrec*)dest,text);
+			
+		return 0;
 	}
 
 	void OnChannelDelete(chanrec* chan)
@@ -287,7 +292,7 @@ class ModuleMsgFlood : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
+		List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
 	}
 
 	virtual ~ModuleMsgFlood()
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 01b9d20a7..8c81fd4c3 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -25,7 +25,7 @@ class cmd_nicklock : public command_t
 {
 	char* dummy;
  public:
- cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
+	cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
@@ -79,9 +79,9 @@ class cmd_nicklock : public command_t
 class cmd_nickunlock : public command_t
 {
  public:
- cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
+	cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
 	{
-		this->source = "m_nickunlock.so";
+		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
 	}