Author: Kev <klmitch@undernet.org>

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

diff --git a/ircd/m_jupe.c b/ircd/m_jupe.c
index 6541d046cc9ce867442bfb532fed53360a213227..fb606d9dc6317f35204a1852c871485d48573b43 100644 (file)
--- a/ircd/m_jupe.c
+++ b/ircd/m_jupe.c
@@ -137,13 +137,8 @@ int ms_jupe(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       return 0; /* no such server */
 
     if (!IsMe(acptr)) { /* manually propagate, since we don't set it */
-      if (IsServer(sptr))
-       sendto_one(acptr, "%s " TOK_JUPE " %s %s %s %s :%s", NumServ(sptr),
-                  target, server, parv[3], parv[4], reason);
-      else
-       sendto_one(acptr, "%s%s " TOK_JUPE " %s %s %s %s :%s", NumNick(sptr),
-                  target, server, parv[3], parv[4], reason);
-
+      sendcmdto_one(acptr, CMD_JUPE, sptr, "%s %s %s %s :%s", target, server,
+                   parv[3], parv[4], reason);
       return 0;
     }
 
@@ -219,28 +214,21 @@ int mo_jupe(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     return need_more_params(sptr, "JUPE");
 
   if (!(target[0] == '*' && target[1] == '\0')) {
-    if (!(acptr = find_match_server(target))) {
-      sendto_one(sptr, err_str(ERR_NOSUCHSERVER), me.name, parv[0], target);
-      return 0;
-    }
+    if (!(acptr = find_match_server(target)))
+      return send_error_to_client(sptr, ERR_NOSUCHSERVER, target);
 
     if (!IsMe(acptr)) { /* manually propagate, since we don't set it */
-      if (!IsOper(sptr)) {
-       sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
-       return 0;
-      }
+      if (!IsOper(sptr))
+       return send_error_to_client(sptr, ERR_NOPRIVILEGES);
 
-      sendto_one(acptr, "%s%s " TOK_JUPE " %s %c%s %s " TIME_T_FMT " :%s",
-                NumNick(sptr), NumServ(acptr), active ? '+' : '-', server,
-                parv[3], TStime(), reason);
+      sendcmdto_one(acptr, CMD_JUPE, sptr, "%C %c%s %s %Tu :%s", acptr,
+                   active ? '+' : '-', server, parv[3], TStime(), reason);
       return 0;
     }
 
     local = 1;
-  } else if (!IsOper(sptr)) {
-    sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
-    return 0;
-  }
+  } else if (!IsOper(sptr))
+    return send_error_to_client(sptr, ERR_NOPRIVILEGES);
 
   expire_off = atoi(parv[3]);