X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_names.cpp;h=fe61c4dea3f6c61aba99004adac1323e7b7ce4e9;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=7857449f27d1bea83fff9616dc2238360c2381b7;hpb=24ac504f4b6dbcca3cb3ab91d3cbb40cc7a9ff33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 7857449f2..fe61c4dea 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -16,37 +13,42 @@
 
 #include "inspircd.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_names.h"
 
-extern InspIRCd* ServerInstance;
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_names(Instance);
+}
 
-void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /NAMES
+ */
+CmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	chanrec* c;
 
 	if (!pcnt)
 	{
-		WriteServ(user->fd,"366 %s * :End of /NAMES list.",user->nick);
-		return;
+		user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
+		return CMD_SUCCESS;
 	}
 
-	if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
-		return;
-	c = FindChan(parameters[0]);
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		return CMD_SUCCESS;
+
+	c = ServerInstance->FindChan(parameters[0]);
 	if (c)
 	{
 		if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))
 		{
-		      WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
-		      return;
+		      user->WriteServ("401 %s %s :No such nick/channel",user->nick, c->name);
+		      return CMD_FAILURE;
 		}
-		userlist(user,c);
-		WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
+		c->UserList(user);
 	}
 	else
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
+
+	return CMD_SUCCESS;
 }