fix some unitialised vectors and tidy up a bit.

[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 5bc41b136ab367665b3b8b5661182b297e021552..7af2204bbc8df18abc0b2b4d39016a54660e9257 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)
@@ -113,7 +113,7 @@ protected:
        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 std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line);
        bool AppliesToMe(User* user, FilterResult* filter, int flags);
 };
 
@@ -121,32 +121,32 @@ 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 std::vector<std::string> &parameters, User *user)
        {
-               if (pcnt == 1)
+               if (parameters.size() == 1)
                {
                        /* Deleting a filter */
                        if (Base->DeleteFilter(parameters[0]))
                        {
-                               user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick, parameters[0]);
+                               user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick, parameters[0].c_str());
                                return CMD_SUCCESS;
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick, parameters[0]);
+                               user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick, parameters[0].c_str());
                                return CMD_FAILURE;
                        }
                }
                else
                {
                        /* Adding a filter */
-                       if (pcnt >= 4)
+                       if (parameters.size() >= 4)
                        {
                                std::string freeform = parameters[0];
                                std::string type = parameters[1];
@@ -163,7 +163,7 @@ class CommandFilter : public Command
 
                                if (type == "gline")
                                {
-                                       if (pcnt >= 5)
+                                       if (parameters.size() >= 5)
                                        {
                                                duration = ServerInstance->Duration(parameters[3]);
                                                reason = parameters[4];
@@ -182,7 +182,7 @@ class CommandFilter : public Command
                                if (result.first)
                                {
                                        user->WriteServ("NOTICE %s :*** Added filter '%s', type '%s'%s%s, flags '%s', reason: '%s'", user->nick, freeform.c_str(),
-                                                       type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3] : ""),
+                                                       type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3].c_str() : ""),
                                                        flags.c_str(), reason.c_str());
                                        return CMD_SUCCESS;
                                }
@@ -207,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;
 }
@@ -276,7 +276,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
                }
                if (f->action == "kill")
                {
-                       User::QuitUser(ServerInstance,user,"Filtered: "+f->reason);
+                       ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason);
                }
                if (f->action == "gline")
                {
@@ -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 std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 {
        flags = 0;
        if ((validated == 1) && (IS_LOCAL(user)))
@@ -307,7 +307,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                if (command == "QUIT")
                {
                        /* QUIT with no reason: nothing to do */
-                       if (pcnt < 1)
+                       if (parameters.size() < 1)
                                return 0;
 
                        checkline = parameters[0];
@@ -318,7 +318,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                else if (command == "PART")
                {
                        /* PART with no reason: nothing to do */
-                       if (pcnt < 2)
+                       if (parameters.size() < 2)
                                return 0;
 
                        std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), parameters[0]);
@@ -345,9 +345,9 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                Command* c = ServerInstance->Parser->GetHandler(command);
                if (c)
                {
-                       const char* params[MAXPARAMETERS];
-                       for (int item = 0; item < pcnt; item++)
-                               params[item] = parameters[item];
+                       std::vector<std::string> params;
+                       for (int item = 0; item < (int)parameters.size(); item++)
+                               params.push_back(parameters[item]);
                        params[replacepoint] = "Reason filtered";
 
                        /* We're blocking, OR theyre quitting and its a KILL action
@@ -355,7 +355,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                         */
                        if ((f->action == "block") || (((!parting) && (f->action == "kill"))) || (f->action == "silent"))
                        {
-                               c->Handle(params, pcnt, user);
+                               c->Handle(params, user);
                                return 1;
                        }
                        else
@@ -364,7 +364,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
                                if ((parting) && (f->action == "kill"))
                                {
                                        user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
-                                       User::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
+                                       ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason);
                                }
                                if (f->action == "gline")
                                {