Removed has_channel(userrec*,chanrec*), the new preferred way of doing it is channel...

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

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index b3c55b1802ca78edb5484cbd0fc44f666fd858ca..8732dd7cfa05266247325dd2d274ce4f63f77909 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
@@ -21,12 +21,6 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
 #include <sstream>
 #include <vector>
 #include <deque>
@@ -38,65 +32,41 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
 #include "cmd_kick.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
-
 void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
 {
+       char reason[MAXKICK];
+       
        chanrec* Ptr = FindChan(parameters[0]);
        userrec* u   = Find(parameters[1]);
 
-       if ((!u) || (!Ptr))
+       if (!u || !Ptr)
        {
-               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)) && (!Ptr->HasUser(user)) && (!is_uline(user->server)))
        {
                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';
-               }
-
+               strlcpy(reason,parameters[2],MAXKICK-1);
                kick_channel(user,u,Ptr,reason);
        }
        else
        {
-               strlcpy(reason,user->nick,MAXBUF);
+               strlcpy(reason,user->nick,MAXKICK-1);
                kick_channel(user,u,Ptr,reason);
        }
-       
 }