X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_whois.cpp;h=ab0b82fff4a3b77293e964a9c4e7b8ad4e0afcd7;hb=0c78ad71d32e4062827f2ebac927bdbf43c091ba;hp=972b0439e0ad62ad1d5573e8e5d749b543d89a3d;hpb=3841c4b04a96389a4661535d12d5215a621d8736;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 972b0439e..ab0b82fff 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@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"
 
 /** Handle /WHOIS. These command handlers can be reloaded by the core,
@@ -56,7 +64,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
 	else
 		dest = ServerInstance->FindNick(parameters[userindex]);
 
-	if (dest)
+	if ((dest) && (dest->registered == REG_ALL))
 	{
 		/*
 		 * Okay. Umpteenth attempt at doing this, so let's re-comment...
@@ -66,9 +74,9 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
 		 * For remote users (/w remoteuser remoteuser), spanningtree will handle calling do_whois, so we can ignore this case.
 		 * Thanks to djGrrr for not being impatient while I have a crap day coding. :p -- w00t
 		 */
-		if (IS_LOCAL(dest) && (!*ServerInstance->Config->HideWhoisServer || parameters.size() > 1))
+		if (IS_LOCAL(dest) && (ServerInstance->Config->HideWhoisServer.empty() || parameters.size() > 1))
 		{
-			idle = abs((long)((dest->idle_lastmsg)-ServerInstance->Time()));
+			idle = labs((long)((dest->idle_lastmsg)-ServerInstance->Time()));
 			signon = dest->signon;
 		}
 
@@ -78,7 +86,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
 	{
 		/* no such nick/channel */
 		user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), !parameters[userindex].empty() ? parameters[userindex].c_str() : "*");
-		user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), parameters[userindex].empty() ? parameters[userindex].c_str() : "*");
+		user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), !parameters[userindex].empty() ? parameters[userindex].c_str() : "*");
 		return CMD_FAILURE;
 	}