X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kick.cpp;h=17933a43f9a7467fb5d3a17f9d05fa09da658a4b;hb=a2b40829c116cd67d5f293404371eb132dcaa8e3;hp=5c272112c75ff461fc8bc948afe720c6122c001e;hpb=5dd6b4e97d9c63172fac90a5b2b7167214b4ba64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 5c272112c..17933a43f 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -2,71 +2,57 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_kick.h"
+#include "inspircd.h"
+#include "commands/cmd_kick.h"
 
-void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_kick(Instance);
+}
+
+/** Handle /KICK
+ */
+CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char reason[MAXKICK];
-	
-	chanrec* Ptr = FindChan(parameters[0]);
-	userrec* u   = Find(parameters[1]);
+	chanrec* c = ServerInstance->FindChan(parameters[0]);
+	userrec* u = ServerInstance->FindNick(parameters[1]);
 
-	if (!u || !Ptr)
+	if (!u || !c)
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, u ? parameters[0] : parameters[1]);
-		return;
+		user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+		return CMD_FAILURE;
 	}
-	if ((IS_LOCAL(user)) && (!has_channel(user,Ptr)) && (!is_uline(user->server)))
+
+	if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
 	{
-		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
-		return;
+		user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+		return CMD_FAILURE;
 	}
 
 	if (pcnt > 2)
 	{
-		strlcpy(reason,parameters[2],MAXKICK-1);
-		kick_channel(user,u,Ptr,reason);
+		strlcpy(reason, parameters[2], MAXKICK - 1);
 	}
 	else
 	{
-		strlcpy(reason,user->nick,MAXKICK-1);
-		kick_channel(user,u,Ptr,reason);
+		strlcpy(reason, user->nick, MAXKICK - 1);
 	}
-}
 
+	if (!c->KickUser(user, u, reason))
+		/* Nobody left here, delete the chanrec */
+		delete c;
 
+	return CMD_SUCCESS;
+}