Fix double dot in half-cloaked resolved hosts

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

diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp
index 09bbad034e176fb2beee0c56af2e146034932a0f..e396e0c84e69b4d2f7eb14ce98c963fa81ff657c 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,12 +12,26 @@
  */
 
 #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 Command
 {
-       return new CommandUser(Instance);
-}
+ public:
+       /** Constructor for user.
+        */
+       CommandUser ( Module* parent) : Command(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 Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User *user)
 {
@@ -40,7 +54,7 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
                         * ~ character, and +1 for null termination, therefore we can safely use up to
                         * IDENTMAX here.
                         */
-                       user->ident.assign(parameters[0], 0, ServerInstance->Config->Limits.IdentMax);
+                       user->ChangeIdent(parameters[0].c_str());
                        user->fullname.assign(parameters[3].empty() ? std::string("No info") : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
@@ -54,14 +68,16 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
        /* 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)