X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_ison.cpp;h=01d12e13bd14149a80f20fda18128cf5d1463988;hb=ad8625919378ffbdbf0993d56e16a75a47c4715e;hp=1d92ad3ca3b63ad835496ff28425c4d7ff2cd1ce;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_ison.cpp b/src/commands/cmd_ison.cpp
index 1d92ad3ca..01d12e13b 100644
--- a/src/commands/cmd_ison.cpp
+++ b/src/commands/cmd_ison.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef __CMD_ISON_H__
-#define __CMD_ISON_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /ISON. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,9 @@ class CommandIson : public Command
  public:
 	/** Constructor for ison.
 	 */
-	CommandIson ( Module* parent) : Command(parent,"ISON",0,0) { syntax = "<nick> {nick}"; }
+	CommandIson ( Module* parent) : Command(parent,"ISON", 1) {
+		syntax = "<nick> {nick}";
+	}
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -41,30 +42,27 @@ class CommandIson : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle /ISON
  */
 CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	std::map<User*,User*> ison_already;
 	User *u;
-	std::string reply = std::string("303 ") + user->nick + " :";
+	std::string reply = "303 " + user->nick + " :";
 
 	for (unsigned int i = 0; i < parameters.size(); i++)
 	{
-		u = ServerInstance->FindNick(parameters[i]);
+		u = ServerInstance->FindNickOnly(parameters[i]);
 		if (ison_already.find(u) != ison_already.end())
 			continue;
 
-		if (u)
+		if ((u) && (u->registered == REG_ALL))
 		{
 			reply.append(u->nick).append(" ");
 			if (reply.length() > 450)
 			{
 				user->WriteServ(reply);
-				reply = std::string("303 ") + user->nick + " :";
+				reply = "303 " + user->nick + " :";
 			}
 			ison_already[u] = u;
 		}
@@ -79,17 +77,17 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
 
 				while (list.GetToken(item))
 				{
-					u = ServerInstance->FindNick(item);
+					u = ServerInstance->FindNickOnly(item);
 					if (ison_already.find(u) != ison_already.end())
 						continue;
 
-					if (u)
+					if ((u) && (u->registered == REG_ALL))
 					{
 						reply.append(u->nick).append(" ");
 						if (reply.length() > 450)
 						{
 							user->WriteServ(reply);
-							reply = std::string("303 ") + user->nick + " :";
+							reply = "303 " + user->nick + " :";
 						}
 						ison_already[u] = u;
 					}