* Moved to the new string tokenizer API

[citadel.git] / webcit / who.c

diff --git a/webcit/who.c b/webcit/who.c
index bc4a55246c08e4e9944c0d833a26348402bb0e09..c3bb03f868d59888bc5057be0143ce7d04da3372 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -35,8 +35,9 @@
  */
 void whobbs(void)
 {
-       char buf[SIZ], sess, user[SIZ], room[SIZ], host[SIZ],
+       char buf[SIZ], user[SIZ], room[SIZ], host[SIZ],
                realroom[SIZ], realhost[SIZ];
+       int sess;
        time_t last_activity;
        time_t now;
        int bg = 0;
@@ -64,7 +65,7 @@ void whobbs(void)
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">"
                "<tr>\n");
-       wprintf("<TH COLSPAN=4>Session ID</TH>\n");
+       wprintf("<TH COLSPAN=3>&nbsp;</TH>\n");
        wprintf("<TH>User Name</TH>\n");
        wprintf("<TH>Room</TH>");
        wprintf("<TH>From host</TH>\n</TR>\n");
@@ -83,11 +84,11 @@ void whobbs(void)
        if (buf[0] == '1') {
                while (serv_gets(buf), strcmp(buf, "000")) {
                        sess = extract_int(buf, 0);
-                       extract(user, buf, 1);
-                       extract(room, buf, 2);
-                       extract(host, buf, 3);
-                       extract(realroom, buf, 9);
-                       extract(realhost, buf, 10);
+                       extract_token(user, buf, 1, '|', sizeof user);
+                       extract_token(room, buf, 2, '|', sizeof room);
+                       extract_token(host, buf, 3, '|', sizeof host);
+                       extract_token(realroom, buf, 9, '|', sizeof realroom);
+                       extract_token(realhost, buf, 10, '|', sizeof realhost);
                        last_activity = extract_long(buf, 5);
 
                        bg = 1 - bg;
@@ -96,7 +97,7 @@ void whobbs(void)
                        );
 
 
-                       wprintf("<TD>%d</TD><TD>", sess);
+                       wprintf("<td>");
                        if ((WC->is_aide) &&
                            (sess != WC->ctdl_pid)) {
                                wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", sess);