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 ab044bac17b64238bfc19d61b561590f811a8a09..646aada3ef1f2e100aa713a0b203070178bbd65e 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -18,47 +18,39 @@
 class ModuleOperLog : public Module
 {
  private:
-        
+
  public:
        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 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;
- 
+                       return MOD_RES_PASSTHRU;
+
                if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
                {
-                       command_t* thiscommand = ServerInstance->Parser->GetHandler(command);
-                       if ((thiscommand) && (thiscommand->flags_needed = 'o'))
-                       {
-                               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;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)
@@ -67,6 +59,6 @@ class ModuleOperLog : public Module
        }
 
 };
- 
- 
+
+
 MODULE_INIT(ModuleOperLog)