Fix OnSetAway hook denying remote users' change rather than local users

[user/henk/code/inspircd.git] / src / commands / cmd_names.cpp

diff --git a/src/commands/cmd_names.cpp b/src/commands/cmd_names.cpp
index 1c53273278a732edebcf1889da7bece626ee1fdf..e6df558a63c38ccc6943c2a6aa44d063b8079837 100644 (file)
--- a/src/commands/cmd_names.cpp
+++ b/src/commands/cmd_names.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,17 +21,17 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /NAMES
  */
-CmdResult CommandNames::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User *user)
 {
        Channel* c;
 
-       if (!pcnt)
+       if (!parameters.size())
        {
-               user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
+               user->WriteNumeric(366, "%s * :End of /NAMES list.",user->nick.c_str());
                return CMD_SUCCESS;
        }
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
 
        c = ServerInstance->FindChan(parameters[0]);
@@ -39,14 +39,14 @@ CmdResult CommandNames::Handle (const char* const* parameters, int pcnt, User *u
        {
                if ((c->IsModeSet('s')) && (!c->HasUser(user)))
                {
-                     user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
+                     user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), c->name.c_str());
                      return CMD_FAILURE;
                }
                c->UserList(user);
        }
        else
        {
-               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
        }
 
        return CMD_SUCCESS;