X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_list.cpp;h=f840c9ab0a51eeb846e67c2ae78987e89e169bcc;hb=11916574f67962dce1d7a2fdf7ef6a3d2d1fa49f;hp=164830a26a08387742037905643f4f1188bfb20c;hpb=cea66039aa62a482a92dd82aedeac60e765e18ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index 164830a26..f840c9ab0 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -1,32 +1,63 @@
-/*       +------------------------------------+
- *       | 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);
-}
+	ChanModeReference secretmode;
+	ChanModeReference privatemode;
+
+ public:
+	/** Constructor for list.
+	 */
+	CommandList(Module* parent)
+		: Command(parent,"LIST", 0, 0)
+		, secretmode(creator, "secret")
+		, privatemode(creator, "private")
+	{
+		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;
 
-	user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+	user->WriteNumeric(RPL_LISTSTART, "Channel :Users Name");
 
 	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
 	if (parameters.size() == 1)
@@ -52,28 +83,33 @@ 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(privatemode))
 		{
-			user->WriteNumeric(322, "%s * %ld :",user->nick, users);
+			/* Channel is +p and user is outside/not privileged */
+			user->WriteNumeric(RPL_LIST, "* %ld :", users);
 		}
 		else
 		{
-			if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n)))
+			if (n || !i->second->IsModeSet(secretmode))
 			{
-				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(RPL_LIST, "%s %ld :[+%s] %s",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(RPL_LISTEND, ":End of channel list.");
 
 	return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandList)