* The previous <div style=\"margin-right:1px\"> has been replaced by a

[citadel.git] / webcit / who.c

diff --git a/webcit/who.c b/webcit/who.c
index c2690f936dcb5a5e1f40ffacfd080de8a7da12ec..d57b18504b2fdab013da5bf753f2615ee2b56c76 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Display a list of all users currently logged on to the Citadel server.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -33,27 +37,47 @@ void whobbs(void)
 {
        char buf[SIZ], sess, user[SIZ], room[SIZ], host[SIZ],
                realroom[SIZ], realhost[SIZ];
+       time_t last_activity;
+       time_t now;
+       int bg = 0;
 
-       output_headers(7);
+       output_headers(1, 1, 2, 0, 1, 0, 0);
 
-       wprintf("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+       wprintf("<script type=\"text/javascript\">\n"
                "function ConfirmKill() { \n"
                "return confirm('Do you really want to kill this session?');\n"
                "}\n"
-               "</SCRIPT>\n"
+               "</script>\n"
        );
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\">&nbsp;&nbsp;<B>Users currently on ");
+       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;Users currently on ");
        escputs(serv_info.serv_humannode);
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER><TABLE BORDER=1 WIDTH=100%%>\n<TR>\n");
-       wprintf("<TH>Session ID</TH>\n");
+       wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
+       offer_start_page();
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n"
+               "<div id=\"content\">\n");
+
+       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>User Name</TH>\n");
        wprintf("<TH>Room</TH>");
        wprintf("<TH>From host</TH>\n</TR>\n");
+
+       serv_puts("TIME");
+       serv_gets(buf);
+       if (buf[0] == '2') {
+               now = extract_long(&buf[4], 0);
+       }
+       else {
+               now = time(NULL);
+       }
+
        serv_puts("RWHO");
        serv_gets(buf);
        if (buf[0] == '1') {
@@ -64,28 +88,48 @@ void whobbs(void)
                        extract(host, buf, 3);
                        extract(realroom, buf, 9);
                        extract(realhost, buf, 10);
+                       last_activity = extract_long(buf, 5);
 
-                       wprintf("<TR>\n\t<TD ALIGN=center>%d", sess);
+                       bg = 1 - bg;
+                       wprintf("<TR BGCOLOR=\"#%s\">",
+                               (bg ? "DDDDDD" : "FFFFFF")
+                       );
+
+
+                       wprintf("<TD>%d</TD><TD>", sess);
                        if ((WC->is_aide) &&
-                           (sess != serv_info.serv_pid)) {
+                           (sess != WC->ctdl_pid)) {
                                wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", sess);
                                urlescputs(user);
                                wprintf("\" onClick=\"return ConfirmKill();\" "
                                ">(kill)</A>");
                        }
-                       if (sess == serv_info.serv_pid) {
+                       if (sess == WC->ctdl_pid) {
                                wprintf(" <A HREF=\"/edit_me\" "
                                        ">(edit)</A>");
                        }
-                       wprintf("</TD>\n\t<TD>");
+                       wprintf("</TD>");
 
                        /* (link to page this user) */
-                       wprintf("<A HREF=\"/display_page&recp=");
+                       wprintf("<TD><A HREF=\"/display_page&recp=");
                        urlescputs(user);
                        wprintf("\">"
-                               "<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" "
+                               "<IMG ALIGN=MIDDLE WIDTH=20 HEIGHT=15 "
+                               "SRC=\"/static/page.gif\" "
                                "ALT=\"(p)\""
                                " BORDER=0></A>&nbsp;");
+                       wprintf("</TD>");
+
+                       /* (idle flag) */
+                       wprintf("<TD>");
+                       if ((now - last_activity) > 900L) {
+                               wprintf("&nbsp;"
+                                       "<IMG ALIGN=MIDDLE "
+                                       "SRC=\"/static/idle.gif\" "
+                                       "ALT=\"[idle]\" BORDER=0>");
+                       }
+                       wprintf("</TD>\n\t<TD>");
+
 
 
                        /* username (link to user bio/photo page) */
@@ -99,7 +143,7 @@ void whobbs(void)
                        wprintf("</TD>\n\t<TD>");
                        escputs(room);
                        if (strlen(realroom) > 0) {
-                               wprintf("<BR><I>");
+                               wprintf("<br /><I>");
                                escputs(realroom);
                                wprintf("</I>");
                        }
@@ -108,18 +152,19 @@ void whobbs(void)
                        /* hostname */
                        escputs(host);
                        if (strlen(realhost) > 0) {
-                               wprintf("<BR><I>");
+                               wprintf("<br /><I>");
                                escputs(realhost);
                                wprintf("</I>");
                        }
                        wprintf("</TD>\n</TR>");
                }
        }
-       wprintf("</TABLE>\n"
+       wprintf("</TABLE></div>\n"
+               "<div align=center>"
                "Click on a name to read user info.  Click on "
                "<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" ALT=\"(p)\" "
                "BORDER=0> to send "
-               "a page (instant message) to that user.<BR></CENTER>\n");
+               "a page (instant message) to that user.</div>\n");
        wDumpContent(1);
 }
 
@@ -157,18 +202,21 @@ void edit_me(void)
                http_redirect("/whobbs");
        } else {
 
-               output_headers(3);
+               output_headers(1, 1, 0, 0, 0, 0, 0);
 
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<div id=\"banner\">\n");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">");
                wprintf("Edit your session display");
-               wprintf("</B></FONT></TD></TR></TABLE>\n");
+               wprintf("</SPAN></TD></TR></TABLE>\n");
+               wprintf("</div>\n<div id=\"content\">\n");
+
                wprintf("This screen allows you to change the way your\n");
                wprintf("session appears in the 'Who is online' listing.\n");
                wprintf("To turn off any 'fake' name you've previously\n");
                wprintf("set, simply click the appropriate 'change' button\n");
                wprintf("without typing anything in the corresponding box.\n");
-               wprintf("<BR>\n");
+               wprintf("<br />\n");
 
                wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_me\">\n");