Merge pull request #1018 from SaberUK/insp20+hidekills

[user/henk/code/inspircd.git] / src / commands / cmd_list.cpp

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index 02b65df48ce4b44937565481a370a8d80eede1fa..2c420d1dde6561f5bb5223a717806a8bd7993b2c 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -73,7 +73,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
                if (too_many || too_few)
                        continue;
 
-               if (parameters.size() && (parameters[0][0] != '<' && parameters[0][0] != '>'))
+               if (parameters.size() && !parameters[0].empty() && (parameters[0][0] != '<' && parameters[0][0] != '>'))
                {
                        if (!InspIRCd::Match(i->second->name, parameters[0]) && !InspIRCd::Match(i->second->topic, parameters[0]))
                                continue;
@@ -82,14 +82,15 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
                // if the channel is not private/secret, OR the user is on the channel anyway
                bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
 
-               if (!n && i->second->IsModeSet('p'))
+               // If we're not in the channel and +s is set on it, we want to ignore it
+               if (n || !i->second->IsModeSet('s'))
                {
-                       /* Channel is +p and user is outside/not privileged */
-                       user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
-               }
-               else
-               {
-                       if (n || !i->second->IsModeSet('s'))
+                       if (!n && i->second->IsModeSet('p'))
+                       {
+                               /* Channel is +p and user is outside/not privileged */
+                               user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
+                       }
+                       else
                        {
                                /* User is in the channel/privileged, channel is not +s */
                                user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str());