Show libratbox version info to opers in /info.

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

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 331630c7b3093ccec6eaa4892e97c7c73dc3a115..085e4d64d00a73556310a07d88d20514fdb1408e 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,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"
@@ -90,7 +89,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");
@@ -99,7 +98,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) !=
@@ -190,7 +189,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)
        {
@@ -198,7 +200,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);
@@ -237,16 +239,9 @@ 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);
@@ -324,6 +319,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))
@@ -345,7 +344,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
@@ -367,7 +366,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           target_p->name, target_p->sockhost);
                        
                }
-       
        }
 
        hdata.client = source_p;