Convert remaining InspIRCd::Log() calls to new logging system

[user/henk/code/inspircd.git] / src / modules / m_operlog.cpp

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 088410baa161099577bb1c214444c69eaa3fcd15..a9ce4aa9be4a5854642768e435800477499af100 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,26 +2,16 @@
  *       | 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-2008 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 "helperfuncs.h"
 #include "inspircd.h"
-#include <vector>
 
 /* $ModDesc: A module which logs all oper commands to the ircd log at default loglevel. */
 
@@ -30,9 +20,11 @@ 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()
@@ -41,28 +33,27 @@ class ModuleOperLog : public Module
  
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
  
-       void Implements(char* List)
-       {
-               List[I_OnPreCommand] = List[I_On005Numeric] = 1;
-       }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, 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++)
+                       Command* thiscommand = ServerInstance->Parser->GetHandler(command);
+                       if ((thiscommand) && (thiscommand->flags_needed == 'o'))
                        {
-                               plist.append(std::string(" ")+std::string(parameters[j]));
+                               std::string plist;
+                               for (int j = 0; j < pcnt; j++)
+                                       plist.append(std::string(" ")+std::string(parameters[j]));
+
+                               ServerInstance->Logs->Log("m_operlog",DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
                        }
-                       ServerInstance->Log(DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
                }
 
                return 0;
@@ -76,29 +67,4 @@ 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)