X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=c4c37e52876d260c0ac32c3af203fbdf8b85695e;hb=166dfe4163f0941148f5927c28dfbdb8bdb49c5e;hp=508956c44f166c051c10ac8749f10699569df717;hpb=b57568ecc46296ba3a0e06d770eceff40cc9aee4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 508956c44..c4c37e528 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -1,15 +1,12 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *<brain@chatspike.net>
- *<Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -23,15 +20,11 @@
 /* get the last 'visible' chan of a user */
 static char *getlastchanname(userrec *u)
 {
-	for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
+	UCListIter i = u->chans.begin();
+	if (i != u->chans.end())
 	{
-		ucrec* temp = (ucrec*)*v;
-
-		if (temp->channel)
-		{
-			if (!temp->channel->IsModeSet('s'))
-				return temp->channel->name;
-		}
+		if (!i->first->IsModeSet('s'))
+			return i->first->name;
 	}
 
 	return "*";
@@ -84,6 +77,9 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 bool cmd_who::CanView(chanrec* chan, userrec* user)
 {
+	if (!user || !chan)
+		return false;
+
 	/* Execute items in fastest-to-execute first order */
 	if (*user->oper)
 		return true;
@@ -95,6 +91,35 @@ bool cmd_who::CanView(chanrec* chan, userrec* user)
 	return false;
 }
 
+void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults)
+{
+	std::string lcn = getlastchanname(u);
+	chanrec* chlast = ServerInstance->FindChan(lcn);
+
+	std::string wholine =	initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
+				((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : u->server) +
+				" " + u->nick + " ";
+
+	/* away? */
+	if (u->awaymsg)
+	{
+		wholine.append("G");
+	}
+	else
+	{
+		wholine.append("H");
+	}
+
+	/* oper? */
+	if (u->oper)
+	{
+		wholine.append("*");
+	}
+
+	wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname;
+	whoresults.push_back(wholine);
+}
+
 CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	/*
@@ -105,11 +130,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	 */
 
 	/* WHO options */
-	bool opt_viewopersonly = false;
-	bool opt_showrealhost = false;
-	bool opt_unlimit = false;
-	bool opt_realname = false;
-	bool opt_mode = false;
+	opt_viewopersonly = false;
+	opt_showrealhost = false;
+	opt_unlimit = false;
+	opt_realname = false;
+	opt_mode = false;
 
 	chanrec *ch = NULL;
 	std::vector<std::string> whoresults;
@@ -169,30 +194,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 			if (opt_viewopersonly && !*(i->second)->oper)
 				continue;
 
-			/* XXX - code duplication; this could be more efficient -- w00t */
-			std::string wholine = initial;
-
-			wholine = wholine + ch->name + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
-					i->second->server + " " + i->second->nick + " ";
-
-			/* away? */
-			if (*(i->second)->awaymsg)
-			{
-				wholine.append("G");
-			}
-			else
-			{
-				wholine.append("H");
-			}
-
-			/* oper? */
-			if (*(i->second)->oper)
-			{
-				wholine.append("*");
-			}
-
-			wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
-			whoresults.push_back(wholine);
+			SendWhoLine(user, initial, ch, i->second, whoresults);
 		}
 	}
 	else
@@ -208,65 +210,17 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 
 				if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode))
 				{
-					std::string wholine = initial;
-	
-					wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " + 
-							oper->server + " " + oper->nick + " ";
-
-					ch = ServerInstance->FindChan(getlastchanname(oper));
-
-					/* away? */
-					if (*oper->awaymsg)
-					{
-						wholine.append("G");
-					}
-					else
-					{
-						wholine.append("H");
-					}
-	
-					/* oper? */
-					if (*oper->oper)
-					{
-						wholine.append("*");
-					}
-	
-					wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
-					whoresults.push_back(wholine);
+					SendWhoLine(user, initial, NULL, oper, whoresults);
 				}
 			}
 		}
 		else
 		{
-			for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
+			for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
 			{
 				if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode))
 				{
-					std::string wholine = initial;
-	
-					wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
-						i->second->server + " " + i->second->nick + " ";
-	
-					ch = ServerInstance->FindChan(getlastchanname(i->second));
-
-					/* away? */
-					if (*(i->second)->awaymsg)
-					{
-						wholine.append("G");
-					}
-					else
-					{
-						wholine.append("H");
-					}
-
-					/* oper? */
-					if (*(i->second)->oper)
-					{
-						wholine.append("*");
-					}
-
-					wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
-					whoresults.push_back(wholine);
+					SendWhoLine(user, initial, NULL, i->second, whoresults);
 				}
 			}
 		}