X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..67b90240c4f15588f944de99391b2f98bc9cb0f7:/modules/m_admin.c

diff --git a/modules/m_admin.c b/modules/m_admin.c
index 0a83485..9b0bf8d 100644
--- a/modules/m_admin.c
+++ b/modules/m_admin.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_admin.c 254 2005-09-21 23:35:12Z nenolod $
+ *  $Id: m_admin.c 3368 2007-04-03 10:11:06Z nenolod $
  */
 
 #include "stdinc.h"
@@ -56,11 +56,10 @@ mapi_hlist_av1 admin_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(admin, NULL, NULL, admin_clist, admin_hlist, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV1(admin, NULL, NULL, admin_clist, admin_hlist, NULL, "$Revision: 3368 $");
 
 /*
  * mr_admin - ADMIN command handler
- *      parv[0] = sender prefix   
  *      parv[1] = servername   
  */
 static int
@@ -68,7 +67,7 @@ mr_admin(struct Client *client_p, struct Client *source_p, int parc, const char
 {
 	static time_t last_used = 0L;
 
-	if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+	if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
 	{
 		sendto_one(source_p, form_str(RPL_LOAD2HI), 
 			   me.name, 
@@ -77,7 +76,7 @@ mr_admin(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 	else
-		last_used = CurrentTime;
+		last_used = rb_current_time();
 
 	do_admin(source_p);
 
@@ -86,7 +85,6 @@ mr_admin(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /*
  * m_admin - ADMIN command handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  */
 static int
@@ -96,14 +94,14 @@ m_admin(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(parc > 1)
 	{
-		if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
 		{
 			sendto_one(source_p, form_str(RPL_LOAD2HI),
 				   me.name, source_p->name, "ADMIN");
 			return 0;
 		}
 		else
-			last_used = CurrentTime;
+			last_used = rb_current_time();
 		
 		if(hunt_server(client_p, source_p, ":%s ADMIN :%s", 1, parc, parv) != HUNTED_ISME)
 			return 0;
@@ -117,7 +115,6 @@ m_admin(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_admin - ADMIN command handler, used for OPERS as well
- *      parv[0] = sender prefix
  *      parv[1] = servername
  */
 static int
@@ -142,22 +139,16 @@ ms_admin(struct Client *client_p, struct Client *source_p, int parc, const char
 static void
 do_admin(struct Client *source_p)
 {
-	const char *myname;
-	const char *nick;
-
 	if(IsPerson(source_p))
 		admin_spy(source_p);
 
-	myname = get_id(&me, source_p);
-	nick = EmptyString(source_p->name) ? "*" : get_id(source_p, source_p);
-
-	sendto_one(source_p, form_str(RPL_ADMINME), myname, nick, me.name);
+	sendto_one_numeric(source_p, RPL_ADMINME, form_str(RPL_ADMINME), me.name);
 	if(AdminInfo.name != NULL)
-		sendto_one(source_p, form_str(RPL_ADMINLOC1), myname, nick, AdminInfo.name);
+		sendto_one_numeric(source_p, RPL_ADMINLOC1, form_str(RPL_ADMINLOC1), AdminInfo.name);
 	if(AdminInfo.description != NULL)
-		sendto_one(source_p, form_str(RPL_ADMINLOC2), myname, nick, AdminInfo.description);
+		sendto_one_numeric(source_p, RPL_ADMINLOC2, form_str(RPL_ADMINLOC2), AdminInfo.description);
 	if(AdminInfo.email != NULL)
-		sendto_one(source_p, form_str(RPL_ADMINEMAIL), myname, nick, AdminInfo.email);
+		sendto_one_numeric(source_p, RPL_ADMINEMAIL, form_str(RPL_ADMINEMAIL), AdminInfo.email);
 }
 
 /* admin_spy()