Combine stats A output parameters (#35)

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index b0ca2c2a8b709e3a13386f65ae4b04af0b887125..281c6d8584f8491bbcffb27565f6c16540ba87e5 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -224,9 +224,6 @@ static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
        char buf[BUFSIZE];
-       rb_dlink_node *ptr;
-       struct membership *msptr;
-       struct Channel *chptr;
        int cur_len = 0;
        int mlen;
        char *t;
@@ -269,19 +266,29 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if (!IsService(target_p))
        {
-               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
+               hook_data_channel_visibility hdata_vis;
+               rb_dlink_node *ps, *pt;
+               struct Channel *chptr;
+               struct membership *ms, *mt;
+
+               hdata_vis.client = source_p;
+               hdata_vis.target = target_p;
+
+               ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr)
                {
-                       msptr = ptr->data;
-                       chptr = msptr->chptr;
+                       if (mt == NULL)
+                               continue;
 
-                       hdata.chptr = chptr;
+                       hdata_vis.chptr = chptr;
+                       hdata_vis.clientms = ms;
+                       hdata_vis.targetms = mt;
+                       hdata_vis.approved = ms != NULL || PubChannel(chptr);
 
-                       hdata.approved = ShowChannel(source_p, chptr);
-                       call_hook(doing_whois_channel_visibility_hook, &hdata);
+                       call_hook(doing_whois_channel_visibility_hook, &hdata_vis);
 
-                       if(hdata.approved || operspy)
+                       if(hdata_vis.approved || operspy)
                        {
-                               if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
+                               if((cur_len + strlen(chptr->chname) + strlen("!@+ ")) > (BUFSIZE - strlen("\r\n")))
                                {
                                        sendto_one(source_p, "%s", buf);
                                        cur_len = mlen + extra_space;
@@ -289,8 +296,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                }
 
                                tlen = sprintf(t, "%s%s%s ",
-                                               hdata.approved ? "" : "!",
-                                               find_channel_status(msptr, 1),
+                                               hdata_vis.approved ? "" : "!",
+                                               find_channel_status(mt, 1),
                                                chptr->chname);
                                t += tlen;
                                cur_len += tlen;
@@ -318,7 +325,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
-       if(!EmptyString(target_p->user->opername) && IsOper(target_p) && IsOper(source_p))
+       if(!EmptyString(target_p->user->opername) && IsOper(target_p) && (target_p == source_p || HasPrivilege(source_p, "oper:privs")))
        {
                char buf[512];
                const char *privset = "(missing)";
@@ -349,7 +356,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if(MyClient(target_p))
        {
-               if (IsDynSpoof(target_p) && (IsOperGeneral(source_p) || source_p == target_p))
+               if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p))
                {
                        /* trick here: show a nonoper their own IP if
                         * dynamic spoofed but not if auth{} spoofed
@@ -385,7 +392,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        }
        else
        {
-               if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
+               if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p))
                {
                        ClearDynSpoof(target_p);
                        sendto_one_numeric(source_p, RPL_WHOISHOST,