* Use the new icons in more places.

[citadel.git] / webcit / userlist.c

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 34e75d9343159697bfa28bd380ee11abce60e201..e8876e2b396100e4d46bba3a7de9bacdf69ec9a2 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -38,17 +38,17 @@ void userlist(void)
 {
        char buf[SIZ];
        char fl[SIZ];
-       struct tm *tmbuf;
-       long lc;
+       struct tm tmbuf;
+       time_t lc;
        struct namelist *bio = NULL;
        struct namelist *bptr;
        int has_bio;
        int bg = 0;
 
        serv_puts("LBIO");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1')
-               while (serv_gets(buf), strcmp(buf, "000")) {
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                        bptr = (struct namelist *) malloc(sizeof(struct namelist));
                        bptr->next = bio;
                        strcpy(bptr->name, buf);
@@ -65,19 +65,19 @@ void userlist(void)
        );
 
        serv_puts("LIST");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("<EM>%s</EM><br />\n", &buf[4]);
                goto DONE;
        }
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>");
        wprintf("<TH>Last Login</TH><TH>Total Logins</TH><TH>Total Posts</TH></TR>\n");
 
-       while (serv_gets(buf), strcmp(buf, "000")) {
-               extract(fl, buf, 0);
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               extract_token(fl, buf, 0, '|', sizeof fl);
                has_bio = 0;
                for (bptr = bio; bptr != NULL; bptr = bptr->next) {
                        if (!strcasecmp(fl, bptr->name))
@@ -100,11 +100,11 @@ void userlist(void)
                        extract_long(buf, 2),
                        extract_int(buf, 1));
                lc = extract_long(buf, 3);
-               tmbuf = (struct tm *) localtime(&lc);
+               localtime_r(&lc, &tmbuf);
                wprintf("%02d/%02d/%04d ",
-                       (tmbuf->tm_mon + 1),
-                       tmbuf->tm_mday,
-                       (tmbuf->tm_year + 1900));
+                       (tmbuf.tm_mon + 1),
+                       tmbuf.tm_mday,
+                       (tmbuf.tm_year + 1900));
 
 
                wprintf("</TD><TD>%ld</TD><TD>%5ld</TD></TR>\n",
@@ -129,21 +129,22 @@ void showuser(void)
 
        output_headers(1, 1, 2, 0, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">User profile</SPAN>"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR>"
+               "<TD><IMG SRC=\"/static/usermanag_48x.gif\"></TD>"
+               "<td align=left><SPAN CLASS=\"titlebar\">User profile</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        serv_printf("OIMG _userpic_|%s", who);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
                have_pic = 1;
                serv_puts("CLOS");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        } else {
                have_pic = 0;
        }
@@ -156,15 +157,15 @@ void showuser(void)
        }
        wprintf("</TD><TD><H1>%s</H1></TD></TR></TABLE></CENTER>\n", who);
        serv_printf("RBIO %s", who);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
                fmout(NULL, "JUSTIFY");
        }
-       wprintf("<br /><A HREF=\"/display_page&recp=");
+       wprintf("<br /><A HREF=\"/display_page?recp=");
        urlescputs(who);
        wprintf("\">"
-               "<IMG SRC=\"/static/page.gif\" ALIGN=MIDDLE BORDER=0>"
-               "&nbsp;&nbsp;"
+               "<IMG SRC=\"/static/citadelchat_24x.gif\" "
+               "ALIGN=MIDDLE BORDER=0>&nbsp;&nbsp;"
                "Click here to send an instant message to ");
        escputs(who);
        wprintf("</A>\n");