- Remove duplicate call to MatchText in filter.. it seems to work ok for me, fingers...

[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 4942b7fb40dcdfb39f12011b0d194ba67ef41ff3..36073db3b8036c3ebb71951bf567a1838edaaafa 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -2,30 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-// Message and notice filtering using glob patterns
-// a module based on the original work done by Craig Edwards in 2003
-// for the chatspike network.
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "m_filter.h"
 
 /* $ModDesc: An advanced spam filtering module */
@@ -40,14 +29,9 @@ class ModuleFilter : public FilterBase
 
  public:
        ModuleFilter(InspIRCd* Me)
-               : FilterBase::FilterBase(Me)
+       : FilterBase(Me, "m_filter.so")
        {
-               // read the configuration file on startup.
-               // it is perfectly valid to set <filter file> to the value of the
-               // main config file, then append your <keyword> tags to the bottom
-               // of the main config... but rather messy. That's why the capability
-               // of using a seperate config file is provided.
-               OnRehash("");
+               OnRehash(NULL,"");
        }
        
        virtual ~ModuleFilter()
@@ -56,12 +40,18 @@ class ModuleFilter : public FilterBase
 
        virtual FilterResult* FilterMatch(const std::string &text)
        {
-               std::string text2 = text+" ";
                for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
                {
-                       if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
+                       if (ServerInstance->MatchText(text,index->first))
                        {
-                               return index->second;
+                               FilterResult* fr = index->second;
+                               if (index != filters.begin())
+                               {
+                                       std::string pat = index->first;
+                                       filters.erase(index);
+                                       filters.insert(filters.begin(), std::make_pair(pat,fr));
+                               }
+                               return fr;
                        }
                }
                return NULL;
@@ -71,6 +61,7 @@ class ModuleFilter : public FilterBase
        {
                if (filters.find(freeform) != filters.end())
                {
+                       delete (filters.find(freeform))->second;
                        filters.erase(filters.find(freeform));
                        return true;
                }
@@ -88,22 +79,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(userrec* user, 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);
@@ -114,10 +111,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.
@@ -141,7 +152,7 @@ class ModuleFilterFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleFilterFactory;
 }