Changed first of files to match new location of headers

[user/henk/code/inspircd.git] / src / cmd_kick.cpp

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index a0fc96a412e857c0fc5f7529a36070743546a646..29e0860e05a3b803141b616465783cbdd704592f 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -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);
+}