kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 5c272112c75ff461fc8bc948afe720c6122c001e..1da6d356f496a9d01b93c3375ecfdd2e15c70362 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,59 +14,40 @@
  * ---------------------------------------------------
  */
 
-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)
+void cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char reason[MAXKICK];
-       
-       chanrec* Ptr = FindChan(parameters[0]);
-       userrec* u   = Find(parameters[1]);
+       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, u ? parameters[0] : parameters[1]);
+               WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
                return;
        }
-       if ((IS_LOCAL(user)) && (!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;
        }
 
        if (pcnt > 2)
        {
-               strlcpy(reason,parameters[2],MAXKICK-1);
-               kick_channel(user,u,Ptr,reason);
+               strlcpy(reason, parameters[2], MAXKICK - 1);
        }
        else
        {
-               strlcpy(reason,user->nick,MAXKICK-1);
-               kick_channel(user,u,Ptr,reason);
+               strlcpy(reason, user->nick, MAXKICK - 1);
        }
-}
-
 
+       if (!c->KickUser(user, u, reason))
+               /* Nobody left here, delete the chanrec */
+               delete c;
+}