Tidyup

[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 139f800823f2a14b6fc8d10b6c5921928294800a..51bc2092a151b65dbf0aeb6d19db9f862b54bf47 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
+/* $ModDep: ../../include/u_listmode.h */
 
 /** Handles channel mode +g
  */
@@ -37,9 +38,9 @@ class ChanFilter : public ListModeBase
        
        virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word)
        {
-               if (word.length() > 35)
+               if ((word.length() > 35) || (word.empty()))
                {
-                       user->WriteServ( "935 %s %s %s :word is too long for censor list",user->nick, chan->name,word.c_str());
+                       user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,word.c_str(), (word.empty() ? "short" : "long"));
                        return false;
                }
                
@@ -115,7 +116,7 @@ class ModuleChanFilter : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -129,9 +130,9 @@ class ModuleChanFilter : public Module
                cf->DoCleanup(target_type, item);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreMessage(user,dest,target_type,text,status);
+               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
        
        virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)