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

diff --git a/src/channels.cpp b/src/channels.cpp
index dd41d1344..52e8faca9 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -856,7 +856,7 @@ void Channel::UserList(User *user, CUList *ulist)
 		}
 	}
 
-	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;
@@ -903,7 +903,7 @@ 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;
@@ -921,7 +921,7 @@ void Channel::UserList(User *user, CUList *ulist)
 	/* if whats left in the list isnt empty, send it */
 	if (numusers)
 	{
-		user->WriteServ(std::string(list));
+		user->WriteNumeric(353,std::string(list));
 	}
 
 	user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick, this->name);
@@ -1001,35 +1001,6 @@ const char* Channel::GetAllPrefixChars(User* user)
 	return prefix;
 }
 
-
-const char* Channel::GetAllPrefixModes(User* user)
-{
-	static char prefix[MAXBUF];
-	int ctr = 0;
-	*prefix = 0;
-
-	prefixlist::iterator n = prefixes.find(user);
-	if (n != prefixes.end())
-	{
-		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
-		{
-			ModeHandler *mh = ServerInstance->Modes->FindPrefix(x->first);
-
-			if (!mh)
-			{
-				ServerInstance->Logs->Log("MODES", DEFAULT, "WTF: Can't find mode from prefix %c", x->first);
-				throw CoreException("I can't find a mode from prefix, HALP!");
-			}
-			else
-				prefix[ctr++] = mh->GetModeChar();
-		}
-	}
-
-	prefix[ctr] = 0;
-
-	return prefix;
-}
-
 unsigned int Channel::GetPrefixValue(User* user)
 {
 	prefixlist::iterator n = prefixes.find(user);