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

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index f606751d72a959e4fff0d768000bd62cd5673b8d..23139c13f099571f68298de4e07acc26b5c393e1 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -20,16 +20,16 @@
 #include "message.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_user.h"
+#include "commands/cmd_user.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
 extern ModuleList modules;
 extern FactoryList factory;
 
-void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (user->registered < 3)
+       if (user->registered < REG_NICKUSER)
        {
                if (!isident(parameters[0])) {
                        // This kinda Sucks, According to the RFC thou, its either this,
@@ -41,9 +41,9 @@ void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
                        /* XXX - Should this IDENTMAX + 1 be IDENTMAX - 1? Ok, users.h has it defined as
                         * char ident[IDENTMAX+2]; - WTF?
                         */
-                       snprintf(user->ident, IDENTMAX+1, "~%s", parameters[0]);
+                       strlcpy(user->ident, parameters[0], IDENTMAX);
                        strlcpy(user->fullname,parameters[3],MAXGECOS);
-                       user->registered = (user->registered | 1);
+                       user->registered = (user->registered | REG_USER);
                }
        }
        else
@@ -52,7 +52,7 @@ void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
                return;
        }
        /* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */
-       if (user->registered == 3)
+       if (user->registered == REG_NICKUSER)
        {
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
                FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));