X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=388b0f60770b9d8d051976b814bbce87af507cfe;hb=HEAD;hp=03984618bac0d8ab69da7e698b1162bfaeef20aa;hpb=1858feabd342636df0b52780c978979b4e049fc3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 03984618b..388b0f607 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -21,60 +25,47 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: A module which logs all oper commands to the ircd log at default loglevel. */
-
 class ModuleOperLog : public Module
 {
 	bool tosnomask;
 
  public:
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		ServerInstance->SNO->EnableSnomask('r', "OPERLOG");
-		OnRehash(NULL);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
+		return Version("Allows the server administrator to make the server log when a server operator-only command is executed.", VF_VENDOR);
 	}
 
-	void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false);
 	}
 
-	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
 			return MOD_RES_PASSTHRU;
 
-		if ((user->IsOper()) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+		if ((user->IsOper()) && (user->HasCommandPermission(command)))
 		{
-			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
+			Command* thiscommand = ServerInstance->Parser.GetHandler(command);
 			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
 			{
-				std::string line;
-				if (!parameters.empty())
-					line = irc::stringjoiner(" ", parameters, 0, parameters.size() - 1).GetJoined();
-				std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + line;
-				ServerInstance->Logs->Log("m_operlog", DEFAULT, "OPERLOG: " + msg);
+				std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + stdalgo::string::join(parameters);
 				if (tosnomask)
 					ServerInstance->SNO->WriteGlobalSno('r', msg);
+				else
+					ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, msg);
 			}
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
-	{
-		tokens["OPERLOG"];
-	}
-
 };
 
 MODULE_INIT(ModuleOperLog)