Introduce Server class

[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 1158bc11deaec5b05cd0414d92e89cc1b2333bab..932e3a9b85ad49fb68a619496733c8dea1c6a7e9 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
 
 /** Handle /USER. These command handlers can be reloaded by the core,
@@ -38,13 +45,13 @@ CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, L
        /* A user may only send the USER command once */
        if (!(user->registered & REG_USER))
        {
-               if (!ServerInstance->IsIdent(parameters[0].c_str()))
+               if (!ServerInstance->IsIdent(parameters[0]))
                {
                        /*
                         * 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->WriteNumeric(461, "%s USER :Your username is not valid",user->nick.c_str());
+                       user->WriteNumeric(ERR_NEEDMOREPARAMS, "USER :Your username is not valid");
                        return CMD_FAILURE;
                }
                else
@@ -54,14 +61,14 @@ CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, L
                         * ~ character, and +1 for null termination, therefore we can safely use up to
                         * IDENTMAX here.
                         */
-                       user->ChangeIdent(parameters[0].c_str());
-                       user->fullname.assign(parameters[3].empty() ? std::string("No info") : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
+                       user->ChangeIdent(parameters[0]);
+                       user->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
        }
        else
        {
-               user->WriteNumeric(462, "%s :You may not reregister", user->nick.c_str());
+               user->WriteNumeric(ERR_ALREADYREGISTERED, ":You may not reregister");
                return CMD_FAILURE;
        }