X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=46710946b67a7adde9193e01aa4a14733a8d93d3;hb=de4b1863536348520c6498e11d910acd050092a7;hp=4db1f70b92c78e9a0d5da781f99c0114a0eec90e;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 4db1f70b9..46710946b 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -33,7 +33,12 @@ static void DisplayList(User* user, Channel* channel)
 			continue;
 		items << " +" << mh->name;
 		if (mh->GetNumParams(true))
-			items << " " << channel->GetModeParameter(letter);
+		{
+			if ((letter == 'k') && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
+				items << " <key>";
+			else
+				items << " " << channel->GetModeParameter(letter);
+		}
 	}
 	char pfx[MAXBUF];
 	snprintf(pfx, MAXBUF, ":%s 961 %s %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), channel->name.c_str());
@@ -65,6 +70,8 @@ class CommandProp : public Command
 		while (i < parameters.size())
 		{
 			std::string prop = parameters[i++];
+			if (prop.empty())
+				continue;
 			bool plus = prop[0] != '-';
 			if (prop[0] == '+' || prop[0] == '-')
 				prop.erase(prop.begin());