Change return type of Channel::GetUsers() to reference from pointer as it is never...

[user/henk/code/inspircd.git] / src / coremods / core_userhost.cpp

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index 541402c10385f0d40ae31337ea3e43815521c217..1b34addb509b93dc36878b6d14d57e03fe476150 100644 (file)
--- a/src/coremods/core_userhost.cpp
+++ b/src/coremods/core_userhost.cpp
@@ -40,6 +40,8 @@ class CommandUserhost : public Command
 
 CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
 {
+       const bool has_privs = user->HasPrivPermission("users/auspex");
+
        std::string retbuf = "302 " + user->nick + " :";
 
        for (unsigned int i = 0; i < parameters.size(); i++)
@@ -48,30 +50,17 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 
                if ((u) && (u->registered == REG_ALL))
                {
-                       retbuf = retbuf + u->nick;
+                       retbuf += u->nick;
 
                        if (u->IsOper())
-                               retbuf = retbuf + "*";
-
-                       retbuf = retbuf + "=";
-
-                       if (u->IsAway())
-                               retbuf += "-";
-                       else
-                               retbuf += "+";
-
-                       retbuf = retbuf + u->ident + "@";
-
-                       if (user->HasPrivPermission("users/auspex"))
-                       {
-                               retbuf = retbuf + u->host;
-                       }
-                       else
-                       {
-                               retbuf = retbuf + u->dhost;
-                       }
+                               retbuf += '*';
 
-                       retbuf = retbuf + " ";
+                       retbuf += '=';
+                       retbuf += (u->IsAway() ? '-' : '+');
+                       retbuf += u->ident;
+                       retbuf += '@';
+                       retbuf += (((u == user) || (has_privs)) ? u->host : u->dhost);
+                       retbuf += ' ';
                }
        }