cgiirc: Pass hosts to WEBIRC command on rehash. No fucking wonder this never worked...

[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 50df5b1cc12bb2d620cbebd464fc77818dac1118..02c39aefe007eaca3a8e2741f5cd0be43f6274de 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -59,6 +59,7 @@ class ModuleChanFilter : public Module
 {
 
        ChanFilter* cf;
+       bool hidemask;
 
  public:
 
@@ -72,6 +73,9 @@ 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);
+
+               OnRehash(NULL);
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
 
        virtual void OnChannelDelete(Channel* chan)
@@ -79,8 +83,10 @@ class ModuleChanFilter : public Module
                cf->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
+               ConfigReader Conf(ServerInstance);
+               hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
                cf->DoRehash();
        }
 
@@ -98,7 +104,10 @@ 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());
+                                       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;
                                }
                        }
@@ -121,6 +130,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);
@@ -140,6 +154,7 @@ class ModuleChanFilter : public Module
        {
                ServerInstance->Modes->DelMode(cf);
                delete cf;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };