X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_userhost.cpp;h=eae6e51ce3f0f3a1eaa2b61f343d57e9edce3652;hb=30fc51c6ddca487a1b89da9ab0ab59da003aee36;hp=541402c10385f0d40ae31337ea3e43815521c217;hpb=c67d3103e9f7397f0ab9631bf07a5e5547deb2c3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index 541402c10..eae6e51ce 100644
--- a/src/coremods/core_userhost.cpp
+++ b/src/coremods/core_userhost.cpp
@@ -24,11 +24,16 @@
  */
 class CommandUserhost : public Command
 {
+	UserModeReference hideopermode;
+
  public:
 	/** Constructor for userhost.
 	 */
-	CommandUserhost ( Module* parent) : Command(parent,"USERHOST", 1, 5) {
-		syntax = "<nick> {<nick>}";
+	CommandUserhost(Module* parent)
+		: Command(parent,"USERHOST", 1)
+		, hideopermode(parent, "hideoper")
+	{
+		syntax = "<nick> [<nick> ...]";
 	}
 	/** Handle command.
 	 * @param parameters The parameters to the command
@@ -40,38 +45,35 @@ 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++)
+	unsigned int max = parameters.size();
+	if (max > 5)
+		max = 5;
+
+	for (unsigned int i = 0; i < max; i++)
 	{
 		User *u = ServerInstance->FindNickOnly(parameters[i]);
 
 		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;
+				// XXX: +H hidden opers must not be shown as opers
+				if ((u == user) || (has_privs) || (!u->IsModeSet(hideopermode)))
+					retbuf += '*';
 			}
 
-			retbuf = retbuf + " ";
+			retbuf += '=';
+			retbuf += (u->IsAway() ? '-' : '+');
+			retbuf += u->ident;
+			retbuf += '@';
+			retbuf += (((u == user) || (has_privs)) ? u->host : u->dhost);
+			retbuf += ' ';
 		}
 	}