X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kick.cpp;h=3c5fb00527ae8e94d73e72b6f16cb8a35e4c2c1a;hb=1d3d2a5434fedb40c5eff621f67c10ff75493de5;hp=e4acbbbf19e8e655ff05f338611a76f646500d00;hpb=ffbd1eebf0b82bf40482879f410f58874030a695;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index e4acbbbf1..3c5fb0052 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -1,59 +1,85 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_kick.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /KICK. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandKick : public Command
 {
-	return new CommandKick(Instance);
-}
+ public:
+	/** Constructor for kick.
+	 */
+	CommandKick ( Module* parent) : Command(parent,"KICK",2,3) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 /** Handle /KICK
  */
 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]);
+	User* u;
 
-	if (ServerInstance->Parser->LoopCall(user, this, parameters, parameters.size(), 1))
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
 		return CMD_SUCCESS;
 
+	if (IS_LOCAL(user))
+		u = ServerInstance->FindNickOnly(parameters[1]);
+	else
+		u = ServerInstance->FindNick(parameters[1]);
+
 	if (!u || !c)
 	{
-		user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0].c_str() : parameters[1].c_str());
+		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].c_str());
+		user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
 		return CMD_FAILURE;
 	}
 
 	if (parameters.size() > 2)
 	{
-		strlcpy(reason, parameters[2].c_str(), 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))
-		/* Nobody left here, delete the Channel */
-		delete c;
+	c->KickUser(user, u, reason.c_str());
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandKick)