Argh, i give up

[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 8feb5be41faad343d0da79083f688fba2f4b7377..58edcbff0f438247a220858d553c2f9ea97893b7 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -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,13 +29,14 @@ 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 flags)
        {
                for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
                {
@@ -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);
 
@@ -106,7 +104,7 @@ class ModuleFilter : public FilterBase
                        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);
-                       long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str());
+                       long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
                        if (do_action.empty())
                                do_action = "none";
                        if (flags.empty())
@@ -114,46 +112,22 @@ class ModuleFilter : public FilterBase
                        FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
                        filters[pattern] = x;
                }
-               DELETE(MyConf);
+               delete MyConf;
        }
 
-       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)