Resolve /STATS S conflict between SVSHOLD and SHUN

[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 a466978e381be02c9c1f8423e600b82190793a34..faa064dbf5d5d16bd77581c38b77d24f501f2cee 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -72,7 +72,6 @@ class ModuleChanFilter : public Module
                ServerInstance->Modules->Attach(eventlist, this, 4);
 
                OnRehash(NULL);
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
 
        virtual void OnRehash(User* user)
@@ -84,8 +83,7 @@ class ModuleChanFilter : public Module
 
        virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
        {
-               ModResult res;
-               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter"));
+               ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter");
 
                if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
@@ -136,12 +134,11 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR);
+               return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
        }
 
        virtual ~ModuleChanFilter()
        {
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };