Conversions

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

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 09705949883fbca66d904793957dbf9211350d35..66a94cfd668bc6eec514e7dae82032624c287d76 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -46,6 +47,8 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext)
 
        if (opt_local && !IS_LOCAL(user))
                return false;
+       else if (opt_far && IS_LOCAL(user))
+               return false;
 
        if (opt_mode)
        {
@@ -86,7 +89,13 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext)
                                        else
                                        {
                                                if (opt_port)
-                                                       port = (user->GetPort() == ConvToInt(matchtext));
+                                               {
+                                                       irc::portparser portrange(matchtext, false);
+                                                       long portno = -1;
+                                                       while ((portno = portrange.GetToken()))
+                                                               if (portno == user->GetPort())
+                                                                       port = true;
+                                               }
                                                else
                                                {
                                                        if (opt_away)
@@ -102,7 +111,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext)
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_who(Instance);
 }
@@ -115,7 +124,7 @@ bool cmd_who::CanView(chanrec* chan, userrec* user)
        /* Execute items in fastest-to-execute first order */
 
        /* Opers see all */
-       if (*user->oper)
+       if (IS_OPER(user))
                return true;
        else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
                return true;
@@ -135,11 +144,11 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch
                return;
 
        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) +
+                               ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
                                " " + u->nick + " ";
 
        /* away? */
-       if (*u->awaymsg)
+       if (IS_AWAY(u))
        {
                wholine.append("G");
        }
@@ -149,7 +158,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch
        }
 
        /* oper? */
-       if (*u->oper)
+       if (IS_OPER(u))
        {
                wholine.append("*");
        }
@@ -178,6 +187,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
        opt_port = false;
        opt_away = false;
        opt_local = false;
+       opt_far = false;
 
        chanrec *ch = NULL;
        std::vector<std::string> whoresults;
@@ -203,11 +213,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                        opt_viewopersonly = true;
                                break;
                                case 'h':
-                                       if (*user->oper)
+                                       if (IS_OPER(user))
                                                opt_showrealhost = true;
                                break;
                                case 'u':
-                                       if (*user->oper)
+                                       if (IS_OPER(user))
                                                opt_unlimit = true;
                                break;
                                case 'r':
@@ -231,6 +241,9 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                case 'l':
                                        opt_local = true;
                                break;
+                               case 'f':
+                                       opt_far = true;
+                               break;
                        }
 
                        *iter++;
@@ -253,14 +266,14 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                        for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
                        {
                                /* opers only, please */
-                               if (opt_viewopersonly && !IS_OPER(i->second))
+                               if (opt_viewopersonly && !IS_OPER(i->first))
                                        continue;
        
                                /* If we're not inside the channel, hide +i users */
-                               if (i->second->IsModeSet('i') && !inside)
+                               if (i->first->IsModeSet('i') && !inside)
                                        continue;
        
-                               SendWhoLine(user, initial, ch, i->second, whoresults);
+                               SendWhoLine(user, initial, ch, i->first, whoresults);
                        }
                }
        }