X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=dc5750ba66ff95be4d6aadbe470601adc8733302;hb=61d586b1a3ad689669f6dcdc285b0d021ca814bd;hp=ed5063fadc12880cce3d1d4e514e0c149409a436;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index ed5063fad..dc5750ba6 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -20,146 +20,73 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Logs snomask output to channel(s). */
-
 class ModuleChanLog : public Module
 {
- private:
 	/*
 	 * Multimap so people can redirect a snomask to multiple channels.
 	 */
-	std::multimap<char, std::string> logstreams;
+	typedef std::multimap<char, std::string> ChanLogTargets;
+	ChanLogTargets logstreams;
 
  public:
-	ModuleChanLog() 	{
-		Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-
-		OnRehash(NULL);
-	}
-
-	virtual ~ModuleChanLog()
+	void init() CXX11_OVERRIDE
 	{
+		OnRehash(NULL);
 	}
 
-	virtual void OnRehash(User *user)
+	void OnRehash(User *user) CXX11_OVERRIDE
 	{
-		ConfigReader MyConf;
 		std::string snomasks;
 		std::string channel;
 
 		logstreams.clear();
 
-		for (int i = 0; i < MyConf.Enumerate("chanlog"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			channel = MyConf.ReadValue("chanlog", "channel", i);
-			snomasks = MyConf.ReadValue("chanlog", "snomasks", i);
+			channel = i->second->getString("channel");
+			snomasks = i->second->getString("snomasks");
 
 			if (channel.empty() || snomasks.empty())
 			{
-				ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Malformed chanlog tag, ignoring");
+				ServerInstance->Logs->Log("CONFIG", 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", DEFAULT, "Logging %c to %s", *it, channel.c_str());
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
 			}
 		}
 
 	}
 
-	virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
+	ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) CXX11_OVERRIDE
 	{
-		std::multimap<char, std::string>::const_iterator it = logstreams.find(sno);
-		char buf[MAXBUF];
-
-		if (it == logstreams.end())
+		std::pair<ChanLogTargets::const_iterator, ChanLogTargets::const_iterator> itpair = logstreams.equal_range(sno);
+		if (itpair.first == itpair.second)
 			return MOD_RES_PASSTHRU;
 
-		snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
+		const std::string snotice = "\2" + desc + "\2: " + msg;
 
-		while (it != logstreams.end())
+		for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
 		{
-			if (it->first != sno)
-			{
-				it++;
-				continue;
-			}
-
 			Channel *c = ServerInstance->FindChan(it->second);
 			if (c)
 			{
-				c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
-				ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
+				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), snotice.c_str());
+				ServerInstance->PI->SendMessage(c, 0, snotice);
 			}
-
-			it++;
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Logs snomask output to channel(s).", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleChanLog)
-
-
-
-
-
-
-
-
-
-/*
- * This is for the "old" chanlog module which intercepted messages going to the logfile..
- * I don't consider it all that useful, and it's quite dangerous if setup incorrectly, so
- * this is defined out but left intact in case someone wants to develop it further someday.
- *
- * -- w00t (aug 23rd, 2008)
- */
-#define OLD_CHANLOG 0
-
-#if OLD_CHANLOG
-class ChannelLogStream : public LogStream
-{
- private:
-	std::string channel;
-
- public:
-	ChannelLogStream(int loglevel, const std::string &chan) : LogStream(loglevel), channel(chan)
-	{
-	}
-
-	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
-	{
-		Channel *c = ServerInstance->FindChan(channel);
-		static bool Logging = false;
-
-		if (loglevel < this->loglvl)
-			return;
-
-		if (Logging)
-			return;
-
-		if (c)
-		{
-			Logging = true; // this avoids (rare chance) loops with logging server IO on networks
-			char buf[MAXBUF];
-			snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str());
-
-			c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
-			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
-			Logging = false;
-		}
-	}
-};
-#endif
-