X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=4bfce210837a8d9c331cff3cda365892251df3d3;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=29385b8e2aae07dcdb55574dc0caac88f4e4c5f1;hpb=fc0a4b7de936c413e6475efca0bfa0813580cd22;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 29385b8e2..4bfce2108 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -24,7 +24,6 @@
 
 class ModuleChanLog : public Module
 {
- private:
 	/*
 	 * Multimap so people can redirect a snomask to multiple channels.
 	 */
@@ -32,40 +31,37 @@ class ModuleChanLog : public Module
 	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);
 	}
 
-	virtual ~ModuleChanLog()
-	{
-	}
-
 	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())
 			{
-				ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Malformed chanlog tag, ignoring");
+				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", DEFAULT, "Logging %c to %s", *it, channel.c_str());
+				ServerInstance->Logs->Log("m_chanlog", LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
 			}
 		}
 
@@ -85,7 +81,7 @@ class ModuleChanLog : public Module
 			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);
 			}
 		}
@@ -147,11 +143,10 @@ 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;
 		}
 	}
 };
 #endif
-