X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=4555deb96aa87551dde81a8adf52b3468ea296da;hb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;hp=4010f819a39d102c6b93ac9d56fb0bd3f5849b65;hpb=b01dc3cb865c2faacfa69f6a081117bf349c6f40;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 4010f819a..4555deb96 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -23,118 +23,42 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
 #include "listmode.h"
 #include <cstdarg>
 #include "mode.h"
 
-static ModeReference ban(NULL, "ban");
-
-Channel::Channel(const std::string &cname, time_t ts)
+namespace
 {
-	if (!ServerInstance->chanlist->insert(std::make_pair(cname, this)).second)
-		throw CoreException("Cannot create duplicate channel " + cname);
-
-	this->name = cname;
-	this->age = ts ? ts : ServerInstance->Time();
-
-	topicset = 0;
-	modes.reset();
+	ChanModeReference ban(NULL, "ban");
+	ChanModeReference inviteonlymode(NULL, "inviteonly");
+	ChanModeReference keymode(NULL, "key");
+	ChanModeReference limitmode(NULL, "limit");
+	ChanModeReference secretmode(NULL, "secret");
+	ChanModeReference privatemode(NULL, "private");
+	UserModeReference invisiblemode(NULL, "invisible");
 }
 
-void Channel::SetMode(char mode,bool mode_on)
+Channel::Channel(const std::string &cname, time_t ts)
+	: name(cname), age(ts), topicset(0)
 {
-	modes[mode-65] = mode_on;
+	if (!ServerInstance->chanlist.insert(std::make_pair(cname, this)).second)
+		throw CoreException("Cannot create duplicate channel " + cname);
 }
 
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
-	modes[mh->GetModeChar() - 65] = on;
-}
-
-void Channel::SetModeParam(char mode, const std::string& parameter)
-{
-	CustomModeList::iterator n = custom_mode_params.find(mode);
-	// always erase, even if changing, so that the map gets the new value
-	if (n != custom_mode_params.end())
-		custom_mode_params.erase(n);
-	if (parameter.empty())
-	{
-		modes[mode-65] = false;
-	}
-	else
-	{
-		custom_mode_params[mode] = parameter;
-		modes[mode-65] = true;
-	}
-}
-
-void Channel::SetModeParam(ModeHandler* mode, const std::string& parameter)
-{
-	SetModeParam(mode->GetModeChar(), parameter);
+	modes[mh->GetId()] = on;
 }
 
-std::string Channel::GetModeParameter(char mode)
+void Channel::SetTopic(User* u, const std::string& ntopic)
 {
-	CustomModeList::iterator n = custom_mode_params.find(mode);
-	if (n != custom_mode_params.end())
-		return n->second;
-	return "";
-}
-
-std::string Channel::GetModeParameter(ModeHandler* mode)
-{
-	CustomModeList::iterator n = custom_mode_params.find(mode->GetModeChar());
-	if (n != custom_mode_params.end())
-		return n->second;
-	return "";
-}
-
-int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
-{
-	if (!u)
-		u = ServerInstance->FakeClient;
-	if (IS_LOCAL(u) && !forceset)
-	{
-		ModResult res;
-		FIRST_MOD_RESULT(OnPreTopicChange, res, (u,this,ntopic));
-
-		if (res == MOD_RES_DENY)
-			return CMD_FAILURE;
-		if (res != MOD_RES_ALLOW)
-		{
-			if (!this->HasUser(u))
-			{
-				u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str());
-				return CMD_FAILURE;
-			}
-			if (IsModeSet('t') && !ServerInstance->OnCheckExemption(u,this,"topiclock").check(GetPrefixValue(u) >= HALFOP_VALUE))
-			{
-				u->WriteNumeric(482, "%s %s :You do not have access to change the topic on this channel", u->nick.c_str(), this->name.c_str());
-				return CMD_FAILURE;
-			}
-		}
-	}
-
 	this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
