From 07d397b4ff88fe088e8718b8f962aebabfebf985 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 27 Feb 2005 00:01:36 +0000 Subject: [PATCH] - Changed the 'is a Secure Connection' msg/numeric in /whois from RPL_WHOISSPECIAL to a slightly changed RPL_WHOISSECURE, namely: ':%s 671 %s %s :is using a Secure connection', --- Changes | 15 +++++++++++++++ include/numeric.h | 2 ++ src/modules/m_whois.c | 4 ++-- src/s_err.c | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 001b94edb..aabc09f44 100644 --- a/Changes +++ b/Changes @@ -676,3 +676,18 @@ - Nicks with ~ are now also not cutoff anymore but rejected like any other illegal char (#0002074). - Fixed bug in +G where with not-really-matching-words color was needlessly stripped, reported by SpeedFire (#0002375). +- Changed the 'is a Secure Connection' msg/numeric in /whois from RPL_WHOISSPECIAL to + a slightly changed RPL_WHOISSECURE, namely: ':%s 671 %s %s :is using a Secure connection', + I'm sure some client coders will bitch at this, but the current way is brok in 2 ways: + - RPL_WHOISSPECIAL is meant for 1 line of additional whois info, usually an IRCOp title or + description. Having a dedicated numeric for it allows for client-side interpretations + and/or translations. + - The 'is a Secure Connection' was incorrect English, this has been reported numerous times. + The PRO's of this change are clear, the only CON is that in-window-/whois's are now + likely not to show this line properly in-window but rather in the status window, until client + coders implement this numeric. + If you wonder why we didn't use RPL_USINGSSL, that's because this numeric collides with + RPL_STATSDLINE (which we are already using for >5 years). + If you wonder why we didn't use the RPL_WHOISSECURE numeric as-is (even though I haven't + seen it in use anywhere), then that's because we wanted to minimize display problems in + the transition period. diff --git a/include/numeric.h b/include/numeric.h index 5f5429007..f5b5408ef 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -354,6 +354,8 @@ #define RPL_DUMPRPL 641 #define RPL_EODUMP 642 +#define RPL_WHOISSECURE 671 + #define ERR_CANNOTDOCOMMAND 972 #define ERR_CANNOTCHANGECHANMODE 974 #define ERR_NUMERICERR 999 diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c index 5edf8878a..a7d6356d3 100644 --- a/src/modules/m_whois.c +++ b/src/modules/m_whois.c @@ -310,8 +310,8 @@ DLLFUNC int m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[]) sendto_one(sptr, rpl_str(RPL_WHOISBOT), me.name, parv[0], name, ircnetwork); if (acptr->umodes & UMODE_SECURE) - sendto_one(sptr, ":%s %d %s %s :%s", me.name, - RPL_WHOISSPECIAL, parv[0], name, "is a Secure Connection"); + sendto_one(sptr, rpl_str(RPL_WHOISSECURE), me.name, parv[0], name, + "is using a Secure Connection"); if (!BadPtr(user->swhois) && !hideoper) sendto_one(sptr, ":%s %d %s %s :%s", diff --git a/src/s_err.c b/src/s_err.c index 5dd16caf9..ffd5e5c5d 100644 --- a/src/s_err.c +++ b/src/s_err.c @@ -727,7 +727,7 @@ static char *replies[] = { /* 668 */ NULL, /* 669 */ NULL, /* 670 */ NULL, /* kineircd */ -/* 671 */ NULL, /* kineircd */ +/* 671 RPL_WHOISSECURE */ ":%s 671 %s %s :%s", /* our variation on the kineircd numeric */ /* 672 */ NULL, /* ithildin */ /* 673 */ NULL, /* ithildin */ /* 674 */ NULL,