Note where to find the docs.

[user/henk/code/inspircd.git] / src / modules / m_chanfilter.cpp

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 4a5dcb2b3616fb31f344cd037b24c5ed2e6f1359..5482e1e4b0cf92eb3ca6474c5301e87a90021b38 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -72,6 +72,8 @@ class ModuleChanFilter : public Module
                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,7 +98,7 @@ 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->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;
@@ -124,6 +123,11 @@ class ModuleChanFilter : public Module
                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);
@@ -136,13 +140,14 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 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);
        }
 };