X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kick.cpp;h=f4001d7dbc3aae2675cf0cb32be1c4450130af4c;hb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;hp=a0ff5d1c3e64fd6d469f29b85b03547f9375499d;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index a0ff5d1c3..f4001d7db 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -1,23 +1,45 @@
-/*       +------------------------------------+
- *       | 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
  */
@@ -25,11 +47,16 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, 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))
 		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());
@@ -51,9 +78,9 @@ 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.c_str());
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandKick)