X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=0ff1298c118729fd23187ea09a6ba7336d6efce5;hb=0036e3a70cabea02e9ec2103ed1dfdf5c799289f;hp=3a89f9e73f7b52709b551431fe419856786315fa;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 3a89f9e73..0ff1298c1 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,56 +11,45 @@
  * ---------------------------------------------------
  */
 
-/* $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(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
 {
-	chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
+	chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
 	if (findchan != Instance->chanlist->end())
-		throw CoreException("Cannot create duplicate channel " + name);
+		throw CoreException("Cannot create duplicate channel " + cname);
 
-	(*(ServerInstance->chanlist))[name.c_str()] = this;
-	strlcpy(this->name, name.c_str(), CHANMAX);
-	this->created = ts ? ts : ServerInstance->Time(true);
-	this->age = this->created;
+	(*(ServerInstance->chanlist))[cname.c_str()] = this;
+	this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
+	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::SetModeParam(char mode, std::string parameter)
 {
-	CustomModeList::iterator n = custom_mode_params.find(mode);	
-
-	if (mode_on)
+	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;
 	}
 }
 
@@ -71,19 +60,61 @@ bool Channel::IsModeSet(char mode)
 
 std::string Channel::GetModeParameter(char mode)
 {
-	switch (mode)
+	CustomModeList::iterator n = custom_mode_params.find(mode);
+	if (n != custom_mode_params.end())
+		return n->second;
+	return "";
+}
+
+int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
+{
+	if (u && IS_LOCAL(u))
+	{
+		if(!forceset)
+		{
+			int MOD_RESULT = 0;
+			/* 0: check status, 1: don't, -1: disallow change silently */
+
+			FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(u,this,ntopic));
+
+			if (MOD_RESULT == 1)
+				return CMD_FAILURE;
+			else if (MOD_RESULT == 0)
+			{
+				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 ((this->IsModeSet('t')) && (this->GetStatus(u) < STATUS_HOP))
+				{
+					u->WriteNumeric(482, "%s %s :You must be at least a half-operator 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
 	{
-		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;
+		this->setby.assign(ServerInstance->Config->ServerName);
+		this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
 	}
+
+	this->topicset = ServerInstance->Time();
+
+	if (u && IS_LOCAL(u))
+	{
+		FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic));
+	}
+
+	return CMD_SUCCESS;
 }
 
 long Channel::GetUserCounter()
@@ -99,7 +130,7 @@ void Channel::AddUser(User* user)
 unsigned long Channel::DelUser(User* user)
 {
 	CUListIter a = internal_userlist.find(user);
-	
+
 	if (a != internal_userlist.end())
 	{
 		internal_userlist.erase(a);
@@ -108,7 +139,7 @@ unsigned long Channel::DelUser(User* user)
 		DelHalfoppedUser(user);
 		DelVoicedUser(user);
 	}
-	
+
 	return internal_userlist.size();
 }
 
@@ -142,7 +173,7 @@ void Channel::DelHalfoppedUser(User* user)
 	CUListIter a = internal_halfop_userlist.find(user);
 
 	if (a != internal_halfop_userlist.end())
-	{   
+	{
 		internal_halfop_userlist.erase(a);
 	}
 }
@@ -155,7 +186,7 @@ void Channel::AddVoicedUser(User* user)
 void Channel::DelVoicedUser(User* user)
 {
 	CUListIter a = internal_voice_userlist.find(user);
-	
+
 	if (a != internal_voice_userlist.end())
 	{
 		internal_voice_userlist.erase(a);
@@ -184,6 +215,7 @@ CUList* Channel::GetVoicedUsers()
 
 void Channel::SetDefaultModes()
 {
+	ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
 	irc::spacesepstream list(ServerInstance->Config->DefaultModes);
 	std::string modeseq;
 	std::string parameter;
@@ -205,13 +237,14 @@ void Channel::SetDefaultModes()
 	}
 }
 
-/* 
+/*
  * 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)
 {
-	if (!user || !cn)
+	// Fix: unregistered users could be joined using /SAJOIN
+	if (!user || !cn || user->registered != REG_ALL)
 		return NULL;
 
 	char cname[MAXBUF];
@@ -227,37 +260,31 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	 */
 	if (IS_LOCAL(user) && !override)
 	{
-		if (user->GetMaxChans())
-		{
-			if (user->chans.size() >= user->GetMaxChans())
-			{
-				user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
-				return NULL;
-			}
-		}
-		else
+		// Checking MyClass exists because we *may* get here with NULL, not 100% sure.
+		if (user->MyClass && user->MyClass->maxchans)
 		{
-			if (IS_OPER(user))
+			if (user->HasPrivPermission("channels/high-join-limit"))
 			{
 				if (user->chans.size() >= Instance->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 (user->chans.size() >= Instance->Config->MaxChans)
+				if (user->chans.size() >= user->MyClass->maxchans)
 				{
-					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;
 				}
 			}
 		}
 	}
 
-	strlcpy(cname, cn, CHANMAX);
+	strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
 	Ptr = Instance->FindChan(cname);
+	bool created_by_local = false;
 
 	if (!Ptr)
 	{
@@ -267,17 +294,18 @@ 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);
+				Instance->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 = "@";
+			created_by_local = true;
 		}
 
 		if (IS_LOCAL(user) && override == false)
 		{
 			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, NULL, cname, privs, key ? key : ""));
 			if (MOD_RESULT == 1)
 				return NULL;
 		}
