X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_userhost.cpp;h=8a0e187fb0a4503b7fdd13e32bc5add9ee924e8d;hb=19157777c5f977fddbcfdc8cdad78e12bf0d6bbb;hp=aaa25c98659cdd64d76733fb5014b92b8a98d393;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index aaa25c986..8a0e187fb 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -2,50 +2,61 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "users.h"
-#include "commands.h"
-
 #include "inspircd.h"
 #include "commands/cmd_userhost.h"
 
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_userhost(Instance);
+}
 
-
-void cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	char Return[MAXBUF],junk[MAXBUF];
-	snprintf(Return,MAXBUF,"302 %s :",user->nick);
+	std::string retbuf = std::string("302 ") + user->nick + " :";
+
 	
 	for (int i = 0; i < pcnt; i++)
 	{
 		userrec *u = ServerInstance->FindNick(parameters[i]);
-		if(u)
+
+		if ((u) && (u->registered == REG_ALL))
 		{
-			if(*u->oper)
-				if(*user->oper)
-					snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-				else
-					snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->dhost);
+			retbuf = retbuf + u->nick;
+
+			if (IS_OPER(u))
+			{
+				retbuf = retbuf + "*=+";
+			}
+			else
+			{
+				retbuf = retbuf + "=+";
+			}
+
+			retbuf = retbuf + u->ident + "@";
+
+			if (IS_OPER(user))
+			{
+				retbuf = retbuf + u->host;
+			}
 			else
-				if(*user->oper)
-					snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-				else
-					snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->dhost);
+			{
+				retbuf = retbuf + u->dhost;
+			}
 
-			strlcat(Return,junk,MAXBUF);
+			retbuf = retbuf + " ";
 		}
 	}
-	user->WriteServ(Return);
+
+	user->WriteServ(retbuf);
+
+	return CMD_SUCCESS;
 }