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

diff --git a/src/channels.cpp b/src/channels.cpp
index d50841de7..d0533aee6 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,258 +1,284 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *   	  <brain@chatspike.net>
- *   	  <Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *	the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include <stdarg.h>
-#include "configreader.h"
 #include "inspircd.h"
-#include "hash_map.h"
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "commands.h"
-#include "wildcard.h"
-#include "message.h"
+#include <cstdarg>
 #include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
 
-chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
+Channel::Channel(const std::string &cname, time_t ts)
 {
-	*name = *topic = *setby = *key = 0;
-	created = topicset = limit = 0;
-	internal_userlist.clear();
-	memset(&modes,0,64);
+	chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
+	if (findchan != ServerInstance->chanlist->end())
+		throw CoreException("Cannot create duplicate channel " + cname);
+
+	(*(ServerInstance->chanlist))[cname.c_str()] = this;
+	this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
+	this->age = ts ? ts : ServerInstance->Time();
+
+	maxbans = topicset = 0;
+	modes.reset();
 }
 
-void chanrec::SetMode(char mode,bool mode_on)
+void Channel::SetMode(char mode,bool mode_on)
 {
 	modes[mode-65] = mode_on;
-	if (!mode_on)
-		this->SetModeParam(mode,"",false);
 }
 
-
-void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetMode(ModeHandler* mh, bool on)
 {
-	log(DEBUG,"SetModeParam called");
-	
-	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);
-			log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
-		}
-		else
-		{
-			log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
-		}
+		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 chanrec::IsModeSet(char mode)
+void Channel::SetModeParam(ModeHandler* mode, const std::string& parameter)
 {
-	return modes[mode-65];
+	SetModeParam(mode->GetModeChar(), parameter);
 }
 
-std::string chanrec::GetModeParameter(char mode)
+std::string Channel::GetModeParameter(char mode)
 {
-	if (mode == 'k')
-	{
-		return this->key;
-	}
-	else if (mode == 'l')
-	{
-		return ConvToStr(this->limit);
-	}
-	else
-	{
-		CustomModeList::iterator n = custom_mode_params.find(mode);
-		if (n != custom_mode_params.end())
-		{
-			return n->second;
-		}
-		return "";
-	}
+	CustomModeList::iterator n = custom_mode_params.find(mode);
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
 }
 
-long chanrec::GetUserCounter()
+std::string Channel::GetModeParameter(ModeHandler* mode)
 {
-	return (this->internal_userlist.size());
+	CustomModeList::iterator n = custom_mode_params.find(mode->GetModeChar());
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
 }
 
-void chanrec::AddUser(userrec* user)
+int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
 {
-	internal_userlist[user] = user;
-}
+	if (!u)
+		u = ServerInstance->FakeClient;
+	if (IS_LOCAL(u) && !forceset)
+	{
+		ModResult res;
+		FIRST_MOD_RESULT(OnPreTopicChange, res, (u,this,ntopic));
 
-unsigned long chanrec::DelUser(userrec* user)
-{
-	CUListIter a = internal_userlist.find(user);
-	
-	if (a != internal_userlist.end())
+		if (res == MOD_RES_DENY)
+			return CMD_FAILURE;
+		if (res != MOD_RES_ALLOW)
+		{
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (u,this,"topiclock"));
+			bool defok = IsModeSet('t') ? GetPrefixValue(u) >= HALFOP_VALUE : HasUser(u);
+			if (!res.check(defok))
+			{
+				if (!this->HasUser(u))
+					u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str());
+				else
+					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)
 	{
-		internal_userlist.erase(a);
-		/* And tidy any others... */
-		DelOppedUser(user);
-		DelHalfoppedUser(user);
-		DelVoicedUser(user);
+		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());
 	}
-	
-	return internal_userlist.size();
-}
 
-bool chanrec::HasUser(userrec* user)
-{
-	return (internal_userlist.find(user) != internal_userlist.end());
-}
+	this->topicset = ServerInstance->Time();
 
-void chanrec::AddOppedUser(userrec* user)
-{
-	internal_op_userlist[user] = user;
+	FOREACH_MOD(I_OnPostTopicChange,OnPostTopicChange(u, this, this->topic));
+
+	return CMD_SUCCESS;
 }
 
-void chanrec::DelOppedUser(userrec* user)
+long Channel::GetUserCounter()
 {
-	CUListIter a = internal_op_userlist.find(user);
-	if (a != internal_op_userlist.end())
-	{
-		internal_op_userlist.erase(a);
-		return;
-	}
+	return userlist.size();
 }
 
-void chanrec::AddHalfoppedUser(userrec* user)
+Membership* Channel::AddUser(User* user)
 {
-	internal_halfop_userlist[user] = user;
+	Membership* memb = new Membership(user, this);
+	userlist[user] = memb;
+	return memb;
 }
 
-void chanrec::DelHalfoppedUser(userrec* user)
+void Channel::DelUser(User* user)
 {
-	CUListIter a = internal_halfop_userlist.find(user);
+	UserMembIter a = userlist.find(user);
 
-	if (a != internal_halfop_userlist.end())
-	{   
-		internal_halfop_userlist.erase(a);
+	if (a != userlist.end())
+	{
+		a->second->cull();
+		delete a->second;
+		userlist.erase(a);
 	}
-}
 
-void chanrec::AddVoicedUser(userrec* user)
-{
-	internal_voice_userlist[user] = user;
-}
-
-void chanrec::DelVoicedUser(userrec* user)
-{
-	CUListIter a = internal_voice_userlist.find(user);
-	
-	if (a != internal_voice_userlist.end())
+	if (userlist.empty())
 	{
-		internal_voice_userlist.erase(a);
+		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);
+		}
+		ServerInstance->GlobalCulls.AddItem(this);
 	}
 }
 
-CUList* chanrec::GetUsers()
+bool Channel::HasUser(User* user)
 {
-	return &internal_userlist;
+	return (userlist.find(user) != userlist.end());
 }
 
-CUList* chanrec::GetOppedUsers()
+Membership* Channel::GetUser(User* user)
 {
-	return &internal_op_userlist;
+	UserMembIter i = userlist.find(user);
+	if (i == userlist.end())
+		return NULL;
+	return i->second;
 }
 
-CUList* chanrec::GetHalfoppedUsers()
+const UserMembList* Channel::GetUsers()
 {
-	return &internal_halfop_userlist;
+	return &userlist;
 }
 
-CUList* chanrec::GetVoicedUsers()
+void Channel::SetDefaultModes()
 {
-	return &internal_voice_userlist;
+	ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s",
+		ServerInstance->Config->DefaultModes.c_str());
+	irc::spacesepstream list(ServerInstance->Config->DefaultModes);
+	std::string modeseq;
+	std::string parameter;
+
+	list.GetToken(modeseq);
+
+	for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
+	{
+		ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
+		if (mode)
+		{
+			if (mode->GetNumParams(true))
+				list.GetToken(parameter);
+			else
+				parameter.clear();
+
+			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
  */
-chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
+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;
 
-	int created = 0;
 	char cname[MAXBUF];
-	int MOD_RESULT = 0;
-	strlcpy(cname,cn,CHANMAX);
+	std::string privs;
+	Channel *Ptr;
 
-	chanrec* Ptr = FindChan(cname);
-
-	if (!Ptr)
+	/*
+	 * We don't restrict the number of channels that remote users or users that are override-joining may be in.
+	 * We restrict local users to MaxChans channels.
+	 * We restrict local operators to OperMaxChans channels.
+	 * This is a lot more logical than how it was formerly. -- w00t
+	 */
+	if (IS_LOCAL(user) && !override)
 	{
-		if (user->fd > -1)
+		if (user->HasPrivPermission("channels/high-join-limit"))
+		{
+			if (user->chans.size() >= ServerInstance->Config->OperMaxChans)
+			{
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+				return NULL;
+			}
+		}
+		else
 		{
-			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
-			if (MOD_RESULT == 1)
+			unsigned int maxchans = user->GetClass()->maxchans;
+			if (!maxchans)
+				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(), cn);
 				return NULL;
+			}
 		}
+	}
 
