X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=9f1eafd0cb1f1e9654a8d3890310a46ac98af26a;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=cab05caeb1b7a607c3faba8d2c74d6c1a58431d4;hpb=366a6768437ef753dc31f3ce73e8b2e20a66d243;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index cab05caeb..9f1eafd0c 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,189 +1,195 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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 Dennis Friis <peavey@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core: libIRCDchannels */
+
+/* $Core */
 
 #include "inspircd.h"
-#include <stdarg.h>
-#include "wildcard.h"
+#include <cstdarg>
 #include "mode.h"
 
-Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance)
+Channel::Channel(const std::string &cname, time_t ts)
 {
-	chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
-	if (findchan != Instance->chanlist->end())
-		throw CoreException("Cannot create duplicate channel " + name);
-
-	(*(ServerInstance->chanlist))[name.c_str()] = this;
-	strlcpy(this->name, name.c_str(), CHANMAX);
-	this->created = ts ? ts : ServerInstance->Time(true);
-	this->age = this->created;
-
+	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();
 
-
-	*topic = *setby = *key = 0;
-	maxbans = topicset = limit = 0;
-	memset(&modes,0,64);
+	maxbans = topicset = 0;
+	modes.reset();
 }
 
 void Channel::SetMode(char mode,bool mode_on)
 {
 	modes[mode-65] = mode_on;
-	if (!mode_on)
-		this->SetModeParam(mode,"",false);
 }
 
-
-void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetMode(ModeHandler* mh, bool on)
 {
-	CustomModeList::iterator n = custom_mode_params.find(mode);	
+	modes[mh->GetModeChar() - 65] = on;
+}
 
-	if (mode_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())
 	{
-		if (n == custom_mode_params.end())
-			custom_mode_params[mode] = strdup(parameter);
+		modes[mode-65] = false;
 	}
 	else
 	{
-		if (n != custom_mode_params.end())
-		{
-			free(n->second);
-			custom_mode_params.erase(n);
-		}
+		custom_mode_params[mode] = parameter;
+		modes[mode-65] = true;
 	}
 }
 
-bool Channel::IsModeSet(char mode)
+void Channel::SetModeParam(ModeHandler* mode, const std::string& parameter)
 {
-	return modes[mode-65];
+	SetModeParam(mode->GetModeChar(), parameter);
 }
 
 std::string Channel::GetModeParameter(char mode)
 {
-	switch (mode)
-	{
-		case 'k':
-			return this->key;
-		case 'l':
-			return ConvToStr(this->limit);
-		default:
-			CustomModeList::iterator n = custom_mode_params.find(mode);
-			if (n != custom_mode_params.end())
-				return n->second;
-			return "";
-		break;
-	}
-}
-
-long Channel::GetUserCounter()
-{
-	return (this->internal_userlist.size());
+	CustomModeList::iterator n = custom_mode_params.find(mode);
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
 }
 
-void Channel::AddUser(User* user)
+std::string Channel::GetModeParameter(ModeHandler* mode)
 {
-	internal_userlist[user] = user->nick;
+	CustomModeList::iterator n = custom_mode_params.find(mode->GetModeChar());
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
 }
 
-unsigned long Channel::DelUser(User* user)
+int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
 {
-	CUListIter a = internal_userlist.find(user);
-	
-	if (a != internal_userlist.end())
+	if (!u)
+		u = ServerInstance->FakeClient;
+	if (IS_LOCAL(u) && !forceset)
 	{
-		internal_userlist.erase(a);
-		/* And tidy any others... */
-		DelOppedUser(user);
-		DelHalfoppedUser(user);
-		DelVoicedUser(user);
+		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;
+			}
+		}
 	}
-	
-	return internal_userlist.size();
-}
 
-bool Channel::HasUser(User* user)
-{
-	return (internal_userlist.find(user) != internal_userlist.end());
-}
+	this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
+	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());
 
-void Channel::AddOppedUser(User* user)
-{
-	internal_op_userlist[user] = user->nick;
-}
+	this->topicset = ServerInstance->Time();
 
-void Channel::DelOppedUser(User* user)
-{
-	CUListIter a = internal_op_userlist.find(user);
-	if (a != internal_op_userlist.end())
-	{
-		internal_op_userlist.erase(a);
-		return;
-	}
-}
+	FOREACH_MOD(I_OnPostTopicChange,OnPostTopicChange(u, this, this->topic));
 
-void Channel::AddHalfoppedUser(User* user)
-{
-	internal_halfop_userlist[user] = user->nick;
+	return CMD_SUCCESS;
 }
 
