Show keys to opers correctly

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

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 88265f2a4f1b75cb62c277225f8467c46776f03e..0ae781cc09ebaec38aa6771c39bcb2668004d858 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -25,21 +25,42 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
+CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User *user)
 {
        char oldnick[NICKMAX];
 
-       if (!*parameters[0] || !*user->nick)
+       if (parameters[0].empty())
        {
                /* We cant put blanks in the parameters, so for this (extremely rare) issue we just put '*' here. */
                user->WriteNumeric(432, "%s * :Erroneous Nickname", *user->nick ? user->nick : "*");
                return CMD_FAILURE;
        }
 
-       if (irc::string(user->nick) == irc::string(parameters[0]))
+       if (((!ServerInstance->IsNick(parameters[0].c_str()))) && (IS_LOCAL(user)))
+       {
+               if (!allowinvalid)
+               {
+                       if (parameters[0] == "0")
+                       {
+                               // Special case, Fake a /nick UIDHERE. Useful for evading "ERR: NICK IN USE" on connect etc.
+                               std::vector<std::string> p2;
+                               std::deque<classbase*> dummy;
+                               p2.push_back(user->uuid);
+                               this->HandleInternal(1, dummy);
+                               this->Handle(p2, user);
+                               this->HandleInternal(0, dummy);
+                               return CMD_SUCCESS;
+                       }
+
+                       user->WriteNumeric(432, "%s %s :Erroneous Nickname", user->nick,parameters[0].c_str());
+                       return CMD_FAILURE;
+               }
+       }
+
+       if (irc::string(user->nick) == assign(parameters[0]))
        {
                /* If its exactly the same, even case, dont do anything. */
-               if (!strcmp(user->nick,parameters[0]))
+               if (parameters[0] == user->nick)
                        return CMD_SUCCESS;
 
                /* Its a change of case. People insisted that they should be
@@ -48,12 +69,12 @@ CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
                 */
                strlcpy(oldnick, user->nick, NICKMAX - 1);
                int MOD_RESULT = 0;
-               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
+               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0].c_str()));
                if (MOD_RESULT)
                        return CMD_FAILURE;
                if (user->registered == REG_ALL)
-                       user->WriteCommon("NICK %s",parameters[0]);
-               strlcpy(user->nick, parameters[0], NICKMAX - 1);
+                       user->WriteCommon("NICK %s",parameters[0].c_str());
+               strlcpy(user->nick, parameters[0].c_str(), NICKMAX - 1);
                user->InvalidateCache();
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
                return CMD_SUCCESS;
@@ -64,14 +85,17 @@ CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
                 * Don't check Q:Lines if it's a server-enforced change, just on the off-chance some fucking *moron*
                 * tries to Q:Line SIDs, also, this means we just get our way period, as it really should be.
                 * Thanks Kein for finding this. -- w00t
+                *
+                * Also don't check Q:Lines for remote nickchanges, they should have our Q:Lines anyway to enforce themselves.
+                *              -- w00t
                 */
-               if (!allowinvalid)
+               if (!allowinvalid || !IS_LOCAL(user))
                {
                        XLine* mq = ServerInstance->XLines->MatchesLine("Q",parameters[0]);
                        if (mq)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0], user->nick, user->ident, user->host, mq->reason);
-                               user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick,parameters[0], mq->reason);
+                               ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0].c_str(), user->nick, user->ident, user->host, mq->reason);
+                               user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick, parameters[0].c_str(), mq->reason);
                                return CMD_FAILURE;
                        }
                }
@@ -86,7 +110,7 @@ CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
                 * because the nick is already (rightfully) in use. -- w00t
                 */
                User* InUse = ServerInstance->FindNickOnly(parameters[0]);
-               if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
+               if (InUse && (InUse != user))
                {
                        if (InUse->registered != REG_ALL)
                        {
@@ -101,33 +125,26 @@ CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
                        else
                        {
                                /* No camping, tell the incoming user  to stop trying to change nick ;p */
-                               user->WriteNumeric(433, "%s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
+                               user->WriteNumeric(433, "%s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0].c_str());
                                return CMD_FAILURE;
                        }
                }
        }
-       if (((!ServerInstance->IsNick(parameters[0]))) && (IS_LOCAL(user)))
-       {
-               if (!allowinvalid)
-               {
-                       user->WriteNumeric(432, "%s %s :Erroneous Nickname",user->nick,parameters[0]);
-                       return CMD_FAILURE;
-               }
-       }
+
 
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[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]);
+               user->WriteCommon("NICK %s", parameters[0].c_str());
 
        strlcpy(oldnick, user->nick, NICKMAX - 1);
 
        /* change the nick of the user in the users_hash */
-       user = user->UpdateNickHash(parameters[0]);
+       user = user->UpdateNickHash(parameters[0].c_str());
 
        /* actually change the nick within the record */
        if (!user)
@@ -135,7 +152,7 @@ CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
        if (!*user->nick)
                return CMD_FAILURE;
 
-       strlcpy(user->nick, parameters[0], NICKMAX - 1);
+       strlcpy(user->nick, parameters[0].c_str(), NICKMAX - 1);
 
        user->InvalidateCache();