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 138df4aa9671a3d0e50075d3413b601203c72505..51bc2092a151b65dbf0aeb6d19db9f862b54bf47 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -22,15 +22,15 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "hashcomp.h"
 #include "u_listmode.h"
 #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
+ */
 class ChanFilter : public ListModeBase
 {
  public:
@@ -38,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;
                }
                
@@ -81,12 +81,7 @@ class ModuleChanFilter : public Module
        void Implements(char* List) 
        { 
                cf->DoImplements(List);
-               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
-       }
-       
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output,"g",1);
+               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
        }
 
        virtual void OnChannelDelete(chanrec* chan)
@@ -121,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)
                {
@@ -135,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)
@@ -147,11 +142,12 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
        virtual ~ModuleChanFilter()
        {
+               ServerInstance->Modes->DelMode(cf);
                DELETE(cf);
        }
 };