X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=52e8faca9006384fd925f8199bfc614b32f0f81e;hb=3f971b447fae258a92f2cc6645497cce93f1c04e;hp=a0c9a030486d9e5fd04e6af9c341f6cd640e5605;hpb=9855300460b2e695b44646897811cc3f28428fa0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index a0c9a0304..52e8faca9 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -231,7 +231,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		{
 			if (user->chans.size() >= user->GetMaxChans())
 			{
-				user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+				user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
 				return NULL;
 			}
 		}
@@ -241,7 +241,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			{
 				if (user->chans.size() >= Instance->Config->OperMaxChans)
 				{
-					user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
 					return NULL;
 				}
 			}
@@ -249,7 +249,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			{
 				if (user->chans.size() >= Instance->Config->MaxChans)
 				{
-					user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+					user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
 					return NULL;
 				}
 			}
@@ -312,7 +312,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 					{
 						if ((!key) || strcmp(key,Ptr->key))
 						{
-							user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
+							user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
 							return NULL;
 						}
 					}
@@ -325,7 +325,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 					{
 						if (!user->IsInvited(Ptr->name))
 						{
-							user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+							user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
 							return NULL;
 						}
 					}
@@ -339,7 +339,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 					{
 						if (Ptr->GetUserCounter() >= Ptr->limit)
 						{
-							user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+							user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
 							return NULL;
 						}
 					}
@@ -348,7 +348,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 				{
 					if (Ptr->IsBanned(user))
 					{
-						user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+						user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
 						return NULL;
 					}
 				}
@@ -418,8 +418,8 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 	{
 		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(332, "%s %s :%s", user->nick, Ptr->name, Ptr->topic);
+			user->WriteNumeric(333, "%s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
 		}
 		Ptr->UserList(user);
 	}
@@ -553,12 +553,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(441, "%s %s %s :They are not on that channel",src->nick, user->nick, this->name);
 			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(482, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
 			return this->GetUserCounter();
 		}
 		int MOD_RESULT = 0;
@@ -583,7 +583,7 @@ long Channel::KickUser(User *src, User *user, const char* reason)
 				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(482, "%s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
 					return this->GetUserCounter();
 				}
 			}
@@ -838,23 +838,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(401, "%s %s :No such nick/channel",user->nick, this->name);
 			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, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=',  this->name);
 
 	int numusers = 0;
 	char* ptr = list + dlen;
@@ -883,18 +885,17 @@ void Channel::UserList(User *user, CUList *ulist)
 
 		std::string prefixlist = this->GetPrefixChar(i->first);
 		std::string nick = i->first->nick;
-		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;
+		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 = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
-
-		curlen += ptrlen;
-		ptr += ptrlen;
-
-		numusers++;
+		size_t ptrlen = 0;
 
 		if (curlen > (480-NICKMAX))
 		{
@@ -902,21 +903,28 @@ void Channel::UserList(User *user, CUList *ulist)
 			user->WriteServ(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, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
 			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(353,std::string(list));
 	}
 
-	user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
+	user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick, this->name);
 }
 
 long Channel::GetMaxBans()
@@ -972,6 +980,7 @@ const char* Channel::GetPrefixChar(User *user)
 	return pf;
 }
 
+
 const char* Channel::GetAllPrefixChars(User* user)
 {
 	static char prefix[MAXBUF];