Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

[user/henk/code/inspircd.git] / src / commands / cmd_who.cpp

diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index 70fe78da144023ff87a51cde990e8dd6abdca87f..a9f27de83c7cb725644ec74cf0d241859652de10 100644 (file)
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,7 +15,9 @@
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-static char *get_first_visible_channel(User *u)
+static const std::string star = "*";
+
+static const std::string& get_first_visible_channel(User *u)
 {
        UCListIter i = u->chans.begin();
        if (i != u->chans.end())
@@ -24,7 +26,7 @@ static char *get_first_visible_channel(User *u)
                        return i->first->name;
        }
 
-       return "*";
+       return star;
 }
 
 bool CommandWho::whomatch(User* user, const char* matchtext)
@@ -134,13 +136,13 @@ bool CommandWho::CanView(Channel* chan, User* user)
 
 void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
 {
-       std::string lcn = get_first_visible_channel(u);
-       Channel* chlast = ServerInstance->FindChan(lcn);
-
        /* Not visible to this user */
        if (u->Visibility && !u->Visibility->VisibleTo(user))
                return;
 
+       const std::string& lcn = get_first_visible_channel(u);
+       Channel* chlast = ServerInstance->FindChan(lcn);
+
        std::string wholine =   initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
                                ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
                                " " + u->nick + " ";
@@ -165,7 +167,7 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch
        whoresults.push_back(wholine);
 }
 
-CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *user)
 {
        /*
         * XXX - RFC says:
@@ -191,13 +193,14 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
        std::vector<std::string> whoresults;
        std::string initial = "352 " + std::string(user->nick) + " ";
 
-       const char* matchtext = NULL;
+       char matchtext[MAXBUF];
        bool usingwildcards = false;
 
        /* Change '0' into '*' so the wildcard matcher can grok it */
-       matchtext = parameters[0];
-       if (!strcmp(matchtext,"0"))
-               matchtext = "*";
+       if (parameters[0] == "0")
+               strlcpy(matchtext, "*", MAXBUF);
+       else
+               strlcpy(matchtext, parameters[0].c_str(), MAXBUF);
 
        for (const char* check = matchtext; *check; check++)
        {
@@ -208,12 +211,15 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                }
        }
 
-       if (pcnt > 1)
+       if (ServerInstance->FindServerName(matchtext))
+               usingwildcards = true;
+
+       if (parameters.size() > 1)
        {
-               /* parse flags */
-               const char *iter = parameters[1];
+               /* Fix for bug #444, WHO flags count as a wildcard */
+               usingwildcards = true;
 
-               while (*iter)
+               for (std::string::const_iterator iter = parameters[1].begin(); iter != parameters[1].end(); ++iter)
                {
                        switch (*iter)
                        {
@@ -253,8 +259,6 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                                        opt_far = true;
                                break;
                        }
-
-                       *iter++;
                }
        }
 
@@ -281,7 +285,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                                                continue;
        
                                        /* If we're not inside the channel, hide +i users */
-                                       if (i->first->IsModeSet('i') && !inside)
+                                       if (i->first->IsModeSet('i') && !inside && !IS_OPER(user))
                                                continue;
                                }
        
@@ -295,7 +299,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                if (opt_viewopersonly)
                {
                        /* Showing only opers */
-                       for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+                       for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
                        {
                                User* oper = *i;
 
@@ -313,7 +317,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
-                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+                       for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
                        {
                                if (whomatch(i->second, matchtext))
                                {
@@ -333,13 +337,13 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);
-               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick.c_str(), *parameters[0].c_str() ? parameters[0].c_str() : "*");
                return CMD_SUCCESS;
        }
        else
        {
                /* BZZT! Too many results. */
-               user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]);
+               user->WriteNumeric(315, "%s %s :Too many results",user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }