Remove completed XXX: override is now only checked locally, snotices are automaticall...

[user/henk/code/inspircd.git] / src / modules / m_filter.h

diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 1be1f85fff65c8108a497896d3f051cc4a4522e6..2ec56ea4f015422caed980cbc47e0ae54bea7a98 100644 (file)
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -276,7 +276,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                }
                if (f->action == "kill")
                {
-                       User::QuitUser(ServerInstance,user,"Filtered: "+f->reason);
+                       ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason);
                }
                if (f->action == "gline")
                {
@@ -289,7 +289,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                                delete gl;
                }
 
-               ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
+               ServerInstance->Logs->Log("FILTER",DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
                return 1;
        }
        return 0;
@@ -364,7 +364,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char* const* para
                                if ((parting) && (f->action == "kill"))
                                {
                                        user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
-                                       User::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
+                                       ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason);
                                }
                                if (f->action == "gline")
                                {