Fix part of bug #419 (source nick showing in KILL message to user with hidekills on)

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

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index c157c3c040d5e7423bb6e16050108913ebfa9985..2b3a421a2dc9230b116be626ba3b03d03f31c994 100644 (file)
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -1 +1,53 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "users.h"\r#include "commands/cmd_names.h"\r\rextern "C" DllExport command_t* init_command(InspIRCd* Instance)\r{\r      return new cmd_names(Instance);\r}\r\r/** Handle /NAMES\r */\rCmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user)\r{\r      chanrec* c;\r\r   if (!pcnt)\r     {\r              user->WriteServ("366 %s * :End of /NAMES list.",user->nick);\r           return CMD_SUCCESS;\r    }\r\r     if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))\r         return CMD_SUCCESS;\r\r   c = ServerInstance->FindChan(parameters[0]);\r   if (c)\r {\r              if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))\r              {\r                    user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);\r                return CMD_FAILURE;\r              }\r              c->UserList(user);\r     }\r      else\r   {\r              user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);\r  }\r\r     return CMD_SUCCESS;\r}\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "commands/cmd_names.h"
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_names(Instance);
+}
+
+/** Handle /NAMES
+ */
+CmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
+{
+       chanrec* c;
+
+       if (!pcnt)
+       {
+               user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
+               return CMD_SUCCESS;
+       }
+
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+               return CMD_SUCCESS;
+
+       c = ServerInstance->FindChan(parameters[0]);
+       if (c)
+       {
+               if ((c->IsModeSet('s')) && (!c->HasUser(user)))
+               {
+                     user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
+                     return CMD_FAILURE;
+               }
+               c->UserList(user);
+       }
+       else
+       {
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+       }
+
+       return CMD_SUCCESS;
+}