* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
*/
#include "stdinc.h"
#include "modules.h"
#include "hook.h"
#include "s_newconf.h"
+#include "s_user.h"
static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
static void
single_whois(struct Client *source_p, struct Client *target_p, int operspy)
{
- const char *awaymsg;
char buf[BUFSIZE];
rb_dlink_node *ptr;
struct membership *msptr;
hook_data_client hdata;
int visible;
int extra_space = 0;
+ int i;
+ char *m;
+ int showsecret = 0;
+ struct Metadata *md;
+
+ if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
+ showsecret = 1;
if(target_p->user == NULL)
{
visible = ShowChannel(source_p, chptr);
- if(visible || operspy)
+ if(visible || operspy || showsecret)
{
if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
{
}
tlen = rb_sprintf(t, "%s%s%s ",
- visible ? "" : "!",
+ visible ? "" : "*",
find_channel_status(msptr, 1),
chptr->chname);
t += tlen;
target_p->name, target_p->servptr->name,
target_p->servptr->info);
- if(!IsCapable(source_p, CLICAP_PRESENCE) && (awaymsg = get_metadata(target_p, "away")) != NULL)
+ if(target_p->user->away)
sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
- target_p->name, awaymsg);
+ target_p->name, target_p->user->away);
if(IsOper(target_p))
{
- sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
- target_p->name,
- IsService(target_p) ? ConfigFileEntry.servicestring :
- (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
- GlobalSetOptions.operstring));
+ if(md = user_metadata_find(target_p, "OPERSTRING"))
+ sendto_one_numeric(source_p, 313, "%s :%s", target_p->name, md->value);
+ else
+ sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
+ target_p->name,
+ IsService(target_p) ? ConfigFileEntry.servicestring :
+ (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
+ GlobalSetOptions.operstring));
+ if(md = user_metadata_find(target_p, "SWHOIS"))
+ sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
}
if(IsSSLClient(target_p))
sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
target_p->name);
+ if((source_p == target_p || IsOper(source_p)) &&
+ target_p->certfp != NULL)
+ sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+ form_str(RPL_WHOISCERTFP),
+ target_p->name, target_p->certfp);
+
+ if(IsSetBot(target_p))
+ sendto_one_numeric(source_p, RPL_WHOISBOT,
+ form_str(RPL_WHOISBOT),
+ target_p->name);
+ if(IsOper(source_p))
+ {
+ m = buf;
+ *m++ = '+';
+
+ for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+ if (target_p->umodes & user_modes[i])
+ *m++ = (char) i;
+ *m = '\0';
+
+ sendto_one_numeric(source_p, RPL_WHOISMODES,
+ form_str(RPL_WHOISMODES),
+ target_p->name, buf);
+ }
if(MyClient(target_p))
{