-	if (u)
-	{
-		this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
-		this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
-	}
-	else
-	{
-		this->setby.assign(ServerInstance->Config->ServerName);
-		this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
-	}
-
+	this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+	this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
 	this->topicset = ServerInstance->Time();
 
-	FOREACH_MOD(I_OnPostTopicChange,OnPostTopicChange(u, this, this->topic));
-
-	return CMD_SUCCESS;
+	FOREACH_MOD(OnPostTopicChange, (u, this, this->topic));
 }
 
 Membership* Channel::AddUser(User* user)
@@ -149,32 +73,42 @@ Membership* Channel::AddUser(User* user)
 
 void Channel::DelUser(User* user)
 {
-	UserMembIter a = userlist.find(user);
+	UserMembIter it = userlist.find(user);
+	if (it != userlist.end())
+		DelUser(it);
+}
+
+void Channel::CheckDestroy()
+{
+	if (!userlist.empty())
+		return;
 
-	if (a != userlist.end())
+	ModResult res;
+	FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
+	if (res == MOD_RES_DENY)
+		return;
+
+	chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
+	/* kill the record */
+	if (iter != ServerInstance->chanlist.end())
 	{
-		a->second->cull();
-		delete a->second;
-		userlist.erase(a);
+		FOREACH_MOD(OnChannelDelete, (this));
+		ServerInstance->chanlist.erase(iter);
 	}
 
-	if (userlist.empty())
-	{
-		ModResult res;
-		FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
-		if (res == MOD_RES_DENY)
-			return;
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-		/* kill the record */
-		if (iter != ServerInstance->chanlist->end())
-		{
-			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-			ServerInstance->chanlist->erase(iter);
-		}
+	ClearInvites();
+	ServerInstance->GlobalCulls.AddItem(this);
+}
 
-		ClearInvites();
-		ServerInstance->GlobalCulls.AddItem(this);
-	}
+void Channel::DelUser(const UserMembIter& membiter)
+{
+	Membership* memb = membiter->second;
+	memb->cull();
+	delete memb;
+	userlist.erase(membiter);
+
+	// If this channel became empty then it should be removed
+	CheckDestroy();
 }
 
 Membership* Channel::GetUser(User* user)
@@ -200,6 +134,9 @@ void Channel::SetDefaultModes()
 		ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
 		if (mode)
 		{
+			if (mode->IsPrefixMode())
+				continue;
+
 			if (mode->GetNumParams(true))
 				list.GetToken(parameter);
 			else
@@ -234,7 +171,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 		{
 			if (user->chans.size() >= ServerInstance->Config->OperMaxChans)
 			{
-				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cname.c_str());
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s :You are on too many channels", cname.c_str());
 				return NULL;
 			}
 		}
@@ -245,7 +182,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 				maxchans = ServerInstance->Config->MaxChans;
 			if (user->chans.size() >= maxchans)
 			{
-				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cname.c_str());
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s :You are on too many channels", cname.c_str());
 				return NULL;
 			}
 		}
@@ -261,7 +198,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 
 	if (!chan)
 	{
-		privs = "o";
+		privs = ServerInstance->Config->DefaultModes.substr(0, ServerInstance->Config->DefaultModes.find(' '));
 
 		if (override == false)
 		{
@@ -299,7 +236,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 			// then this entire section is skipped
 			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
-				std::string ckey = chan->GetModeParameter('k');
+				std::string ckey = chan->GetModeParameter(keymode);
 				bool invited = user->IsInvited(chan);
 				bool can_bypass = ServerInstance->Config->InvBypassModes && invited;
 
@@ -309,35 +246,35 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 					if (!MOD_RESULT.check((ckey == key) || can_bypass))
 					{
 						// 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, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), chan->name.c_str());
+						user->WriteNumeric(ERR_BADCHANNELKEY, "%s :Cannot join channel (Incorrect channel key)", chan->name.c_str());
 						return NULL;
 					}
 				}
 
-				if (chan->IsModeSet('i'))
+				if (chan->IsModeSet(inviteonlymode))
 				{
 					FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
 					if (!MOD_RESULT.check(invited))
 					{
-						user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), chan->name.c_str());
+						user->WriteNumeric(ERR_INVITEONLYCHAN, "%s :Cannot join channel (Invite only)", chan->name.c_str());
 						return NULL;
 					}
 				}
 
