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

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index d732bd771..972b0439e 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,96 +12,27 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "hashcomp.h"
 
-void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick)
+/** Handle /WHOIS. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandWhois : public Command
 {
-	if (dest->Visibility && !dest->Visibility->VisibleTo(user))
-	{
-		ServerInstance->SendWhoisLine(user, dest, 401, "%s %s :No such nick/channel",user->nick.c_str(), *nick ? nick : "*");
-		ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick.c_str(), *nick ? nick : "*");
-		return;
-	}
-
-	if (dest->registered == REG_ALL)
-	{
-		ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->dhost.c_str(), dest->fullname.c_str());
-		if (user == dest || user->HasPrivPermission("users/auspex"))
-		{
-			ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->host.c_str(), dest->GetIPString());
-		}
-
-		std::string cl = dest->ChannelList(user);
-
-		if (cl.length())
-		{
-			if (cl.length() > 400)
-			{
-				user->SplitChanList(dest,cl);
-			}
-			else
-			{
-				ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), cl.c_str());
-			}
-		}
-		if (*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex"))
-		{
-			ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
-		}
-		else
-		{
-			ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
-		}
-
-		if (IS_AWAY(dest))
-		{
-			ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
-		}
-
-		if (IS_OPER(dest))
-		{
-			ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick.c_str(), dest->nick.c_str(), (strchr("AEIOUaeiou",dest->oper[0]) ? "an" : "a"),irc::Spacify(dest->oper.c_str()), ServerInstance->Config->Network);
-		}
-
-		if (user == dest || user->HasPrivPermission("users/auspex"))
-		{
-			if (dest->IsModeSet('s') != 0)
-			{
-				ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s +%s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes(), dest->FormatNoticeMasks());
-			}
-			else
-			{
-				ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes());
-			}
-		}
-
-		FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
-
-		/*
-		 * We only send these if we've been provided them. That is, if hidewhois is turned off, and user is local, or
-		 * if remote whois is queried, too. This is to keep the user hidden, and also since you can't reliably tell remote time. -- w00t
-		 */
-		if ((idle) || (signon))
-		{
-			ServerInstance->SendWhoisLine(user, dest, 317, "%s %s %lu %lu :seconds idle, signon time",user->nick.c_str(), dest->nick.c_str(), idle, signon);
-		}
-
-		ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick.c_str(), dest->nick.c_str());
-	}
-	else
-	{
-		ServerInstance->SendWhoisLine(user, dest, 401, "%s %s :No such nick/channel",user->nick.c_str(), *nick ? nick : "*");
-		ServerInstance->SendWhoisLine(user, dest, 318, "%s %s :End of /WHOIS list.",user->nick.c_str(), *nick ? nick : "*");
-	}
-}
-
-
+ public:
+	/** Constructor for whois.
+	 */
+	CommandWhois ( Module* parent) : Command(parent,"WHOIS",1) { Penalty = 2; syntax = "<nick>{,<nick>}"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
-{
-	return new CommandWhois(Instance);
-}
 
 CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User *user)
 {
@@ -141,7 +72,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
 			signon = dest->signon;
 		}
 
-		do_whois(this->ServerInstance, user,dest,signon,idle,parameters[userindex].c_str());
+		ServerInstance->DoWhois(user,dest,signon,idle,parameters[userindex].c_str());
 	}
 	else
 	{
@@ -155,3 +86,5 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
 }
 
 
+
+COMMAND_INIT(CommandWhois)