X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=5482e1e4b0cf92eb3ca6474c5301e87a90021b38;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=19e1fe3d92bdf14526262b6eed988d86b0d7002f;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 19e1fe3d9..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,75 +25,72 @@ class ChanFilter : public ListModeBase { public: - ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { } - - virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word) + 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(userrec* user, chanrec* chan, std::string &word) + + 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(userrec* user, chanrec* chan, std::string &word) + + 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(userrec* user, chanrec* chan, std::string &word) + + 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, 'g')) + if (!ServerInstance->Modes->AddMode(cf)) throw ModuleException("Could not add new modes!"); - } - void Implements(char* List) - { - cf->DoImplements(List); - List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1; + 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(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { cf->DoChannelDelete(chan); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { cf->DoRehash(); } - virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text) + 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); @@ -101,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; } } @@ -112,39 +109,45 @@ class ModuleChanFilter : public Module return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { - return ProcessMessages(user,(chanrec*)dest,text); + 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 int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + + 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(chanrec* chan, Module* proto, void* opaque) + + virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { cf->DoSyncChannel(chan, proto, opaque); } 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); + delete cf; + ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); } };