Fix more incorrect std::string::operator[] usage

[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 b7023072b47a6b9a872c57fd24e41053119a9b0c..eb28fb89c0ffe09fbd5f21e1702ae1fd6f5dc89b 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /** Handle /LIST. These command handlers can be reloaded by the core,
@@ -42,8 +49,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 
        user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
-       /* Work around mIRC suckyness. YOU SUCK, KHALED! */
-       if (parameters.size() == 1)
+       if ((parameters.size() == 1) && (!parameters[0].empty()))
        {
                if (parameters[0][0] == '<')
                {
@@ -66,7 +72,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;
@@ -75,14 +81,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'))
-               {
-                       /* Channel is +p and user is outside/not privileged */
-                       user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
-               }
-               else
+               // If we're not in the channel and +s is set on it, we want to ignore it
+               if (n || !i->second->IsModeSet('s'))
                {
-                       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());