-void Channel::DelHalfoppedUser(User* user)
+long Channel::GetUserCounter()
 {
-	CUListIter a = internal_halfop_userlist.find(user);
-
-	if (a != internal_halfop_userlist.end())
-	{   
-		internal_halfop_userlist.erase(a);
-	}
+	return userlist.size();
 }
 
-void Channel::AddVoicedUser(User* user)
+Membership* Channel::AddUser(User* user)
 {
-	internal_voice_userlist[user] = user->nick;
+	Membership* memb = new Membership(user, this);
+	userlist[user] = memb;
+	return memb;
 }
 
-void Channel::DelVoicedUser(User* user)
+void Channel::DelUser(User* user)
 {
-	CUListIter a = internal_voice_userlist.find(user);
-	
-	if (a != internal_voice_userlist.end())
+	UserMembIter a = userlist.find(user);
+
+	if (a != userlist.end())
 	{
-		internal_voice_userlist.erase(a);
+		a->second->cull();
+		delete a->second;
+		userlist.erase(a);
 	}
-}
 
-CUList* Channel::GetUsers()
-{
-	return &internal_userlist;
+	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);
+	}
 }
 
-CUList* Channel::GetOppedUsers()
+bool Channel::HasUser(User* user)
 {
-	return &internal_op_userlist;
+	return (userlist.find(user) != userlist.end());
 }
 
-CUList* Channel::GetHalfoppedUsers()
+Membership* Channel::GetUser(User* user)
 {
-	return &internal_halfop_userlist;
+	UserMembIter i = userlist.find(user);
+	if (i == userlist.end())
+		return NULL;
+	return i->second;
 }
 
-CUList* Channel::GetVoicedUsers()
+const UserMembList* Channel::GetUsers()
 {
-	return &internal_voice_userlist;
+	return &userlist;
 }
 
 void Channel::SetDefaultModes()
 {
+	ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s",
+		ServerInstance->Config->DefaultModes.c_str());
 	irc::spacesepstream list(ServerInstance->Config->DefaultModes);
 	std::string modeseq;
 	std::string parameter;
@@ -196,26 +202,33 @@ void Channel::SetDefaultModes()
 		if (mode)
 		{
 			if (mode->GetNumParams(true))
+			{
 				list.GetToken(parameter);
+				// If the parameter begins with a ':' then it's invalid
+				if (parameter.c_str()[0] == ':')
+					continue;
+			}
 			else
 				parameter.clear();
 
+			if ((mode->GetNumParams(true)) && (parameter.empty()))
+				continue;
+
 			mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
 		}
 	}
 }
 
-/* 
+/*
  * add a channel to a user, creating the record for it if needed and linking
- * it to the user record 
+ * it to the user record
  */
-Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
+Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
 {
-	if (!user || !cn)
+	// Fix: unregistered users could be joined using /SAJOIN
+	if (!user || !cn || user->registered != REG_ALL)
 		return NULL;
 
-	char cname[MAXBUF];
-	int MOD_RESULT = 0;
 	std::string privs;
 	Channel *Ptr;
 
@@ -227,37 +240,31 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	 */
 	if (IS_LOCAL(user) && !override)
 	{
-		if (user->GetMaxChans())
+		if (user->HasPrivPermission("channels/high-join-limit"))
 		{
-			if (user->chans.size() >= user->GetMaxChans())
+			if (user->chans.size() >= ServerInstance->Config->OperMaxChans)
 			{
-				user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 				return NULL;
 			}
 		}
 		else
 		{
-			if (IS_OPER(user))
+			unsigned int maxchans = user->GetClass()->maxchans;
+			if (!maxchans)
+				maxchans = ServerInstance->Config->MaxChans;
+			if (user->chans.size() >= maxchans)
 			{
-				if (user->chans.size() >= Instance->Config->OperMaxChans)
-				{
-					user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
-					return NULL;
-				}
-			}
-			else
-			{
-				if (user->chans.size() >= Instance->Config->MaxChans)
-				{
-					user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
-					return NULL;
-				}
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+				return NULL;
 			}
 		}
 	}
 
-	strlcpy(cname, cn, CHANMAX);
-	Ptr = Instance->FindChan(cname);
+	std::string cname;
+	cname.assign(std::string(cn), 0, ServerInstance->Config->Limits.ChanMax);
+	Ptr = ServerInstance->FindChan(cname);
+	bool created_by_local = false;
 
 	if (!Ptr)
 	{
@@ -267,22 +274,23 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		if (!IS_LOCAL(user))
 		{
 			if (!TS)
-				Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+				ServerInstance->Logs->Log("CHANNELS",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn);
 		}
 		else
 		{
-			privs = "@";
+			privs = "o";
+			created_by_local = true;
 		}
 
 		if (IS_LOCAL(user) && override == false)
 		{
-			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
-			if (MOD_RESULT == 1)
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, NULL, cname.c_str(), privs, key ? key : ""));
+			if (MOD_RESULT == MOD_RES_DENY)
 				return NULL;
 		}
 
