X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_user.cpp;h=13e42f04335c7e662d680a5c8c17c57810dfa359;hb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;hp=23139c13f099571f68298de4e07acc26b5c393e1;hpb=63ecaa7059166007635f5dd19b93f2d478fbf1ce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 23139c13f..13e42f043 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -14,32 +14,31 @@
  * ---------------------------------------------------
  */
 
-#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;
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_user(Instance);
+}
 
 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?
+			/* 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.
 			 */
 			strlcpy(user->ident, parameters[0], IDENTMAX);
 			strlcpy(user->fullname,parameters[3],MAXGECOS);
@@ -48,7 +47,7 @@ void cmd_user::Handle (const char** parameters, int pcnt, userrec *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 */