Patch to not increment nickchange counter for nick changes that would be blocked...

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

diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 94f406c315eec5b40e0304e25de416b5d7e3b6bb..83375a0fd4f926f6d7af784b13787522fc46d359 100644 (file)
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,12 +19,11 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandUserhost(Instance);
 }
 
-CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string retbuf = std::string("302 ") + user->nick + " :";
 
-       
-       for (int i = 0; i < pcnt; i++)
+       for (unsigned int i = 0; i < parameters.size(); i++)
        {
                User *u = ServerInstance->FindNick(parameters[i]);
 
@@ -34,16 +33,21 @@ CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user
 
                        if (IS_OPER(u))
                        {
-                               retbuf = retbuf + "*=+";
+                               retbuf = retbuf + "*=";
                        }
                        else
                        {
-                               retbuf = retbuf + "=+";
+                               retbuf = retbuf + "=";
                        }
 
+                       if (IS_AWAY(u))
+                               retbuf += "-";
+                       else
+                               retbuf += "+";
+
                        retbuf = retbuf + u->ident + "@";
 
-                       if (IS_OPER(user))
+                       if (user->HasPrivPermission("users/auspex"))
                        {
                                retbuf = retbuf + u->host;
                        }