X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kick.cpp;h=e26ec865314a653476afedba59e3405b0205a6a6;hb=1064b6732975ad32ac32147974a3af2d888a7e12;hp=9cf4f8b5c390062d04fe1924008c9612a10d8c56;hpb=86dd9fa5ea02644096f3529a6cbf3a55b5bb1d60;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 9cf4f8b5c..e26ec8653 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.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.
@@ -21,37 +21,37 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KICK
  */
-CmdResult CommandKick::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	char reason[MAXKICK];
+	std::string reason;
 	Channel* c = ServerInstance->FindChan(parameters[0]);
 	User* u = ServerInstance->FindNick(parameters[1]);
 
-	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1))
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
 		return CMD_SUCCESS;
 
 	if (!u || !c)
 	{
-		user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+		user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
 		return CMD_FAILURE;
 	}
 
 	if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
 	{
-		user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+		user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
 		return CMD_FAILURE;
 	}
 
-	if (pcnt > 2)
+	if (parameters.size() > 2)
 	{
-		strlcpy(reason, parameters[2], MAXKICK - 1);
+		reason.assign(parameters[2], 0, ServerInstance->Config->Limits.MaxKick);
 	}
 	else
 	{
-		strlcpy(reason, user->nick, MAXKICK - 1);
+		reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
 	}
 
-	if (!c->KickUser(user, u, reason))
+	if (!c->KickUser(user, u, reason.c_str()))
 		/* Nobody left here, delete the Channel */
 		delete c;