X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=b293e7fad74a93bada1db9940b581aaf3d961aff;hb=8f5952d1e56c9dbefebbacfc7e40546a9df901e8;hp=1edc57693dfeb5f1345b1ee95edaa6b958bb3206;hpb=d865b434865907bfad0a187dd403d4ca8144e469;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 1edc57693..b293e7fad 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -29,9 +29,6 @@
 namespace
 {
 	ChanModeReference ban(NULL, "ban");
-	ChanModeReference inviteonlymode(NULL, "inviteonly");
-	ChanModeReference keymode(NULL, "key");
-	ChanModeReference limitmode(NULL, "limit");
 }
 
 Channel::Channel(const std::string &cname, time_t ts)
@@ -235,45 +232,12 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 				return NULL;
 
 			// If no module returned MOD_RES_DENY or MOD_RES_ALLOW (which is the case
-			// most of the time) then proceed to check channel modes +k, +i, +l and bans,
-			// in this order.
+			// most of the time) then proceed to check channel bans.
+			//
 			// If a module explicitly allowed the join (by returning MOD_RES_ALLOW),
 			// then this entire section is skipped
 			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
-				std::string ckey = chan->GetModeParameter(keymode);
-				if (!ckey.empty())
-				{
-					FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, chan, key));
-					if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, key)))
-					{
-						// If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
-						user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)");
-						return NULL;
-					}
-				}
-
-				if (chan->IsModeSet(inviteonlymode))
-				{
-					FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
-					if (MOD_RESULT != MOD_RES_ALLOW)
-					{
-						user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)");
-						return NULL;
-					}
-				}
-
-				std::string limit = chan->GetModeParameter(limitmode);
-				if (!limit.empty())
-				{
-					FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
-					if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()))))
-					{
-						user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)");
-						return NULL;
-					}
-				}
-
 				if (chan->IsBanned(user))
 				{
 					user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)");
@@ -349,6 +313,9 @@ bool Channel::IsBanned(User* user)
 		return (result == MOD_RES_DENY);
 
 	ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+	if (!banlm)
+		return false;
+
 	const ListModeBase::ModeList* bans = banlm->GetList(this);
 	if (bans)
 	{
@@ -397,12 +364,18 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
 		return rv;
 
 	ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+	if (!banlm)
+		return MOD_RES_PASSTHRU;
+
 	const ListModeBase::ModeList* bans = banlm->GetList(this);
 	if (bans)
 	{
 		for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
 		{
-			if (CheckBan(user, it->mask))
+			if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+				continue;
+
+			if (CheckBan(user, it->mask.substr(2)))
 				return MOD_RES_DENY;
 		}
 	}
@@ -651,3 +624,11 @@ bool Membership::SetPrefix(PrefixMode* delta_mh, bool adding)
 		modes.push_back(prefix);
 	return adding;
 }
+
+
+void Membership::WriteNotice(const std::string& text) const
+{
+	std::string rawmsg = "NOTICE ";
+	rawmsg.append(chan->name).append(" :").append(text);
+	user->WriteServ(rawmsg);
+}