X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=e290fd480365332bf199a152804e428677a01563;hb=563ad5acb0fb3d1aee5094989377d8b284d33d92;hp=f2a6ffbd95798e44cad9352ec44777332727201e;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index f2a6ffbd9..e290fd480 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,66 +2,52 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
- 
-#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:
-	 
+
  public:
-	ModuleOperLog(InspIRCd* Me) : Module::Module(Me)
+	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 ((*user->oper) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+
+		if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
-			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;
@@ -73,31 +59,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)