Merge pull request #35 from pcarrier/insp20ldap

[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 833a9b2754603ce2605419619df444fa8b3a4799..1158bc11deaec5b05cd0414d92e89cc1b2333bab 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,14 +12,28 @@
  */
 
 #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))
@@ -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)