X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_userhost.cpp;h=542c1831dce9b959e27199f80584419bbe292bfe;hb=9aadc251e9910998fbbe5438b461958a261eae1d;hp=a6782419496a0710f13bc8480a4248d7e07c87d7;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index a67824194..542c1831d 100644
--- a/src/coremods/core_userhost.cpp
+++ b/src/coremods/core_userhost.cpp
@@ -24,10 +24,15 @@
  */
 class CommandUserhost : public Command
 {
+	UserModeReference hideopermode;
+
  public:
 	/** Constructor for userhost.
 	 */
-	CommandUserhost ( Module* parent) : Command(parent,"USERHOST", 1, 5) {
+	CommandUserhost(Module* parent)
+		: Command(parent,"USERHOST", 1)
+		, hideopermode(parent, "hideoper")
+	{
 		syntax = "<nick> [<nick> ...]";
 	}
 	/** Handle command.
@@ -35,16 +40,20 @@ class CommandUserhost : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
-CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandUserhost::Handle(User* user, const Params& parameters)
 {
 	const bool has_privs = user->HasPrivPermission("users/auspex");
 
-	std::string retbuf = "302 " + user->nick + " :";
+	std::string retbuf;
 
-	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,20 +62,41 @@ 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 += (((u == user) || (has_privs)) ? u->host : u->dhost);
+			retbuf += u->GetHost(u == user || has_privs);
 			retbuf += ' ';
 		}
 	}
 
-	user->WriteServ(retbuf);
+	user->WriteNumeric(RPL_USERHOST, retbuf);
 
 	return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandUserhost)
+class CoreModUserhost : public Module
+{
+ private:
+	CommandUserhost cmd;
+
+ public:
+	CoreModUserhost()
+		: cmd(this)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the USERHOST command", VF_CORE | VF_VENDOR);
+	}
+};
+
+MODULE_INIT(CoreModUserhost)