-		/* create a new one */
-		Ptr = new chanrec(Instance);
-		Instance->chanlist[cname] = Ptr;
-
-		strlcpy(Ptr->name, cname,CHANMAX);
-		Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
-		Ptr->created = TIME;
-		*Ptr->topic = 0;
-		strlcpy(Ptr->setby, user->nick,NICKMAX-1);
-		Ptr->topicset = 0;
-		log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
+	strlcpy(cname, cn, ServerInstance->Config->Limits.ChanMax);
+	Ptr = ServerInstance->FindChan(cname);
+	bool created_by_local = false;
+
+	if (!Ptr)
+	{
 		/*
-		 * set created to 2 to indicate user
-		 * is the first in the channel
-		 * and should be given ops
+		 * Fix: desync bug was here, don't set @ on remote users - spanningtree handles their permissions. bug #358. -- w00t
 		 */
-		created = 2;
+		if (!IS_LOCAL(user))
+		{
+			if (!TS)
+				ServerInstance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn);
+		}
+		else
+		{
+			privs = "o";
+			created_by_local = true;
+		}
+
+		if (IS_LOCAL(user) && override == false)
+		{
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : ""));
+			if (MOD_RESULT == MOD_RES_DENY)
+				return NULL;
+		}
+
+		Ptr = new Channel(cname, TS);
 	}
 	else
 	{
@@ -264,380 +290,267 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 		 * remote users are allowed us to bypass channel modes
 		 * and bans (used by servers)
 		 */
-		if (IS_LOCAL(user)) /* was a check on fd > -1 */
+		if (IS_LOCAL(user) && override == false)
 		{
-			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
-			if (MOD_RESULT == 1)
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, 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)
-						{
-							log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
-							user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
-							return NULL;
-						}
-						else
-						{
-							if (strcmp(key,Ptr->key))
-							{
-								log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
-								user->WriteServ("475 %s %s :Cannot join channel (Incorrect 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->modes[CM_INVITEONLY])
+
+				if (Ptr->IsModeSet('i'))
 				{
-					MOD_RESULT = 0;
-					irc::string xname(Ptr->name);
-					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(xname))
-						{
-							/* user was invited to channel */
-							/* there may be an optional channel NOTICE here */
-						}
-						else
-						{
-							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(xname);
 				}
-				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)
 				{
-					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckBan,OnCheckBan(user, Ptr));
-					char mask[MAXBUF];
-					sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString());
-					if (!MOD_RESULT)
-					{
-						for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->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)))
-							{
-								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());
 				}
 			}
 		}
-		else
-		{
-			log(DEBUG,"chanrec::JoinUser(): Overridden checks");
-		}
-		created = 1;
 	}
 
-	for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
+	if (created_by_local)
 	{
-		if ((*index)->channel == NULL)
-		{
-			return chanrec::ForceChan(Instance, Ptr, *index, user, created);
-		}
+		/* As spotted by jilles, dont bother to set this on remote users */
+		Ptr->SetDefaultModes();
 	}
 
-	/*
-	 * XXX: If the user is an oper here, we can just extend their user->chans vector by one
-	 * and put the channel in here. Same for remote users which are not bound by
-	 * the channel limits. Otherwise, nope, youre boned.
-	 */
-	if (!IS_LOCAL(user)) /* was a check on fd < 0 */
-	{
-		ucrec* a = new ucrec();
-		chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
-		user->chans.push_back(a);
-		return c;
-	}
-	else if (*user->oper)
-	{
-		/* Oper allows extension up to the OPERMAXCHANS value */
-		if (user->chans.size() < OPERMAXCHANS)
-		{
-			ucrec* a = new ucrec();
-			chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
-			user->chans.push_back(a);
-			return c;
-		}
-	}
+	return Channel::ForceChan(Ptr, user, privs, bursting, created_by_local);
+}
+
+Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
+{
+	std::string nick = user->nick;
 
-	user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
+	Membership* memb = Ptr->AddUser(user);
+	user->chans.insert(Ptr);
 
-	if (created == 2)
+	for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
 	{
-		log(DEBUG,"BLAMMO, Whacking channel.");
-		/* Things went seriously pear shaped, so take this away. bwahaha. */
-		chan_hash::iterator n = Instance->chanlist.find(cname);
-		if (n != Instance->chanlist.end())
+		const char status = *x;
+		ModeHandler* mh = ServerInstance->Modes->FindMode(status, MODETYPE_CHANNEL);
+		if (mh)
 		{
-			Ptr->DelUser(user);
-			DELETE(Ptr);
-			Instance->chanlist.erase(n);
-			for (unsigned int index =0; index < user->chans.size(); index++)
-			{
-				if (user->chans[index]->channel == Ptr)
-				{
-					user->chans[index]->channel = NULL;
-					user->chans[index]->uc_modes = 0;	
-				}
-			}
+			/* Set, and make sure that the mode handler knows this mode was now set */
+			Ptr->SetPrefix(user, mh->GetModeChar(), true);
+			mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, Ptr, nick, true);
 		}
 	}
