X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=42a0e4ecf0580fb6e9cc48679dbf45ae3cf74feb;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=09395fccb29e6eecbcdc80f76326d100da745066;hpb=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 09395fccb..42a0e4ecf 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,72 +1,74 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 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: A module which logs all oper commands to the ircd log at default loglevel. */
+#include "inspircd.h"
 
 class ModuleOperLog : public Module
 {
- private:
-	 
+	bool tosnomask;
+
  public:
-	ModuleOperLog(InspIRCd* Me) : Module(Me)
-	{
-		
-	}
- 
-	virtual ~ModuleOperLog()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->SNO->EnableSnomask('r', "OPERLOG");
+		OnRehash(NULL);
 	}
- 
-	virtual Version GetVersion()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
 	}
- 
-	void Implements(char* List)
+
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
-		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+		tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
-			return 0;
- 
-		if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+			return MOD_RES_PASSTHRU;
+
+		if ((user->IsOper()) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
 			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
 			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
 			{
-				std::string plist;
-				for (int j = 0; j < pcnt; j++)
-					plist.append(std::string(" ")+std::string(parameters[j]));
-
-				ServerInstance->Log(DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
+				std::string line = irc::stringjoiner(parameters).GetJoined();
+				std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + line;
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "OPERLOG: " + msg);
+				if (tosnomask)
+					ServerInstance->SNO->WriteGlobalSno('r', msg);
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" OPERLOG");
+		tokens["OPERLOG"];
 	}
 
 };
- 
- 
+
 MODULE_INIT(ModuleOperLog)