X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_list.cpp;h=5962e2547d2d4da71a0509db2afe2c1cf768fc86;hb=03a623a284b6c9f2f11f549c55333c45c4d91eab;hp=2f417bc04dbe89d926af1f685aa4c8d1ee49c542;hpb=2916ae7c920c069ff180f0224b2dc953bbd32501;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index 2f417bc04..5962e2547 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -27,10 +27,20 @@
  */
 class CommandList : public Command
 {
+	ChanModeReference secretmode;
+	ChanModeReference privatemode;
+
  public:
 	/** Constructor for list.
 	 */
-	CommandList ( Module* parent) : Command(parent,"LIST", 0, 0) { Penalty = 5; }
+	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
@@ -82,14 +92,14 @@ 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'))
+		if (!n && i->second->IsModeSet(privatemode))
 		{
 			/* Channel is +p and user is outside/not privileged */
 			user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
 		}
 		else
 		{
-			if (n || !i->second->IsModeSet('s'))
+			if (n || !i->second->IsModeSet(secretmode))
 			{
 				/* 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());