Add s2s backward compatability for protocol changes

[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 be49deeac1727d5d21917efd84378b6744165189..b9ef94c97aecb6bcbc0e33f72a944c497c1f0f32 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,18 +19,18 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandUser(Instance);
 }
 
-CmdResult CommandUser::Handle (const char** parameters, int, User *user)
+CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User *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,25 +40,25 @@ CmdResult CommandUser::Handle (const char** 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() ? std::string("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->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(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
        }