ssl sync with http://hg.angelforce.ru/charybdis-old

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

diff --git a/modules/m_whois.c b/modules/m_whois.c
index caba2b7a405fd046a6c3af36c4b948873edeff29..c2a00ef5b1cd74230b5ba05e8321d5e8862c97d3 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"
@@ -39,7 +38,7 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -91,7 +90,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 +99,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) !=
@@ -191,7 +190,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))\r
+               target_p = find_named_person(nick);\r
+       else\r
+               target_p = find_person(nick);
 
        if(target_p != NULL)
        {
@@ -346,7 +348,10 @@ 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);
+
+               sendto_one_notice(source_p, ":%ld %ld", target_p->localClient->last, 
                                   target_p->localClient->firsttime);
        }
        else