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 541fd34d7d120ddab29e400406d6608a052aa2f2..8732dd7cfa05266247325dd2d274ce4f63f77909 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -41,39 +41,32 @@ using namespace std;
 
 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);
        }
-       
 }