m_starttls: fix fucked-up merge

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c58f7d83b31ab5297d419bb89033b296bd3fac2a..5afa2c94cd9ba56593163cc833bb3d7df0b83675 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  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"
@@ -50,32 +48,36 @@
 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 int m_whois(struct Client *, struct Client *, int, const char **);
-static int ms_whois(struct Client *, struct Client *, int, const char **);
+static int m_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char whois_desc[] =
+       "Provides the WHOIS command to display information about a user";
 
 struct Message whois_msgtab = {
-       "WHOIS", 0, 0, 0, MFLG_SLOW,
+       "WHOIS", 0, 0, 0, 0,
        {mg_unreg, {m_whois, 2}, {ms_whois, 2}, mg_ignore, mg_ignore, {m_whois, 2}}
 };
 
 int doing_whois_hook;
 int doing_whois_global_hook;
+int doing_whois_channel_visibility_hook;
 
 mapi_clist_av1 whois_clist[] = { &whois_msgtab, NULL };
 mapi_hlist_av1 whois_hlist[] = {
-       { "doing_whois",        &doing_whois_hook },
-       { "doing_whois_global", &doing_whois_global_hook },
+       { "doing_whois",                        &doing_whois_hook },
+       { "doing_whois_global",                 &doing_whois_global_hook },
+       { "doing_whois_channel_visibility",     &doing_whois_channel_visibility_hook },
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
+DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, whois_desc);
 
 /*
  * m_whois
  *      parv[1] = nickname masklist
  */
 static int
-m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0;
 
@@ -121,7 +123,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
  *      parv[2] = nickname to whois
  */
 static int
-ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
 
@@ -197,7 +199,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        char buffer[BUFSIZE];
 
-                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
                                target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
@@ -236,7 +238,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        char *t;
        int tlen;
        hook_data_client hdata;
-       int visible;
        int extra_space = 0;
 #ifdef RB_IPV6
        struct sockaddr_in ip4;
@@ -252,7 +253,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                           target_p->name, target_p->username,
                           target_p->host, target_p->info);
 
-       cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
+       cur_len = mlen = sprintf(buf, form_str(RPL_WHOISCHANNELS),
                                    get_id(&me, source_p), get_id(source_p, source_p),
                                    target_p->name);
 
@@ -271,6 +272,9 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        t = buf + mlen;
 
+       hdata.client = source_p;
+       hdata.target = target_p;
+
        if (!IsService(target_p))
        {
                RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
@@ -278,9 +282,12 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                        msptr = ptr->data;
                        chptr = msptr->chptr;
 
-                       visible = ShowChannel(source_p, chptr);
+                       hdata.chptr = chptr;
+
+                       hdata.approved = ShowChannel(source_p, chptr);
+                       call_hook(doing_whois_channel_visibility_hook, &hdata);
 
-                       if(visible || operspy)
+                       if(hdata.approved || operspy)
                        {
                                if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
                                {
@@ -289,8 +296,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        t = buf + mlen;
                                }
 
-                               tlen = rb_sprintf(t, "%s%s%s ",
-                                               visible ? "" : "!",
+                               tlen = sprintf(t, "%s%s%s ",
+                                               hdata.approved ? "" : "!",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
                                t += tlen;
@@ -310,7 +317,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
                                   target_p->name, target_p->user->away);
 
-       if(IsOper(target_p))
+       if(IsOper(target_p) && (!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)))
        {
                sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
                                   target_p->name,
@@ -319,11 +326,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
-       if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) &&
-          (IsOperAdmin(source_p) || IsAdmin(source_p) || (source_p == target_p)))
+       if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p))
        {
                char buf[512];
-               rb_snprintf(buf, sizeof(buf), "Opered as %s, privset %s",
+               snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
                            target_p->localClient->opername, target_p->localClient->privset->name);
                sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL),
                                   target_p->name, buf);
@@ -404,9 +410,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                }
        }
 
-       hdata.client = source_p;
-       hdata.target = target_p;
-
        /* doing_whois_hook must only be called for local clients,
         * doing_whois_global_hook must only be called for local targets
         */
@@ -420,4 +423,3 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        return;
 }
-