X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=903aab33a8eeb2f5f2e724a0225a6188849152b1;hb=f020429fd33ec1a7bf1114b2db1b2fd5d6bc1650;hp=d201f5418b60bed6dcff04963f41b317a9136590;hpb=d5a6054948502625d7f0c235f6faaeea58734de5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index d201f5418..903aab33a 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,15 +27,26 @@
 #include "listmode.h"
 #include "modules/exemption.h"
 
+enum
+{
+	// InspIRCd-specific.
+	ERR_ALREADYCHANFILTERED = 937,
+	ERR_NOSUCHCHANFILTER = 938,
+	ERR_CHANFILTERFULL = 939
+};
+
 /** Handles channel mode +g
  */
 class ChanFilter : public ListModeBase
 {
  public:
+	unsigned long maxlen;
+
 	ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
-	bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE	{
-		if (word.length() > 35)
+	bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
+	{
+		if (word.length() > maxlen)
 		{
 			user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Word is too long for the spamfilter list"));
 			return false;
@@ -46,17 +57,17 @@ class ChanFilter : public ListModeBase
 
 	void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(939, chan->name, word, "Channel spamfilter list is full");
+		user->WriteNumeric(ERR_CHANFILTERFULL, chan->name, word, "Channel spamfilter list is full");
 	}
 
 	void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(937, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));
+		user->WriteNumeric(ERR_ALREADYCHANFILTERED, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));
 	}
 
 	void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(938, chan->name, "No such spamfilter word is set");
+		user->WriteNumeric(ERR_NOSUCHCHANFILTER, chan->name, "No such spamfilter word is set");
 	}
 };
 
@@ -65,6 +76,7 @@ class ModuleChanFilter : public Module
 	CheckExemption::EventProvider exemptionprov;
 	ChanFilter cf;
 	bool hidemask;
+	bool notifyuser;
 
  public:
 
@@ -76,7 +88,10 @@ class ModuleChanFilter : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
+		ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter");
+		hidemask = tag->getBool("hidemask");
+		cf.maxlen = tag->getUInt("maxlen", 35, 10, 100);
+		notifyuser = tag->getBool("notifyuser", true);
 		cf.DoRehash();
 	}
 
@@ -99,10 +114,16 @@ class ModuleChanFilter : public Module
 			{
 				if (InspIRCd::Match(details.text, i->mask))
 				{
+					if (!notifyuser)
+					{
+						details.echo_original = true;
+						return MOD_RES_DENY;
+					}
+
 					if (hidemask)
 						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)");
 					else
-						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, i->mask, "Cannot send to channel (your message contained a censored word)");
+						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word: " + i->mask + ")");
 					return MOD_RES_DENY;
 				}
 			}
@@ -113,7 +134,12 @@ class ModuleChanFilter : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
+		// We don't send any link data if the length is 35 for compatibility with the 2.0 branch.
+		std::string maxfilterlen;
+		if (cf.maxlen != 35)
+			maxfilterlen.assign(ConvToStr(cf.maxlen));
+
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR, maxfilterlen);
 	}
 };