Add extra parameter to OnUserPreNotice and OnUserPrePrivmsg, CUList &exempt_list...

[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 0b6c386ba42c5ba82a6fa9a73bc19a0da1d6e46d..1074b27bb913873056b1b0ad9a1d1309e123411c 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -66,6 +66,7 @@ class ModuleFilter : public FilterBase
        {
                if (filters.find(freeform) != filters.end())
                {
+                       delete (filters.find(freeform))->second;
                        filters.erase(filters.find(freeform));
                        return true;
                }
@@ -83,22 +84,28 @@ class ModuleFilter : public FilterBase
                x->reason = reason;
                x->action = type;
                x->gline_time = duration;
+               x->freeform = freeform;
                filters[freeform] = x;
 
                return std::make_pair(true, "");
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void SyncFilters(Module* proto, void* opaque)
        {
-               // this automatically re-reads the configuration file into the class
-               ConfigReader* MyConf = new ConfigReader(ServerInstance);
                for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
                {
-                       DELETE(n->second);
+                       this->SendFilter(proto, opaque, n->second);
                }
-               filters.clear();
+       }
+
+       virtual void OnRehash(const std::string &parameter)
+       {
+               ConfigReader* MyConf = new ConfigReader(ServerInstance);
+
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
                {
+                       this->DeleteFilter(MyConf->ReadValue("keyword","pattern",index));
+
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
                        std::string reason = MyConf->ReadValue("keyword","reason",index);
                        std::string do_action = MyConf->ReadValue("keyword","action",index);
@@ -109,10 +116,24 @@ class ModuleFilter : public FilterBase
                        x->reason = reason;
                        x->action = do_action;
                        x->gline_time = gline_time;
+                       x->freeform = pattern;
                        filters[pattern] = x;
                }
                DELETE(MyConf);
        }
+
+       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       {
+               if (symbol == 's')
+               {
+                       std::string sn = ServerInstance->Config->ServerName;
+                       for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
+                       {
+                               results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+                       }
+               }
+               return 0;
+       }
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.