-				std::string limit = chan->GetModeParameter('l');
+				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()) || can_bypass)))
 					{
-						user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), chan->name.c_str());
+						user->WriteNumeric(ERR_CHANNELISFULL, "%s :Cannot join channel (Channel is full)", chan->name.c_str());
 						return NULL;
 					}
 				}
 
 				if (chan->IsBanned(user) && !can_bypass)
 				{
-					user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), chan->name.c_str());
+					user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Cannot join channel (You're banned)", chan->name.c_str());
 					return NULL;
 				}
 
@@ -361,39 +298,37 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 
 void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
-	Membership* memb = this->AddUser(user);
-	if (!memb)
-		return; // Already on the channel
-
 	if (IS_SERVER(user))
 	{
 		ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
 		return;
 	}
 
-	user->chans.insert(this);
+	Membership* memb = this->AddUser(user);
+	if (!memb)
+		return; // Already on the channel
+
+	user->chans.push_front(memb);
 
 	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
-		memb->modes = *privs;
 		for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
 		{
-			ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+			PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
 			if (mh)
 			{
 				std::string nick = user->nick;
-				/* Set, and make sure that the mode handler knows this mode was now set */
-				this->SetPrefix(user, mh->GetModeChar(), true);
-				mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, nick, true);
+				// Set the mode on the user
+				mh->OnModeChange(ServerInstance->FakeClient, NULL, this, nick, true);
 			}
 		}
 	}
 
 	// Tell modules about this join, they have the chance now to populate except_list with users we won't send the JOIN (and possibly MODE) to
 	CUList except_list;
-	FOREACH_MOD(I_OnUserJoin,OnUserJoin(memb, bursting, created_by_local, except_list));
+	FOREACH_MOD(OnUserJoin, (memb, bursting, created_by_local, except_list));
 
 	this->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", this->name.c_str());
 
@@ -412,13 +347,13 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
 	{
 		if (this->topicset)
 		{
-			user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), this->name.c_str(), this->topic.c_str());
-			user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), this->name.c_str(), this->setby.c_str(), (unsigned long)this->topicset);
+			user->WriteNumeric(RPL_TOPIC, "%s :%s", this->name.c_str(), this->topic.c_str());
+			user->WriteNumeric(RPL_TOPICTIME, "%s %s %lu", this->name.c_str(), this->setby.c_str(), (unsigned long)this->topicset);
 		}
 		this->UserList(user);
 	}
 
-	FOREACH_MOD(I_OnPostJoin,OnPostJoin(memb));
+	FOREACH_MOD(OnPostJoin, (memb));
 }
 
 bool Channel::IsBanned(User* user)
@@ -480,7 +415,6 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
 	ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
 	const ListModeBase::ModeList* bans = banlm->GetList(this);
 	if (bans)
