ThreadEngine: remove excessive mutex use on thread creation

[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 62bf8d628db99ae301d6fe541141d28da89b75a4..9d65b4165392fc9022fdf515e950d21d41396d17 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "commands/cmd_list.h"
-#include "wildcard.h"
 
 /** Handle /LIST
  */
@@ -52,23 +51,26 @@ 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][0] != '<' && parameters[0][0] != '>'))
                {
-                       if (!match(i->second->name, parameters[0]) && !match(i->second->topic, parameters[0]))
+                       if (!InspIRCd::Match(i->second->name, parameters[0]) && !InspIRCd::Match(i->second->topic, parameters[0]))
                                continue;
                }
 
                // if the channel is not private/secret, OR the user is on the channel anyway
-               bool n = (i->second->HasUser(user) || IS_OPER(user));
-               if (!IS_OPER(user) && (i->second->IsModeSet('p')) && (!n))
+               bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
+
+               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
                {
-                       if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n)))
+                       if (n || !i->second->IsModeSet('s'))
                        {
-                               user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                               /* 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());
                        }
                }
        }