X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_userhost.cpp;h=5b00524d7e2341a61947a6b001494a9e753bc5ad;hb=d383ce9b72bf5c58bb0571998b282cf67cf7635c;hp=94f406c315eec5b40e0304e25de416b5d7e3b6bb;hpb=5d5285f24b1fe306faa2a6d0565ba1cff0f17f11;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 94f406c31..5b00524d7 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,21 +12,45 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_userhost.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+#ifndef CMD_USERHOST_H
+#define CMD_USERHOST_H
+
+// include the common header files
+
+#include "users.h"
+#include "channels.h"
+
+/** Handle /USERHOST. 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 CommandUserhost : public Command
 {
-	return new CommandUserhost(Instance);
-}
+ public:
+	/** Constructor for userhost.
+	 */
+	CommandUserhost ( Module* parent) : Command(parent,"USERHOST",0,1) { 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);
+};
 
-CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user)
+#endif
+
+
+CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	std::string retbuf = std::string("302 ") + user->nick + " :";
 
-	
-	for (int i = 0; i < pcnt; i++)
+	for (unsigned int i = 0; i < parameters.size(); i++)
 	{
-		User *u = ServerInstance->FindNick(parameters[i]);
+		User *u = ServerInstance->FindNickOnly(parameters[i]);
 
 		if ((u) && (u->registered == REG_ALL))
 		{
@@ -34,16 +58,21 @@ CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user
 
 			if (IS_OPER(u))
 			{
-				retbuf = retbuf + "*=+";
+				retbuf = retbuf + "*=";
 			}
 			else
 			{
-				retbuf = retbuf + "=+";
+				retbuf = retbuf + "=";
 			}
 
+			if (IS_AWAY(u))
+				retbuf += "-";
+			else
+				retbuf += "+";
+
 			retbuf = retbuf + u->ident + "@";
 
-			if (IS_OPER(user))
+			if (user->HasPrivPermission("users/auspex"))
 			{
 				retbuf = retbuf + u->host;
 			}
@@ -60,3 +89,5 @@ CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandUserhost)