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 9edfb46b6131ec48de738e437ceaf0abdbab4228..e396e0c84e69b4d2f7eb14ce98c963fa81ff657c 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_USER_H__
-#define __CMD_USER_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** 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
@@ -31,7 +23,7 @@ class CommandUser : public Command
  public:
        /** Constructor for user.
         */
-       CommandUser (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"USER",0,4,true,0) { syntax = "<username> <localhost> <remotehost> <GECOS>"; }
+       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
@@ -41,9 +33,6 @@ class CommandUser : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User *user)
 {
        /* A user may only send the USER command once */
@@ -82,7 +71,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;