-
 	{
 		for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
 		{
@@ -492,61 +426,54 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
 }
 
 /* Channel::PartUser
- * remove a channel from a users record, and return the number of users left.
- * Therefore, if this function returns 0 the caller should delete the Channel.
+ * Remove a channel from a users record, remove the reference to the Membership object
+ * from the channel and destroy it.
  */
 void Channel::PartUser(User *user, std::string &reason)
 {
-	if (!user)
-		return;
-
-	Membership* memb = GetUser(user);
+	UserMembIter membiter = userlist.find(user);
 
-	if (memb)
+	if (membiter != userlist.end())
 	{
+		Membership* memb = membiter->second;
 		CUList except_list;
-		FOREACH_MOD(I_OnUserPart,OnUserPart(memb, reason, except_list));
+		FOREACH_MOD(OnUserPart, (memb, reason, except_list));
 
 		WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
-		user->chans.erase(this);
-		this->RemoveAllPrefixes(user);
+		// Remove this channel from the user's chanlist
+		user->chans.erase(memb);
+		// Remove the Membership from this channel's userlist and destroy it
+		this->DelUser(membiter);
 	}
-
-	this->DelUser(user);
 }
 
-void Channel::KickUser(User *src, User *user, const std::string& reason)
+void Channel::KickUser(User* src, User* victim, const std::string& reason, Membership* srcmemb)
 {
-	if (!src || !user)
+	UserMembIter victimiter = userlist.find(victim);
+	Membership* memb = ((victimiter != userlist.end()) ? victimiter->second : NULL);
+
+	if (!memb)
+	{
+		src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", victim->nick.c_str(), this->name.c_str());
 		return;
+	}
 
-	Membership* memb = GetUser(user);
+	// Do the following checks only if the KICK is done by a local user;
+	// each server enforces its own rules.
 	if (IS_LOCAL(src))
 	{
-		if (!memb)
-		{
-			src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
-			return;
-		}
-		if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
-		{
-			src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), this->name.c_str());
-			return;
-		}
-
+		// Modules are allowed to explicitly allow or deny kicks done by local users
 		ModResult res;
-		if (ServerInstance->ULine(src->server))
-			res = MOD_RES_ALLOW;
-		else
-			FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
-
+		FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
 		if (res == MOD_RES_DENY)
 			return;
 
 		if (res == MOD_RES_PASSTHRU)
 		{
-			unsigned int them = this->GetPrefixValue(src);
+			if (!srcmemb)
+				srcmemb = GetUser(src);
+			unsigned int them = srcmemb ? srcmemb->getRank() : 0;
 			unsigned int req = HALFOP_VALUE;
 			for (std::string::size_type i = 0; i < memb->modes.length(); i++)
 			{
@@ -557,32 +484,24 @@ void Channel::KickUser(User *src, User *user, const std::string& reason)
 
 			if (them < req)
 			{
-				src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",
-					src->nick.c_str(), this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
+				src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
+					this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
 				return;
 			}
 		}
 	}
 
-	if (memb)
-	{
-		CUList except_list;
-		FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list));
-
-		WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason.c_str());
+	CUList except_list;
+	FOREACH_MOD(OnUserKick, (src, memb, reason, except_list));
 
-		user->chans.erase(this);
-		this->RemoveAllPrefixes(user);
-	}
+	WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), victim->nick.c_str(), reason.c_str());
 
