Fix obvious oversight spotted by Ankit, provide xline reasons when adding them

[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 f662f79973933e0c5ee704bd83acabe7947e733c..9ecbea6a672315bebf3c95ff8d3e6c0351fca6b1 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "commands/cmd_list.h"
-#include "wildcard.h"
 
 /** Handle /LIST
  */
@@ -26,7 +25,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 {
        int minusers = 0, maxusers = 0;
 
-       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
        /* Work around mIRC suckyness. YOU SUCK, KHALED! */
        if (parameters.size() == 1)
@@ -52,27 +51,30 @@ 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].c_str()) && !match(i->second->topic, parameters[0].c_str()))
+                       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'))
                {
-                       user->WriteNumeric(322, "%s * %ld :",user->nick, users);
+                       /* 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,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());
                        }
                }
        }
-       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
 
        return CMD_SUCCESS;
 }