X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=826c6f32f2e2e2cb0fb250ccc2082fc7ecd55f86;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=8ba07d9badf105f8aa14bf581e8b87f38ebf0dfb;hpb=481b59d3f87042a010c4d39548bd7cf1f56a4073;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 8ba07d9ba..826c6f32f 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,51 +15,6 @@
 
 /* $ModDesc: Logs snomask output to channel(s). */
 
-/*
- * 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(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, 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, "PRIVMSG %s :%s", c->name.c_str(), buf);
-			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
-			Logging = false;
-		}
-	}
-};
-#endif
-
 class ModuleChanLog : public Module
 {
  private:
@@ -69,21 +24,20 @@ class ModuleChanLog : public Module
 	std::multimap<char, std::string> logstreams;
 
  public:
-	ModuleChanLog(InspIRCd* Me) : Module(Me)
-	{
+	ModuleChanLog() 	{
 		Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 
-		OnRehash(NULL, "");
+		OnRehash(NULL);
 	}
 
 	virtual ~ModuleChanLog()
 	{
 	}
 
-	virtual void OnRehash(User *user, const std::string &parameter)
+	virtual void OnRehash(User *user)
 	{
-		ConfigReader MyConf(ServerInstance);
+		ConfigReader MyConf;
 		std::string snomasks;
 		std::string channel;
 
@@ -109,13 +63,13 @@ class ModuleChanLog : public Module
 
 	}
 
-	virtual int OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
+	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())
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
 
@@ -137,15 +91,68 @@ class ModuleChanLog : public Module
 			it++;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("Logs snomask output to channel(s).", VF_VENDOR,API_VERSION);
 	}
 };
 
 
 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, "PRIVMSG %s :%s", c->name.c_str(), buf);
+			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
+			Logging = false;
+		}
+	}
+};
+#endif
+