-	else
-	{
-		for (unsigned int index =0; index < user->chans.size(); index++)
-		{
-			if (user->chans[index]->channel == Ptr)
-			{
-				user->chans[index]->channel = NULL;
-				user->chans[index]->uc_modes = 0;
-			}
-		}
-	}
-	return NULL;
-}
 
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created)
-{
-	if (created == 2)
-	{
-		/* first user in is given ops */
-		a->uc_modes = UCMODE_OP;
-		Ptr->AddOppedUser(user);
-	}
-	else
-	{
-		a->uc_modes = 0;
-	}
+	CUList except_list;
+	FOREACH_MOD(I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
 
-	a->channel = Ptr;
-	Ptr->AddUser(user);
-	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 = memb->modes;
+	for(unsigned int i=0; i < memb->modes.length(); i++)
+		ms.append(" ").append(user->nick);
+	if ((Ptr->GetUserCounter() > 1) && (ms.length()))
+		Ptr->WriteAllExceptSender(user, true, 0, "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))
 	{
-		log(DEBUG,"Sent JOIN to client");
 		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);
 		}
-		userlist(user,Ptr);
-		user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+		Ptr->UserList(user);
 	}
-	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
+	FOREACH_MOD(I_OnPostJoin,OnPostJoin(memb));
 	return Ptr;
 }
 
-/* chanrec::PartUser
- * remove a channel from a users record, and remove the record from the hash
- * if the channel has become empty
- */
-long chanrec::PartUser(userrec *user, const char* reason)
+bool Channel::IsBanned(User* user)
 {
-	if (!user)
-		return this->GetUserCounter();
+	ModResult result;
+	FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, this));
+
+	if (result != MOD_RES_PASSTHRU)
+		return (result == MOD_RES_DENY);
 
-	for (unsigned int i =0; i < user->chans.size(); i++)
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 	{
-		/* zap it from the channel list of the user */
-		if (user->chans[i]->channel == this)
-		{
-			if (reason)
-			{
-				FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason));
-				this->WriteChannel(user, "PART %s :%s", this->name, reason);
-			}
-			else
-			{
-				FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, ""));
-				this->WriteChannel(user, "PART :%s", this->name);
-			}
-			user->chans[i]->uc_modes = 0;
-			user->chans[i]->channel = NULL;
-			break;
-		}
+		if (CheckBan(user, i->data))
+			return true;
 	}
+	return false;
+}
 
-	if (!this->DelUser(user)) /* if there are no users left on the channel... */
+bool Channel::CheckBan(User* user, const std::string& mask)
+{
+	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[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))
 	{
-		chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
-		/* kill the record */
-		if (iter != ServerInstance->chanlist.end())
-		{
-			log(DEBUG,"del_channel: destroyed: %s", this->name);
-			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
-			ServerInstance->chanlist.erase(iter);
-		}
-		return 0;
+		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 this->GetUserCounter();
+	return false;
 }
 
-long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
+ModResult Channel::GetExtBanStatus(User *user, char type)
 {
-	if (!user || !reason)
-		return this->GetUserCounter();
-
-	if (IS_LOCAL(user))
+	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++)
 	{
-		if (!this->HasUser(user))
+		if (i->data[0] == type && i->data[1] == ':')
 		{
-			/* Not on channel */
-			return this->GetUserCounter();
+			std::string val = i->data.substr(2);
+			if (CheckBan(user, val))
+				return MOD_RES_DENY;
 		}
 	}
+	return MOD_RES_PASSTHRU;
+}
 
