X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_zline.cpp;h=c1951d44765cdb61003e4594070bc086fb2a4165;hb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;hp=95063c8e288c7e529b7c720acd85b267b6bf5e61;hpb=8782cde20b474cf50f11fc6685c70a785bb3b2be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 95063c8e2..c1951d447 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -22,50 +22,76 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandZline(Instance);
 }
 
-CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt >= 3)
+	std::string target = parameters[0];
+
+	if (parameters.size() >= 3)
 	{
-		if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
+		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);
 			return CMD_FAILURE;
 		}
 
-		if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+		User *u = ServerInstance->FindNick(target.c_str());
+		
+		if (u)
+		{
+			target = u->GetIPString();
+		}
+
+		if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
 			return CMD_FAILURE;
 
-		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->AddZLine(duration,user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1].c_str());
+
+		const char* ipaddr = target.c_str();
+		User* find = ServerInstance->FindNick(target.c_str());
+
+		if (find)
+		{
+			ipaddr = find->GetIPString();
+		}
+		else
+		{
+			if (strchr(ipaddr,'@'))
+			{
+				while (*ipaddr != '@')
+					ipaddr++;
+				ipaddr++;
+			}
+		}
+		ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), ipaddr);
+		if (ServerInstance->XLines->AddLine(zl,user))
 		{
-			FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
 			if (!duration)
 			{
-				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->ApplyLines();
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+			delete zl;
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
 		}
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'Z'))
+		if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
 		{
-			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
+			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;
 		}
 	}