X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/81af5bcb394280ff1af82486961d852b102b923b..8e2ebdb80add54d46c9f7f058ad469d70ddf9457:/modules/m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 331630c7..53b4b250 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -38,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"
@@ -90,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");
@@ -99,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) !=
@@ -190,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))
+		target_p = find_named_person(nick);
+	else
+		target_p = find_person(nick);
 
 	if(target_p != NULL)
 	{
@@ -324,6 +327,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 +352,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 +374,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 					   target_p->name, target_p->sockhost);
 			
 		}
-	
 	}
 
 	hdata.client = source_p;