X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=760b5c4bda8299a526b7b14bc906d63e6ab70b1e;hb=9b732cb49dcd1b8d28881236f5afb93e47f19b94;hp=e25500892baa8c8f3942884f183e329fc44e29e1;hpb=654355c2d114a68639ac36238291ebfceec2537d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index e25500892..760b5c4bd 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -178,7 +178,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 		unsigned int maxchans = user->GetClass()->maxchans;
 		if (user->IsOper())
 		{
-			unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans"));
+			unsigned int opermaxchans = ConvToNum<unsigned int>(user->oper->getConfig("maxchans"));
 			// If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
 			if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit"))
 				opermaxchans = ServerInstance->Config->OperMaxChans;
@@ -436,7 +436,7 @@ void Channel::Write(ClientProtocol::Event& protoev, char status, const CUList& e
 	}
 }
 
-const char* Channel::ChanModes(bool showkey)
+const char* Channel::ChanModes(bool showsecret)
 {
 	static std::string scratch;
 	std::string sparam;
@@ -455,9 +455,9 @@ const char* Channel::ChanModes(bool showkey)
 			if (!pm)
 				continue;
 
-			if (n == 'k' - 65 && !showkey)
+			if (pm->IsParameterSecret() && !showsecret)
 			{
-				sparam += " <key>";
+				sparam += " <" + pm->name + ">";
 			}
 			else
 			{