Changeset 803 for trunk/ithildin/modules/ircd/commands/who.c

Timestamp:

05/31/07 15:15:23 (5 years ago)

Author:

wd

Message:

Many more changes:

• Moved the 'core' addon code into various places in the main ircd module.
• Split channel/user modes out of channel.c/client.c and into chanmode.c/usermode.c respectively.
• Added init/teardown routines for channel/usermodes.
• Changed the INVIS and OPER macros to have longer(:/) and more descriptive names.

File:

• trunk/ithildin/modules/ircd/commands/who.c (modified) (8 diffs)

trunk/ithildin/modules/ircd/commands/who.c

@@ -212 +212 @@
                 break;
             case 'g': /* gcos field search */
-                if (!OPER(cli) || oarg >= argc)
+                if (!CLIENT_OPERATOR(cli) || oarg >= argc)
                     WHO_PARSE_SERROR(argv[0]);
                 who_opts.gcos = argv[oarg++];
@@ -224 +224 @@
                 break;
             case 'i': /* IP address search */
-                if (!OPER(cli) || oarg >= argc)
+                if (!CLIENT_OPERATOR(cli) || oarg >= argc)
                     WHO_PARSE_SERROR(argv[0]);
                 who_opts.ip = argv[oarg++];
@@ -239 +239 @@
                     s++;
                 }
-                if (!OPER(cli)) /* restrict them to only +o */
+                if (!CLIENT_OPERATOR(cli)) /* restrict them to only +o */
                     who_opts.usermodes = (who_opts.usermodes &
                             ircd.umodes.modes['o'].mask);
@@ -325 +325 @@
 static int who_check(client_t *cli, int showall) {
 
-    if (INVIS(cli) && !showall)
+    if (CLIENT_INVISIBLE(cli) && !showall)
         return 0; /* can't see them.  sneak sneak. */
     if (who_opts.flags.check_umode) {
@@ -460 +460 @@
                 continue; /* don't show them */
             sprintf(status, "%c%s%s", AWAYMSG(cp) != NULL ? 'G' : 'H',
-                    OPER(cp) ? "*" : (INVIS(cp) && OPER(cli) ? "%" : ""),
+                    CLIENT_OPERATOR(cp) ? "*" :
+                    (CLIENT_INVISIBLE(cp) && CLIENT_OPERATOR(cli) ? "%" : ""),
                     chanmode_getprefixes(who_opts.channel, cp));
             sendto_one(cli, RPL_FMT(cli, RPL_WHOREPLY),
@@ -481 +482 @@
         if (cp != NULL && who_check(cp, 1)) {
             sprintf(status, "%c%s", AWAYMSG(cp) != NULL ? 'G' : 'H',
-                    OPER(cp) ? "*" : (INVIS(cp) && OPER(cli) ? "%" : ""));
+                    CLIENT_OPERATOR(cp) ? "*" :
+                    (CLIENT_INVISIBLE(cp) && CLIENT_OPERATOR(cli) ? "%" : ""));
             sendto_one(cli, RPL_FMT(cli, RPL_WHOREPLY),
                     who_opts.flags.show_chan ? who_first_visible(cli, cp) :
@@ -509 +511 @@
                 } else {
                     sprintf(status, "%c%s%s", AWAYMSG(cp) != NULL ? 'G' : 'H',
-                            OPER(cp) ? "*" : (INVIS(cp) &&
-                                OPER(cli) ? "%" : ""),
+                            CLIENT_OPERATOR(cp) ? "*" :
+                            (CLIENT_INVISIBLE(cp) &&
+                             CLIENT_OPERATOR(cli) ? "%" : ""),
                             chanmode_getprefixes(who_opts.channel, cp));
                     sendto_one(cli, RPL_FMT(cli, RPL_WHOREPLY),
@@ -535 +538 @@
             } else {
                 sprintf(status, "%c%s", AWAYMSG(cp) != NULL ? 'G' : 'H',
-                        OPER(cp) ? "*" : (INVIS(cp) && OPER(cli) ? "%" : ""));
+                        CLIENT_OPERATOR(cp) ? "*" :
+                        (CLIENT_INVISIBLE(cp) &&
+                         CLIENT_OPERATOR(cli) ? "%" : ""));
                 sendto_one(cli, RPL_FMT(cli, RPL_WHOREPLY),
                         who_opts.flags.show_chan ? who_first_visible(cli, cp) :