-		Ptr = new Channel(Instance, cname, TS);
+		Ptr = new Channel(cname, TS);
 	}
 	else
 	{
@@ -296,335 +304,276 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		 */
 		if (IS_LOCAL(user) && override == false)
 		{
-			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
-			if (MOD_RESULT == 1)
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, Ptr, cname.c_str(), privs, key ? key : ""));
+			if (MOD_RESULT == MOD_RES_DENY)
 			{
 				return NULL;
 			}
-			else if (MOD_RESULT == 0)
+			else if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
-				if (*Ptr->key)
+				std::string ckey = Ptr->GetModeParameter('k');
+				bool invited = IS_LOCAL(user)->IsInvited(Ptr->name.c_str());
+				bool can_bypass = ServerInstance->Config->InvBypassModes && invited;
+
+				if (!ckey.empty())
 				{
-					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
-					if (!MOD_RESULT)
+					FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : ""));
+					if (!MOD_RESULT.check((key && ckey == key) || can_bypass))
 					{
-						if ((!key) || strcmp(key,Ptr->key))
-						{
-							user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
-							return NULL;
-						}
+						// 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(), Ptr->name.c_str());
+						return NULL;
 					}
 				}
+
 				if (Ptr->IsModeSet('i'))
 				{
-					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
-					if (!MOD_RESULT)
+					FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, Ptr));
+					if (!MOD_RESULT.check(invited))
 					{
-						if (!user->IsInvited(Ptr->name))
-						{
-							user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
-							return NULL;
-						}
+						user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
+						return NULL;
 					}
-					user->RemoveInvite(Ptr->name);
 				}
-				if (Ptr->limit)
+
+				std::string limit = Ptr->GetModeParameter('l');
+				if (!limit.empty())
 				{
-					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
-					if (!MOD_RESULT)
+					FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, Ptr));
+					if (!MOD_RESULT.check((Ptr->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
 					{
-						if (Ptr->GetUserCounter() >= Ptr->limit)
-						{
-							user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
-							return NULL;
-						}
+						user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
+						return NULL;
 					}
 				}
-				if (Ptr->bans.size())
+
+				if (Ptr->IsBanned(user) && !can_bypass)
 				{
-					if (Ptr->IsBanned(user))
-					{
-						user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
-						return NULL;
-					}
+					user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
+					return NULL;
+				}
+
+				/*
+				 * If the user has invites for this channel, remove them now
+				 * after a successful join so they don't build up.
+				 */
+				if (invited)
+				{
+					IS_LOCAL(user)->RemoveInvite(Ptr->name.c_str());
 				}
 			}
 		}
 	}
 
-	/* As spotted by jilles, dont bother to set this on remote users */
-	if (IS_LOCAL(user) && Ptr->GetUserCounter() == 1)
+	if (created_by_local)
+	{
+		/* As spotted by jilles, dont bother to set this on remote users */
 		Ptr->SetDefaultModes();
+	}
 
-	return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
+	return Channel::ForceChan(Ptr, user, privs, bursting, created_by_local);
 }
 
-Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
+Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
 {
 	std::string nick = user->nick;
-	bool silent = false;
-
-	Ptr->AddUser(user);
 
-	/* Just in case they have no permissions */
-	user->chans[Ptr] = 0;
+	Membership* memb = Ptr->AddUser(user);
+	user->chans.insert(Ptr);
 
 	for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
 	{
 		const char status = *x;
-		ModeHandler* mh = Instance->Modes->FindPrefix(status);
+		ModeHandler* mh = ServerInstance->Modes->FindMode(status, MODETYPE_CHANNEL);
 		if (mh)
 		{
 			/* Set, and make sure that the mode handler knows this mode was now set */
-			Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
-			mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
-
-			switch (mh->GetPrefix())
-			{
-				/* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist,
-				 * addressing operator[] creates it. If they do exist, it points to it.
-				 * At all other times where we dont want to create an item if it doesnt exist, we
-				 * must stick to ::find().
-				 */
-				case '@':
-					user->chans[Ptr] |= UCMODE_OP;
-				break;
-				case '%':
-					user->chans[Ptr] |= UCMODE_HOP;
-				break;
-				case '+':
-					user->chans[Ptr] |= UCMODE_VOICE;
-				break;
-			}
+			Ptr->SetPrefix(user, mh->GetModeChar(), true);
+			mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, Ptr, nick, true);
 		}
 	}
 
-	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
+	CUList except_list;
+	FOREACH_MOD(I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
 
-	if (!silent)
-		Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+	Ptr->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", Ptr->name.c_str());
 
 	/* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
-	std::string ms = Instance->Modes->ModeString(user, Ptr);
-	if ((Ptr->GetUserCounter() > 1) && (ms.length()))
-		Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str());
+	if ((Ptr->GetUserCounter() > 1) && (!memb->modes.empty()))
+	{
+		std::string ms = memb->modes;
+		for(unsigned int i=0; i < memb->modes.length(); i++)
+			ms.append(" ").append(user->nick);
+
+		except_list.insert(user);
+		Ptr->WriteAllExcept(user, !ServerInstance->Config->CycleHostsFromUser, 0, except_list, "MODE %s +%s", Ptr->name.c_str(), ms.c_str());
+	}
 
-	/* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
 	if (IS_LOCAL(user))
 	{
 		if (Ptr->topicset)
 		{
-			user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-			user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+			user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
+			user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
 		}
 		Ptr->UserList(user);
 	}
-	FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
+	FOREACH_MOD(I_OnPostJoin,OnPostJoin(memb));
 	return Ptr;
 }
 
 bool Channel::IsBanned(User* user)
 {
-	char mask[MAXBUF];
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
-	if (!MOD_RESULT)
+	ModResult result;
+	FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, this));
+
+	if (result != MOD_RES_PASSTHRU)
+		return (result == MOD_RES_DENY);
+
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 	{
-		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
-		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
-		{
-			/* This allows CIDR ban matching
-			 * 
-			 *        Full masked host                      Full unmasked host                   IP with/without CIDR
-			 */
-			if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
-			{
-				return true;
-			}
-		}
+		if (CheckBan(user, i->data))
+			return true;
 	}
 	return false;
 }
 
-/* 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.
- */
-long Channel::PartUser(User *user, const char* reason)
+bool Channel::CheckBan(User* user, const std::string& mask)
 {
-	bool silent = false;
-
-	if (!user)
-		return this->GetUserCounter();
-
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
+	ModResult result;
+	FIRST_MOD_RESULT(OnCheckBan, result, (user, this, mask));
+	if (result != MOD_RES_PASSTHRU)
+		return (result == MOD_RES_DENY);
+
+	// extbans were handled above, if this is one it obviously didn't match
+	if ((mask.length() <= 2) || (mask[1] == ':'))
+		return false;
+
+	std::string::size_type at = mask.find('@');
+	if (at == std::string::npos)
+		return false;
+
+	char tomatch[MAXBUF];
+	snprintf(tomatch, MAXBUF, "%s!%s", user->nick.c_str(), user->ident.c_str());
+	std::string prefix = mask.substr(0, at);
+	if (InspIRCd::Match(tomatch, prefix, NULL))
 	{
-		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
-
-		if (!silent)
-			this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
-
-		user->chans.erase(i);
-		this->RemoveAllPrefixes(user);
+		std::string suffix = mask.substr(at + 1);
+		if (InspIRCd::Match(user->host, suffix, NULL) ||
+			InspIRCd::Match(user->dhost, suffix, NULL) ||
+			InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
+			return true;
 	}
+	return false;
+}
 
-	if (!this->DelUser(user)) /* if there are no users left on the channel... */
+ModResult Channel::GetExtBanStatus(User *user, char type)
+{
+	ModResult rv;
+	FIRST_MOD_RESULT(OnExtBanCheck, rv, (user, this, type));
+	if (rv != MOD_RES_PASSTHRU)
+		return rv;
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 	{
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-		/* kill the record */
-		if (iter != ServerInstance->chanlist->end())
+		if (i->data[0] == type && i->data[1] == ':')
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
-			if (MOD_RESULT == 1)
-				return 1; // delete halted by module
-			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-			ServerInstance->chanlist->erase(iter);
+			std::string val = i->data.substr(2);
+			if (CheckBan(user, val))
+				return MOD_RES_DENY;
 		}
-		return 0;
 	}
-
-	return this->GetUserCounter();
+	return MOD_RES_PASSTHRU;
 }
 
-long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
+/* 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.
+ */
+void Channel::PartUser(User *user, std::string &reason)
 {
-	bool silent = false;
+	if (!user)
+		return;
 
-	if (!user || !reason)
-		return this->GetUserCounter();
+	Membership* memb = GetUser(user);
 
-	if (IS_LOCAL(user))
+	if (memb)
 	{
-		if (!this->HasUser(user))
-		{
-			/* Not on channel */
-			return this->GetUserCounter();
-		}
-	}
+		CUList except_list;
+		FOREACH_MOD(I_OnUserPart,OnUserPart(memb, reason, except_list));
 
-	if (triggerevents)
-	{
-		FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
-	}
+		WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
-	{
-		if (!silent)
-			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
-
-		user->chans.erase(i);
+		user->chans.erase(this);
 		this->RemoveAllPrefixes(user);
 	}
 
-	if (!this->DelUser(user))
-	{
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-		/* kill the record */
-		if (iter != ServerInstance->chanlist->end())
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
-			if (MOD_RESULT == 1)
-				return 1; // delete halted by module
-			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-			ServerInstance->chanlist->erase(iter);
-		}
-		return 0;
-	}
-
-	return this->GetUserCounter();
+	this->DelUser(user);
 }
 
-long Channel::KickUser(User *src, User *user, const char* reason)
+void Channel::KickUser(User *src, User *user, const char* reason)
 {
-	bool silent = false;
-
 	if (!src || !user || !reason)
-		return this->GetUserCounter();
+		return;
 
+	Membership* memb = GetUser(user);
 	if (IS_LOCAL(src))
 	{
-		if (!this->HasUser(user))
+		if (!memb)
 		{
-			src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
-			return this->GetUserCounter();
+			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->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
-			return this->GetUserCounter();
+			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;
 		}
-		int MOD_RESULT = 0;
 
-		if (!ServerInstance->ULine(src->server))
-		{
-			MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
-			if (MOD_RESULT == 1)
-				return this->GetUserCounter();
-		}
-		/* Set to -1 by OnUserPreKick if explicit allow was set */
-		if (MOD_RESULT != -1)
+		ModResult res;
+		if (ServerInstance->ULine(src->server))
+			res = MOD_RES_ALLOW;
+		else
+			FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
+
+		if (res == MOD_RES_DENY)
+			return;
+
+		if (res == MOD_RES_PASSTHRU)
 		{
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
-			if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server)))
-				return this->GetUserCounter();
-	
-			if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server)))
+			unsigned int them = this->GetPrefixValue(src);
+			unsigned int req = HALFOP_VALUE;
+			for (std::string::size_type i = 0; i < memb->modes.length(); i++)
 			{
-				int them = this->GetStatus(src);
-				int us = this->GetStatus(user);
-   			 	if ((them < STATUS_HOP) || (them < us))
-				{
-					src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
-					return this->GetUserCounter();
-				}
+				ModeHandler* mh = ServerInstance->Modes->FindMode(memb->modes[i], MODETYPE_CHANNEL);
+				if (mh && mh->GetLevelRequired() > req)
+					req = mh->GetLevelRequired();
+			}
+
+			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-");
+				return;
 			}
 		}
 	}
 
-	FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent));
-
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
+	if (memb)
 	{
-		/* zap it from the channel list of the user */
-		if (!silent)
-			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+		CUList except_list;
+		FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list));
 
-		user->chans.erase(i);
-		this->RemoveAllPrefixes(user);
-	}
+		WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason);
 
-	if (!this->DelUser(user))
-	/* if there are no users left on the channel */
-	{
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-
-		/* kill the record */
-		if (iter != ServerInstance->chanlist->end())
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
-			if (MOD_RESULT == 1)
-				return 1; // delete halted by module
-			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-			ServerInstance->chanlist->erase(iter);
-		}
-		return 0;
+		user->chans.erase(this);
+		this->RemoveAllPrefixes(user);
 	}
 
-	return this->GetUserCounter();
+	this->DelUser(user);
 }
 
-void Channel::WriteChannel(User* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -641,23 +590,22 @@ void Channel::WriteChannel(User* user, char* text, ...)
 
 void Channel::WriteChannel(User* user, const std::string &text)
 {
-	CUList *ulist = this->GetUsers();
 	char tb[MAXBUF];
 
 	if (!user)
 		return;
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+	snprintf(tb,MAXBUF,":%s %s", user->GetFullHost().c_str(), text.c_str());
 	std::string out = tb;
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
 	{
 		if (IS_LOCAL(i->first))
 			i->first->Write(out);
 	}
 }
 
-void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -672,15 +620,14 @@ void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
 	this->WriteChannelWithServ(ServName, std::string(textbuffer));
 }
 
