X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=5a3a925a31dc42c68b4047fa7ac224e52c56f766;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=fc99cd29f24416302d1e5ffbe50f7a6b6f0a410f;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index fc99cd29f..5a3a925a3 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -1,19 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
+#include "inspircd.h"
 
 /** Handle /TITLE
  */
@@ -21,46 +27,29 @@ class CommandTitle : public Command
 {
  public:
 	StringExtItem ctitle;
-	CommandTitle (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"TITLE",0,2),
+	CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2),
 		ctitle("ctitle", 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(ServerInstance);
-		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);
 
@@ -69,13 +58,13 @@ class CommandTitle : public Command
 				if (!vhost.empty())
 					user->ChangeDisplayedHost(vhost.c_str());
 
-				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;
 	}
 
@@ -86,15 +75,18 @@ class ModuleCustomTitle : public Module
 	CommandTitle cmd;
 
  public:
-	ModuleCustomTitle(InspIRCd* Me) : Module(Me), cmd(Me, this)
+	ModuleCustomTitle() : cmd(this)
+	{
+	}
+
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->AddCommand(&cmd);
-		Extensible::Register(&cmd.ctitle);
-		ServerInstance->Modules->Attach(I_OnWhoisLine, this);
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->AddService(cmd.ctitle);
 	}
 
 	// :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(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -110,13 +102,9 @@ class ModuleCustomTitle : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleCustomTitle()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Custom Title for users", VF_COMMON | VF_VENDOR);
+		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };