Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / cmd_userhost.cpp

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 555aa1953f128f10a80b0adbe02308454e9ce052..aa4d3de3e41a867efc1bd50a4d29f76103efdf06 100644 (file)
--- 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);