-void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
+void Channel::WriteChannelWithServ(const std::string& ServName, const std::string &text)
 {
-	CUList *ulist = this->GetUsers();
 	char tb[MAXBUF];
 
-	snprintf(tb,MAXBUF,":%s %s",ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+	snprintf(tb,MAXBUF,":%s %s", ServName.empty() ? ServerInstance->Config->ServerName.c_str() : ServName.c_str(), text.c_str());
 	std::string out = tb;
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
 	{
 		if (IS_LOCAL(i->first))
 			i->first->Write(out);
@@ -689,7 +636,7 @@ void Channel::WriteChannelWithServ(const char* ServName, const std::string &text
 
 /* write formatted text from a source user to all users on a channel except
  * for the sender (for privmsg etc) */
-void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -704,7 +651,7 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c
 	this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
 }
 
-void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -712,45 +659,42 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList
 	if (!text)
 		return;
 
+	int offset = snprintf(textbuffer,MAXBUF,":%s ", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str());
+
 	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	vsnprintf(textbuffer + offset, MAXBUF - offset, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
+	this->RawWriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
 }
 
 void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
 {
-	CUList *ulist;
 	char tb[MAXBUF];
 
-	switch (status)
-	{
-		case '@':
-			ulist = this->GetOppedUsers();
-			break;
-		case '%':
-			ulist = this->GetHalfoppedUsers();
-			break;
-		case '+':
-			ulist = this->GetVoicedUsers();
-			break;
-		default:
-			ulist = this->GetUsers();
-			break;
-	}
+	snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str(), text.c_str());
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
-	std::string out = tb;
+	this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb));
+}
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out)
+{
+	unsigned int minrank = 0;
+	if (status)
 	{
-		if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
+		ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+		if (mh)
+			minrank = mh->GetPrefixRank();
+	}
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+	{
+		if (IS_LOCAL(i->first) && (except_list.find(i->first) == except_list.end()))
 		{
-			if (serversource)
-				i->first->WriteServ(text);
-			else
-				i->first->Write(out);
+			/* User doesn't have the status we're after */
+			if (minrank && i->second->getRank() < minrank)
+				continue;
+
+			i->first->Write(out);
 		}
 	}
 }
@@ -758,7 +702,7 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList
 void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
 {
 	CUList except_list;
-	except_list[user] = user->nick;
+	except_list.insert(user);
 	this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
 }
 
