X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence_ext.cpp;h=ba76abc294dc7f7623ad118822925e04a041debf;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=e3f8826e95d42561101d8d24043455c30b8b8d11;hpb=4490e273b1dc62fae144daa3b3cf655156fd1ef0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index e3f8826e9..ba76abc29 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include <vector>
@@ -30,7 +25,7 @@ using namespace std;
 /* $ModDesc: Provides support for the /SILENCE command */
 
 /* Improved drop-in replacement for the /SILENCE command
- * syntax: /SILENCE [+|-]<mask> <p|c|i|n|a|x> as in <private|channel|invites|notices|all|exclude>
+ * syntax: /SILENCE [+|-]<mask> <p|c|i|n|t|a|x> as in <privatemessage|channelmessage|invites|privatenotice|channelnotice|all|exclude>
  *
  * example that blocks all except private messages
  *  /SILENCE +*!*@* a
@@ -219,7 +214,7 @@ class cmd_silence : public command_t
 	/* turn the mask into a nice human readable format */
 	std::string DecompPattern (const int pattern)
 	{
-		std::string out = "";
+		std::string out;
 		if ((pattern & SILENCE_PRIVATE) > 0)
 			out += ",privatemessages";
 		if ((pattern & SILENCE_CHANNEL) > 0)
@@ -255,10 +250,10 @@ class ModuleSilence : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
+		List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
 	{
 		// when the user quits tidy up any silence list they might have just to keep things tidy
 		silencelist* sl;
@@ -276,9 +271,43 @@ class ModuleSilence : public Module
 		output = output + " ESILENCE SILENCE=999";
 	}
 
+	virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list)
+	{
+		int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
+		CUList *ulist;
+		switch (status)
+		{
+			case '@':
+				ulist = chan->GetOppedUsers();
+				break;
+			case '%':
+				ulist = chan->GetHalfoppedUsers();
+				break;
+			case '+':
+				ulist = chan->GetVoicedUsers();
+				break;
+			default:
+				ulist = chan->GetUsers();
+				break;
+		}
+
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			if (IS_LOCAL(i->second))
+			{
+				if (MatchPattern(i->second, sender, public_silence) == 1)
+				{
+					exempt_list[i->second] = i->second;
+				}
+			}
+		}
+	}
 
 	virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
 	{
+		if (!IS_LOCAL(user))
+			return 0;
+
 		if (target_type == TYPE_USER)
 		{
 			return MatchPattern((userrec*)dest, user, silence_type);
@@ -288,33 +317,7 @@ class ModuleSilence : public Module
 			chanrec* chan = (chanrec*)dest;
 			if (chan)
 			{
-				CUList *ulist;
-				switch (status)
-				{
-					case '@':
-						ulist = chan->GetOppedUsers();
-						break;
-					case '%':
-						ulist = chan->GetHalfoppedUsers();
-						break;
-					case '+':
-						ulist = chan->GetVoicedUsers();
-						break;
-					default:
-						ulist = chan->GetUsers();
-						break;
-				}
-	
-				for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				{
-					if ((IS_LOCAL(i->second)) && (user != i->second))
-					{
-						if (MatchPattern(i->second, user, silence_type == SILENCE_PRIVATE ? SILENCE_CHANNEL : SILENCE_CNOTICE) == 1)
-						{
-							exempt_list[i->second] = i->second;
-						}
-					}
-				}
+				this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list);
 			}
 		}
 		return 0;
@@ -343,16 +346,8 @@ class ModuleSilence : public Module
 		{
 			for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
 			{
-				if ((match(source->GetFullHost(), c->first.c_str())) && ( ((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0))
-				{
-					if (((c->second & SILENCE_EXCLUDE) > 0))
-					{
-						return 0;
-					}
-					else {
-						return 1;
-					}
-				}
+				if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first)))
+					return !(((c->second & SILENCE_EXCLUDE) > 0));
 			}
 		}
 		return 0;