Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[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 aa7923be9d000bd1657cf4ddafd94ea3eb8f8ea0..edb9109e89f246d0cde5089655c1ae7279d0c7c6 100644 (file)
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -1,62 +1,77 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 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 "inspircd.h"
 
 /* $ModDesc: A module which logs all oper commands to the ircd log at default loglevel. */
 
 class ModuleOperLog : public Module
 {
- private:
-        
+       bool tosnomask;
+
  public:
-       ModuleOperLog(InspIRCd* Me) : Module(Me)
+       void init()
        {
-               
-               Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               ServerInstance->SNO->EnableSnomask('r', "OPERLOG");
+               OnRehash(NULL);
        }
- 
+
        virtual ~ModuleOperLog()
        {
        }
- 
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
+       }
+
+       void OnRehash(User* user)
+       {
+               tosnomask = ServerInstance->Config->ConfValue("operlog")->getBool("tosnomask", false);
        }
- 
 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *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* 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->Logs->Log("m_operlog",DEFAULT,"OPERLOG: [%s!%s@%s] %s%s",user->nick,user->ident,user->host,command.c_str(),plist.c_str());
+                               std::string line;
+                               if (!parameters.empty())
+                                       line = irc::stringjoiner(" ", parameters, 0, parameters.size() - 1).GetJoined();
+                               std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + line;
+                               ServerInstance->Logs->Log("m_operlog", DEFAULT, "OPERLOG: " + msg);
+                               if (tosnomask)
+                                       ServerInstance->SNO->WriteGlobalSno('r', msg);
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)
@@ -65,6 +80,6 @@ class ModuleOperLog : public Module
        }
 
 };
- 
- 
+
+
 MODULE_INIT(ModuleOperLog)