X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=c16b1eda21313093ffdfe3d2a60a35a53f62588a;hb=a0f7d012791d79b67b56b62415f7901d5e48870f;hp=67eca6dda8d0c596e7886494572b3a473b989dd5;hpb=b705c6426818ba8cedfd00d1a84dab8ff0d0f1a0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 67eca6dda..c16b1eda2 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -20,6 +20,13 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
+
+enum
+{
+	// From UnrealIRCd.
+	RPL_WHOISSPECIAL = 320
+};
 
 /** Handle /TITLE
  */
@@ -33,9 +40,9 @@ class CommandTitle : public Command
 		syntax = "<user> <password>";
 	}
 
-	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		const std::string userHost = user->ident + "@" + user->host;
+		const std::string userHost = user->ident + "@" + user->GetRealHost();
 		const std::string userIP = user->ident + "@" + user->GetIPString();
 
 		ConfigTagList tags = ServerInstance->Config->ConfTags("title");
@@ -70,26 +77,28 @@ class CommandTitle : public Command
 
 };
 
-class ModuleCustomTitle : public Module
+class ModuleCustomTitle : public Module, public Whois::LineEventListener
 {
 	CommandTitle cmd;
 
  public:
-	ModuleCustomTitle() : cmd(this)
+	ModuleCustomTitle()
+		: Whois::LineEventListener(this)
+		, cmd(this)
 	{
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
+	ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
-		if (numeric == 312)
+		if (numeric.GetNumeric() == 312)
 		{
 			/* Insert our numeric before 312 */
-			const std::string* ctitle = cmd.ctitle.get(dest);
+			const std::string* ctitle = cmd.ctitle.get(whois.GetTarget());
 			if (ctitle)
 			{
-				ServerInstance->SendWhoisLine(user, dest, 320, "%s :%s", dest->nick.c_str(), ctitle->c_str());
+				whois.SendLine(RPL_WHOISSPECIAL, ctitle);
 			}
 		}
 		/* Don't block anything */