X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=0b24aa4b7014660e90c8818992d59b77567502d5;hb=6d64862fb556c43568efdf6b4f65de3fbd33c576;hp=83a3a59869b63a8fbfd0c7cee0e09ceb29aa24ea;hpb=869bd02318d94a38369a125726b8edeb54ba0706;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 83a3a5986..0b24aa4b7 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDchannels */
+/* $Core */
 
 #include "inspircd.h"
-#include <stdarg.h>
+#include <cstdarg>
 #include "wildcard.h"
 #include "mode.h"
 
@@ -25,16 +25,12 @@ Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : Serv
 		throw CoreException("Cannot create duplicate channel " + cname);
 
 	(*(ServerInstance->chanlist))[cname.c_str()] = this;
-	strlcpy(this->name, cname.c_str(), CHANMAX);
+	this->name.assign(cname, 0, ServerInstance->Config->Limits.ChanMax);
 	this->created = ts ? ts : ServerInstance->Time();
 	this->age = this->created;
 
-
-
-
-	*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)
@@ -47,7 +43,7 @@ void Channel::SetMode(char mode,bool mode_on)
 
 void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-	CustomModeList::iterator n = custom_mode_params.find(mode);	
+	CustomModeList::iterator n = custom_mode_params.find(mode);
 
 	if (mode_on)
 	{
@@ -71,19 +67,52 @@ 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 (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);
+	this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+	this->topicset = ServerInstance->Time();
+	this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+
+	if (IS_LOCAL(u))
 	{
-		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;
+		FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic));
 	}
+
+	return CMD_SUCCESS;
 }
 
 long Channel::GetUserCounter()
@@ -99,7 +128,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 +137,7 @@ unsigned long Channel::DelUser(User* user)
 		DelHalfoppedUser(user);
 		DelVoicedUser(user);
 	}
-	
+
 	return internal_userlist.size();
 }
 
@@ -142,7 +171,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 +184,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);
@@ -206,9 +235,9 @@ 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)
 {
@@ -228,11 +257,12 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	 */
 	if (IS_LOCAL(user) && !override)
 	{
-		if (user->GetMaxChans())
+		// Checking MyClass exists because we *may* get here with NULL, not 100% sure.
+		if (user->MyClass && user->MyClass->GetMaxChans())
 		{
-			if (user->chans.size() >= user->GetMaxChans())
+			if (user->chans.size() >= user->MyClass->GetMaxChans())
 			{
-				user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 				return NULL;
 			}
 		}
@@ -242,7 +272,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			{
 				if (user->chans.size() >= Instance->Config->OperMaxChans)
 				{
-					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), cn);
+					user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 					return NULL;
 				}
 			}
@@ -250,14 +280,14 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			{
 				if (user->chans.size() >= Instance->Config->MaxChans)
 				{
-					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick.c_str(), 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);
 
 	if (!Ptr)
@@ -305,54 +335,72 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			}
 			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->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), 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->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), 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->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), 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))
+					if (Ptr->IsBanned(user) && !can_bypass)
 					{
-						user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name);
+						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());
+				}
 			}
 		}
 	}
@@ -365,7 +413,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 }
 
 Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
-{
+{	
 	std::string nick = user->nick;
 	bool silent = false;
 
@@ -407,20 +455,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->WriteNumeric(332, "%s %s :%s", user->nick.c_str(), Ptr->name, Ptr->topic);
-			user->WriteNumeric(333, "%s %s %s %lu", user->nick.c_str(), 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);
 	}
@@ -442,7 +490,7 @@ bool Channel::IsBanned(User* user)
 		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)))
@@ -454,29 +502,53 @@ bool Channel::IsBanned(User* user)
 	return false;
 }
 
-bool Channel::IsExtBanned(User *user, char type)
+bool Channel::IsExtBanned(const std::string &str, char type)
 {
-	// XXX. do we need events?
-	char mask[MAXBUF];
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type));
+
+	if (MOD_RESULT == -1)
+		return true;
+	else if (MOD_RESULT == 0)
+	{
+		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+		{
+			if (i->data[0] != type || i->data[1] != ':')
+				continue;
+
+			// Iterate past char and : to get to the mask without doing a data copy(!)
+			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);
 
-	snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+			if (match(str, maskptr))
+				return true;
+		}
+	}
 
-	for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+	return false;
+}
+
+bool Channel::IsExtBanned(User *user, char type)
+{
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnCheckExtBan, OnCheckExtBan(user, this, type));
+
+	if (MOD_RESULT == -1)
+		return true;
+	else if (MOD_RESULT == 0)
 	{
-		if (i->data[0] != type || i->data[1] != ':')
-			continue;
+		char mask[MAXBUF];
+		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
 
-		// Iterate past char and : to get to the mask without doing a data copy(!)
-		std::string maskptr = i->data.substr(2);
+		// XXX: we should probably hook cloaked hosts in here somehow too..
+		if (this->IsExtBanned(mask, type))
+			return true;
 
-		/* This allows CIDR ban matching
-		 * 
-		 *        Full masked host                             Full unmasked host                     IP with/without CIDR
-		 */
-		if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
-		{
+		if (this->IsExtBanned(user->GetFullHost(), type))
+			return true;
+
+		if (this->IsExtBanned(user->GetFullRealHost(), type))
 			return true;
-		}
 	}
 
 	return false;
@@ -485,8 +557,10 @@ bool Channel::IsExtBanned(User *user, char type)
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.
+ *
+ * XXX: bleh, string copy of reason, fixme! -- w00t
  */
-long Channel::PartUser(User *user, const char* reason)
+long Channel::PartUser(User *user, std::string &reason)
 {
 	bool silent = false;
 
@@ -496,10 +570,10 @@ long Channel::PartUser(User *user, const char* reason)
 	UCListIter i = user->chans.find(this);
 	if (i != user->chans.end())
 	{
-		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+		FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
 
 		if (!silent)
-			this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+			this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
@@ -552,7 +626,7 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents,
 	if (i != user->chans.end())
 	{
 		if (!silent)
-			this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name, user->nick.c_str(), reason);
+			this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
@@ -588,12 +662,12 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 	{
 		if (!this->HasUser(user))
 		{
-			src->WriteNumeric(441, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), 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->WriteNumeric(482, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick.c_str(), 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;
@@ -611,14 +685,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->WriteNumeric(482, "%s %s :You must be a channel %soperator",src->nick.c_str(), 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();
 				}
 			}
@@ -632,7 +706,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.c_str(), reason);
+			this->WriteChannel(src, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);
@@ -641,7 +715,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())
@@ -682,7 +756,7 @@ void Channel::WriteChannel(User* user, const std::string &text)
 	if (!user)
 		return;
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(),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++)
@@ -712,7 +786,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++)
@@ -759,7 +833,7 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList
 	CUList *ulist = this->GetUsers();
 	char tb[MAXBUF];
 
-	snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(),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++)
@@ -822,11 +896,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:
@@ -874,12 +953,12 @@ void Channel::UserList(User *user, CUList *ulist)
 	{
 		if ((this->IsModeSet('s')) && (!this->HasUser(user)))
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), 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,"%s %c %s :", user->nick.c_str(), 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;
@@ -912,21 +991,21 @@ void Channel::UserList(User *user, CUList *ulist)
 		if (call_modules)
 		{
 			FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
-	
+
 			/* 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));
 
 			/* reset our lengths */
-			dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), 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;
@@ -944,10 +1023,10 @@ void Channel::UserList(User *user, CUList *ulist)
 	/* if whats left in the list isnt empty, send it */
 	if (numusers)
 	{
-		user->WriteNumeric(353,std::string(list));
+		user->WriteNumeric(RPL_NAMREPLY, std::string(list));
 	}
 
-	user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name);
+	user->WriteNumeric(RPL_ENDOFNAMES, "%s %s :End of /NAMES list.", user->nick.c_str(), this->name.c_str());
 }
 
 long Channel::GetMaxBans()
@@ -983,7 +1062,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())
 	{