Add amd64/linux to list of OS'es tested, but mainly CIA test :P

[user/henk/code/inspircd.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index e9d634e761bfbe6e822744f6fbd3c665ab6ca2c7..96e4b31410767f232c422d3f7ebf9a9bb070828f 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -401,12 +401,10 @@ char lst[MAXBUF];
 std::string chlist(userrec *user,userrec* source)
 {
        /* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */
-       std::string lst;
+       std::ostringstream list;
        
        if (!user || !source)
-       {
-               return lst;
-       }
+               return "";
        
        for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
        {
@@ -418,17 +416,19 @@ std::string chlist(userrec *user,userrec* source)
                        /* Commenting this out until someone finds a case where we need it */
                        //if (lst.find(rec->channel->name) == std::string::npos)
                        //{
-                               // 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 or is an oper, shortcircuit the comparison.
+                       
+                               /*
+                                * If the target is the same as the sender, let them see all their channels.
+                                * If the channel is NOT private/secret AND the user is not invisible.
+                                * If the user is an oper, and the <options:operspywhois> option is set.
+                                */
                                if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modebits & UM_INVISIBLE)) || (rec->channel->HasUser(source))))
                                {
-                                       lst += cmode(user, rec->channel);
-                                       lst += rec->channel->name;
-                                       lst += " ";
+                                       list << cmode(user, rec->channel) << rec->channel->name << " ";
                                }
                        //}
                }
        }
        
-       return lst;
+       return list.str();
 }