X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=5482e1e4b0cf92eb3ca6474c5301e87a90021b38;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=53a0ff0334ba5a9232d5888d3d5e3cd87419694b;hpb=6fa2633311098d9775593186f5f5e1d339434cd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 53a0ff033..5482e1e4b 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,53 +25,55 @@
 class ChanFilter : public ListModeBase
 {
  public:
-	ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
-	
+	ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+
 	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
 		if ((word.length() > 35) || (word.empty()))
 		{
-			user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,word.c_str(), (word.empty() ? "short" : "long"));
+			user->WriteNumeric(935, "%s %s %s :word is too %s for censor list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
 			return false;
 		}
-		
+
 		return true;
 	}
-	
+
 	virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
+		user->WriteNumeric(939, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
 		return true;
 	}
-	
+
 	virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
+		user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str());
 	}
-	
+
 	virtual void TellNotSet(User* user, Channel* chan, std::string &word)
 	{
-		user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name);
+		user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str());
 	}
 };
 
 class ModuleChanFilter : public Module
 {
-	
+
 	ChanFilter* cf;
-	
+
  public:
- 
+
 	ModuleChanFilter(InspIRCd* Me)
 		: Module(Me)
 	{
 		cf = new ChanFilter(ServerInstance);
-		if (!ServerInstance->AddMode(cf))
+		if (!ServerInstance->Modes->AddMode(cf))
 			throw ModuleException("Could not add new modes!");
 
 		cf->DoImplements(this);
 		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
+
+		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 	}
 
 	virtual void OnChannelDelete(Channel* chan)
@@ -86,12 +88,9 @@ class ModuleChanFilter : public Module
 
 	virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
-		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
+		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
 			return 0;
 
-		// Create a copy of the string in irc::string
-		irc::string line = text.c_str();
-
 		modelist* list;
 		chan->GetExt(cf->GetInfoKey(), list);
 
@@ -99,9 +98,9 @@ class ModuleChanFilter : public Module
 		{
 			for (modelist::iterator i = list->begin(); i != list->end(); i++)
 			{
-				if (line.find(i->mask.c_str()) != std::string::npos)
+				if (InspIRCd::Match(text, i->mask))
 				{
-					user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->mask.c_str());
+					user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
 					return 1;
 				}
 			}
@@ -116,19 +115,24 @@ class ModuleChanFilter : public Module
 		{
 			return ProcessMessages(user,(Channel*)dest,text);
 		}
-		else return 0;
+		return 0;
 	}
 
 	virtual void OnCleanup(int target_type, void* item)
 	{
 		cf->DoCleanup(target_type, item);
 	}
-	
+
+	virtual const char* OnRequest(Request* request)
+	{
+		return cf->DoOnRequest(request);
+	}
+
 	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
-	
+
 	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		cf->DoSyncChannel(chan, proto, opaque);
@@ -136,13 +140,14 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 	virtual ~ModuleChanFilter()
 	{
 		ServerInstance->Modes->DelMode(cf);
 		delete cf;
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };