* Integrated the first batch of new icons.

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index df8d2b59723b1fbd6800f222f3c571bd1fc0b551..f6d6a3dcc9a6f576e85c59f684fbe897b6755579 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -333,7 +333,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                if (pass == 1) {
                        wprintf("<TR BGCOLOR=\"#AAAAAA\">"
                        "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
+                       "<IMG ALIGN=CENTER SRC=\"/static/savecontact_48x.gif\">"
                        "<FONT SIZE=+1><B>");
                        escputs(displayname);
                        wprintf("</B></FONT>");
@@ -500,7 +500,7 @@ void read_message(long msgnum) {
                if (!strncasecmp(buf, "rcpt=", 5))
                        wprintf("to %s ", &buf[5]);
                if (!strncasecmp(buf, "time=", 5)) {
-                       fmt_date(now, atol(&buf[5]));
+                       fmt_date(now, atol(&buf[5]), 0);
                        wprintf("%s ", now);
                }
 
@@ -730,7 +730,8 @@ void summarize_message(long msgnum, int is_new) {
        memset(&summ, 0, sizeof(summ));
        strcpy(summ.subj, "(no subject)");
 
-       sprintf(buf, "MSG0 %ld|3", msgnum);     /* ask for headers only with no MIME */
+       /* ask for headers only with no MIME */
+       sprintf(buf, "MSG0 %ld|3", msgnum);
        serv_puts(buf);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') return;
@@ -740,13 +741,15 @@ void summarize_message(long msgnum, int is_new) {
                        strcpy(summ.from, &buf[5]);
                }
                if (!strncasecmp(buf, "subj=", 5)) {
-                       strcpy(summ.subj, &buf[5]);
+                       if (strlen(&buf[5]) > 0) {
+                               strcpy(summ.subj, &buf[5]);
+                       }
                }
-               if (!strncasecmp(buf, "rfca=", 5)) {
+               /* if (!strncasecmp(buf, "rfca=", 5)) {
                        strcat(summ.from, " <");
                        strcat(summ.from, &buf[5]);
                        strcat(summ.from, ">");
-               }
+               } */
 
                if (!strncasecmp(buf, "node=", 5)) {
                        if ( ((WC->room_flags & QR_NETWORK)
@@ -763,7 +766,7 @@ void summarize_message(long msgnum, int is_new) {
                }
 
                if (!strncasecmp(buf, "time=", 5)) {
-                       fmt_date(summ.date, atol(&buf[5]));
+                       fmt_date(summ.date, atol(&buf[5]), 1);  /* brief */
                }
        }
 
@@ -1642,7 +1645,7 @@ void display_enter(void)
        }
 
        now = time(NULL);
-       fmt_date(buf, now);
+       fmt_date(buf, now, 0);
        strcat(&buf[strlen(buf)], " <I>from</I> ");
        stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
        if (strlen(bstr("recp")) > 0) {