Annotations

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index f606751d72a959e4fff0d768000bd62cd5673b8d..f7a22eb0184a6abf59e6358043f979468779fc82 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -14,48 +14,49 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
-#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)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
 {
-       if (user->registered < 3)
+       return new cmd_user(Instance);
+}
+
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       if (user->registered < REG_NICKUSER)
        {
-               if (!isident(parameters[0])) {
+               if (!ServerInstance->IsIdent(parameters[0])) {
                        // This kinda Sucks, According to the RFC thou, its either this,
                        // or "You have already registered" :p -- Craig
-                       WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick);
+                       user->WriteServ("461 %s USER :Not enough parameters",user->nick);
+                       return CMD_FAILURE;
                }
                else {
                        /* We're not checking ident, but I'm not sure I like the idea of '~' prefixing.. */
-                       /* XXX - Should this IDENTMAX + 1 be IDENTMAX - 1? Ok, users.h has it defined as
-                        * char ident[IDENTMAX+2]; - WTF?
+                       /* XXX - The ident field is IDENTMAX+2 in size to account for +1 for the optional
+                        * ~ character, and +1 for null termination, therefore we can safely use up to
+                        * IDENTMAX here.
                         */
-                       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
        {
-               WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
-               return;
+               user->WriteServ("462 %s :You may not reregister",user->nick);
+               return CMD_FAILURE;
        }
        /* 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));
-               //ConnectUser(user,NULL);
        }
+
+       return CMD_SUCCESS;
 }