All working now, with any luck

[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 50f9ebf0810db07188f66555c9459851e969e709..d96873dc1e0631b384284fac98e55beb559fdf31 100644 (file)
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -24,22 +24,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  */
 CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
 {
+    std::string target = parameters[0];
+
        if (pcnt >= 3)
        {
                IdentHostPair ih;
-               User* find = ServerInstance->FindNick(parameters[0]);
+               User* find = ServerInstance->FindNick(target.c_str());
                if (find)
                {
                        ih.first = "*";
                        ih.second = find->GetIPString();
+                       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);
+            return CMD_FAILURE;
+        }
 
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
-               if (strchr(parameters[0],'!'))
+               if (strchr(target.c_str(),'!'))
                {
                        user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick);
                        return CMD_FAILURE;
@@ -51,12 +60,12 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *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,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,target.c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
 
@@ -65,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,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,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,target.c_str());
                }
        }