Fix a typo in help/opers/cmode.

[irc/rqf/shadowircd.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 2b186f861042f250c920e2c806170f3a07e80ead..8ce505c1b91b5b7d53bacc75698625f9a5731912 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -43,6 +43,7 @@
 #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);
@@ -241,6 +242,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        int extra_space = 0;
        int i;
        char *m;
+       int showsecret = 0;
+
+       if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
+               showsecret = 1;
 
        if(target_p->user == NULL)
        {
@@ -280,7 +285,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
                        visible = ShowChannel(source_p, chptr);
 
-                       if(visible || operspy)
+                       if(visible || operspy || showsecret)
                        {
                                if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
                                {
@@ -290,7 +295,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                }
 
                                tlen = rb_sprintf(t, "%s%s%s ",
-                                               visible ? "" : "!",
+                                               visible ? "" : "*",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
                                t += tlen;
@@ -332,18 +337,20 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                sendto_one_numeric(source_p, RPL_WHOISBOT,
                                form_str(RPL_WHOISBOT),
                                target_p->name);
+       if(IsOper(source_p))
+       {
+               m = buf;
+               *m++ = '+';
 
-       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';
+               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);
+               sendto_one_numeric(source_p, RPL_WHOISMODES,
+                               form_str(RPL_WHOISMODES),
+                               target_p->name, buf);
+       }
 
        if(MyClient(target_p))
        {