Merge pull request #1054 from SaberUK/master+fix-linking-modules

[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 49e5efacc5643db2ecb4423c7879de2043bcd70e..a62e1c207ca87717b6d6fa1237e0e6effa9432e2 100644 (file)
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -61,24 +61,36 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
                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, (user));
-                       if (MOD_RESULT == MOD_RES_DENY)
+                       Channel* chan = (*i)->chan;
+                       if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
+                       {
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str());
                                return CMD_FAILURE;
-
-                       // return early to not penalize new users
-                       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);
+       }
+
        return CMD_SUCCESS;
 }