X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whois.cpp;h=d48d1a10c46a3dcbd1569f62d33195157f41e417;hb=dc7927e17cffb2ee3c50ef9f037ed873d378f679;hp=138589237a34d0b64e8f351a0f310ef2082f4c38;hpb=0bb5b62bfb18d033ef03932f6ea8fe7a366c1b92;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 138589237..d48d1a10c 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -15,21 +15,11 @@
  */
 
 #include "inspircd.h"
-#include "message.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_whois.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-
 const char* Spacify(char* n)
 {
 	static char x[MAXBUF];
@@ -40,43 +30,43 @@ const char* Spacify(char* n)
 	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
-	if (dest->registered == 7)
+	if (dest->registered == REG_ALL)
 	{
-		WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
+		user->WriteServ("311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
 		if ((user == dest) || (*user->oper))
 		{
-			WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, inet_ntoa(dest->ip4));
+			user->WriteServ("378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
 		}
-		std::string cl = chlist(dest,user);
+		std::string cl = dest->ChannelList(user);
 		if (cl.length())
 		{
 			if (cl.length() > 400)
 			{
-				split_chlist(user,dest,cl);
+				user->SplitChanList(dest,cl);
 			}
 			else
 			{
-				WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl.c_str());
+				user->WriteServ("319 %s %s :%s",user->nick, dest->nick, cl.c_str());
 			}
 		}
-		if (*Config->HideWhoisServer && !(*user->oper))
+		if (*ServerInstance->Config->HideWhoisServer && !(*user->oper))
 		{
-			WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, Config->HideWhoisServer, Config->Network);
+			user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
 		}
 		else
 		{
-			WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
+			user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
 		}
 		if (*dest->awaymsg)
 		{
-			WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
+			user->WriteServ("301 %s %s :%s",user->nick, dest->nick, dest->awaymsg);
 		}
 		if (*dest->oper)
 		{
-			WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), Config->Network);
+			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))
 		{
@@ -85,36 +75,48 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
 		if (!strcasecmp(user->server,dest->server))
 		{
 			// idle time and signon line can only be sent if youre on the same server (according to RFC)
-			WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
+			user->WriteServ("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))
-				WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
+				user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon);
 		}
-		WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
+		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
 	}
 	else
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, nick);
-		WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, nick);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+		user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
 	}
 }
 
-void cmd_whois::Handle (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(this,parameters,pcnt,user,0,pcnt-1,0))
-		return;
-	dest = Find(parameters[0]);
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		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 */
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-		WriteServ(user->fd,"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;
 }
+