Remote server PRIVMSG/NOTICE to nickname support

[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 926b6b03ec4ad5f9224c834369cd6970b770ff02..2be2cfeca39a912d8d3d5366a6cf50d7ba1e3458 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "m_filter.h"
 
 /* $ModDesc: An advanced spam filtering module */
@@ -32,19 +29,20 @@ class ModuleFilter : public FilterBase
        : FilterBase(Me, "m_filter.so")
        {
                OnRehash(NULL,"");
+
        }
        
        virtual ~ModuleFilter()
        {
        }
 
-       virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
+       virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
        {
                for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
                {
 
                        /* Skip ones that dont apply to us */
-                       if (!FilterBase::AppliesToMe(user, index->second, flags))
+                       if (!FilterBase::AppliesToMe(user, index->second, iflags))
                                continue;
 
                        if (ServerInstance->MatchText(text,index->first))
@@ -73,14 +71,14 @@ class ModuleFilter : public FilterBase
                return false;
        }
 
-       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)
+       virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &sflags)
        {
                if (filters.find(freeform) != filters.end())
                {
                        return std::make_pair(false, "Filter already exists");
                }
 
-               FilterResult* x = new FilterResult(freeform, reason, type, duration, flags);
+               FilterResult* x = new FilterResult(freeform, reason, type, duration, sflags);
                filters[freeform] = x;
 
                return std::make_pair(true, "");
@@ -94,7 +92,7 @@ class ModuleFilter : public FilterBase
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
 
@@ -105,55 +103,32 @@ class ModuleFilter : public FilterBase
                        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);
-                       std::string flags = MyConf->ReadValue("keyword","flags",index);
+                       std::string sflags = MyConf->ReadValue("keyword","flags",index);
                        long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
                        if (do_action.empty())
                                do_action = "none";
-                       if (flags.empty())
-                               flags = "*";
-                       FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
+                       if (sflags.empty())
+                               sflags = "*";
+                       FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, sflags);
                        filters[pattern] = x;
                }
-               DELETE(MyConf);
+               delete MyConf;
+               FilterBase::OnRehash(user, parameter);
        }
 
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       virtual int OnStats(char symbol, User* 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);
+                               results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->flags+" "+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.
-
-class ModuleFilterFactory : public ModuleFactory
-{
- public:
-       ModuleFilterFactory()
-       {
-       }
-       
-       ~ModuleFilterFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleFilter(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleFilterFactory;
-}
 
+MODULE_INIT(ModuleFilter)