Textual improvements and fixes such as typos, casing, etc. (#1612)

[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 ce6e7aea4188a7fbcbdbd9243ec1aa1c38176b10..c0deb81eda0640a7d5b357a6e7a70ba369c71fa1 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,101 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
-#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. */
+
+#include "inspircd.h"
 
 class ModuleOperLog : public Module
 {
- private:
-        
+       bool tosnomask;
+
  public:
-       ModuleOperLog(InspIRCd* Me) : Module(Me)
+       void init() CXX11_OVERRIDE
        {
-               
+               ServerInstance->SNO->EnableSnomask('r', "OPERLOG");
        }
- 
-       virtual ~ModuleOperLog()
-       {
-       }
- 
-       virtual Version GetVersion()
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version("Provides logging of all oper commands to the ircd log at the default loglevel", VF_VENDOR);
        }
- 
-       void Implements(char* List)
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+               tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false);
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)
-                       return 0;
- 
-               if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+                       return MOD_RES_PASSTHRU;
+
+               if ((user->IsOper()) && (user->HasCommandPermission(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 = "";
-                               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());
+                               std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + stdalgo::string::join(parameters);
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "OPERLOG: " + msg);
+                               if (tosnomask)
+                                       ServerInstance->SNO->WriteGlobalSno('r', msg);
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" OPERLOG");
+               tokens["OPERLOG"];
        }
 
 };
- 
- 
- 
-/******************************************************************************************************/
- 
-class ModuleOperLogFactory : public ModuleFactory
-{
- public:
-       ModuleOperLogFactory()
-       {
-       }
- 
-       ~ModuleOperLogFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOperLog(Me);
-       }
- 
-};
- 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleOperLogFactory;
-}
 
+MODULE_INIT(ModuleOperLog)