K|G|Z|ELine fix, from 8901

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8902 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 20 insertions, 13 deletions

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index b4c666923..c8c2fbe53 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -27,46 +27,53 @@ extern "C" DllExport command_t* init_command(InspIRCd* Instance)
  */
 CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
+	std::string target = parameters[0];
+
 	if (pcnt >= 3)
 	{
 		IdentHostPair ih;
-		userrec* find = ServerInstance->FindNick(parameters[0]);
+		userrec* find = ServerInstance->FindNick(target.c_str());
 		if (find)
 		{
 			std::string c = std::string("*@") + find->GetIPString();
 			ih.first = "*";
 			ih.second = find->GetIPString();
-			parameters[0] = c.c_str();
+			target = c.c_str();
 		}
 		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;
 		}
 
 		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],parameters[0]))
+		if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],target.c_str()))
 		{
 			int to_apply = APPLY_KLINES;
 
-			FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0]));
+			FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], target.c_str()));
 	
 			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());
 				to_apply |= APPLY_PERM_ONLY;
 			}
 			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());
 			}
 
@@ -74,19 +81,19 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 		else
 		{
-			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->del_kline(parameters[0]))
+		if (ServerInstance->XLines->del_kline(target.c_str()))
 		{
-			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
+			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, target.c_str()));
+			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());
 		}
 	}