* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class ModuleChanFilter : public Module
{
-
- ChanFilter* cf;
+ ChanFilter cf;
+ bool hidemask;
public:
ModuleChanFilter(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), cf(Me)
{
- cf = new ChanFilter(ServerInstance);
- if (!ServerInstance->Modes->AddMode(cf))
+ if (!ServerInstance->Modes->AddMode(&cf))
throw ModuleException("Could not add new modes!");
- cf->DoImplements(this);
+ cf.DoImplements(this);
Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
ServerInstance->Modules->Attach(eventlist, this, 6);
+ OnRehash(NULL);
ServerInstance->Modules->PublishInterface("ChannelBanList", this);
}
virtual void OnChannelDelete(Channel* chan)
{
- cf->DoChannelDelete(chan);
+ cf.DoChannelDelete(chan);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
- cf->DoRehash();
+ ConfigReader Conf(ServerInstance);
+ hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
+ cf.DoRehash();
}
virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
return 0;
modelist* list;
- chan->GetExt(cf->GetInfoKey(), list);
+ chan->GetExt(cf.GetInfoKey(), list);
if (list)
{
{
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());
+ 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 1;
}
}
virtual void OnCleanup(int target_type, void* item)
{
- cf->DoCleanup(target_type, item);
+ cf.DoCleanup(target_type, item);
}
virtual const char* OnRequest(Request* request)
{
- return cf->DoOnRequest(request);
+ return cf.DoOnRequest(request);
}
virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- cf->DoSyncChannel(chan, proto, opaque);
+ cf.DoSyncChannel(chan, proto, opaque);
}
virtual Version GetVersion()
virtual ~ModuleChanFilter()
{
- ServerInstance->Modes->DelMode(cf);
- delete cf;
+ ServerInstance->Modes->DelMode(&cf);
ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
}
};