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

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 4fe9eb1b4..8a0e187fb 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -2,91 +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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_userhost.h"
+#include "commands/cmd_userhost.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_userhost(Instance);
+}
 
-void cmd_userhost::Handle (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 = Find(parameters[i]);
-		if(u)
+		userrec *u = ServerInstance->FindNick(parameters[i]);
+
+		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
-				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 + "=+";
+			}
 
-			strlcat(Return,junk,MAXBUF);
+			retbuf = retbuf + u->ident + "@";
+
+			if (IS_OPER(user))
+			{
+				retbuf = retbuf + u->host;
+			}
+			else
+			{
+				retbuf = retbuf + u->dhost;
+			}
+
+			retbuf = retbuf + " ";
 		}
 	}
-	WriteServ(user->fd,Return);
-}
-
 
+	user->WriteServ(retbuf);
 
+	return CMD_SUCCESS;
+}