X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_zline.cpp;h=93ad7f8936bcfe4d0ee59dfa06ebb736a15f1fc9;hb=c4cb1f9477b1fbf8662bedb1c36f84ff6f87e1f3;hp=2a12ee5b54c6922c2bdeed7a44808d53fdd7a5f3;hpb=04e8f8fd991804d38975f54ddd1879809bf94bac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 2a12ee5b5..93ad7f893 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -22,76 +22,69 @@ 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)
 {
 	std::string target = parameters[0];
 
-	if (pcnt >= 3)
+	if (parameters.size() >= 3)
 	{
-		if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!'))
+		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.c_str());
 			return CMD_FAILURE;
 		}
 
 		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]);
-
 		const char* ipaddr = target.c_str();
-		User* find = ServerInstance->FindNick(target.c_str());
 
-		if (find)
-		{
-			ipaddr = find->GetIPString();
-		}
-		else
+		if (strchr(ipaddr,'@'))
 		{
-			if (strchr(ipaddr,'@'))
-			{
-				while (*ipaddr != '@')
-					ipaddr++;
+			while (*ipaddr != '@')
 				ipaddr++;
-			}
+			ipaddr++;
 		}
-		ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+
+		if (ServerInstance->IPMatchesEveryone(ipaddr,user))
+			return CMD_FAILURE;
+
+		long duration = ServerInstance->Duration(parameters[1].c_str());
+
+		ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
 		if (ServerInstance->XLines->AddLine(zl,user))
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,target.c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s: %s", user->nick.c_str(), ipaddr, parameters[2].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,target.c_str(),
-						ServerInstance->TimeString(c_requires_crap).c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
+						ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
 		else
 		{
 			delete zl;
-			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),ipaddr);
 		}
 	}
 	else
 	{
 		if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick.c_str(),target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,target.c_str());
+			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick.c_str(),target.c_str());
 			return CMD_FAILURE;
 		}
 	}