Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 29e0860e05a3b803141b616465783cbdd704592f..8c0b83498ca536710142d7e80d5b43d89c2fdeb0 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,27 +14,25 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 #include "commands/cmd_kick.h"
 
-void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char reason[MAXKICK];
-       chanrec* c = FindChan(parameters[0]);
-       userrec* u   = Find(parameters[1]);
+       chanrec* c = ServerInstance->FindChan(parameters[0]);
+       userrec* u = ServerInstance->FindNick(parameters[1]);
 
        if (!u || !c)
        {
-               WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
                return;
        }
 
-       if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!is_uline(user->server)))
+       if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
        {
-               WriteServ(user->fd, "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
                return;
        }
 
@@ -47,5 +45,7 @@ void cmd_kick::Handle (char **parameters, int pcnt, userrec *user)
                strlcpy(reason, user->nick, MAXKICK - 1);
        }
 
-       kick_channel(user, u, c, reason);
+       if (!c->KickUser(user, u, reason))
+               /* Nobody left here, delete the chanrec */
+               delete c;
 }