static bool
IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
{
- bool is_visible, is_member, is_ircop;
+ bool is_visible, is_member, is_ircop, is_oper;
CL2CHAN *cl2chan;
char flags[10];
CLIENT *c;
assert( Chan != NULL );
is_member = Channel_IsMemberOf(Chan, Client);
+ is_oper = Client_HasMode(Client, 'o');
/* Secret channel? */
- if (!is_member && Channel_HasMode(Chan, 's'))
+ if (!is_member && !is_oper && Channel_HasMode(Chan, 's'))
return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG,
Client_ID(Client), Channel_Name(Chan));
continue;
is_visible = !Client_HasMode(c, 'i');
- if (is_member || is_visible) {
+ if (is_member || is_visible || is_oper) {
memset(flags, 0, sizeof(flags));
if (Client_HasMode(c, 'a'))
/* Secret channel? */
if (Channel_HasMode(chan, 's')
- && !Channel_IsMemberOf(chan, Client))
+ && !Channel_IsMemberOf(chan, Client))
continue;
/* Local channel and request is not from a user? */
if (Client_Type(Client) == CLIENT_SERVER
- && Channel_IsLocal(chan))
+ && Channel_IsLocal(chan))
continue;
/* Concatenate channel names */
strlcat(str, " ", sizeof(str));
who_flags_qualifier(Client, Channel_UserModes(chan, c),
- str, sizeof(str));
+ str, sizeof(str));
strlcat(str, Channel_Name(chan), sizeof(str));
if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {
/* Local client and requester is the user itself or an IRC Op? */
if (Client_Conn(c) > NONE &&
- (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
+ (from == c || Client_HasMode(from, 'o'))) {
/* Client hostname */
if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
Client_ID(from), Client_ID(c),
NGIRCd_Version))
return DISCONNECTED;
-#if defined(__DATE__) && defined(__TIME__)
+#if defined(BIRTHDATE)
+ char t_str[60];
+ time_t t = BIRTHDATE;
+ (void)strftime(t_str, sizeof(t_str), "%a %b %d %Y at %H:%M:%S (%Z)",
+ localtime(&t));
+ snprintf(msg, sizeof(msg), "Birth Date: %s", t_str);
+ if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
+ return DISCONNECTED;
+#elif defined(__DATE__) && defined(__TIME__)
snprintf(msg, sizeof(msg), "Birth Date: %s at %s", __DATE__, __TIME__);
if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
return DISCONNECTED;
list = Class_GetList(CLASS_GLINE);
else
list = Class_GetList(CLASS_KLINE);
- list_item = Lists_GetFirst(list);
- while (list_item) {
- if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG,
+ list_item = Lists_GetFirst(list);
+ while (list_item) {
+ if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG,
Client_ID(from), query,
Lists_GetMask(list_item),
Lists_GetValidity(list_item),
Lists_GetReason(list_item)))
- return DISCONNECTED;
- list_item = Lists_GetNext(list_item);
- }
+ return DISCONNECTED;
+ list_item = Lists_GetNext(list_item);
+ }
break;
case 'L': /* Link status (servers and user links) */
if (!Op_Check(from, Req))