X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=6dbc0e7a860418d1154d36b00646d5bfa38040f4;hb=91c34d4e971dcc9370d205ff6d8189cd92f1d556;hp=f18a01b50854cac1a8be953206a52cdc42aff23b;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index f18a01b50..6dbc0e7a8 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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: Logs snomask output to channel(s). */
@@ -21,12 +28,14 @@ class ModuleChanLog : public Module
 	/*
 	 * 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() 	{
+	void init()
+	{
 		Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 		OnRehash(NULL);
 	}
@@ -37,16 +46,16 @@ class ModuleChanLog : public Module
 
 	virtual void OnRehash(User *user)
 	{
-		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())
 			{
@@ -65,30 +74,21 @@ class ModuleChanLog : public Module
 
 	virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
 	{
-		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;
 
+		char buf[MAXBUF];
 		snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
 
-		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);
+				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
 				ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
 			}
-
-			it++;
 		}
 
 		return MOD_RES_PASSTHRU;
@@ -148,7 +148,7 @@ class ChannelLogStream : public LogStream
 			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);
+			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
 			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
 			Logging = false;
 		}