X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=3ffc9f682aaef26fd0193954313eaa8ae3f23338;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=86ed66110c1bce2446e76176da68cd9c3248aa5d;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 86ed66110..3ffc9f682 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -20,6 +20,48 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
+
+enum
+{
+	// From UnrealIRCd.
+	RPL_WHOISSPECIAL = 320
+};
+
+struct CustomTitle
+{
+	const std::string name;
+	const std::string password;
+	const std::string hash;
+	const std::string host;
+	const std::string title;
+	const std::string vhost;
+
+	CustomTitle(const std::string& n, const std::string& p, const std::string& h, const std::string& hst, const std::string& t, const std::string& v)
+		: name(n)
+		, password(p)
+		, hash(h)
+		, host(hst)
+		, title(t)
+		, vhost(v)
+	{
+	}
+
+	bool MatchUser(User* user) const
+	{
+		const std::string userHost = user->ident + "@" + user->GetRealHost();
+		const std::string userIP = user->ident + "@" + user->GetIPString();
+		return InspIRCd::MatchMask(host, userHost, userIP);
+	}
+
+	bool CheckPass(User* user, const std::string& pass) const
+	{
+		return ServerInstance->PassCompare(user, password, pass, hash);
+	}
+};
+
+typedef std::multimap<std::string, CustomTitle> CustomVhostMap;
+typedef std::pair<CustomVhostMap::iterator, CustomVhostMap::iterator> MatchingConfigs;
 
 /** Handle /TITLE
  */
@@ -27,38 +69,31 @@ class CommandTitle : public Command
 {
  public:
 	StringExtItem ctitle;
+	CustomVhostMap configs;
+
 	CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2),
-		ctitle("ctitle", Creator)
+		ctitle("ctitle", ExtensionItem::EXT_USER, Creator)
 	{
-		syntax = "<user> <password>";
+		syntax = "<username> <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 userIP = user->ident + "@" + user->GetIPString();
+		MatchingConfigs matching = configs.equal_range(parameters[0]);
 
-		ConfigTagList tags = ServerInstance->Config->ConfTags("title");
-		for (ConfigIter i = tags.first; i != tags.second; ++i)
+		for (MatchingConfigs::first_type i = matching.first; i != matching.second; ++i)
 		{
-			std::string Name = i->second->getString("name");
-			std::string pass = i->second->getString("password");
-			std::string hash = i->second->getString("hash");
-			std::string host = i->second->getString("host", "*@*");
-			std::string title = i->second->getString("title");
-			std::string vhost = i->second->getString("vhost");
-
-			if (Name == parameters[0] && !ServerInstance->PassCompare(user, pass, parameters[1], hash) &&
-				InspIRCd::MatchMask(host, userHost, userIP) && !title.empty())
+			CustomTitle config = i->second;
+			if (config.MatchUser(user) && config.CheckPass(user, parameters[1]))
 			{
-				ctitle.set(user, title);
+				ctitle.set(user, config.title);
 
-				ServerInstance->PI->SendMetaData(user, "ctitle", title);
+				ServerInstance->PI->SendMetaData(user, "ctitle", config.title);
 
-				if (!vhost.empty())
-					user->ChangeDisplayedHost(vhost.c_str());
+				if (!config.vhost.empty())
+					user->ChangeDisplayedHost(config.vhost);
 
-				user->WriteNotice("Custom title set to '" + title + "'");
+				user->WriteNotice("Custom title set to '" + config.title + "'");
 
 				return CMD_SUCCESS;
 			}
@@ -70,33 +105,53 @@ 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)
 	{
 	}
 
-	void init() CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(cmd.ctitle);
-		ServerInstance->Modules->Attach(I_OnWhoisLine, this);
+		ConfigTagList tags = ServerInstance->Config->ConfTags("title");
+		CustomVhostMap newtitles;
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+		{
+			reference<ConfigTag> tag = i->second;
+			std::string name = tag->getString("name", "", 1);
+			if (name.empty())
+				throw ModuleException("<title:name> is empty at " + tag->getTagLocation());
+
+			std::string pass = tag->getString("password");
+			if (pass.empty())
+				throw ModuleException("<title:password> is empty at " + tag->getTagLocation());
+
+			std::string hash = tag->getString("hash");
+			std::string host = tag->getString("host", "*@*");
+			std::string title = tag->getString("title");
+			std::string vhost = tag->getString("vhost");
+			CustomTitle config(name, pass, hash, host, title, vhost);
+			newtitles.insert(std::make_pair(name, config));
+		}
+		cmd.configs.swap(newtitles);
 	}
 
 	// :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 :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str());
+				whois.SendLine(RPL_WHOISSPECIAL, ctitle);
 			}
 		}
 		/* Don't block anything */
@@ -105,7 +160,7 @@ class ModuleCustomTitle : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the TITLE command, custom titles for users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };