X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_userhost.cpp;h=7e1efd6375de04c8c041c588f32580e03c91f6ee;hb=1624ab03b86542a2cb02eda809303144974755f3;hp=126b49ee408442ec7e6797c9d33c884935969103;hpb=3cf993500544c2157992650da2487bfa89be405d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 126b49ee4..7e1efd637 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef __CMD_USERHOST_H__
-#define __CMD_USERHOST_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /USERHOST. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,9 @@ class CommandUserhost : public Command
  public:
 	/** Constructor for userhost.
 	 */
-	CommandUserhost ( Module* parent) : Command(parent,"USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
+	CommandUserhost ( Module* parent) : Command(parent,"USERHOST", 1) {
+		syntax = "<nick> [<nick> ...]";
+	}
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -41,14 +42,16 @@ class CommandUserhost : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	std::string retbuf = std::string("302 ") + user->nick + " :";
+	std::string retbuf = "302 " + user->nick + " :";
+
+	unsigned int max = parameters.size();
+	if (max > 5)
+		max = 5;
 
-	for (unsigned int i = 0; i < parameters.size(); i++)
+	bool has_privs = user->HasPrivPermission("users/auspex");
+	for (unsigned int i = 0; i < max; i++)
 	{
 		User *u = ServerInstance->FindNickOnly(parameters[i]);
 
@@ -58,13 +61,14 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 
 			if (IS_OPER(u))
 			{
-				retbuf = retbuf + "*=";
-			}
-			else
-			{
-				retbuf = retbuf + "=";
+				// XXX: +H hidden opers must not be shown as opers
+				ModeHandler* mh = ServerInstance->Modes->FindMode('H', MODETYPE_USER);
+				if ((u == user) || (has_privs) || (!mh) || (!u->IsModeSet('H')) || (mh->name != "hideoper"))
+					retbuf += '*';
 			}
 
+			retbuf = retbuf + "=";
+
 			if (IS_AWAY(u))
 				retbuf += "-";
 			else
@@ -72,7 +76,7 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 
 			retbuf = retbuf + u->ident + "@";
 
-			if (user->HasPrivPermission("users/auspex"))
+			if (has_privs)
 			{
 				retbuf = retbuf + u->host;
 			}