X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=9e01b5c7e2271222d6cefb38f88f00263702d01c;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=0a189be7f2485aa954b384a4c9d56b9b713b06bc;hpb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 0a189be7f..9e01b5c7e 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -1,66 +1,93 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
 
-class ChannelLogStream : public LogStream
+class ModuleChanLog : public Module
 {
- private:
-	std::string channel;
+	/*
+	 * Multimap so people can redirect a snomask to multiple channels.
+	 */
+	typedef insp::flat_multimap<char, std::string> ChanLogTargets;
+	ChanLogTargets logstreams;
 
  public:
-	ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-	}
+		std::string snomasks;
+		std::string channel;
+		ChanLogTargets newlogs;
 
-	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
-	{
-		Channel *c = ServerInstance->FindChan(channel);
+		ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+		{
+			channel = i->second->getString("channel");
+			snomasks = i->second->getString("snomasks");
 
-		if (loglevel < this->loglvl) return;
+			if (channel.empty() || snomasks.empty())
+			{
+				throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation());
+			}
 
-		if (c)
-		{
-			// So this won't work remotely. Oh well.
-			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :\2%s\2: %s", c->name, type.c_str(), msg.c_str());
+			for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++)
+			{
+				newlogs.insert(std::make_pair(*it, channel));
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
+			}
 		}
-	}
-};
+		logstreams.swap(newlogs);
 
-/* $ModDesc: Logs output to a channel instead of / as well as a file. */
-
-class ModuleChanLog : public Module
-{
- private:
-	ChannelLogStream *l;
- public:
-	ModuleChanLog(InspIRCd* Me) : Module(Me)
-	{
-		l = new ChannelLogStream(Me, ServerInstance->Config->LogLevel, "#services");
-		Me->Logs->AddLogType("*", l);
 	}
 
-	virtual ~ModuleChanLog()
+	ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) CXX11_OVERRIDE
 	{
-		delete l;
+		std::pair<ChanLogTargets::const_iterator, ChanLogTargets::const_iterator> itpair = logstreams.equal_range(sno);
+		if (itpair.first == itpair.second)
+			return MOD_RES_PASSTHRU;
+
+		const std::string snotice = "\002" + desc + "\002: " + msg;
+
+		for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
+		{
+			Channel *c = ServerInstance->FindChan(it->second);
+			if (c)
+			{
+				ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->Config->ServerName, c, snotice);
+				c->Write(ServerInstance->GetRFCEvents().privmsg, privmsg);
+				ServerInstance->PI->SendMessage(c, 0, snotice);
+			}
+		}
+
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Allows messages sent to snomasks to be logged to a channel.", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleChanLog)
-