X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_user%2Fcmd_mode.cpp;h=190983d13047b28d9f2cd6568d3d9ae933148d2b;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=99b9ab20d56f05dc0fcdd3e93ac5cee0c0b96d9e;hpb=3eda212c2ad561fae6a7d8cf20280da9d37a90f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_user/cmd_mode.cpp b/src/coremods/core_user/cmd_mode.cpp
index 99b9ab20d..190983d13 100644
--- a/src/coremods/core_user/cmd_mode.cpp
+++ b/src/coremods/core_user/cmd_mode.cpp
@@ -84,7 +84,10 @@ CmdResult CommandMode::Handle(const std::vector<std::string>& parameters, User*
 	else
 		flags |= ModeParser::MODE_LOCALONLY;
 
-	ServerInstance->Modes->ProcessSingle(user, targetchannel, targetuser, changelist, flags);
+	if (IS_LOCAL(user))
+		ServerInstance->Modes->ProcessSingle(user, targetchannel, targetuser, changelist, flags);
+	else
+		ServerInstance->Modes->Process(user, targetchannel, targetuser, changelist, flags);
 
 	if ((ServerInstance->Modes.GetLastParse().empty()) && (targetchannel) && (parameters.size() == 2))
 	{
@@ -140,11 +143,16 @@ void CommandMode::DisplayCurrentModes(User* user, User* targetuser, Channel* tar
 		if (targetuser == user || user->HasPrivPermission("users/auspex"))
 		{
 			// Display user's current mode string
-			user->WriteNumeric(RPL_UMODEIS, ":+%s", targetuser->FormatModes());
+			// XXX: Use WriteServ() because WriteNumeric() assumes the target (i.e. next word after the number)
+			// is 'user' and puts his nick there which is not what we want
+			user->WriteServ("%03d %s :+%s", RPL_UMODEIS, targetuser->nick.c_str(), targetuser->FormatModes());
 			if (targetuser->IsOper())
 			{
 				ModeHandler* snomask = ServerInstance->Modes->FindMode('s', MODETYPE_USER);
-				user->WriteNumeric(RPL_SNOMASKIS, "%s :Server notice mask", snomask->GetUserParameter(user).c_str());
+				std::string snomaskstr = snomask->GetUserParameter(user);
+				// snomaskstr is empty if the snomask mode isn't set, otherwise it begins with a '+'.
+				// In the former case output a "+", not an empty string.
+				user->WriteServ("%03d %s %s%s :Server notice mask", RPL_SNOMASKIS, targetuser->nick.c_str(), (snomaskstr.empty() ? "+" : ""), snomaskstr.c_str());
 			}
 		}
 		else