We were already sending FMODE +nt after each channel creation to keep services happy...

[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 7bbe5b56a24e5e121448f0d77f2d0ac8530ae847..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,9 +29,9 @@ class ModuleFilter : public FilterBase
 
  public:
        ModuleFilter(InspIRCd* Me)
-       : FilterBase::FilterBase(Me, "m_filter.so")
+       : FilterBase(Me, "m_filter.so")
        {
-               OnRehash("");
+               OnRehash(NULL,"");
        }
        
        virtual ~ModuleFilter()
@@ -51,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;
@@ -98,7 +93,7 @@ class ModuleFilter : public FilterBase
                }
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
 
@@ -129,7 +124,7 @@ class ModuleFilter : public FilterBase
                        std::string sn = ServerInstance->Config->ServerName;
                        for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
                        {
-                               results.push_back(sn+" 223 "+user->nick+" :"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+                               results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
                        }
                }
                return 0;
@@ -157,7 +152,7 @@ class ModuleFilterFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleFilterFactory;
 }