X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kick.cpp;h=b59eec0309ae181a6d1dadeddbc8736fadd3801f;hb=882084defcc43c876ecb10e30086b63ac074fcad;hp=54a5bd88834c9f604a53f0e4d6a47863d2135bf9;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 54a5bd888..b59eec030 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
-
-#ifndef __CMD_KICK_H__
-#define __CMD_KICK_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /KICK. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,7 @@ class CommandKick : public Command
  public:
 	/** Constructor for kick.
 	 */
-	CommandKick (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"KICK",0,2) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
+	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
@@ -39,32 +38,49 @@ class CommandKick : public Command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+	}
 };
 
-#endif
-
-
 /** Handle /KICK
  */
 CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	std::string reason;
 	Channel* c = ServerInstance->FindChan(parameters[0]);
-	User* u = ServerInstance->FindNick(parameters[1]);
+	User* u;
 
-	if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
+	if (CommandParser::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.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)))
+	Membership* srcmemb = NULL;
+	if (IS_LOCAL(user))
 	{
-		user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
-		return CMD_FAILURE;
+		srcmemb = c->GetUser(user);
+		if (!srcmemb)
+		{
+			user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
+
+		if (ServerInstance->ULine(u->server))
+		{
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You may not kick a u-lined client", user->nick.c_str(), c->name.c_str());
+			return CMD_FAILURE;
+		}
 	}
 
 	if (parameters.size() > 2)
@@ -76,9 +92,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 		reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
 	}
 
-	if (!c->KickUser(user, u, reason.c_str()))
-		/* Nobody left here, delete the Channel */
-		delete c;
+	c->KickUser(user, u, reason, srcmemb);
 
 	return CMD_SUCCESS;
 }