Replace IS_AWAY() and IS_OPER() macros with User::IsAway() and User::IsOper()

[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 b2ec1941bed766da04e4c0f6845c2a54148f0b51..2f417bc04dbe89d926af1f685aa4c8d1ee49c542 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -1,27 +1,48 @@
-/*       +------------------------------------+
- *       | 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);
+};
+
 
+/** Handle /LIST
+ */
 CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *user)
 {
        int minusers = 0, maxusers = 0;
@@ -52,22 +73,25 @@ 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 (!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 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());
                        }
                }
@@ -77,3 +101,5 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandList)