X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlog.cpp;h=b39c4fe58627006e29827471af136dfcc73e43c1;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=1913ceeee35d620baa205560efd52518a9fcee34;hpb=569a742b9420b62a538c27fbd38a2bb8db6b9ca6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 1913ceeee..b39c4fe58 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -25,17 +25,15 @@
 
 class ModuleOperLog : public Module
 {
- private:
+	bool tosnomask;
 
  public:
-	ModuleOperLog() 	{
-
-		Implementation eventlist[] = { I_OnPreCommand, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual ~ModuleOperLog()
+	void init()
 	{
+		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 Version GetVersion()
@@ -43,6 +41,10 @@ class ModuleOperLog : public Module
 		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 ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
@@ -50,7 +52,7 @@ class ModuleOperLog : public Module
 		if (!validated)
 			return MOD_RES_PASSTHRU;
 
-		if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+		if ((user->IsOper()) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
 			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
 			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
@@ -58,19 +60,21 @@ class ModuleOperLog : public Module
 				std::string line;
 				if (!parameters.empty())
 					line = irc::stringjoiner(" ", parameters, 0, parameters.size() - 1).GetJoined();
-				ServerInstance->Logs->Log("m_operlog",DEFAULT,"OPERLOG: [%s] %s %s", user->GetFullRealHost().c_str(), command.c_str(), line.c_str());
+				std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + line;
+				ServerInstance->Logs->Log("m_operlog", LOG_DEFAULT, "OPERLOG: " + msg);
+				if (tosnomask)
+					ServerInstance->SNO->WriteGlobalSno('r', msg);
 			}
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		output.append(" OPERLOG");
+		tokens["OPERLOG"];
 	}
 
 };
 
-
 MODULE_INIT(ModuleOperLog)