X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=f58945c2587a8085a45e6e114e9b482d441627bc;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=9bbdbef25678b141c9ed3bfa8ed844e49fc5bf32;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 9bbdbef25..f58945c25 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -11,54 +11,43 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: A module which logs all oper commands to the ircd log at default loglevel. */
 
 class ModuleOperLog : public Module
 {
  private:
-	 
+
  public:
 	ModuleOperLog(InspIRCd* Me) : Module(Me)
 	{
-		
+
+		Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
- 
+
 	virtual ~ModuleOperLog()
 	{
 	}
- 
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
-	}
- 
-	void Implements(char* List)
-	{
-		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *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 ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
-			command_t* 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());
-			}
+			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
+			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
+				ServerInstance->Logs->Log("m_operlog",DEFAULT,"OPERLOG: [%s!%s@%s] %s %s",user->nick.c_str(), user->ident.c_str(), user->host.c_str(), command.c_str(), parameters.empty() ? "" : irc::stringjoiner(" ", parameters, 0, parameters.size() - 1).GetJoined().c_str());
 		}
 
 		return 0;
@@ -70,6 +59,6 @@ class ModuleOperLog : public Module
 	}
 
 };
- 
- 
+
+
 MODULE_INIT(ModuleOperLog)