presence: If CLICAP_PRESENCE is enabled, then RPL_AWAY is replaced by the "away"...

[irc/rqf/shadowircd.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 147811909d894405794741f0ff0f71c14ee1aa28..04423f725755e1cafc7147b3dc977ca860e22a66 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "client.h"
 #include "hash.h"
@@ -36,10 +35,9 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -71,7 +69,6 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision
 
 /*
  * m_whois
- *      parv[0] = sender prefix
  *      parv[1] = nickname masklist
  */
 static int
@@ -91,7 +88,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!IsOper(source_p))
                {
                        /* seeing as this is going across servers, we should limit it */
-                       if((last_used + ConfigFileEntry.pace_wait_simple) > CurrentTime)
+                       if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time())
                        {
                                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                           me.name, source_p->name, "WHOIS");
@@ -100,7 +97,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                                return 0;
                        }
                        else
-                               last_used = CurrentTime;
+                               last_used = rb_current_time();
                }
 
                if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) !=
@@ -117,7 +114,6 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_whois
- *      parv[0] = sender prefix
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
@@ -191,7 +187,10 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                nick++;
        }
 
-       target_p = find_named_person(nick);
+       if(MyClient(source_p))
+               target_p = find_named_person(nick);
+       else
+               target_p = find_person(nick);
 
        if(target_p != NULL)
        {
@@ -199,7 +198,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        char buffer[BUFSIZE];
 
-                       snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
                                target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
@@ -229,9 +228,9 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
+       const char *awaymsg;
        char buf[BUFSIZE];
-       dlink_node *ptr;
-       struct Client *a2client_p;
+       rb_dlink_node *ptr;
        struct membership *msptr;
        struct Channel *chptr;
        int cur_len = 0;
@@ -239,29 +238,20 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        char *t;
        int tlen;
        hook_data_client hdata;
-       char *name;
-       char quest[] = "?";
        int visible;
        int extra_space = 0;
 
-       if(target_p->name[0] == '\0')
-               name = quest;
-       else
-               name = target_p->name;
-
        if(target_p->user == NULL)
        {
                s_assert(0);
                return;
        }
 
-       a2client_p = target_p->servptr;
-
        sendto_one_numeric(source_p, RPL_WHOISUSER, form_str(RPL_WHOISUSER),
                           target_p->name, target_p->username, 
                           target_p->host, target_p->info);
 
-       cur_len = mlen = ircsprintf(buf, form_str(RPL_WHOISCHANNELS), 
+       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS), 
                                    get_id(&me, source_p), get_id(source_p, source_p), 
                                    target_p->name);
 
@@ -282,7 +272,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if (!IsService(target_p))
        {
-               DLINK_FOREACH(ptr, target_p->user->channel.head)
+               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
                {
                        msptr = ptr->data;
                        chptr = msptr->chptr;
@@ -298,7 +288,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        t = buf + mlen;
                                }
 
-                               tlen = ircsprintf(t, "%s%s%s ",
+                               tlen = rb_sprintf(t, "%s%s%s ",
                                                visible ? "" : "!",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
@@ -313,11 +303,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        sendto_one_numeric(source_p, RPL_WHOISSERVER, form_str(RPL_WHOISSERVER),
                           target_p->name, target_p->servptr->name,
-                          a2client_p ? a2client_p->info : "*Not On This Net*");
+                          target_p->servptr->info);
 
-       if(target_p->user->away)
+       if(!IsCapable(source_p, CLICAP_PRESENCE) && (awaymsg = get_metadata(target_p, "away")) != NULL)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
-                                  target_p->name, target_p->user->away);
+                                  target_p->name, awaymsg);
 
        if(IsOper(target_p))
        {
@@ -328,6 +318,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
+       if(IsSSLClient(target_p))
+               sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
+                                  target_p->name);
+
        if(MyClient(target_p))
        {
                if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
@@ -349,7 +343,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
                sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
                                   target_p->name, 
-                                  CurrentTime - target_p->localClient->last, 
+                                  rb_current_time() - target_p->localClient->last, 
                                   target_p->localClient->firsttime);
        }
        else
@@ -371,7 +365,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           target_p->name, target_p->sockhost);
                        
                }
-       
        }
 
        hdata.client = source_p;