Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 1b5764bdc05b238b31fce7cef1470f30e570f86f..95e24a7eac232daa8214e379b0418c19915d03a5 100644 (file)
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -22,43 +22,50 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KLINE
  */
-CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (pcnt >= 3)
+    std::string target = parameters[0];
+
+       if (parameters.size() >= 3)
        {
                IdentHostPair ih;
-               User* find = ServerInstance->FindNick(parameters[0]);
+               User* find = ServerInstance->FindNick(target.c_str());
                if (find)
                {
                        ih.first = "*";
                        ih.second = find->GetIPString();
-                       std::string c = std::string("*@") + find->GetIPString();
-                       parameters[0] = c.c_str();
+                       target = std::string("*@") + find->GetIPString();
                }
                else
-                       ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+                       ih = ServerInstance->XLines->IdentSplit(target.c_str());
+                       
+        if (ih.first.empty())
+        {
+            user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
+            return CMD_FAILURE;
+        }
 
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
-               if (strchr(parameters[0],'!'))
+               if (target.find('!') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick);
+                       user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick.c_str());
                        return CMD_FAILURE;
                }
 
-               long duration = ServerInstance->Duration(parameters[1]);
-               KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               long duration = ServerInstance->Duration(parameters[1].c_str());
+               KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(kl,user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-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 K-line for %s, expires on %s",user->nick,parameters[0],
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick.c_str(),target.c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
 
@@ -67,18 +74,18 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
                else
                {
                        delete kl;
-                       user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick.c_str(),target.c_str());
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0],"K",user))
+               if (ServerInstance->XLines->DelLine(target.c_str(),"K",user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick.c_str(),target.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick.c_str(),target.c_str());
                }
        }