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, 15 insertions, 13 deletions

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 8a6f94921..0b457a6eb 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -27,58 +27,60 @@ extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
+	std::string target;
+
 	if (pcnt >= 3)
 	{
-		if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
+		if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!'))
 		{
 			user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
 			return CMD_FAILURE;
 		}
 
-		userrec *u = ServerInstance->FindNick(parameters[0]);
+		userrec *u = ServerInstance->FindNick(target.c_str());
 		
 		if (u)
 		{
-			parameters[0] = u->GetIPString();
+			target = u->GetIPString();
 		}
 
-		if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+		if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
 			return CMD_FAILURE;
 
 		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0]))
+		if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],target.c_str()))
 		{
 			int to_apply = APPLY_ZLINES;
 
-			FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
+			FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], target.c_str()));
 			if (!duration)
 			{
 				to_apply |= APPLY_PERM_ONLY;
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,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,parameters[0],
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,target.c_str(),
 						ServerInstance->TimeString(c_requires_crap).c_str());
 			}
 			ServerInstance->XLines->apply_lines(to_apply);
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
 		}
 	}
 	else
 	{
-		if (ServerInstance->XLines->del_zline(parameters[0]))
+		if (ServerInstance->XLines->del_zline(target.c_str()))
 		{
-			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
+			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, target.c_str()));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,target.c_str());
 			return CMD_FAILURE;
 		}
 	}