Convert remaining InspIRCd::Log() calls to new logging system

[user/henk/code/inspircd.git] / src / modules / m_filter.h

diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index aa866ee82ecfacb0ced1df18e10b0e48daa414f0..e1f97bd72855fc15718f296a7496bca0cf490ed0 100644 (file)
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -36,10 +36,10 @@ class FilterResult : public classbase
        bool flag_privmsg;
        bool flag_notice;
 
-       FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) : freeform(free), reason(rea),
-                                                                       action(act), gline_time(gt), flags(fla)
+       FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) :
+                       freeform(free), reason(rea), action(act), gline_time(gt), flags(fla)
        {
-               this->FillFlags(flags);
+               this->FillFlags(fla);
        }
 
        int FillFlags(const std::string &fl)
@@ -94,10 +94,11 @@ class FilterBase : public Module
 {
        CommandFilter* filtcommand;
        int flags;
+protected:
+       std::vector<std::string> exemptfromfilter; // List of channel names excluded from filtering.
  public:
        FilterBase(InspIRCd* Me, const std::string &source);
        virtual ~FilterBase();
-       virtual void Implements(char* List);
        virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
        virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) = 0;
        virtual bool DeleteFilter(const std::string &freeform) = 0;
@@ -112,7 +113,7 @@ class FilterBase : public Module
        virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable = false);
        virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata);
        virtual int OnStats(char symbol, User* user, string_list &results) = 0;
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line);
        bool AppliesToMe(User* user, FilterResult* filter, int flags);
 };
 
@@ -120,13 +121,13 @@ class CommandFilter : public Command
 {
        FilterBase* Base;
  public:
-       CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f)
+       CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f)
        {
-               this->source = source;
+               this->source = ssource;
                this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, User *user)
+       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
        {
                if (pcnt == 1)
                {
@@ -206,17 +207,17 @@ class CommandFilter : public Command
        }
 };
 
-bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags)
+bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int iflags)
 {
        if ((filter->flag_no_opers) && IS_OPER(user))
                return false;
-       if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
+       if ((iflags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
                return false;
-       if ((flags & FLAG_NOTICE) && (!filter->flag_notice))
+       if ((iflags & FLAG_NOTICE) && (!filter->flag_notice))
                return false;
-       if ((flags & FLAG_QUIT)   && (!filter->flag_quit_message))
+       if ((iflags & FLAG_QUIT)   && (!filter->flag_quit_message))
                return false;
-       if ((flags & FLAG_PART)   && (!filter->flag_part_message))
+       if ((iflags & FLAG_PART)   && (!filter->flag_part_message))
                return false;
        return true;
 }
@@ -225,17 +226,14 @@ FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me)
 {
        filtcommand = new CommandFilter(this, Me, source);
        ServerInstance->AddCommand(filtcommand);
+       Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash };
+       ServerInstance->Modules->Attach(eventlist, this, 7);
 }
 
 FilterBase::~FilterBase()
 {
 }
 
-void FilterBase::Implements(char* List)
-{
-       List[I_OnPreCommand] = List[I_OnStats] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
-}
-
 int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
        flags = FLAG_PRIVMSG;
@@ -264,6 +262,8 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                {
                        Channel* t = (Channel*)dest;
                        target = std::string(t->name);
+                       std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), target);
+                       if (i != exemptfromfilter.end()) return 0;
                }
                if (f->action == "block")
                {       
@@ -289,13 +289,13 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                                delete gl;
                }
 
-               ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
+               ServerInstance->Logs->Log("FILTER",DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
                return 1;
        }
        return 0;
 }
 
-int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+int FilterBase::OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 {
        flags = 0;
        if ((validated == 1) && (IS_LOCAL(user)))
@@ -321,6 +321,8 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                        if (pcnt < 2)
                                return 0;
 
+                       std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), parameters[0]);
+                       if (i != exemptfromfilter.end()) return 0;
                        checkline = parameters[1];
                        replacepoint = 1;
                        parting = true;
@@ -385,8 +387,18 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 
 void FilterBase::OnRehash(User* user, const std::string &parameter)
 {
+       ConfigReader* MyConf = new ConfigReader(ServerInstance);
+       std::vector<std::string>().swap(exemptfromfilter);
+       for (int index = 0; index < MyConf->Enumerate("exemptfromfilter"); ++index)
+       {
+               std::string chan = MyConf->ReadValue("exemptfromfilter", "channel", index);
+               if (!chan.empty()) {
+                       exemptfromfilter.push_back(chan);
+               }
+       }
+       delete MyConf;
 }
-       
+
 Version FilterBase::GetVersion()
 {
        return Version(1,1,0,2,VF_VENDOR|VF_COMMON,API_VERSION);