This works, not sure why. Someone find out why we cant use && !isock->HasResult(...

[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 4968a892557b9d5128ca43d5aebd0ff9f272cf57..0ca13b2da237cd97c70cb1af9cc8845399dd8afd 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -10,12 +10,8 @@
  *
  * ---------------------------------------------------
  */
- 
-#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. */
 
@@ -24,7 +20,7 @@ class ModuleOperLog : public Module
  private:
         
  public:
-       ModuleOperLog(InspIRCd* Me) : Module::Module(Me)
+       ModuleOperLog(InspIRCd* Me) : Module(Me)
        {
                
        }
@@ -43,18 +39,18 @@ class ModuleOperLog : public Module
                List[I_OnPreCommand] = List[I_On005Numeric] = 1;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** 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)))
                {
-                       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 = "";
+                               std::string plist;
                                for (int j = 0; j < pcnt; j++)
                                        plist.append(std::string(" ")+std::string(parameters[j]));
 
@@ -73,29 +69,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)