More numerics.h conversion

[user/henk/code/inspircd.git] / src / commands / cmd_zline.cpp

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index c4bc750c70d0cea861d4f458f1d2db2f48fc5093..6151d7181e72f113e5d96b79cdc04d977177c1b2 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -22,15 +22,15 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandZline(Instance);
 }
 
-CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string target = parameters[0];
 
-       if (pcnt >= 3)
+       if (parameters.size() >= 3)
        {
-               if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!'))
+               if (target.find('!') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
+                       user->WriteServ("NOTICE %s :*** You cannot include a nickname in a zline, a zline must ban only an IP mask",user->nick.c_str());
                        return CMD_FAILURE;
                }
 
@@ -44,7 +44,7 @@ CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *u
                if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
                        return CMD_FAILURE;
 
-               long duration = ServerInstance->Duration(parameters[1]);
+               long duration = ServerInstance->Duration(parameters[1].c_str());
 
                const char* ipaddr = target.c_str();
                User* find = ServerInstance->FindNick(target.c_str());
@@ -62,17 +62,17 @@ CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *u
                                ipaddr++;
                        }
                }
-               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
                if (ServerInstance->XLines->AddLine(zl,user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,target.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick.c_str(),target.c_str());
                        }
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,target.c_str(),
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick.c_str(),target.c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
@@ -80,18 +80,18 @@ CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *u
                else
                {
                        delete zl;
-                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
+                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),target.c_str());
                }
        }
        else
        {
                if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick.c_str(),target.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,target.c_str());
+                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick.c_str(),target.c_str());
                        return CMD_FAILURE;
                }
        }