ModResult conversion: Change return type of all module functions

[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..646aada3ef1f2e100aa713a0b203070178bbd65e 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,70 +2,55 @@
  *       | 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://wiki.inspircd.org/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;
+
+               Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
- 
+
        virtual ~ModuleOperLog()
        {
        }
- 
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
-       }
- 
-       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)
+
+       virtual ModResult 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)))
+                       return MOD_RES_PASSTHRU;
+
+               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]));
-                       }
-                       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;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)
@@ -74,31 +59,6 @@ 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)