X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kick.cpp;h=d11295b9e65117ced07baa34e6c142570d90fde6;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=5c03921b6bade53c0a726903003a78bf55e81937;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 5c03921b6..d11295b9e 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,16 +14,18 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 #include "commands/cmd_kick.h"
 
-extern InspIRCd* ServerInstance;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_kick(Instance);
+}
 
-void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /KICK
+ */
+CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char reason[MAXKICK];
 	chanrec* c = ServerInstance->FindChan(parameters[0]);
@@ -32,13 +34,13 @@ void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 	if (!u || !c)
 	{
 		user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
-		return;
+		return CMD_FAILURE;
 	}
 
-	if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!is_uline(user->server)))
+	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]);
-		return;
+		return CMD_FAILURE;
 	}
 
 	if (pcnt > 2)
@@ -53,4 +55,6 @@ void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 	if (!c->KickUser(user, u, reason))
 		/* Nobody left here, delete the chanrec */
 		delete c;
+
+	return CMD_SUCCESS;
 }