Added "char status" parameter to OnUserPreNotice and OnUserPreMessage for NOTICE @#chan etc.

Tidied up craq++ in modules (copy and pasting OnUserPreNotice into OnUserPreMessage?! why not just call one from the other!)


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3072 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 3 insertions, 18 deletions

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 2b931daec..19c69ec4b 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -122,7 +122,7 @@ class ModuleStripColor : public Module
 		text = sentence;
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		bool active = false;
 		if (target_type == TYPE_USER)
@@ -142,24 +142,9 @@ class ModuleStripColor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		bool active = false;
-		if (target_type == TYPE_USER)
-		{
-			userrec* t = (userrec*)dest;
-			active = (strchr(t->modes,'S') > 0);
-		}
-		else if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* t = (chanrec*)dest;
-			active = (t->IsCustomModeSet('S'));
-		}
-		if (active)
-		{
-			this->ReplaceLine(text);
-		}
-		return 0;
+		return OnUserPreMessage(user,dest,target_type,text,status);
 	}
 	
 	virtual Version GetVersion()