Use CommandBase::Params instead of std::vector<std::string>.

[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 45e7adae59e229041da73d5a8e06b36f6bdcdc49..670931f7aacf8379de0b235ec0f478f90c16a0fa 100644 (file)
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -36,7 +36,7 @@ CommandNick::CommandNick(Module* parent)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 {
        std::string oldnick = user->nick;
        std::string newnick = parameters[0];
@@ -47,7 +47,7 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
 
        if (newnick.empty())
        {
-               user->WriteNumeric(ERR_ERRONEUSNICKNAME, '*', "Erroneous Nickname");
+               user->WriteNumeric(ERR_NONICKNAMEGIVEN, "No nickname given");
                return CMD_FAILURE;
        }
 
@@ -70,14 +70,16 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
 
        // 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)
+       if (ServerInstance->Config->RestrictBannedUsers != ServerConfig::BUT_NORMAL)
        {
                for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
                {
                        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)");
+                               if (ServerInstance->Config->RestrictBannedUsers == ServerConfig::BUT_RESTRICT_NOTIFY)
+                                       user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (you're banned)",
+                                               chan->name.c_str()));
                                return CMD_FAILURE;
                        }
                }