X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=edb9109e89f246d0cde5089655c1ae7279d0c7c6;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=4968a892557b9d5128ca43d5aebd0ff9f272cf57;hpb=b8d63cd639f98e80c766dd8f00406a2170f0e88f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 4968a8925..edb9109e8 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,68 +1,77 @@
-/*       +------------------------------------+
- *       | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
+
+
 #include "inspircd.h"
-#include <vector>
 
 /* $ModDesc: A module which logs all oper commands to the ircd log at default loglevel. */
 
 class ModuleOperLog : public Module
 {
- private:
-	 
+	bool tosnomask;
+
  public:
-	ModuleOperLog(InspIRCd* Me) : Module::Module(Me)
+	void init()
 	{
-		
+		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 ~ModuleOperLog()
 	{
 	}
- 
+
 	virtual Version GetVersion()
 	{
-		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)
 	{
-		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)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
-			return 0;
- 
-		if ((*user->oper) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+			return MOD_RES_PASSTHRU;
+
+		if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
-			command_t* thiscommand = ServerInstance->Parser->GetHandler(command);
-			if ((thiscommand) && (thiscommand->flags_needed = 'o'))
+			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;
+				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);
+				if (tosnomask)
+					ServerInstance->SNO->WriteGlobalSno('r', msg);
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -71,31 +80,6 @@ class ModuleOperLog : public Module
 	}
 
 };
- 
- 
- 
-/******************************************************************************************************/
- 
-class ModuleOperLogFactory : public ModuleFactory
-{
- public:
-	ModuleOperLogFactory()
-	{
-	}
- 
-	~ModuleOperLogFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperLog(Me);
-	}
- 
-};
- 
-extern "C" void * init_module( void )
-{
-	return new ModuleOperLogFactory;
-}
 
+
+MODULE_INIT(ModuleOperLog)