X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=b86bf1809182f6e7041c02b8a0b7d86c62e360ea;hb=b928bbfd192c5569b2fc5d497cfc88790bb6d795;hp=fd5ec6f0955f065883c2172905d1353c525fccc2;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index fd5ec6f09..b86bf1809 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
-
 /** Handle /TITLE
  */
 class CommandTitle : public Command
@@ -30,99 +28,77 @@ class CommandTitle : public Command
  public:
 	StringExtItem ctitle;
 	CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2),
-		ctitle("ctitle", Creator)
+		ctitle("ctitle", ExtensionItem::EXT_USER, Creator)
 	{
 		syntax = "<user> <password>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
-	}
-
-	bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
-	{
-		std::stringstream hl(hostlist);
-		std::string xhost;
-		while (hl >> xhost)
-		{
-			if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
-			{
-				return true;
-			}
-		}
-		return false;
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
 	{
-		char TheHost[MAXBUF];
-		char TheIP[MAXBUF];
-
-		snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str());
-		snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString());
+		const std::string userHost = user->ident + "@" + user->host;
+		const std::string userIP = user->ident + "@" + user->GetIPString();
 
-		ConfigReader Conf;
-		for (int i=0; i<Conf.Enumerate("title"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("title");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			std::string Name = Conf.ReadValue("title", "name", "", i);
-			std::string pass = Conf.ReadValue("title", "password", "", i);
-			std::string hash = Conf.ReadValue("title", "hash", "", i);
-			std::string host = Conf.ReadValue("title", "host", "*@*", i);
-			std::string title = Conf.ReadValue("title", "title", "", i);
-			std::string vhost = Conf.ReadValue("title", "vhost", "", i);
-
-			if (!strcmp(Name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
+			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())
 			{
 				ctitle.set(user, title);
 
 				ServerInstance->PI->SendMetaData(user, "ctitle", title);
 
 				if (!vhost.empty())
-					user->ChangeDisplayedHost(vhost.c_str());
+					user->ChangeDisplayedHost(vhost);
 
-				user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
+				user->WriteNotice("Custom title set to '" + title + "'");
 
 				return CMD_SUCCESS;
 			}
 		}
 
-		user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
+		user->WriteNotice("Invalid title credentials");
 		return CMD_SUCCESS;
 	}
 
 };
 
-class ModuleCustomTitle : public Module
+class ModuleCustomTitle : public Module, public Whois::LineEventListener
 {
 	CommandTitle cmd;
 
  public:
-	ModuleCustomTitle() : cmd(this)
+	ModuleCustomTitle()
+		: Whois::LineEventListener(this)
+		, cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		ServerInstance->Extensions.Register(&cmd.ctitle);
-		ServerInstance->Modules->Attach(I_OnWhoisLine, this);
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 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(320, ":%s", ctitle->c_str());
 			}
 		}
 		/* Don't block anything */
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleCustomTitle()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
 	}