X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_userhost.cpp;h=eae6e51ce3f0f3a1eaa2b61f343d57e9edce3652;hb=06bc8df45045a3d1fdc45f793abf7ba72b7403b1;hp=9d4c9e8f71b256bcd36faeecd9a6fbcaad4c0ea4;hpb=7a43a5d87593a1f8ea06a5f32865e73b88c7afea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index 9d4c9e8f7..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
@@ -44,7 +49,11 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 
 	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]);
 
@@ -53,13 +62,17 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 			retbuf += u->nick;
 
 			if (u->IsOper())
-				retbuf += '*';
+			{
+				// XXX: +H hidden opers must not be shown as opers
+				if ((u == user) || (has_privs) || (!u->IsModeSet(hideopermode)))
+					retbuf += '*';
+			}
 
 			retbuf += '=';
 			retbuf += (u->IsAway() ? '-' : '+');
 			retbuf += u->ident;
 			retbuf += '@';
-			retbuf += (has_privs ? u->host : u->dhost);
+			retbuf += (((u == user) || (has_privs)) ? u->host : u->dhost);
 			retbuf += ' ';
 		}
 	}