X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=c80b4691cf9e8097f2f1ce582178235566cb7818;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=736285be8ac5c3afecd53400dcf2d0fee1913efd;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 736285be8..c80b4691c 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -1,8 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   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) 2010 Craig Edwards <brain@inspircd.org>
+ *   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 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
@@ -25,7 +32,7 @@ class ModuleChanLog : public Module
 	/*
 	 * Multimap so people can redirect a snomask to multiple channels.
 	 */
-	typedef std::multimap<char, std::string> ChanLogTargets;
+	typedef insp::flat_multimap<char, std::string> ChanLogTargets;
 	ChanLogTargets logstreams;
 
  public:
@@ -33,8 +40,7 @@ class ModuleChanLog : public Module
 	{
 		std::string snomasks;
 		std::string channel;
-
-		logstreams.clear();
+		ChanLogTargets newlogs;
 
 		ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
 		for (ConfigIter i = tags.first; i != tags.second; ++i)
@@ -44,16 +50,16 @@ class ModuleChanLog : public Module
 
 			if (channel.empty() || snomasks.empty())
 			{
-				ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Malformed chanlog tag, ignoring");
-				continue;
+				throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation());
 			}
 
 			for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++)
 			{
-				logstreams.insert(std::make_pair(*it, channel));
+				newlogs.insert(std::make_pair(*it, channel));
 				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
 			}
 		}
+		logstreams.swap(newlogs);
 
 	}
 
@@ -63,14 +69,15 @@ class ModuleChanLog : public Module
 		if (itpair.first == itpair.second)
 			return MOD_RES_PASSTHRU;
 
-		const std::string snotice = "\2" + desc + "\2: " + msg;
+		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)
 			{
-				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), snotice.c_str());
+				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);
 			}
 		}
@@ -80,7 +87,7 @@ class ModuleChanLog : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Logs snomask output to channel(s).", VF_VENDOR);
+		return Version("Allows messages sent to snomasks to be logged to a channel.", VF_VENDOR);
 	}
 };