X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=8f28a7e9cbee8825e7952973415e4f56beb01bad;hb=de4e4860091fe5a9a530acdb25f9a17e22323acf;hp=b91b602a688905acc6276218e3406f7e74ba4a3e;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index b91b602a6..8f28a7e9c 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,38 +20,66 @@
  */
 
 
-/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
-
 #include "inspircd.h"
 
 /** Handle /SAMODE
  */
 class CommandSamode : public Command
 {
+	bool logged;
+
  public:
 	bool active;
 	CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
 	{
 		allow_empty_last_param = false;
-		flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+		flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}";
 		active = false;
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		User* target = ServerInstance->FindNick(parameters[0]);
-		if ((target) && (target != user))
+		if (parameters[0].c_str()[0] != '#')
 		{
-			if (!user->HasPrivPermission("users/samode-usermodes", true))
+			User* target = ServerInstance->FindNickOnly(parameters[0]);
+			if ((!target) || (target->registered != REG_ALL))
+			{
+				user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+				return CMD_FAILURE;
+			}
+
+			// Changing the modes of another user requires a special permission
+			if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes", true)))
 				return CMD_FAILURE;
 		}
+
+		// XXX: Make ModeParser clear LastParse
+		Modes::ChangeList emptychangelist;
+		ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist);
+
+		logged = false;
 		this->active = true;
-		ServerInstance->Parser->CallHandler("MODE", parameters, user);
-		if (ServerInstance->Modes->GetLastParse().length())
-			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+		ServerInstance->Parser.CallHandler("MODE", parameters, user);
 		this->active = false;
+
+		if (!logged)
+		{
+			// If we haven't logged anything yet then the client queried the list of a listmode
+			// (e.g. /SAMODE #chan b), which was handled internally by the MODE command handler.
+			//
+			// Viewing the modes of a user or a channel could also result in this, but
+			// that is not possible with /SAMODE because we require at least 2 parameters.
+			LogUsage(user, stdalgo::string::join(parameters));
+		}
+
 		return CMD_SUCCESS;
 	}
+
+	void LogUsage(const User* user, const std::string& text)
+	{
+		logged = true;
+		ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + text);
+	}
 };
 
 class ModuleSaMode : public Module
@@ -63,28 +91,41 @@ class ModuleSaMode : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->Attach(I_OnPreMode, this);
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
 	}
 
-	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
 	{
 		if (cmd.active)
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
 
-	void Prioritize()
+	void OnMode(User* user, User* destuser, Channel* destchan, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE
+	{
+		if (!cmd.active)
+			return;
+
+		std::string logtext = (destuser ? destuser->nick : destchan->name);
+		logtext.push_back(' ');
+		logtext += ClientProtocol::Messages::Mode::ToModeLetters(modes);
+
+		for (Modes::ChangeList::List::const_iterator i = modes.getlist().begin(); i != modes.getlist().end(); ++i)
+		{
+			const Modes::Change& item = *i;
+			if (!item.param.empty())
+				logtext.append(1, ' ').append(item.param);
+		}
+
+		cmd.LogUsage(user, logtext);
+	}
+
+	void Prioritize() CXX11_OVERRIDE
 	{
 		Module *override = ServerInstance->Modules->Find("m_override.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
+		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
 	}
 };