X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_userhost.cpp;h=aa4d3de3e41a867efc1bd50a4d29f76103efdf06;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=555aa1953f128f10a80b0adbe02308454e9ce052;hpb=9826d2ee0a26234a4f5421ae686b0068f3f64c57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 555aa1953..aa4d3de3e 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -66,21 +66,24 @@ void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user)
 {
 	char Return[MAXBUF],junk[MAXBUF];
 	snprintf(Return,MAXBUF,"302 %s :",user->nick);
+	
 	for (int i = 0; i < pcnt; i++)
 	{
 		userrec *u = Find(parameters[i]);
-		if (u)
+		if(u)
 		{
-			if (strchr(u->modes,'o'))
-			{
-				snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-				strlcat(Return,junk,MAXBUF);
-			}
+			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);
 			else
-			{
-				snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-				strlcat(Return,junk,MAXBUF);
-			}
+				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);
+
+			strlcat(Return,junk,MAXBUF);
 		}
 	}
 	WriteServ(user->fd,Return);