Remove unnecessary header traffic

[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 4881eefa021ffa0ac7d896628036b5be23f02e0d..ab044bac17b64238bfc19d61b561590f811a8a09 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,37 +2,27 @@
  *       | 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-2007 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. */
 
 class ModuleOperLog : public Module
 {
  private:
-        Server *Srv;
+        
  public:
-       ModuleOperLog(Server* Me) : Module::Module(Me)
+       ModuleOperLog(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
+               
        }
  
        virtual ~ModuleOperLog()
@@ -41,7 +31,7 @@ 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)
@@ -49,20 +39,23 @@ 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)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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_t* 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->Log(DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
                        }
-                       log(DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
                }
 
                return 0;
@@ -76,29 +69,4 @@ class ModuleOperLog : public Module
 };
  
  
- 
-/******************************************************************************************************/
- 
-class ModuleOperLogFactory : public ModuleFactory
-{
- public:
-       ModuleOperLogFactory()
-       {
-       }
- 
-       ~ModuleOperLogFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleOperLog(Me);
-       }
- 
-};
- 
-extern "C" void * init_module( void )
-{
-       return new ModuleOperLogFactory;
-}
-
+MODULE_INIT(ModuleOperLog)