Make rehash work more than once per run, and fix some uninitialized values in connect...

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

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 514fd7e6b92133091781cdda0aad83d2a1ddd1a1..fb4538224c423fdb4f89ae4c6ddd3a427718585d 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -113,7 +113,7 @@ protected:
        virtual void SendFilter(Module* proto, void* opaque, FilterResult* iter);
        virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) = 0;
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-       virtual void OnRehash(User* user, const std::string &parameter);
+       virtual void OnRehash(User* user);
        virtual Version GetVersion();
        std::string EncodeFilter(FilterResult* filter);
        FilterResult DecodeFilter(const std::string &data);
@@ -144,7 +144,7 @@ class CommandFilter : public Command
                        if (Base->DeleteFilter(parameters[0]))
                        {
                                user->WriteServ("NOTICE %s :*** Removed filter '%s'", user->nick.c_str(), parameters[0].c_str());
-                               ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" removed filter '"+parameters[0]+"'");
+                               ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'a' : 'A', std::string("FILTER: ")+user->nick+" removed filter '"+parameters[0]+"'");
                                return CMD_SUCCESS;
                        }
                        else
@@ -195,7 +195,7 @@ class CommandFilter : public Command
                                                        type.c_str(), (duration ? ", duration " : ""), (duration ? parameters[3].c_str() : ""),
                                                        flags.c_str(), reason.c_str());
 
-                                       ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason);
+                                       ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'a' : 'A', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason);
 
                                        return CMD_SUCCESS;
                                }
@@ -251,19 +251,22 @@ FilterBase::~FilterBase()
 
 int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
+       if (!IS_LOCAL(user))
+               return 0;
+
        flags = FLAG_PRIVMSG;
        return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 }
 
 int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
-       if (!flags)
-               flags = FLAG_NOTICE;
-
        /* Leave ulines alone */
        if ((ServerInstance->ULine(user->server)) || (!IS_LOCAL(user)))
                return 0;
 
+       if (!flags)
+               flags = FLAG_NOTICE;
+
        FilterResult* f = this->FilterMatch(user, text, flags);
        if (f)
        {
@@ -282,7 +285,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                }
                if (f->action == "block")
                {
-                       ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason);
+                       ServerInstance->SNO->WriteGlobalSno('a', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason);
                        if (target_type == TYPE_CHANNEL)
                                user->WriteNumeric(404, "%s %s :Message to channel blocked and opers notified (%s)",user->nick.c_str(), target.c_str(), f->reason.c_str());
                        else
@@ -406,7 +409,7 @@ int FilterBase::OnPreCommand(std::string &command, std::vector<std::string> &par
        return 0;
 }
 
-void FilterBase::OnRehash(User* user, const std::string &parameter)
+void FilterBase::OnRehash(User* user)
 {
        ConfigReader MyConf(ServerInstance);
        std::vector<std::string>().swap(exemptfromfilter);
@@ -423,7 +426,7 @@ void FilterBase::OnRehash(User* user, const std::string &parameter)
                if (RegexEngine == newrxengine)
                        return;
 
-               ServerInstance->SNO->WriteToSnoMask('a', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str());
                //ServerInstance->XLines->DelAll("R");
        }
        rxengine = NULL;
@@ -436,14 +439,14 @@ void FilterBase::OnRehash(User* user, const std::string &parameter)
                {
                        if (RegexNameRequest(this, *i).Send() == newrxengine)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', "Filter now using engine '%s'", RegexEngine.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Filter now using engine '%s'", RegexEngine.c_str());
                                rxengine = *i;
                        }
                }
        }
        if (!rxengine)
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str());
        }
 }
 
@@ -459,7 +462,7 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name)
                         * on startup or on load are applied right now.
                         */
                        ConfigReader Config(ServerInstance);
-                       ServerInstance->SNO->WriteToSnoMask('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
                        ReadFilters(Config);
                }
        }
@@ -556,7 +559,7 @@ class ModuleFilter : public FilterBase
        ModuleFilter(InspIRCd* Me)
        : FilterBase(Me, "m_filter.so")
        {
-               OnRehash(NULL,"");
+               OnRehash(NULL);
        }
 
        virtual ~ModuleFilter()
@@ -633,10 +636,10 @@ class ModuleFilter : public FilterBase
                return std::make_pair(true, "");
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader MyConf(ServerInstance);
-               FilterBase::OnRehash(user, parameter);
+               FilterBase::OnRehash(user);
                ReadFilters(MyConf);
        }