Review and optimize

[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 679df66bc5d25f9b7c38f71f344a2834a65ec09f..d43ad7373b05bfe3edd4057ce9fb915866eb8109 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+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.
@@ -23,39 +25,39 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
 
-        
-
 class ModuleFilter : public Module
 {
  Server *Srv;
  ConfigReader *Conf, *MyConf;
  
  public:
-       ModuleFilter()
+       ModuleFilter(Server* Me)
+               : Module::Module(Me)
        {
                // 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.
-               Srv = new Server;
+               Srv = Me;
                Conf = new ConfigReader;
                std::string filterfile = Conf->ReadValue("filter","file",0);
                MyConf = new ConfigReader(filterfile);
                if ((filterfile == "") || (!MyConf->Verify()))
                {
-                       printf("Error, could not find <filter file=\"\"> definition in your config file!");
-                       exit(0);
+                       printf("Error, could not find <filter file=\"\"> definition in your config file!\n");
+                       log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
+                       return;
                }
                Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
        }
        
        virtual ~ModuleFilter()
        {
-               delete Srv;
                delete MyConf;
                delete Conf;
        }
@@ -64,11 +66,11 @@ class ModuleFilter : public Module
        
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
        {
-               std::string text2 = text + " ";
+               std::string text2 = text+" ";
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
-                       if (Srv->MatchText(text2,pattern))
+                       if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
                        {
                                std::string target = "";
                                std::string reason = MyConf->ReadValue("keyword","reason",index);
@@ -113,11 +115,11 @@ class ModuleFilter : public Module
        
        virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
        {
-               std::string text2 = text + " ";
+               std::string text2 = text+" ";
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
-                       if (Srv->MatchText(text2,pattern))
+                       if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
                        {
                                std::string target = "";
                                std::string reason = MyConf->ReadValue("keyword","reason",index);
@@ -158,7 +160,7 @@ class ModuleFilter : public Module
                return 0;
        }
        
-       virtual void OnRehash()
+       virtual void OnRehash(std::string parameter)
        {
                // reload our config file on rehash - we must destroy and re-allocate the classes
                // to call the constructor again and re-read our data.
@@ -172,7 +174,8 @@ class ModuleFilter : public Module
                {
                        // bail if the user forgot to create a config file
                        printf("Error, could not find <filter file=\"\"> definition in your config file!");
-                       exit(0);
+                       log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
+                       return;
                }
                Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
        }
@@ -180,7 +183,7 @@ class ModuleFilter : public Module
        virtual Version GetVersion()
        {
                // This is version 2 because version 1.x is the unreleased unrealircd module
-               return Version(2,0,0,0);
+               return Version(2,0,0,1,VF_VENDOR);
        }
        
 };
@@ -198,9 +201,9 @@ class ModuleFilterFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleFilter;
+               return new ModuleFilter(Me);
        }
        
 };