cmd_list: Give +s precedence to +p

[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 764297f5842decd7a8f526a4e9976511a81e8c9e..2c420d1dde6561f5bb5223a717806a8bd7993b2c 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -1,45 +1,64 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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"
-#include "commands/cmd_list.h"
-#include "wildcard.h"
 
-/** Handle /LIST
+/** Handle /LIST. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
  */
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+class CommandList : public Command
 {
-       return new CommandList(Instance);
-}
+ public:
+       /** Constructor for list.
+        */
+       CommandList ( Module* parent) : Command(parent,"LIST", 0, 0) { Penalty = 5; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
-CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *user)
+
+/** Handle /LIST
+ */
+CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *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 (pcnt == 1)
+       if (parameters.size() == 1)
        {
-               if (*parameters[0] == '<')
+               if (parameters[0][0] == '<')
                {
-                       maxusers = atoi(parameters[0]+1);
-                       pcnt = 0;
+                       maxusers = atoi((parameters[0].c_str())+1);
                }
-               else if (*parameters[0] == '>')
+               else if (parameters[0][0] == '>')
                {
-                       minusers = atoi(parameters[0]+1);
-                       pcnt = 0;
+                       minusers = atoi((parameters[0].c_str())+1);
                }
        }
 
@@ -54,28 +73,34 @@ CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *us
                if (too_many || too_few)
                        continue;
 
-               if (pcnt)
+               if (parameters.size() && !parameters[0].empty() && (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);
-               if ((i->second->IsModeSet('p')) && (!n))
-               {
-                       user->WriteNumeric(322, "%s *",user->nick,i->second->name);
-               }
-               else
+               bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
+
+               // 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 (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
+                       if (!n && i->second->IsModeSet('p'))
                        {
-                               user->WriteNumeric(322, "%s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                               /* 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());
                        }
                }
        }
-       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;
 }
 
+
+COMMAND_INIT(CommandList)