@@ -297,68 +325,85 @@ 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));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, Ptr, cname, privs, key ? key : ""));
 			if (MOD_RESULT == 1)
 			{
 				return NULL;
 			}
 			else if (MOD_RESULT == 0)
 			{
-				if (*Ptr->key)
+				std::string ckey = Ptr->GetModeParameter('k');
+				bool invited = user->IsInvited(Ptr->name.c_str());
+				bool can_bypass = Instance->Config->InvBypassModes && invited;
+
+				if (!ckey.empty())
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+					FOREACH_RESULT_I(Instance, I_OnCheckKey, OnCheckKey(user, Ptr, key ? key : ""));
 					if (!MOD_RESULT)
 					{
-						if ((!key) || strcmp(key,Ptr->key))
+						// If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
+						if ((!key || ckey != key) && !can_bypass)
 						{
-							user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
+							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)
 					{
-						if (!user->IsInvited(Ptr->name))
+						if (!invited)
 						{
-							user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+							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));
+					FOREACH_RESULT_I(Instance, I_OnCheckLimit, OnCheckLimit(user, Ptr));
 					if (!MOD_RESULT)
 					{
-						if (Ptr->GetUserCounter() >= Ptr->limit)
+						long llimit = atol(limit.c_str());
+						if (Ptr->GetUserCounter() >= llimit && !can_bypass)
 						{
-							user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+							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)
+				{
+					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);
 }
@@ -379,18 +424,15 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 		ModeHandler* mh = Instance->Modes->FindPrefix(status);
 		if (mh)
 		{
+			/* Set, and make sure that the mode handler knows this mode was now set */
 			Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
-			/* Make sure that the mode handler knows this mode was now set */
 			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
+				/* 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 '@':
@@ -409,20 +451,20 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
 
 	if (!silent)
-		Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+		Ptr->WriteChannel(user,"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());
+		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))
 	{
 		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);
 	}
@@ -432,101 +474,99 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 
 bool Channel::IsBanned(User* user)
 {
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckBan, OnCheckBan(user, this),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
+
+	if (result)
+		return (result < 0);
+
 	char mask[MAXBUF];
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
-	if (!MOD_RESULT)
+	snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+	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++)
+		if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
+			(InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
+			(InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
 		{
-			/* 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;
-			}
+			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)
+int Channel::GetExtBanStatus(const std::string &str, char type)
 {
-	bool silent = false;
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
 
-	if (!user)
-		return this->GetUserCounter();
+	if (result)
+		return result;
 
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
+	// nobody decided for us, check the ban list
+	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
 	{
-		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+		if (i->data[0] != type || i->data[1] != ':')
+			continue;
 
-		if (!silent)
-			this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+		std::string maskptr = i->data.substr(2);
+		ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
 
-		user->chans.erase(i);
-		this->RemoveAllPrefixes(user);
+		if (InspIRCd::Match(str, maskptr, NULL))
+			return -1;
 	}
 
-	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;
-	}
+	return 0;
+}
 
-	return this->GetUserCounter();
+int Channel::GetExtBanStatus(User *user, char type)
+{
+	int result = 0;
+	FOREACH_RESULT_MAP(I_OnCheckExtBan, OnCheckExtBan(user, this, type),
+		result = banmatch_reduce(result, MOD_RESULT);
+	);
+
+	if (result)
+		return result;
+
+	char mask[MAXBUF];
+	int rv = 0;
+	snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+
+	// XXX: we should probably hook cloaked hosts in here somehow too..
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(mask, type));
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullHost(), type));
+	rv = banmatch_reduce(rv, this->GetExtBanStatus(user->GetFullRealHost(), type));
+	return rv;
 }
 
-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.
+ */
+long Channel::PartUser(User *user, std::string &reason)
 {
 	bool silent = false;
 
-	if (!user || !reason)
+	if (!user)
 		return this->GetUserCounter();
 
-	if (IS_LOCAL(user))
-	{
-		if (!this->HasUser(user))
-		{
-			/* Not on channel */
-			return this->GetUserCounter();
-		}
-	}
-
-	if (triggerevents)
-	{
-		FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
-	}
-
 	UCListIter i = user->chans.find(this);
 	if (i != user->chans.end())
 	{
+		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
+
 		if (!silent)
-			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
+			this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
 	}
 
-	if (!this->DelUser(user))
+	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 */
@@ -545,6 +585,15 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
 	return this->GetUserCounter();
 }
 
+long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
+{
+	if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
+		servername = ServerInstance->Config->ServerName;
+
+	ServerInstance->FakeClient->server = servername;
+	return this->KickUser(ServerInstance->FakeClient, user, reason);
+}
+
 long Channel::KickUser(User *src, User *user, const char* reason)
 {
 	bool silent = false;
@@ -556,12 +605,12 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	{
 		if (!this->HasUser(user))
 		{
-			src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
+			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 this->GetUserCounter();
 		}
 		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);
+			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 this->GetUserCounter();
 		}
 		int MOD_RESULT = 0;
@@ -579,14 +628,14 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 			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)))
 			{
 				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-");
+					src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-");
 					return this->GetUserCounter();
 				}
 			}
@@ -600,7 +649,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	{
 		/* zap it from the channel list of the user */
 		if (!silent)
-			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+			this->WriteChannel(src, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
@@ -609,7 +658,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	if (!this->DelUser(user))
 	/* if there are no users left on the channel */
 	{
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name.c_str());
 
 		/* kill the record */
 		if (iter != ServerInstance->chanlist->end())
@@ -627,7 +676,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	return this->GetUserCounter();
 }
 
-void Channel::WriteChannel(User* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -650,7 +699,7 @@ void Channel::WriteChannel(User* user, const std::string &text)
 	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++)
@@ -680,7 +729,7 @@ void Channel::WriteChannelWithServ(const char* 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 ? ServName : ServerInstance->Config->ServerName, text.c_str());
 	std::string out = tb;
 
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
@@ -692,7 +741,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;
@@ -707,7 +756,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;
@@ -724,32 +773,20 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList
 
 void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
 {
-	CUList *ulist;
+	CUList *ulist = this->GetUsers();
 	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",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++)
 	{
 		if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
 		{
+			/* User doesnt have the status we're after */
+			if (status && !strchr(this->GetAllPrefixChars(i->first), status))
+				continue;
+
 			if (serversource)
 				i->first->WriteServ(text);
 			else
@@ -802,11 +839,16 @@ char* Channel::ChanModes(bool showkey)
 			switch (n)
 			{
 				case CM_KEY:
-					extparam = (showkey ? this->key : "<key>");
-				break;
-				case CM_LIMIT:
-					extparam = ConvToStr(this->limit);
-				break;
+					// Unfortunately this must be special-cased, as we definitely don't want to always display key.
+					if (showkey)
+					{
+						extparam = this->GetModeParameter('k');
+					}
+					else
+					{
+						extparam = "<key>";
+					}
+					break;
 				case CM_NOEXTERNAL:
 				case CM_TOPICLOCK:
 				case CM_INVITEONLY:
@@ -841,23 +883,25 @@ void Channel::UserList(User *user, CUList *ulist)
 	char list[MAXBUF];
 	size_t dlen, curlen;
 	int MOD_RESULT = 0;
+	bool call_modules = true;
 
 	if (!IS_LOCAL(user))
 		return;
 
 	FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
 	if (MOD_RESULT == 1)
-		return;
+		call_modules = false;
+
 	if (MOD_RESULT != -1)
 	{
 		if ((this->IsModeSet('s')) && (!this->HasUser(user)))
 		{
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, this->name);
+			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);
+	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;
@@ -884,36 +928,48 @@ void Channel::UserList(User *user, CUList *ulist)
 		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;
+		std::string prefixlist = this->GetPrefixChar(i->first);
+		std::string nick = i->first->nick;
 
-		curlen += ptrlen;
-		ptr += ptrlen;
+		if (call_modules)
+		{
+			FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
 
-		numusers++;
+			/* Nick was nuked, a module wants us to skip it */
+			if (nick.empty())
+				continue;
+		}
+
+		size_t ptrlen = 0;
 
-		if (curlen > (480-NICKMAX))
+		if (curlen + prefixlist.length() + nick.length() + 1 > 480)
 		{
 			/* list overflowed into multiple numerics */
-			user->WriteServ(std::string(list));
+			user->WriteNumeric(RPL_NAMREPLY, std::string(list));
 
 			/* reset our lengths */
-			dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
+			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->WriteServ(std::string(list));
+		user->WriteNumeric(RPL_NAMREPLY, std::string(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()
@@ -925,7 +981,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;
@@ -949,7 +1005,7 @@ 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())
 	{
@@ -969,6 +1025,7 @@ const char* Channel::GetPrefixChar(User *user)
 	return pf;
 }
 
+
 const char* Channel::GetAllPrefixChars(User* user)
 {
 	static char prefix[MAXBUF];
@@ -1080,4 +1137,3 @@ void Channel::RemoveAllPrefixes(User* user)
 		prefixes.erase(n);
 	}
 }
-