X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kick.cpp;h=29e0860e05a3b803141b616465783cbdd704592f;hb=6dfc98470938a932ddee0100f515658dffe94438;hp=541fd34d7d120ddab29e400406d6608a052aa2f2;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 541fd34d7..29e0860e0 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,66 +14,38 @@
  * ---------------------------------------------------
  */
 
-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 "commands/cmd_kick.h"
 
 void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
 {
-	chanrec* Ptr = FindChan(parameters[0]);
+	char reason[MAXKICK];
+	chanrec* c = FindChan(parameters[0]);
 	userrec* u   = Find(parameters[1]);
 
-	if ((!u) || (!Ptr))
+	if (!u || !c)
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
 		return;
 	}
-	
-	if ((!has_channel(user,Ptr)) && (!is_uline(user->server)))
+
+	if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!is_uline(user->server)))
 	{
-		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]);
+		WriteServ(user->fd, "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
 		return;
 	}
-	
-	char reason[MAXBUF];
-	
+
 	if (pcnt > 2)
 	{
-		strlcpy(reason,parameters[2],MAXBUF);
-		if (strlen(reason)>MAXKICK)
-		{
-			reason[MAXKICK-1] = '\0';
-		}
-
-		kick_channel(user,u,Ptr,reason);
+		strlcpy(reason, parameters[2], MAXKICK - 1);
 	}
 	else
 	{
-		strlcpy(reason,user->nick,MAXBUF);
-		kick_channel(user,u,Ptr,reason);
+		strlcpy(reason, user->nick, MAXKICK - 1);
 	}
-	
-}
-
 
+	kick_channel(user, u, c, reason);
+}