X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=651e659b59d437bfd468573ffc1a676a0d03c7f5;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=5482e1e4b0cf92eb3ca6474c5301e87a90021b38;hpb=e9f1fd175bbdc7dde60f5ff05d9470b7efe798ba;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 5482e1e4b..651e659b5 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -1,31 +1,42 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2005 Craig McLure + * Copyright (C) 2005 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */ + #define _CRT_SECURE_NO_DEPRECATE #define _SCL_SECURE_NO_DEPRECATE #include "inspircd.h" #include "u_listmode.h" -/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */ -/* $ModDep: ../../include/u_listmode.h */ - /** Handles channel mode +g */ class ChanFilter : public ListModeBase { public: - ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } + ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } virtual bool ValidateParam(User* user, Channel* chan, std::string &word) { @@ -57,42 +68,41 @@ class ChanFilter : public ListModeBase class ModuleChanFilter : public Module { - - ChanFilter* cf; + ChanFilter cf; + bool hidemask; public: - ModuleChanFilter(InspIRCd* Me) - : Module(Me) + ModuleChanFilter() + : cf(this) { - cf = new ChanFilter(ServerInstance); - 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) + void init() { - cf->DoChannelDelete(chan); + ServerInstance->Modules->AddService(cf); + + cf.DoImplements(this); + Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + + OnRehash(NULL); } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { - cf->DoRehash(); + hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask"); + cf.DoRehash(); } - virtual int ProcessMessages(User* user,Channel* chan,std::string &text) + virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text) { - if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)) - return 0; + ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter"); + + if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - modelist* list; - chan->GetExt(cf->GetInfoKey(), list); + modelist* list = cf.extItem.get(chan); if (list) { @@ -100,54 +110,44 @@ class ModuleChanFilter : public Module { if (InspIRCd::Match(text, i->mask)) { - 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; + if (hidemask) + user->WriteNumeric(404, "%s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str()); + else + user->WriteNumeric(404, "%s %s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str(), i->mask.c_str()); + return MOD_RES_DENY; } } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { return ProcessMessages(user,(Channel*)dest,text); } - 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); + return MOD_RES_PASSTHRU; } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult 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); + cf.DoSyncChannel(chan, proto, opaque); } virtual Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR); } virtual ~ModuleChanFilter() { - ServerInstance->Modes->DelMode(cf); - delete cf; - ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); } };