Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_lusers.c

diff --git a/ircd/m_lusers.c b/ircd/m_lusers.c
index ebf6751e5ebd8c5fffc86345701d4f06b1956f29..0a1c9e3024842bb3b0a3a0e0e9cffa65152f287a 100644 (file)
--- a/ircd/m_lusers.c
+++ b/ircd/m_lusers.c
@@ -112,31 +112,23 @@ int m_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   int longoutput = MyUser(sptr) || IsOper(sptr);
   if (parc > 2)
-    if (hunt_server(0, cptr, sptr, "%s%s " TOK_LUSERS " %s :%s", 2, parc, parv) !=
+    if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, 0, "%s :%C", 2, parc, parv) !=
         HUNTED_ISME)
       return 0;
 
-  sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0],
-      UserStats.clients - UserStats.inv_clients, UserStats.inv_clients, UserStats.servers);
+  send_reply(sptr, RPL_LUSERCLIENT, UserStats.clients - UserStats.inv_clients,
+            UserStats.inv_clients, UserStats.servers);
   if (longoutput && UserStats.opers)
-    sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], UserStats.opers);
+    send_reply(sptr, RPL_LUSEROP, UserStats.opers);
   if (UserStats.unknowns > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN), me.name, parv[0],
-        UserStats.unknowns);
+    send_reply(sptr, RPL_LUSERUNKNOWN, UserStats.unknowns);
   if (longoutput && UserStats.channels > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS), me.name, parv[0],
-        UserStats.channels);
-  sendto_one(sptr, rpl_str(RPL_LUSERME), me.name, parv[0], UserStats.local_clients,
-      UserStats.local_servers);
+    send_reply(sptr, RPL_LUSERCHANNELS, UserStats.channels);
+  send_reply(sptr, RPL_LUSERME, UserStats.local_clients,
+            UserStats.local_servers);
 
-  if (MyUser(sptr) || Protocol(cptr) < 10)
-    sendto_one(sptr,
-        ":%s NOTICE %s :Highest connection count: %d (%d clients)",
-        me.name, parv[0], max_connection_count, max_client_count);
-  else
-    sendto_one(sptr,
-        "%s NOTICE %s%s :Highest connection count: %d (%d clients)",
-        NumServ(&me), NumNick(sptr), max_connection_count, max_client_count);
+  sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Highest connection count: "
+               "%d (%d clients)", max_connection_count, max_client_count);
 
   return 0;
 }
@@ -152,31 +144,23 @@ int ms_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   int longoutput = MyUser(sptr) || IsOper(sptr);
   if (parc > 2)
-    if (hunt_server(0, cptr, sptr, "%s%s " TOK_LUSERS " %s :%s", 2, parc, parv) !=
+    if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, 0, "%s :%C", 2, parc, parv) !=
         HUNTED_ISME)
       return 0;
 
-  sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0],
-      UserStats.clients - UserStats.inv_clients, UserStats.inv_clients, UserStats.servers);
+  send_reply(sptr, RPL_LUSERCLIENT, UserStats.clients - UserStats.inv_clients,
+            UserStats.inv_clients, UserStats.servers);
   if (longoutput && UserStats.opers)
-    sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], UserStats.opers);
+    send_reply(sptr, RPL_LUSEROP, UserStats.opers);
   if (UserStats.unknowns > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN), me.name, parv[0],
-        UserStats.unknowns);
+    send_reply(sptr, RPL_LUSERUNKNOWN, UserStats.unknowns);
   if (longoutput && UserStats.channels > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS), me.name, parv[0],
-        UserStats.channels);
-  sendto_one(sptr, rpl_str(RPL_LUSERME), me.name, parv[0], UserStats.local_clients,
-      UserStats.local_servers);
+    send_reply(sptr, RPL_LUSERCHANNELS, UserStats.channels);
+  send_reply(sptr, RPL_LUSERME, UserStats.local_clients,
+            UserStats.local_servers);
 
-  if (MyUser(sptr) || Protocol(cptr) < 10)
-    sendto_one(sptr,
-        ":%s NOTICE %s :Highest connection count: %d (%d clients)",
-        me.name, parv[0], max_connection_count, max_client_count);
-  else
-    sendto_one(sptr,
-        "%s NOTICE %s%s :Highest connection count: %d (%d clients)",
-        NumServ(&me), NumNick(sptr), max_connection_count, max_client_count);
+  sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Highest connection count: "
+               "%d (%d clients)", max_connection_count, max_client_count);
 
   return 0;
 }
@@ -194,29 +178,29 @@ int m_lusers(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
   int longoutput = MyUser(sptr) || IsOper(sptr);
   if (parc > 2)
-    if (hunt_server(0, cptr, sptr, "%s%s " TOK_LUSERS " %s :%s", 2, parc, parv) !=
+    if (hunt_server(0, cptr, sptr, "%s%s " TOK_LUSERS " %s :%s", 2, parc, parv) != /* XXX DEAD */
         HUNTED_ISME)
       return 0;
 
-  sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0],
+  sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0], /* XXX DEAD */
       UserStats.clients - UserStats.inv_clients, UserStats.inv_clients, UserStats.servers);
   if (longoutput && UserStats.opers)
-    sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], UserStats.opers);
+    sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], UserStats.opers); /* XXX DEAD */
   if (UserStats.unknowns > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN), me.name, parv[0],
+    sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN), me.name, parv[0], /* XXX DEAD */
         UserStats.unknowns);
   if (longoutput && UserStats.channels > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS), me.name, parv[0],
+    sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS), me.name, parv[0], /* XXX DEAD */
         UserStats.channels);
-  sendto_one(sptr, rpl_str(RPL_LUSERME), me.name, parv[0], UserStats.local_clients,
+  sendto_one(sptr, rpl_str(RPL_LUSERME), me.name, parv[0], UserStats.local_clients, /* XXX DEAD */
       UserStats.local_servers);
 
   if (MyUser(sptr) || Protocol(cptr) < 10)
-    sendto_one(sptr,
+    sendto_one(sptr, /* XXX DEAD */
         ":%s NOTICE %s :Highest connection count: %d (%d clients)",
         me.name, parv[0], max_connection_count, max_client_count);
   else
-    sendto_one(sptr,
+    sendto_one(sptr, /* XXX DEAD */
         "%s NOTICE %s%s :Highest connection count: %d (%d clients)",
         NumServ(&me), NumNick(sptr), max_connection_count, max_client_count);