X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whois.cpp;h=192e2822c1975b80957b4e394a33a87ca07892ab;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=15ae9110b52a2d0edb407b24d3a6e459bcc50b65;hpb=d02a5866d4fdedec9219aeca0a6048828b394fd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 15ae9110b..192e2822c 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.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.
  *
@@ -18,33 +15,18 @@
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_whois.h"
+#include "hashcomp.h"
 
-extern InspIRCd* ServerInstance;
-
-extern time_t TIME;
-
-const char* Spacify(char* n)
-{
-	static char x[MAXBUF];
-	strlcpy(x,n,MAXBUF);
-	for (char* y = x; *y; y++)
-		if (*y == '_')
-			*y = ' ';
-	return x;
-}
-
-void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
+void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
-	// bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
+	/* check if the user is registered first, can't whois unknown connections */
 	if (dest->registered == REG_ALL)
 	{
-		user->WriteServ("311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
+		ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
 		if ((user == dest) || (*user->oper))
 		{
-			user->WriteServ("378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
+			ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick, dest->nick, dest->ident, dest->host, dest->GetIPString());
 		}
 		std::string cl = dest->ChannelList(user);
 		if (cl.length())
@@ -55,64 +37,73 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
 			}
 			else
 			{
-				user->WriteServ("319 %s %s :%s",user->nick, dest->nick, cl.c_str());
+				ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick, dest->nick, cl.c_str());
 			}
 		}
 		if (*ServerInstance->Config->HideWhoisServer && !(*user->oper))
 		{
-			user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
+			ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
 		}
 		else
 		{
-			user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
+			ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
 		}
 		if (*dest->awaymsg)
 		{
-			user->WriteServ("301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
+			ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick, dest->nick, dest->awaymsg);
 		}
 		if (*dest->oper)
 		{
-			user->WriteServ("313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), ServerInstance->Config->Network);
-		}
-		if ((!signon) && (!idle))
-		{
-			FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+			ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network);
 		}
+
+		FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+
 		if (!strcasecmp(user->server,dest->server))
 		{
 			// idle time and signon line can only be sent if youre on the same server (according to RFC)
-			user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
+			ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-ServerInstance->Time()), dest->signon);
 		}
 		else
 		{
 			if ((idle) || (signon))
-				user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+				ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
 		}
-		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
+		ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, dest->nick);
 	}
 	else
 	{
-		user->WriteServ("401 %s %s :No such nick/channel",user->nick, nick);
-		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, nick);
+		ServerInstance->SendWhoisLine(user, dest, 401, "%s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+		ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
 	}
 }
 
-void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_whois(Instance);
+}
+
+CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-		return;
+		return CMD_SUCCESS;
 
 	dest = ServerInstance->FindNick(parameters[0]);
 	if (dest)
 	{
-		do_whois(user,dest,0,0,parameters[0]);
+		do_whois(this->ServerInstance, user,dest,0,0,parameters[0]);
 	}
 	else
 	{
 		/* no such nick/channel */
-		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
-		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, *parameters[0] ? parameters[0] : "*");
+		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *parameters[0] ? parameters[0] : "*");
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
 }