Fix some confusing logic in sanick.

[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 a62e1c207ca87717b6d6fa1237e0e6effa9432e2..44bcb95fa86bc334bc411c3349e3df4e58ad9a9a 100644 (file)
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -36,7 +41,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 +52,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;
        }
 
@@ -57,7 +62,7 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
        }
        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;
        }
 
@@ -70,14 +75,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, "%s :Cannot send to channel (you're banned)", chan->name.c_str());
+                               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;
                        }
                }