More tweaks

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 67b7c94927b3c427beb3d5cc0e6e112fac7753e8..66a275c7223a9f0fc3f74512e13477301076decf 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -17,38 +17,34 @@
 #include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
-#include "message.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_user.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
+
 
 void 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);
                }
                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?
                         */
-                       snprintf(user->ident, IDENTMAX+1, "~%s", parameters[0]);
+                       strlcpy(user->ident, parameters[0], IDENTMAX);
                        strlcpy(user->fullname,parameters[3],MAXGECOS);
                        user->registered = (user->registered | REG_USER);
                }
        }
        else
        {
-               WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
+               user->WriteServ("462 %s :You may not reregister",user->nick);
                return;
        }
        /* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */