* New format for wholist.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 07b6ebb548b736ea3f52d2db16eab443eeb779cf..2e5658f40ea23461ad820719ee915cd56fe56146 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 607.2  2003/06/17 22:05:11  ajc
+ * New format for wholist.
+
  Revision 607.1  2003/06/16 04:39:45  ajc
  * support.c: removed an unused variable
  * citadel.c: sort wholist by idle time (most recently active users first)
@@ -4764,4 +4767,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 78a9ccb2aeed7e003c3828ed0710823a8de45169..8932d9bbedf84f9d2b7658ee09245305b2a7af23 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -853,9 +853,9 @@ void who_is_online(CtdlIPC *ipc, int longlist)
 
        if (!longlist) {
                color(BRIGHT_WHITE);
-               pprintf("FLG ###        User Name                 Room                 From host\n");
+               pprintf("           User Name               Room           Idle        From host\n");
                color(DIM_WHITE);
-               pprintf("--- --- ------------------------- -------------------- ------------------------\n");
+               pprintf("   ------------------------- -------------------- ---- ------------------------\n");
        }
        r = CtdlIPCOnlineUsers(ipc, &listing, &timenow, buf);
        listing = SortOnlineUsers(listing);
@@ -920,34 +920,33 @@ void who_is_online(CtdlIPC *ipc, int longlist)
                                        pprintf("        ");
                                } else {
                                        color(BRIGHT_MAGENTA);
-                                       pprintf("%-3s ", flags);
-                                       color(DIM_WHITE);
-                                       pprintf("%-3d ", extract_int(buf, 0));
+                                       pprintf("%-3s", flags);
                                }
                                last_session = extract_int(buf, 0);
                                color(BRIGHT_CYAN);
                                pprintf("%-25s ", username);
                                color(BRIGHT_MAGENTA);
+                               roomname[20] = 0;
+                               pprintf("%-20s ", roomname);
                                if (idletime > rc_idle_threshold) {
-                                       roomname[14] = 0;
-                                       pprintf("%-14s", roomname);
                                        /* over 10 days, must be gone fishing */
                                        if (idlehours > 239) {
-                                               pprintf("[fish] ");
+                                               pprintf("fish");
                                        /* over 10 hours */
                                        } else if (idlehours > 9) {
-                                               pprintf("[%1ldd%02ld] ",
+                                               pprintf("%1ldd%02ld",
                                                        idlehours / 24,
                                                        idlehours % 24);
                                        /* less than 10 hours */
                                        } else {
-                                               pprintf("[%1ld:%02ld] ",
+                                               pprintf("%1ld:%02ld",
                                                        idlehours, idlemins);
                                        }
-                               } else {
-                                       roomname[20] = 0;
-                                       pprintf("%-20s ", roomname);
                                }
+                               else {
+                                       pprintf("    ");
+                               }
+                               pprintf(" ");
                                color(BRIGHT_CYAN);
                                fromhost[24] = '\0';
                                pprintf("%-24s\n", fromhost);