X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=ed5063fadc12880cce3d1d4e514e0c149409a436;hb=808a0a09577009c2d6e494979c2189426b332aef;hp=9528a94de65a4d637be932ad6473b7da16b29c34;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 9528a94de..ed5063fad 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://www.inspircd.org/wiki/index.php/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). */
@@ -24,21 +31,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;
 
@@ -64,13 +70,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());
 
@@ -85,19 +91,19 @@ class ModuleChanLog : public Module
 			Channel *c = ServerInstance->FindChan(it->second);
 			if (c)
 			{
-				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
+				c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
 				ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
 			}
 
 			it++;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Logs snomask output to channel(s).", VF_VENDOR);
 	}
 };
 
@@ -128,7 +134,7 @@ class ChannelLogStream : public LogStream
 	std::string channel;
 
  public:
-	ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan)
+	ChannelLogStream(int loglevel, const std::string &chan) : LogStream(loglevel), channel(chan)
 	{
 	}
 
@@ -149,7 +155,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, "PRIVMSG %s :%s", c->name.c_str(), buf);
+			c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
 			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
 			Logging = false;
 		}