X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=46710946b67a7adde9193e01aa4a14733a8d93d3;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=024cc427c4f4aaeb00ee6e99494ad7d9dd6107a9;hpb=90875afded8d80cc6c61d9f7804c1ba7a74e70a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 024cc427c..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());
@@ -112,7 +119,7 @@ class ModuleNamedModes : public Module
 		ServerInstance->Modules->AddService(dummyZ);
 
 		Implementation eventlist[] = { I_OnPreMode };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion()