Bad w00tie bad, /who isnt checking +s for channel /who!

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

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 0a66372420bef16c393d8d9ce95dbdf3adc365ca..508956c44f166c051c10ac8749f10699569df717 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -16,18 +16,10 @@
 
 #include "configreader.h"
 #include "users.h"
-#include "message.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-extern InspIRCd* ServerInstance;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-
 /* get the last 'visible' chan of a user */
 static char *getlastchanname(userrec *u)
 {
@@ -45,10 +37,34 @@ static char *getlastchanname(userrec *u)
        return "*";
 }
 
-bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost)
+bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode)
 {
        bool realhost = false;
        bool realname = false;
+       bool positive = true;
+
+       if (user->registered != REG_ALL)
+               return false;
+
+       if (opt_mode)
+       {
+               for (const char* n = matchtext; *n; n++)
+               {
+                       if (*n == '+')
+                       {
+                               positive = true;
+                               continue;
+                       }
+                       else if (*n == '-')
+                       {
+                               positive = false;
+                               continue;
+                       }
+                       if (user->IsModeSet(*n) != positive)
+                               return false;
+               }
+               return true;
+       }
 
        if (opt_realname)
                realname = match(user->fullname, matchtext);
@@ -59,7 +75,27 @@ bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_
        return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
 }
 
-void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_who(Instance);
+}
+
+bool cmd_who::CanView(chanrec* chan, userrec* user)
+{
+       /* Execute items in fastest-to-execute first order */
+       if (*user->oper)
+               return true;
+       else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
+               return true;
+       else if (chan->HasUser(user))
+               return true;
+
+       return false;
+}
+
+CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 {
        /*
         * XXX - RFC says:
@@ -73,6 +109,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
        bool opt_showrealhost = false;
        bool opt_unlimit = false;
        bool opt_realname = false;
+       bool opt_mode = false;
 
        chanrec *ch = NULL;
        std::vector<std::string> whoresults;
@@ -108,6 +145,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                case 'r':
                                        opt_realname = true;
                                break;
+                               case 'm':
+                                       opt_mode = true;
+                               break;
                        }
 
                        *iter++;
@@ -116,9 +156,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 
 
        /* who on a channel? */
-       ch = FindChan(matchtext);
+       ch = ServerInstance->FindChan(matchtext);
 
-       if (ch)
+       if ((ch) && (CanView(ch,user)))
        {
                /* who on a channel. */
                CUList *cu = ch->GetUsers();
@@ -151,7 +191,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                wholine.append("*");
                        }
 
-                       wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
+                       wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
                        whoresults.push_back(wholine);
                }
        }
@@ -162,17 +202,19 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                if (opt_viewopersonly)
                {
                        /* Showing only opers */
-                       for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+                       for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
                        {
                                userrec* oper = *i;
 
-                               if (whomatch(oper, matchtext, opt_realname, opt_showrealhost))
+                               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)
                                        {
@@ -189,22 +231,24 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                                wholine.append("*");
                                        }
        
-                                       wholine = wholine + cmode(oper, ch) + " :0 " + oper->fullname;
+                                       wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
                                        whoresults.push_back(wholine);
                                }
                        }
                }
                else
                {
-                       for (user_hash::iterator i = clientlist.begin(); i != 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))
+                               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)
                                        {
@@ -221,7 +265,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                                wholine.append("*");
                                        }
 
-                                       wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
+                                       wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
                                        whoresults.push_back(wholine);
                                }
                        }
@@ -232,11 +276,13 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *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]);
+               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               return CMD_SUCCESS;
        }
        else
        {
                /* BZZT! Too many results. */
                user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
 }