-	if (triggerevents)
-	{
-		FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,reason));
-	}
+/* 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)
+{
+	if (!user)
+		return;
 
-	for (unsigned int i =0; i < user->chans.size(); i++)
-	{
-		if (user->chans[i]->channel == this)
-		{
-			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
-			user->chans[i]->uc_modes = 0;
-			user->chans[i]->channel = NULL;
-			break;
-		}
-	}
+	Membership* memb = GetUser(user);
 
-	if (!this->DelUser(user))
+	if (memb)
 	{
-		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);
-		}
-		return 0;
+		CUList except_list;
+		FOREACH_MOD(I_OnUserPart,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);
 	}
 
-	return this->GetUserCounter();
+	this->DelUser(user);
 }
 
-long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
+void Channel::KickUser(User *src, User *user, const char* reason)
 {
 	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 ((is_uline(user->server)) && (!is_uline(src->server)))
+		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 (!is_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) && (!is_uline(src->server)))
-				return this->GetUserCounter();
-	
-			if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
+			int them = this->GetPrefixValue(src);
+			int us = this->GetPrefixValue(user);
+			if ((them < HALFOP_VALUE) || (them < us))
 			{
-				int them = cstatus(src, this);
-				int us = cstatus(user, this);
-   			 	if ((them < STATUS_HOP) || (them < us))
-				{
-					if (them == STATUS_HOP)
-					{
-						src->WriteServ("482 %s %s :You must be a channel operator",src->nick, this->name);
-					}
-					else
-					{
-						src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name);
-					}
-					return this->GetUserCounter();
-				}
+				src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them >= HALFOP_VALUE ? "" : "half-");
+				return;
 			}
 		}
 	}
 
-	FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason));
-			
-	for (UserChanList::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+	if (memb)
 	{
-		/* zap it from the channel list of the user */
-		if ((*i)->channel == this)
-		{
-			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
-			(*i)->uc_modes = 0;
-			(*i)->channel = NULL;
-			break;
-		}
-	}
+		CUList except_list;
+		FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list));
 
-	if (!this->DelUser(user))
-	/* if there are no users left on the channel */
-	{
-		chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
+		WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason);
 
-		/* kill the record */
-		if (iter != ServerInstance->chanlist.end())
-		{
-			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 chanrec::WriteChannel(userrec* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -652,21 +565,24 @@ void chanrec::WriteChannel(userrec* user, char* text, ...)
 	this->WriteChannel(user, std::string(textbuffer));
 }
 
-void chanrec::WriteChannel(userrec* user, const std::string &text)
+void Channel::WriteChannel(User* user, const std::string &text)
 {
-	CUList *ulist = this->GetUsers();
+	char tb[MAXBUF];
 
 	if (!user)
 		return;
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	snprintf(tb,MAXBUF,":%s %s", user->GetFullHost().c_str(), text.c_str());
+	std::string out = tb;
+
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
 	{
-		if (i->second->fd != FD_MAGIC_NUMBER)
-			user->WriteTo(i->second,text);
+		if (IS_LOCAL(i->first))
+			i->first->Write(out);
 	}
 }
 
-void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -681,61 +597,353 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
 	this->WriteChannelWithServ(ServName, std::string(textbuffer));
 }
 
-void chanrec::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];
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	snprintf(tb,MAXBUF,":%s %s", ServName.empty() ? ServerInstance->Config->ServerName.c_str() : ServName.c_str(), text.c_str());
+	std::string out = tb;
+
+	for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
 	{
-		if (IS_LOCAL(i->second))
-			i->second->WriteServ(text);
+		if (IS_LOCAL(i->first))
+			i->first->Write(out);
 	}
 }
 
 /* write formatted text from a source user to all users on a channel except
  * for the sender (for privmsg etc) */
