Fix <options:noservices> causing +o (and +q!) not being correctly given on channel...

[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..f0e1a143e626e0616a9332d6db3727a9f3fa3931 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,9 +51,9 @@ 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;
                }
 
@@ -62,17 +61,17 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
                bool n = (i->second->HasUser(user) || IS_OPER(user));
                if (!IS_OPER(user) && (i->second->IsModeSet('p')) && (!n))
                {
-                       user->WriteNumeric(322, "%s * %ld :",user->nick, users);
+                       user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
                }
                else
                {
                        if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n)))
                        {
-                               user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                               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;
 }