-	this->DelUser(user);
+	victim->chans.erase(memb);
+	this->DelUser(victimiter);
 }
 
 void Channel::WriteChannel(User* user, const char* text, ...)
 {
-	if (!user || !text)
-		return;
-
 	std::string textbuffer;
 	VAFORMAT(textbuffer, text, text);
 	this->WriteChannel(user, textbuffer);
@@ -590,9 +509,6 @@ void Channel::WriteChannel(User* user, const char* text, ...)
 
 void Channel::WriteChannel(User* user, const std::string &text)
 {
-	if (!user)
-		return;
-
 	const std::string message = ":" + user->GetFullHost() + " " + text;
 
 	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
@@ -604,9 +520,6 @@ void Channel::WriteChannel(User* user, const std::string &text)
 
 void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
 {
-	if (!text)
-		return;
-
 	std::string textbuffer;
 	VAFORMAT(textbuffer, text, text);
 	this->WriteChannelWithServ(ServName, textbuffer);
@@ -627,9 +540,6 @@ void Channel::WriteChannelWithServ(const std::string& ServName, const std::strin
  * for the sender (for privmsg etc) */
 void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
 {
-	if (!text)
-		return;
-
 	std::string textbuffer;
 	VAFORMAT(textbuffer, text, text);
 	this->WriteAllExceptSender(user, serversource, status, textbuffer);
@@ -637,9 +547,6 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c
 
 void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
 {
-	if (!text)
-		return;
-
 	std::string textbuffer;
 	VAFORMAT(textbuffer, text, text);
 	textbuffer = ":" + (serversource ? ServerInstance->Config->ServerName : user->GetFullHost()) + " " + textbuffer;
@@ -657,7 +564,7 @@ void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CULi
 	unsigned int minrank = 0;
 	if (status)
 	{
-		ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+		PrefixMode* mh = ServerInstance->Modes->FindPrefix(status);
 		if (mh)
 			minrank = mh->GetPrefixRank();
 	}
@@ -681,22 +588,6 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c
 	this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
 }
 
-/*
- * return a count of the users on a specific channel accounting for
- * invisible users who won't increase the count. e.g. for /LIST
- */
-int Channel::CountInvisible()
-{
-	int count = 0;
-	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
-	{
-		if (!i->first->quitting && !i->first->IsModeSet('i'))
-			count++;
-	}
-
-	return count;
-}
-
 const char* Channel::ChanModes(bool showkey)
 {
 	static std::string scratch;
@@ -707,21 +598,23 @@ const char* Channel::ChanModes(bool showkey)
 	/* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */
 	for(int n = 0; n < 64; n++)
 	{
-		if(this->modes[n])
+		ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_CHANNEL);
+		if (mh && IsModeSet(mh))
 		{
 			scratch.push_back(n + 65);
+
+			ParamModeBase* pm = mh->IsParameterMode();
+			if (!pm)
+				continue;
+
 			if (n == 'k' - 65 && !showkey)
 			{
 				sparam += " <key>";
 			}
 			else
 			{
-				const std::string param = this->GetModeParameter(n + 65);
-				if (!param.empty())
-				{
-					sparam += ' ';
-					sparam += param;
-				}
+				sparam += ' ';
+				pm->GetParameter(this, sparam);
 			}
 		}
 	}
@@ -735,33 +628,32 @@ const char* Channel::ChanModes(bool showkey)
  */
 void Channel::UserList(User *user)
 {
-	char list[MAXBUF];
-	size_t dlen, curlen;
-
-	if (!IS_LOCAL(user))
-		return;
-
-	if (this->IsModeSet('s') && !this->HasUser(user) && !user->HasPrivPermission("channels/auspex"))
+	bool has_privs = user->HasPrivPermission("channels/auspex");
+	if (this->IsModeSet(secretmode) && !this->HasUser(user) && !has_privs)
 	{
-		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", this->name.c_str());
 		return;
 	}
 
-	dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=',  this->name.c_str());
+	std::string list;
+	list.push_back(this->IsModeSet(secretmode) ? '@' : this->IsModeSet(privatemode) ? '*' : '=');
+	list.push_back(' ');
+	list.append(this->name).append(" :");
+	std::string::size_type pos = list.size();
 
-	int numusers = 0;
-	char* ptr = list + dlen;
+	bool has_one = false;
 
 	/* Improvement by Brain - this doesnt change in value, so why was it inside
 	 * the loop?
 	 */
 	bool has_user = this->HasUser(user);
 
-	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+	const size_t maxlen = ServerInstance->Config->Limits.MaxLine - 10 - ServerInstance->Config->ServerName.size();
+	std::string prefixlist;
+	std::string nick;
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i)
 	{
-		if (i->first->quitting)
-			continue;
-		if ((!has_user) && (i->first->IsModeSet('i')))
+		if ((!has_user) && (i->first->IsModeSet(invisiblemode)) && (!has_privs))
 		{
 			/*
 			 * user is +i, and source not on the channel, does not show
@@ -770,68 +662,60 @@ void Channel::UserList(User *user)
 			continue;
 		}
 
-		std::string prefixlist = this->GetPrefixChar(i->first);
-		std::string nick = i->first->nick;
+		Membership* memb = i->second;
 
-		FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, prefixlist, nick));
+		prefixlist.clear();
+		char prefix = memb->GetPrefixChar();
+		if (prefix)
+			prefixlist.push_back(prefix);
+		nick = i->first->nick;
+
+		FOREACH_MOD(OnNamesListItem, (user, memb, prefixlist, nick));
 
 		/* Nick was nuked, a module wants us to skip it */
 		if (nick.empty())
 			continue;
 
-		size_t ptrlen = 0;
-
-		if (curlen + prefixlist.length() + nick.length() + 1 > 480)
+		if (list.size() + prefixlist.length() + nick.length() + 1 > maxlen)
 		{
 			/* list overflowed into multiple numerics */
-			user->WriteNumeric(RPL_NAMREPLY, std::string(list));
-
-			/* reset our lengths */
-			dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name.c_str());
-			ptr = list + dlen;
+			user->WriteNumeric(RPL_NAMREPLY, list);
 
-			numusers = 0;
+			// Erase all nicks, keep the constant part
+			list.erase(pos);
+			has_one = false;
 		}
 
-		ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
+		list.append(prefixlist).append(nick).push_back(' ');
 
-		curlen += ptrlen;
-		ptr += ptrlen;
-
-		numusers++;
+		has_one = true;
 	}
 
 	/* if whats left in the list isnt empty, send it */
-	if (numusers)
+	if (has_one)
 	{
-		user->WriteNumeric(RPL_NAMREPLY, std::string(list));
+		user->WriteNumeric(RPL_NAMREPLY, list);
 	}
 
-	user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
+	user->WriteNumeric(RPL_ENDOFNAMES, "%s :End of /NAMES list.", this->name.c_str());
 }
 
 /* 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.
  */
-const char* Channel::GetPrefixChar(User *user)
+char Membership::GetPrefixChar() const
 {
-	static char pf[2] = {0, 0};
-	*pf = 0;
+	char pf = 0;
 	unsigned int bestrank = 0;
 
-	UserMembIter m = userlist.find(user);
-	if (m != userlist.end())
+	for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
 	{
-		for(unsigned int i=0; i < m->second->modes.length(); i++)
+		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
+		if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
 		{
-			char mchar = m->second->modes[i];
-			ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
-			if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
-			{
-				bestrank = mh->GetPrefixRank();
-				pf[0] = mh->GetPrefix();
-			}
+			bestrank = mh->GetPrefixRank();
+			pf = mh->GetPrefix();
 		}
 	}
 	return pf;
@@ -843,28 +727,23 @@ unsigned int Membership::getRank()
 	unsigned int rv = 0;
 	if (mchar)
 	{
-		ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(mchar);
 		if (mh)
 			rv = mh->GetPrefixRank();
 	}
 	return rv;
 }
 
-const char* Channel::GetAllPrefixChars(User* user)
+const char* Membership::GetAllPrefixChars() const
 {
 	static char prefix[64];
 	int ctr = 0;
 
-	UserMembIter m = userlist.find(user);
-	if (m != userlist.end())
+	for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
 	{
-		for(unsigned int i=0; i < m->second->modes.length(); i++)
-		{
-			char mchar = m->second->modes[i];
-			ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
-			if (mh && mh->GetPrefix())
-				prefix[ctr++] = mh->GetPrefix();
-		}
+		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
+		if (mh && mh->GetPrefix())
+			prefix[ctr++] = mh->GetPrefix();
 	}
 	prefix[ctr] = 0;
 
@@ -879,41 +758,26 @@ unsigned int Channel::GetPrefixValue(User* user)
 	return m->second->getRank();
 }
 
-bool Channel::SetPrefix(User* user, char prefix, bool adding)
+bool Membership::SetPrefix(PrefixMode* delta_mh, bool adding)
 {
-	ModeHandler* delta_mh = ServerInstance->Modes->FindMode(prefix, MODETYPE_CHANNEL);
-	if (!delta_mh)
-		return false;
-	UserMembIter m = userlist.find(user);
-	if (m == userlist.end())
-		return false;
-	for(unsigned int i=0; i < m->second->modes.length(); i++)
+	char prefix = delta_mh->GetModeChar();
+	for (unsigned int i = 0; i < modes.length(); i++)
 	{
-		char mchar = m->second->modes[i];
-		ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+		char mchar = modes[i];
+		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(mchar);
 		if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank())
 		{
-			m->second->modes =
-				m->second->modes.substr(0,i) +
+			modes = modes.substr(0,i) +
 				(adding ? std::string(1, prefix) : "") +
-				m->second->modes.substr(mchar == prefix ? i+1 : i);
+				modes.substr(mchar == prefix ? i+1 : i);
 			return adding != (mchar == prefix);
 		}
 	}
 	if (adding)
-		m->second->modes += std::string(1, prefix);
+		modes.push_back(prefix);
 	return adding;
 }
 
-void Channel::RemoveAllPrefixes(User* user)
-{
-	UserMembIter m = userlist.find(user);
-	if (m != userlist.end())
-	{
-		m->second->modes.clear();
-	}
-}
-
 void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
 {
 	if ((timeout != 0) && (ServerInstance->Time() >= timeout))
@@ -933,8 +797,8 @@ void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
 	else
 	{
 		inv = new Invitation(c, u, timeout);
-		c->invites.push_back(inv);
-		u->invites.push_back(inv);
+		c->invites.push_front(inv);
+		u->invites.push_front(inv);
 		ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create created new invitation %p", (void*) inv);
 	}
 }
@@ -945,20 +809,17 @@ Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 	if (!u || u->invites.empty())
 		return NULL;
 
-	InviteList locallist;
-	locallist.swap(u->invites);
-
 	Invitation* result = NULL;
-	for (InviteList::iterator i = locallist.begin(); i != locallist.end(); )
+	for (InviteList::iterator i = u->invites.begin(); i != u->invites.end(); )
 	{
 		Invitation* inv = *i;
+		++i;
+
 		if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
 		{
 			/* Expired invite, remove it. */
-			std::string expiration = ServerInstance->TimeString(inv->expiry);
+			std::string expiration = InspIRCd::TimeString(inv->expiry);
 			ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
-			i = locallist.erase(i);
-			inv->cull();
 			delete inv;
 		}
 		else
@@ -969,11 +830,9 @@ Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 				result = inv;
 				break;
 			}
-			++i;
 		}
 	}
 
-	locallist.swap(u->invites);
 	ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find result=%p", (void*) result);
 	return result;
 }
@@ -981,22 +840,7 @@ Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 Invitation::~Invitation()
 {
 	// Remove this entry from both lists
-	InviteList::iterator it = std::find(chan->invites.begin(), chan->invites.end(), this);
-	if (it != chan->invites.end())
-		chan->invites.erase(it);
-	it = std::find(user->invites.begin(), user->invites.end(), this);
-	if (it != user->invites.end())
-		user->invites.erase(it);
-}
-
-void InviteBase::ClearInvites()
-{
-	ServerInstance->Logs->Log("INVITEBASE", LOG_DEBUG, "InviteBase::ClearInvites %p", (void*) this);
-	InviteList locallist;
-	locallist.swap(invites);
-	for (InviteList::const_iterator i = locallist.begin(); i != locallist.end(); ++i)
-	{
-		(*i)->cull();
-		delete *i;
-	}
+	chan->invites.erase(this);
+	user->invites.erase(this);
+	ServerInstance->Logs->Log("INVITEBASE", LOG_DEBUG, "Invitation::~ %p", (void*) this);
 }