diff options
| author |  Attila Molnar | 2014-07-03 12:21:00 +0200 |
|---|---|---|
| committer | Attila Molnar | 2014-07-03 12:21:00 +0200 |
| commit | bee8625fbe375f55053d3709b72a2972fbf6ba84 (patch) | |
| tree | 421b62eb48531705813bbe19232564900e4e7f7f /src/users.cpp | |
| parent | core_user Deduplicate code that calls the OnUserRegister hook (diff) | |
| download | inspircd++-bee8625fbe375f55053d3709b72a2972fbf6ba84.tar.gz inspircd++-bee8625fbe375f55053d3709b72a2972fbf6ba84.tar.bz2 inspircd++-bee8625fbe375f55053d3709b72a2972fbf6ba84.zip | |
Move calling the OnUserPreNick() hook and the restrictbannedusers check from core to cmd_nick (core_user)
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/users.cpp b/src/users.cpp index 75852330f..47dbd2d22 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -619,32 +619,6 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts) return false; } - LocalUser* const localuser = IS_LOCAL(this); - if (!force && localuser) - { - ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (localuser, newnick)); - - // If a module denied the change, abort now - if (MOD_RESULT == MOD_RES_DENY) - return false; - - // 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) - { - for (UCListIter i = this->chans.begin(); i != this->chans.end(); ++i) - { - Channel* chan = (*i)->chan; - if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this)) - { - this->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str()); - return false; - } - } - } - } - if (assign(newnick) == assign(nick)) { // case change, don't need to check campers |