X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=972efa92773865592db8b4c8703bb1ad09ee9c60;hb=7ba36f5348a6cca1c0da820c60ae17063f3cdad5;hp=c9816db4b006795fc0dde9faef88ade67a6d07b7;hpb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index c9816db4b..972efa927 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,13 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2014, 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006, 2008 Oliver Lupton <oliverlupton@gmail.com>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -40,7 +42,8 @@ Channel::Channel(const std::string &cname, time_t ts)
 
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
-	modes[mh->GetId()] = on;
+	if (mh && mh->GetId() != ModeParser::MODEID_MAX)
+		modes[mh->GetId()] = on;
 }
 
 void Channel::SetTopic(User* u, const std::string& ntopic, time_t topicts, const std::string* setter)
@@ -175,9 +178,11 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 	if (!override)
 	{
 		unsigned int maxchans = user->GetClass()->maxchans;
+		if (!maxchans)
+			maxchans = ServerInstance->Config->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;
@@ -241,7 +246,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 			{
 				if (chan->IsBanned(user))
 				{
-					user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)");
+					user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
 					return NULL;
 				}
 			}
@@ -270,8 +275,8 @@ Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursti
 
 	if (privs)
 	{
-		// If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
-		// remote user and his own server set the modes), then set them internally now
+		// If the user was granted prefix modes (in the OnUserPreJoin hook, or they're a
+		// remote user and their own server set the modes), then set them internally now
 		for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
 		{
 			PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
@@ -435,7 +440,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;
@@ -454,9 +459,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
 			{
@@ -470,12 +475,18 @@ const char* Channel::ChanModes(bool showkey)
 	return scratch.c_str();
 }
 
-void Channel::WriteNotice(const std::string& text)
+void Channel::WriteNotice(const std::string& text, char status)
 {
-	ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this, text, MSG_NOTICE);
+	ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this, text, MSG_NOTICE, status);
 	Write(ServerInstance->GetRFCEvents().privmsg, privmsg);
 }
 
+void Channel::WriteRemoteNotice(const std::string& text, char status)
+{
+	WriteNotice(text, status);
+	ServerInstance->PI->SendMessage(this, status, text, MSG_NOTICE);
+}
+
 /* returns the status character for a given user on a channel, e.g. @ for op,
  * % for halfop etc. If the user has several modes set, the highest mode
  * the user has must be returned.