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 fb89b162f74db3976c4362e94ede86b02cc0eb03..c0deb81eda0640a7d5b357a6e7a70ba369c71fa1 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,64 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 "inspircd.h"
 
-/* $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
        {
-
-               Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->SNO->EnableSnomask('r', "OPERLOG");
        }
 
-       virtual ~ModuleOperLog()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Provides logging of all oper commands to the ircd log at the default loglevel", VF_VENDOR);
        }
 
-       virtual Version GetVersion()
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR, API_VERSION);
+               tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false);
        }
 
-
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *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 MOD_RES_PASSTHRU;
 
-               if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+               if ((user->IsOper()) && (user->HasCommandPermission(command)))
                {
-                       Command* thiscommand = ServerInstance->Parser->GetHandler(command);
+                       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());
+                       {
+                               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 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"];
        }
 
 };
 
-
 MODULE_INIT(ModuleOperLog)