Convert more by-values to const references, optimise ConfigReader a bit

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

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 1ce2564b84c660be62166bf2a35dae88d96fffdf..4a94dc659ed49ffb23cdc876cbf5ebae6546f450 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -17,7 +17,6 @@
 using namespace std;
 
 #include "inspircd_config.h"
-#include "inspircd.h"
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
@@ -47,6 +46,7 @@ using namespace std;
 #include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
+#include "inspircd.h"
 #include "cmd_who.h"
 
 extern ServerConfig* Config;
@@ -57,7 +57,6 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
@@ -70,28 +69,27 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
        /* theres more to do here, but for now just close the socket */
        if (pcnt == 1)
        {
-               if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")))
+               if ((IS_SINGLE(parameters[0],'0')) || (IS_SINGLE(parameters[0],'*')))
                {
-                       if ((user->chans.size()) && (user->chans[0].channel))
+                       if ((user->chans.size()) && (((ucrec*)*(user->chans.begin()))->channel))
                        {
                                int n_list = 0;
                                for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
                                {
-                                       Ptr = i->second->chans[0].channel;
+                                       Ptr = ((ucrec*)*(i->second->chans.begin()))->channel;
                                        // suggested by phidjit and FCS
                                        if ((!common_channels(user,i->second)) && (isnick(i->second->nick)))
                                        {
                                                // Bug Fix #29
                                                *tmp = 0;
                                                if (*i->second->awaymsg) {
-                                                       strlcat(tmp, "G", 9);
+                                                       charlcat(tmp, 'G', 9);
                                                } else {
-                                                       strlcat(tmp, "H", 9);
+                                                       charlcat(tmp, 'H', 9);
                                                }
-                                               if (strchr(i->second->modes,'o')) { strlcat(tmp, "*", 9); }
+                                               if (*i->second->oper) { charlcat(tmp, '*', 9); }
                                                WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr ? Ptr->name : "*", i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
-                                               n_list++;
-                                               if (n_list > Config->MaxWhoResults)
+                                               if (n_list++ > Config->MaxWhoResults)
                                                {
                                                        WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick);
                                                        break;
@@ -117,16 +115,16 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
                                int n_list = 0;
                                for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
                                {
-                                       if ((has_channel(i->second,Ptr)) && (isnick(i->second->nick)))
+                                       if ((Ptr->HasUser(i->second)) && (isnick(i->second->nick)))
                                        {
                                                // Fix Bug #29 - Part 2..
                                                *tmp = 0;
                                                if (*i->second->awaymsg) {
-                                                       strlcat(tmp, "G", 9);
+                                                       charlcat(tmp, 'G', 9);
                                                } else {
-                                                       strlcat(tmp, "H", 9);
+                                                       charlcat(tmp, 'H', 9);
                                                }
-                                               if (strchr(i->second->modes,'o')) { strlcat(tmp, "*", 9); }
+                                               if (*i->second->oper) { charlcat(tmp, '*', 9); }
                                                strlcat(tmp, cmode(i->second, Ptr),5);
                                                WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
                                                 n_list++;
@@ -153,12 +151,12 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
                                // Bug Fix #29 -- Part 29..
                                *tmp = 0;
                                if (*u->awaymsg) {
-                                       strlcat(tmp, "G" ,9);
+                                       charlcat(tmp, 'G' ,9);
                                } else {
-                                       strlcat(tmp, "H" ,9);
+                                       charlcat(tmp, 'H' ,9);
                                }
-                               if (strchr(u->modes,'o')) { strlcat(tmp, "*" ,9); }
-                               WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans.size() ? u->chans[0].channel->name
+                               if (*u->oper) { charlcat(tmp, '*' ,9); }
+                               WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans.size() && ((ucrec*)*(u->chans.begin()))->channel ? ((ucrec*)*(u->chans.begin()))->channel->name
                                 : "*", u->ident, u->dhost, u->server, u->nick, tmp, u->fullname);
                        }
                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
@@ -166,7 +164,7 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
        }
        if (pcnt == 2)
        {
-                if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")) && (!strcmp(parameters[1],"o")))
+                if ((IS_SINGLE(parameters[0],'0')) || (IS_SINGLE(parameters[0],'*')) && (IS_SINGLE(parameters[1],'o')))
                 {
                        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
                         {
@@ -175,11 +173,11 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
                                userrec* oper = *i;
                                *tmp = 0;
                                if (*oper->awaymsg) {
-                                       strlcat(tmp, "G" ,9);
+                                       charlcat(tmp, 'G' ,9);
                                } else {
-                                       strlcat(tmp, "H" ,9);
+                                       charlcat(tmp, 'H' ,9);
                                }
-                                WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans.size() ? oper->chans[0].channel->name 
+                                WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans.size() && ((ucrec*)*(oper->chans.begin()))->channel ? ((ucrec*)*(oper->chans.begin()))->channel->name
                                : "*", oper->ident, oper->dhost, oper->server, oper->nick, tmp, oper->fullname);
                         }
                         WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
@@ -188,4 +186,3 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
        }
 }
 
-