X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=add51026f7afa4db1bcd70eef9dfb361fcd7ea8e;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=a0d3da4dcd8fbf2e7c0737547f7314b331f078ae;hpb=1df212127427f88b502a5f1030fd2e0a31bd499e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index a0d3da4dc..add51026f 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -1,65 +1,95 @@
-/*       +------------------------------------+
- *       | 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) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@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"
 
-class ChannelLogStream : public LogStream
+class ModuleChanLog : public Module
 {
- private:
-	std::string channel;
-	
+	/*
+	 * Multimap so people can redirect a snomask to multiple channels.
+	 */
+	typedef std::multimap<char, std::string> ChanLogTargets;
+	ChanLogTargets logstreams;
+
  public:
-	ChannelLogStream(InspIRCd *Instance, const std::string &chan) : LogStream(Instance), channel(chan)
+	void init() CXX11_OVERRIDE
 	{
+		Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+
+		OnRehash(NULL);
 	}
-								
-	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
+
+	void OnRehash(User *user) CXX11_OVERRIDE
 	{
-		Channel *c = ServerInstance->FindChan(channel);
-		
-		if (c)
+		std::string snomasks;
+		std::string channel;
+
+		logstreams.clear();
+
+		ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			// 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());
-		}
-	}
-};
+			channel = i->second->getString("channel");
+			snomasks = i->second->getString("snomasks");
 
-/* $ModDesc: Logs output to a channel instead of / as well as a file. */
+			if (channel.empty() || snomasks.empty())
+			{
+				ServerInstance->Logs->Log("m_chanlog", LOG_DEFAULT, "Malformed chanlog tag, ignoring");
+				continue;
+			}
+
+			for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++)
+			{
+				logstreams.insert(std::make_pair(*it, channel));
+				ServerInstance->Logs->Log("m_chanlog", LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
+			}
+		}
 
-class ModuleChanLog : public Module
-{
- private:
-	InspIRCd *ServerInstance;
-	ChannelLogStream *l;
- public:
-	ModuleChanLog(InspIRCd* Me) : Module(Me)
-	{
-		l = new ChannelLogStream(Me, "#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 = "\2" + desc + "\2: " + msg;
+
+		for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
+		{
+			Channel *c = ServerInstance->FindChan(it->second);
+			if (c)
+			{
+				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), snotice.c_str());
+				ServerInstance->PI->SendChannelPrivmsg(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("Logs snomask output to channel(s).", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleChanLog)
-