Don't route after nuking the user from orbit, there's no point (minor)

[user/henk/code/inspircd.git] / src / modules / m_cban.cpp

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 79adf9fcf471c60c26a8f56049e32eb0a94cde7a..94d99c3747418569df89026d4e76a9097fa9d6b0 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -88,25 +88,25 @@ class CommandCBan : public Command
                TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
        }
 
-       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                /* syntax: CBAN #channel time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
 
-               if(pcnt == 1)
+               if (parameters.size() == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0], "CBAN", user))
+                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick,parameters[0].c_str());
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick,parameters[0]);
+                               user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick,parameters[0].c_str());
                        }
 
                        return CMD_SUCCESS;
                }
-               else if (pcnt >= 2)
+               else if (parameters.size() >= 2)
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
                        long duration = ServerInstance->Duration(parameters[1]);
@@ -114,7 +114,7 @@ class CommandCBan : public Command
 
                        try
                        {
-                               r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+                               r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
                        }
                        catch (...)
                        {
@@ -127,12 +127,12 @@ class CommandCBan : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick, parameters[0]);
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick, parameters[0].c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick, parameters[0],
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick, parameters[0].c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                                        }
 
@@ -141,7 +141,7 @@ class CommandCBan : public Command
                                else
                                {
                                        delete r;
-                                       user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick, parameters[0]);
+                                       user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick, parameters[0].c_str());
                                }
                        }
                }
@@ -177,7 +177,7 @@ class ModuleCBan : public Module
                return 0;
        }
 
-       virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
+       virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
        {
                XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);