Make better use of User::GetFullRealHost()

[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 b9ef94c97aecb6bcbc0e33f72a944c497c1f0f32..305d0847f2e598bf0ab696f2fb5e7b43687bfdea 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -1,25 +1,46 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 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"
-#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 std::vector<std::string>& parameters, 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))
@@ -41,7 +62,7 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
                         * 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->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
        }
@@ -57,7 +78,7 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
                ModResult MOD_RESULT;
 
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-               FIRST_MOD_RESULT(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+               FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
@@ -65,3 +86,5 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
 
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandUser)