From 7b9fe589320b540db549eb17be46c09778ca021a Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 28 Jul 2006 10:52:04 +0000 Subject: Fix to not hide invisible users non-common channels in whois (rfc doesnt state this) git-svn-id: http://svn.inspircd.org/repository/branches/1_0_stable@4565 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/message.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/message.cpp') diff --git a/src/message.cpp b/src/message.cpp index 765f9a304..dc4367095 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -402,7 +402,6 @@ std::string chlist(userrec *user,userrec* source) { return lst; } - bool userinvisible = (user->modebits & UM_INVISIBLE); for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name)) @@ -412,9 +411,9 @@ std::string chlist(userrec *user,userrec* source) { // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible. // if the user is the same as the source, shortcircuit the comparison. - if ((source == user) || ((((!(((ucrec*)(*i))->channel->modes[CM_PRIVATE])) && (!(((ucrec*)(*i))->channel->modes[CM_SECRET])) && (!userinvisible)) || (((ucrec*)(*i))->channel->HasUser(source))))) + if ((source == user) || ((((!(((ucrec*)(*i))->channel->modes[CM_PRIVATE])) && (!(((ucrec*)(*i))->channel->modes[CM_SECRET]))) || (((ucrec*)(*i))->channel->HasUser(source))))) { - lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " "; + lst.append(cmode(user,((ucrec*)(*i))->channel)).append(((ucrec*)(*i))->channel->name).append(" "); } } } -- cgit v1.3.1-10-gc9f91