-void chanrec::WriteAllExceptSender(userrec* user, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
-	if (!user || !text)
+	if (!text)
 		return;
 
 	va_start(argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteAllExceptSender(user, status, std::string(textbuffer));
+	this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
 }
 
-void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string& text)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
 {
-	CUList *ulist;
+	char textbuffer[MAXBUF];
+	va_list argsPtr;
 
-	if (!user)
+	if (!text)
+		return;
+
+	int offset = snprintf(textbuffer,MAXBUF,":%s ", user->GetFullHost().c_str());
+
+	va_start(argsPtr, text);
+	vsnprintf(textbuffer + offset, MAXBUF - offset, text, argsPtr);
+	va_end(argsPtr);
+
+	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)
+{
+	char tb[MAXBUF];
+
+	snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str(), text.c_str());
+	std::string out = tb;
+
+	this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb));
+}
+
+void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out)
+{
+	unsigned int minrank = 0;
+	if (status)
+	{
+		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()))
+		{
+			/* User doesn't have the status we're after */
+			if (minrank && i->second->getRank() < minrank)
+				continue;
+
+			i->first->Write(out);
+		}
+	}
+}
+
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
+{
+	CUList except_list;
+	except_list.insert(user);
+	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->IsModeSet('i')))
+			count++;
+	}
+
+	return count;
+}
+
+char* Channel::ChanModes(bool showkey)
+{
+	static char scratch[MAXBUF];
+	static char sparam[MAXBUF];
+	char* offset = scratch;
+	std::string extparam;
+
+	*scratch = '\0';
+	*sparam = '\0';
+
+	/* 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])
+		{
+			*offset++ = n + 65;
+			extparam.clear();
+			if (n == 'k' - 65 && !showkey)
+			{
+				extparam = "<key>";
+			}
+			else
+			{
+				extparam = this->GetModeParameter(n + 65);
+			}
+			if (!extparam.empty())
+			{
+				charlcat(sparam,' ',MAXBUF);
+				strlcat(sparam,extparam.c_str(),MAXBUF);
+			}
+		}
+	}
+
+	/* Null terminate scratch */
+	*offset = '\0';
+	strlcat(scratch,sparam,MAXBUF);
+	return scratch;
+}
+
+/* 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)
+{
+	char list[MAXBUF];
+	size_t dlen, curlen;
+
+	if (!IS_LOCAL(user))
 		return;
 
-	switch (status)
+	if (this->IsModeSet('s') && !this->HasUser(user) && !user->HasPrivPermission("channels/auspex"))
 	{
-		case '@':
-			ulist = this->GetOppedUsers();
-			break;
-		case '%':
-			ulist = this->GetHalfoppedUsers();
-			break;
-		case '+':
-			ulist = this->GetVoicedUsers();
-			break;
-		default:
-			ulist = this->GetUsers();
-			break;
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), this->name.c_str());
+		return;
 	}
 
-	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=',  this->name.c_str());
+
+	int numusers = 0;
+	char* ptr = list + dlen;
+
+	/* 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++)
 	{
-		if ((IS_LOCAL(i->second)) && (user != i->second))
-			i->second->WriteFrom(user,text);
+		if ((!has_user) && (i->first->IsModeSet('i')))
+		{
+			/*
+			 * user is +i, and source not on the channel, does not show
+			 * nick in NAMES list
+			 */
+			continue;
+		}
+
+		std::string prefixlist = this->GetPrefixChar(i->first);
+		std::string nick = i->first->nick;
+
+		FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, 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)
+		{
+			/* 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;
+
+			ptrlen = 0;
+			numusers = 0;
+		}
+
+		ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
+
+		curlen += ptrlen;
+		ptr += ptrlen;
+
+		numusers++;
+	}
+
+	/* if whats left in the list isnt empty, send it */
+	if (numusers)
+	{
+		user->WriteNumeric(RPL_NAMREPLY, std::string(list));
+	}
+
+	user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
+}
+
+long Channel::GetMaxBans()
+{
+	/* Return the cached value if there is one */
+	if (this->maxbans)
+		return this->maxbans;
+
+	/* 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 (InspIRCd::Match(this->name, n->first, NULL))
+		{
+			this->maxbans = n->second;
+			return n->second;
+		}
 	}
+
+	/* Screw it, just return the default of 64 */
+	this->maxbans = 64;
+	return this->maxbans;
+}
+
+void Channel::ResetMaxBans()
+{
+	this->maxbans = 0;
 }
 
+/* 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)
+{
+	static char pf[2] = {0, 0};
+	*pf = 0;
+	unsigned int bestrank = 0;
+
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
+	{
+		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->GetPrefixRank() > bestrank && mh->GetPrefix())
+			{
+				bestrank = mh->GetPrefixRank();
+				pf[0] = mh->GetPrefix();
+			}
+		}
+	}
+	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[64];
+	int ctr = 0;
+
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
+	{
+		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();
+		}
+	}
+	prefix[ctr] = 0;
+
+	return prefix;
+}
+
+unsigned int Channel::GetPrefixValue(User* user)
+{
+	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++)
+	{
+		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);
+		}
+	}
+	if (adding)
+		m->second->modes += std::string(1, prefix);
+	return adding;
+}
+
+void Channel::RemoveAllPrefixes(User* user)
+{
+	UserMembIter m = userlist.find(user);
+	if (m != userlist.end())
+	{
+		m->second->modes.clear();
+	}
+}