X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_ison.cpp;h=0cee160c7f8e39c657328c6b9601594b9ab9d934;hb=a2b40829c116cd67d5f293404371eb132dcaa8e3;hp=cf60b6f6b3bc7689a1e14c9b7caf666f488e9c42;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index cf60b6f6b..0cee160c7 100644
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -2,39 +2,85 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#include "users.h"
 #include "inspircd.h"
+#include "users.h"
 #include "commands/cmd_ison.h"
 
-void cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
-	char retbuf[MAXBUF];
-	userrec *u;
+	return new cmd_ison(Instance);
+}
 
-	snprintf(retbuf, MAXBUF, "303 %s :", user->nick);
+/** Handle /ISON
+ */
+CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	std::map<userrec*,userrec*> ison_already;
+	userrec *u;
+	std::string reply = std::string("303 ") + user->nick + " :";
 
 	for (int i = 0; i < pcnt; i++)
 	{
 		u = ServerInstance->FindNick(parameters[i]);
+		if (ison_already.find(u) != ison_already.end())
+			continue;
 
 		if (u)
 		{
-			strlcat(retbuf, u->nick, MAXBUF);
-			charlcat(retbuf, ' ', MAXBUF);
+			reply.append(u->nick).append(" ");
+			if (reply.length() > 450)
+			{
+				user->WriteServ(reply);
+				reply = std::string("303 ") + user->nick + " :";
+			}
+			ison_already[u] = u;
+		}
+		else
+		{
+			if ((i == pcnt-1) && (strchr(parameters[i],' ')))
+			{
+				/* Its a space seperated list of nicks (RFC1459 says to support this)
+				 */
+				irc::spacesepstream list(parameters[i]);
+				std::string item("*");
+				while (((item = list.GetToken()) != ""))
+				{
+					u = ServerInstance->FindNick(item);
+					if (ison_already.find(u) != ison_already.end())
+						continue;
+
+					if (u)
+					{
+						if (u->Visibility && !u->Visibility->VisibleTo(user))
+							continue;
+
+						reply.append(u->nick).append(" ");
+						if (reply.length() > 450)
+						{
+							user->WriteServ(reply);
+							reply = std::string("303 ") + user->nick + " :";
+						}
+						ison_already[u] = u;
+					}
+				}
+			}
+			/* There will only be one of these, we can bail after. */
+			break;
 		}
 	}
 
-	user->WriteServ( retbuf);
+	if (!reply.empty())
+		user->WriteServ(reply);
+
+	return CMD_SUCCESS;
 }
+