@@ -769,10 +713,9 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c
 int Channel::CountInvisible()
 {
 	int count = 0;
-	CUList *ulist= this->GetUsers();
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
 	{
-		if (!(i->first->IsModeSet('i')))
+		if (!i->first->quitting && !i->first->IsModeSet('i'))
 			count++;
 	}
 
@@ -796,25 +739,13 @@ char* Channel::ChanModes(bool showkey)
 		{
 			*offset++ = n + 65;
 			extparam.clear();
-			switch (n)
+			if (n == 'k' - 65 && !showkey)
 			{
-				case CM_KEY:
-					extparam = (showkey ? this->key : "<key>");
-				break;
-				case CM_LIMIT:
-					extparam = ConvToStr(this->limit);
-				break;
-				case CM_NOEXTERNAL:
-				case CM_TOPICLOCK:
-				case CM_INVITEONLY:
-				case CM_MODERATED:
-				case CM_SECRET:
-				case CM_PRIVATE:
-					/* We know these have no parameters */
-				break;
-				default:
-					extparam = this->GetModeParameter(n + 65);
-				break;
+				extparam = "<key>";
+			}
+			else
+			{
+				extparam = this->GetModeParameter(n + 65);
 			}
 			if (!extparam.empty())
 			{
@@ -833,43 +764,41 @@ char* Channel::ChanModes(bool showkey)
 /* compile a userlist of a channel into a string, each nick seperated by
  * spaces and op, voice etc status shown as @ and +, and send it to 'user'
  */
-void Channel::UserList(User *user, CUList *ulist)
+void Channel::UserList(User *user)
 {
-	char list[MAXBUF];
-	size_t dlen, curlen;
-	int MOD_RESULT = 0;
-
 	if (!IS_LOCAL(user))
 		return;
 
-	FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
-	if (MOD_RESULT == 1)
-		return;
-	if (MOD_RESULT != -1)
+	bool has_privs = user->HasPrivPermission("channels/auspex");
+
+	if (this->IsModeSet('s') && !this->HasUser(user) && !has_privs)
 	{
-		if ((this->IsModeSet('s')) && (!this->HasUser(user)))
-		{
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, this->name);
-			return;
-		}
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
+		return;
 	}
 
-	dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=',  this->name);
-
-	int numusers = 0;
-	char* ptr = list + dlen;
+	std::string list = user->nick;
+	list.push_back(' ');
+	list.push_back(this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=');
+	list.push_back(' ');
+	list.append(this->name).append(" :");
+	std::string::size_type pos = list.size();
 
-	if (!ulist)
-		ulist = this->GetUsers();
+	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 (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	const size_t maxlen = MAXBUF - 10 - ServerInstance->Config->ServerName.size();
+	std::string prefixlist;
+	std::string nick;
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i)
 	{
-		if ((!has_user) && (i->first->IsModeSet('i')))
+		if (i->first->quitting)
+			continue;
+		if ((!has_user) && (i->first->IsModeSet('i')) && (!has_privs))
 		{
 			/*
 			 * user is +i, and source not on the channel, does not show
@@ -878,39 +807,37 @@ void Channel::UserList(User *user, CUList *ulist)
 			continue;
 		}
 
-		if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
-			continue;
-
-		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
-		/* OnUserList can change this - reset it back to normal */
-		i->second = i->first->nick;
+		prefixlist = this->GetPrefixChar(i->first);
+		nick = i->first->nick;
 
-		curlen += ptrlen;
-		ptr += ptrlen;
+		FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, prefixlist, nick));
 
-		numusers++;
+		/* Nick was nuked, a module wants us to skip it */
+		if (nick.empty())
+			continue;
 
-		if (curlen > (480-NICKMAX))
+		if (list.size() + prefixlist.length() + nick.length() + 1 > maxlen)
 		{
 			/* list overflowed into multiple numerics */
-			user->WriteServ(std::string(list));
+			user->WriteNumeric(RPL_NAMREPLY, list);
 
-			/* reset our lengths */
-			dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
-			ptr = list + dlen;
-
-			ptrlen = 0;
-			numusers = 0;
+			// Erase all nicks, keep the constant part
+			list.erase(pos);
+			has_one = false;
 		}
+
+		list.append(prefixlist).append(nick).push_back(' ');
+
+		has_one = true;
 	}
 
 	/* if whats left in the list isnt empty, send it */
-	if (numusers)
+	if (has_one)
 	{
-		user->WriteServ(std::string(list));
+		user->WriteNumeric(RPL_NAMREPLY, list);
 	}
 
-	user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
+	user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
 }
 
 long Channel::GetMaxBans()
@@ -922,7 +849,7 @@ long Channel::GetMaxBans()
 	/* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
 	for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
 	{
-		if (match(this->name,n->first.c_str()))
+		if (InspIRCd::Match(this->name, n->first, NULL))
 		{
 			this->maxbans = n->second;
 			return n->second;
@@ -946,41 +873,55 @@ void Channel::ResetMaxBans()
 const char* Channel::GetPrefixChar(User *user)
 {
 	static char pf[2] = {0, 0};
-	
-	prefixlist::iterator n = prefixes.find(user);
-	if (n != prefixes.end())
+	*pf = 0;
+	unsigned int bestrank = 0;
+
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
 	{
-		if (n->second.size())
+		for(unsigned int i=0; i < m->second->modes.length(); i++)
 		{
-			/* If the user has any prefixes, their highest prefix
-			 * will always be at the head of the list, as the list is
-			 * sorted in rank order highest first (see SetPrefix()
-			 * for reasons why)
-			 */
-			*pf = n->second.begin()->first;
-			return pf;
+			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();
+			}
 		}
 	}
-
-	*pf = 0;
 	return pf;
 }
 
+unsigned int Membership::getRank()
+{
+	char mchar = modes.c_str()[0];
+	unsigned int rv = 0;
+	if (mchar)
+	{
+		ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+		if (mh)
+			rv = mh->GetPrefixRank();
+	}
+	return rv;
+}
+
 const char* Channel::GetAllPrefixChars(User* user)
 {
-	static char prefix[MAXBUF];
+	static char prefix[64];
 	int ctr = 0;
-	*prefix = 0;
 
-	prefixlist::iterator n = prefixes.find(user);
-	if (n != prefixes.end())
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
 	{
-		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+		for(unsigned int i=0; i < m->second->modes.length(); i++)
 		{
-			prefix[ctr++] = x->first;
+			char mchar = m->second->modes[i];
+			ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+			if (mh && mh->GetPrefix())
+				prefix[ctr++] = mh->GetPrefix();
 		}
 	}
-
 	prefix[ctr] = 0;
 
 	return prefix;
@@ -988,93 +929,130 @@ const char* Channel::GetAllPrefixChars(User* user)
 
 unsigned int Channel::GetPrefixValue(User* user)
 {
-	prefixlist::iterator n = prefixes.find(user);
-	if (n != prefixes.end())
+	UserMembIter m = userlist.find(user);
+	if (m == userlist.end())
+		return 0;
+	return m->second->getRank();
+}
+
+bool Channel::SetPrefix(User* user, char prefix, 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++)
 	{
-		if (n->second.size())
-			return n->second.begin()->second;
+		char mchar = m->second->modes[i];
+		ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+		if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank())
+		{
+			m->second->modes =
+				m->second->modes.substr(0,i) +
+				(adding ? std::string(1, prefix) : "") +
+				m->second->modes.substr(mchar == prefix ? i+1 : i);
+			return adding != (mchar == prefix);
+		}
 	}
