X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=2fbdca26561856ca5ecc29ac6ae66b12a73d9248;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=73c5cb521fdc919572e5576ca2a474b8fef6a3da;hpb=124c17e14134a4999afc1a5e981ab7c75b3694b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 73c5cb521..2fbdca265 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -38,10 +38,11 @@ static void DisplayList(LocalUser* user, Channel* channel)
 		if (!channel->IsModeSet(mh))
 			continue;
 		numeric.Add("+" + mh->name);
-		if (mh->NeedsParam(true))
+		ParamModeBase* pm = mh->IsParameterMode();
+		if (pm)
 		{
-			if ((mh->name == "key") && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
-				numeric.Add("<key>");
+			if ((pm->IsParameterSecret()) && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
+				numeric.Add("<" + mh->name + ">");
 			else
 				numeric.Add(channel->GetModeParameter(mh));
 		}
@@ -56,10 +57,10 @@ class CommandProp : public SplitCommand
 	CommandProp(Module* parent)
 		: SplitCommand(parent, "PROP", 1)
 	{
-		syntax = "<user|channel> {[+-]<mode> [<value>]}*";
+		syntax = "<channel> [[(+|-)]<mode> [<value>]]";
 	}
 
-	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* src) CXX11_OVERRIDE
+	CmdResult HandleLocal(LocalUser* src, const Params& parameters) CXX11_OVERRIDE
 	{
 		Channel* const chan = ServerInstance->FindChan(parameters[0]);
 		if (!chan)
@@ -128,7 +129,7 @@ class ModuleNamedModes : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
+		return Version("Provides the ability to manipulate modes via long names", VF_VENDOR);
 	}
 
 	void Prioritize() CXX11_OVERRIDE