X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_who.cpp;h=5e0e55b66865abfb0a9c31efa5164e18e316c129;hb=dafa2f3031c4abc7f5506385770c4fc743669b17;hp=82d541a2a7829802df5728fb237b06aa934755a1;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index 82d541a2a..5e0e55b66 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -39,13 +39,34 @@ class CommandWho : public Command
 	bool opt_local;
 	bool opt_far;
 	bool opt_time;
+	ChanModeReference secretmode;
+	ChanModeReference privatemode;
+	UserModeReference invisiblemode;
+
+	Channel* get_first_visible_channel(User *u)
+	{
+		UCListIter i = u->chans.begin();
+		while (i != u->chans.end())
+		{
+			Channel* c = *i++;
+			if (!c->IsModeSet(secretmode))
+				return c;
+		}
+		return NULL;
+	}
 
  public:
 	/** Constructor for who.
 	 */
-	CommandWho ( Module* parent) : Command(parent,"WHO", 1) {
+	CommandWho(Module* parent)
+		: Command(parent, "WHO", 1)
+		, secretmode(parent, "secret")
+		, privatemode(parent, "private")
+		, invisiblemode(parent, "invisible")
+	{
 		syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]";
 	}
+
 	void SendWhoLine(User* user, const std::vector<std::string>& parms, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
@@ -57,19 +78,6 @@ class CommandWho : public Command
 	bool whomatch(User* cuser, User* user, const char* matchtext);
 };
 
-
-static Channel* get_first_visible_channel(User *u)
-{
-	UCListIter i = u->chans.begin();
-	while (i != u->chans.end())
-	{
-		Channel* c = *i++;
-		if (!c->IsModeSet('s'))
-			return c;
-	}
-	return NULL;
-}
-
 bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
 {
 	bool match = false;
@@ -180,7 +188,7 @@ bool CommandWho::CanView(Channel* chan, User* user)
 	if (user->HasPrivPermission("users/auspex"))
 		return true;
 	/* Cant see inside a +s or a +p channel unless we are a member (see above) */
-	else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
+	else if (!chan->IsModeSet(secretmode) && !chan->IsModeSet(privatemode))
 		return true;
 
 	return false;
@@ -221,7 +229,7 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
 
 	wholine.append(" :0 " + u->fullname);
 
-	FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, parms, u, wholine));
+	FOREACH_MOD(OnSendWhoLine, (user, parms, u, wholine));
 
 	if (!wholine.empty())
 		whoresults.push_back(wholine);
@@ -330,7 +338,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 						continue;
 
 					/* If we're not inside the channel, hide +i users */
-					if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex"))
+					if (i->first->IsModeSet(invisiblemode) && !inside && !user->HasPrivPermission("users/auspex"))
 						continue;
 				}
 
@@ -352,7 +360,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 				{
 					if (!user->SharesChannelWith(oper))
 					{
-						if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+						if (usingwildcards && (!oper->IsModeSet(invisiblemode)) && (!user->HasPrivPermission("users/auspex")))
 							continue;
 					}
 
@@ -368,7 +376,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 				{
 					if (!user->SharesChannelWith(i->second))
 					{
-						if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+						if (usingwildcards && (i->second->IsModeSet(invisiblemode)) && (!user->HasPrivPermission("users/auspex")))
 							continue;
 					}