Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

[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 977bab4cbb58053819fc083f13c8f0fd4b02c019..1079505d56839f5830e54861bfc74e23ce780f56 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -76,11 +76,6 @@ class ModuleChanFilter : public Module
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
 
-       virtual void OnChannelDelete(Channel* chan)
-       {
-               cf.DoChannelDelete(chan);
-       }
-
        virtual void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
@@ -88,13 +83,12 @@ class ModuleChanFilter : public Module
                cf.DoRehash();
        }
 
-       virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
+       virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
        {
-               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
-                       return 0;
+               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetPrefixValue(user) == OP_VALUE))
+                       return MOD_RES_PASSTHRU;
 
-               modelist* list;
-               chan->GetExt(cf.GetInfoKey(), list);
+               modelist* list = cf.extItem.get(chan);
 
                if (list)
                {
@@ -106,21 +100,21 @@ class ModuleChanFilter : public Module
                                                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;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        return ProcessMessages(user,(Channel*)dest,text);
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -133,7 +127,7 @@ class ModuleChanFilter : public Module
                return cf.DoOnRequest(request);
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult 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);
        }