move opening of log before opening of config so that failure to open the config can...

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index a00803d75e139aaac1cb89e2635c4933550a4b19..4eb439895f581d8ef8c5c7241b6239ea5fc6b7be 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
@@ -76,8 +73,8 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                 * the nickname too, we force a nickchange on the older user (Simply the one who was
                 * here first, no TS checks need to take place here)
                 */
-               userrec* InUse = ServerInstance->FindNick(parameters[0]);
-               if (InUse && (InUse != user) && (ServerInstance->IsNick(parameters[0])))
+               userrec* InUse = ServerInstance->FindNickOnly(parameters[0]);
+               if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
                {
                        if (InUse->registered != REG_ALL)
                        {
@@ -98,24 +95,23 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                }
        }
-       if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
+       if (((!ServerInstance->IsNick(parameters[0]))) && (IS_LOCAL(user)))
        {
-               user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
-               return CMD_FAILURE;
-       }
-
-       if (user->registered == REG_ALL)
-       {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
-               if (MOD_RESULT) {
-                       // if a module returns true, the nick change is silently forbidden.
+               if (!allowinvalid)
+               {
+                       user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
                        return CMD_FAILURE;
                }
+       }
 
-               user->WriteCommon("NICK %s",parameters[0]);
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
+       if (MOD_RESULT)
+               // if a module returns true, the nick change is silently forbidden.
+               return CMD_FAILURE;
 
-       }
+       if (user->registered == REG_ALL)
+               user->WriteCommon("NICK %s",parameters[0]);
 
        strlcpy(oldnick, user->nick, NICKMAX - 1);
 
@@ -123,8 +119,10 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        user = user->UpdateNickHash(parameters[0]);
 
        /* actually change the nick within the record */
-       if (!user) return CMD_FAILURE;
-       if (!*user->nick) return CMD_FAILURE;
+       if (!user)
+               return CMD_FAILURE;
+       if (!*user->nick)
+               return CMD_FAILURE;
 
        strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
@@ -180,3 +178,9 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 }
 
+CmdResult cmd_nick::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
+{
+       allowinvalid = (id != 0);
+       return CMD_SUCCESS;
+}
+