-	return 0;
+	if (adding)
+		m->second->modes += std::string(1, prefix);
+	return adding;
 }
 
-int Channel::GetStatusFlags(User *user)
+void Channel::RemoveAllPrefixes(User* user)
 {
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
 	{
-		return i->second;
+		m->second->modes.clear();
 	}
-	return 0;
 }
 
-int Channel::GetStatus(User *user)
+void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
 {
-	if (ServerInstance->ULine(user->server))
-		return STATUS_OP;
+	if ((timeout != 0) && (ServerInstance->Time() >= timeout))
+		// Expired, don't bother
+		return;
+
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create chan=%s user=%s", c->name.c_str(), u->uuid.c_str());
 
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
+	Invitation* inv = Invitation::Find(c, u, false);
+	if (inv)
 	{
-		if ((i->second & UCMODE_OP) > 0)
-		{
-			return STATUS_OP;
-		}
-		if ((i->second & UCMODE_HOP) > 0)
-		{
-			return STATUS_HOP;
-		}
-		if ((i->second & UCMODE_VOICE) > 0)
-		{
-			return STATUS_VOICE;
-		}
-		return STATUS_NORMAL;
+		 if ((inv->expiry == 0) || (inv->expiry > timeout))
+			return;
+		inv->expiry = timeout;
+		ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create changed expiry in existing invitation %p", (void*) inv);
+	}
+	else
+	{
+		inv = new Invitation(c, u, timeout);
+		c->invites.push_back(inv);
+		u->invites.push_back(inv);
+		ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create created new invitation %p", (void*) inv);
 	}
-	return STATUS_NORMAL;
 }
 
-void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding)
+Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 {
-	prefixlist::iterator n = prefixes.find(user);
-	prefixtype pfx = std::make_pair(prefix,prefix_value);
-	if (adding)
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find chan=%s user=%s check_expired=%d", c ? c->name.c_str() : "NULL", u ? u->uuid.c_str() : "NULL", 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(); )
 	{
-		if (n != prefixes.end())
+		Invitation* inv = *i;
+		if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
 		{
-			if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
-			{
-				n->second.push_back(pfx);
-				/* We must keep prefixes in rank order, largest first.
-				 * This is for two reasons, firstly because x-chat *ass-u-me's* this
-				 * state, and secondly it turns out to be a benefit to us later.
-				 * See above in GetPrefix().
-				 */
-				std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
-			}
+			/* Expired invite, remove it. */
+			std::string expiration = ServerInstance->TimeString(inv->expiry);
+			ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
+			i = locallist.erase(i);
+			inv->cull();
+			delete inv;
 		}
 		else
 		{
-			pfxcontainer one;
-			one.push_back(pfx);
-			prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
-		}
-	}
-	else
-	{
-		if (n != prefixes.end())
-		{
-			pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx);
-			if (x != n->second.end())
-				n->second.erase(x);
+			/* Is it what we're searching for? */
+			if (inv->chan == c)
+			{
+				result = inv;
+				break;
+			}
+			++i;
 		}
 	}
+
+	locallist.swap(u->invites);
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find result=%p", (void*) result);
+	return result;
 }
 
-void Channel::RemoveAllPrefixes(User* user)
+Invitation::~Invitation()
 {
-	prefixlist::iterator n = prefixes.find(user);
-	if (n != prefixes.end())
+	// 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", DEBUG, "InviteBase::ClearInvites %p", (void*) this);
+	InviteList locallist;
+	locallist.swap(invites);
+	for (InviteList::const_iterator i = locallist.begin(); i != locallist.end(); ++i)
 	{
-		prefixes.erase(n);
+		(*i)->cull();
+		delete *i;
 	}
 }
-