Merge tag 'v2.0.25' into master.

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

diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp
index 486fce7ebf0a8cbd5138c2a4cff6cc19a0959222..cedafbbf47025516627a53d2911b57652023d197 100644 (file)
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -21,40 +21,33 @@
 
 
 #include "inspircd.h"
+#include "core_user.h"
 
-/** Handle /NICK.
- */
-class CommandNick : public Command
+CommandNick::CommandNick(Module* parent)
+       : SplitCommand(parent, "NICK", 1, 1)
 {
- public:
-       /** Constructor for nick.
-        */
-       CommandNick ( Module* parent) : Command(parent,"NICK", 1, 1) { works_before_reg = true; syntax = "<newnick>"; Penalty = 0; }
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
+       works_before_reg = true;
+       syntax = "<newnick>";
+       Penalty = 0;
+}
 
 /** Handle nick changes from users.
  * NOTE: If you are used to ircds based on ircd2.8, and are looking
  * 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 std::vector<std::string>& parameters, User *user)
+CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
 {
        std::string oldnick = user->nick;
        std::string newnick = parameters[0];
 
        // anything except the initial NICK gets a flood penalty
-       if (user->registered == REG_ALL && IS_LOCAL(user))
-               IS_LOCAL(user)->CommandFloodPenalty += 4000;
+       if (user->registered == REG_ALL)
+               user->CommandFloodPenalty += 4000;
 
        if (newnick.empty())
        {
-               user->WriteNumeric(ERR_ERRONEUSNICKNAME, "* :Erroneous Nickname");
+               user->WriteNumeric(ERR_NONICKNAMEGIVEN, "No nickname given");
                return CMD_FAILURE;
        }
 
@@ -64,31 +57,40 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        }
        else if (!ServerInstance->IsNick(newnick))
        {
-               user->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Erroneous Nickname", newnick.c_str());
+               user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, "Erroneous Nickname");
                return CMD_FAILURE;
        }
 
-       if (!user->ChangeNick(newnick, false))
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user, newnick));
+
+       // If a module denied the change, abort now
+       if (MOD_RESULT == MOD_RES_DENY)
                return CMD_FAILURE;
 
-       if (user->registered < REG_NICKUSER)
+       // Disallow the nick change if <security:restrictbannedusers> is on and there is a ban matching this user in
+       // one of the channels they are on
+       if (ServerInstance->Config->RestrictBannedUsers)
        {
-               user->registered = (user->registered | REG_NICK);
-               if (user->registered == REG_NICKUSER)
+               for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
                {
-                       /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-                       ModResult MOD_RESULT;
-                       FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (IS_LOCAL(user)));
-                       if (MOD_RESULT == MOD_RES_DENY)
+                       Channel* chan = (*i)->chan;
+                       if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
+                       {
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're banned)");
                                return CMD_FAILURE;
-
-                       // return early to not penalize new users
-                       return CMD_SUCCESS;
+                       }
                }
        }
 
-       return CMD_SUCCESS;
-}
+       if (!user->ChangeNick(newnick))
+               return CMD_FAILURE;
 
+       if (user->registered < REG_NICKUSER)
+       {
+               user->registered = (user->registered | REG_NICK);
+               return CommandUser::CheckRegister(user);
+       }
 
-COMMAND_INIT(CommandNick)
+       return CMD_SUCCESS;
+}