Finally take ServerInstance out of the global scope in this module, amongst a ton...

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

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 4743f47df91c53991a6759767d160a07c3e57ed5..d11295b9e65117ced07baa34e6c142570d90fde6 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,28 +14,33 @@
  * ---------------------------------------------------
  */
 
-#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 (const char** parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_kick(Instance);
+}
+
+/** Handle /KICK
+ */
+CmdResult 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]);
-               return;
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+               return CMD_FAILURE;
        }
 
-       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]);
-               return;
+               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
 
        if (pcnt > 2)
@@ -47,5 +52,9 @@ void cmd_kick::Handle (const 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;
+
+       return CMD_SUCCESS;
 }