X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_user.cpp;h=09e1e3319475e204caf67c4254c456ac825028af;hb=54ecd7ff910408015d395c5c737fb48dfb9d7a0a;hp=8f056d83ffa59fede73f167c727c135a691c8bc6;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp
index 8f056d83f..09e1e3319 100644
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -1,36 +1,57 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_user.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /USER. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandUser : public SplitCommand
 {
-	return new CommandUser(Instance);
-}
+ public:
+	/** Constructor for user.
+	 */
+	CommandUser ( Module* parent) : SplitCommand(parent,"USER",4,4) { works_before_reg = true; Penalty = 0; syntax = "<username> <localhost> <remotehost> <GECOS>"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser *user);
+};
 
-CmdResult CommandUser::Handle (const char* const* parameters, int, User *user)
+CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
 {
 	/* A user may only send the USER command once */
 	if (!(user->registered & REG_USER))
 	{
-		if (!ServerInstance->IsIdent(parameters[0]))
+		if (!ServerInstance->IsIdent(parameters[0].c_str()))
 		{
 			/*
 			 * RFC says we must use this numeric, so we do. Let's make it a little more nub friendly though. :)
 			 *  -- Craig, and then w00t.
 			 */
-			user->WriteServ("461 %s USER :Your username is not valid",user->nick);
+			user->WriteNumeric(461, "%s USER :Your username is not valid",user->nick.c_str());
 			return CMD_FAILURE;
 		}
 		else
@@ -40,28 +61,31 @@ CmdResult CommandUser::Handle (const char* const* parameters, int, User *user)
 			 * ~ 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] ? parameters[3] : "No info", MAXGECOS);
+			user->ChangeIdent(parameters[0].c_str());
+			user->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
 			user->registered = (user->registered | REG_USER);
 		}
 	}
 	else
 	{
-		user->WriteServ("462 %s :You may not reregister",user->nick);
+		user->CommandFloodPenalty += 1000;
+		user->WriteNumeric(462, "%s :You may not reregister", user->nick.c_str());
 		return CMD_FAILURE;
 	}
 
 	/* parameters 2 and 3 are local and remote hosts, and are ignored */
 	if (user->registered == REG_NICKUSER)
 	{
-		int MOD_RESULT = 0;
+		ModResult MOD_RESULT;
 
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
-		if (MOD_RESULT > 0)
+		FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
+		if (MOD_RESULT == MOD_RES_DENY)
 			return CMD_FAILURE;
 
 	}
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandUser)