* Mailbox summary view is now generated using the server's

  new "message list with headers summary" mode.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9712641d4a662038c7b9bbdee47fdae7e86f4f6a..33a285021e69dadbd7064a3da1a0254b7499b68f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 621.1  2005/08/09 01:13:29  ajc
+* Mailbox summary view is now generated using the server's
+  new "message list with headers summary" mode.
+
 Revision 621.0  2005/08/05 16:28:24  ajc
 * THIS IS 6.21
 
@@ -2784,4 +2788,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/messages.c b/webcit/messages.c
index 148200d71c4c84e7825982b0f88902c7afdf730c..9fe0cb5f6d3f4ec98e7648b72dcf5efa855ca2ed 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -946,65 +946,6 @@ void display_summarized(int num) {
 }
 
 
-void summarize_message(int num, long msgnum, int is_new) {
-       char buf[SIZ];
-
-       memset(&WC->summ[num], 0, sizeof(struct message_summary));
-       safestrncpy(WC->summ[num].subj, "(no subject)", sizeof WC->summ[num].subj);
-       WC->summ[num].is_new = is_new;
-       WC->summ[num].msgnum = msgnum;
-
-       /* 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;
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "from=", 5)) {
-                       safestrncpy(WC->summ[num].from, &buf[5], sizeof WC->summ[num].from);
-               }
-               if (!strncasecmp(buf, "subj=", 5)) {
-                       if (strlen(&buf[5]) > 0) {
-                               safestrncpy(WC->summ[num].subj, &buf[5],
-                                       sizeof WC->summ[num].subj);
-#ifdef HAVE_ICONV
-                               /* Handle subjects with RFC2047 encoding */
-                               utf8ify_rfc822_string(WC->summ[num].subj);
-#endif
-                               if (strlen(WC->summ[num].subj) > 75) {
-                                       strcpy(&WC->summ[num].subj[72], "...");
-                               }
-                       }
-               }
-
-               if (!strncasecmp(buf, "node=", 5)) {
-                       if ( ((WC->room_flags & QR_NETWORK)
-                       || ((strcasecmp(&buf[5], serv_info.serv_nodename)
-                       && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
-                       ) {
-                               strcat(WC->summ[num].from, " @ ");
-                               strcat(WC->summ[num].from, &buf[5]);
-                       }
-               }
-
-               if (!strncasecmp(buf, "rcpt=", 5)) {
-                       safestrncpy(WC->summ[num].to, &buf[5], sizeof WC->summ[num].to);
-               }
-
-               if (!strncasecmp(buf, "time=", 5)) {
-                       WC->summ[num].date = atol(&buf[5]);
-               }
-       }
-       
-#ifdef HAVE_ICONV
-       /* Handle senders with RFC2047 encoding */
-       utf8ify_rfc822_string(WC->summ[num].from);
-#endif
-       if (strlen(WC->summ[num].from) > 25) {
-               strcpy(&WC->summ[num].from[22], "...");
-       }
-}
 
 
 
@@ -1263,12 +1204,29 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 /* 
  * load message pointers from the server
  */
-int load_msg_ptrs(char *servcmd)
+int load_msg_ptrs(char *servcmd, int with_headers)
 {
-       char buf[SIZ];
+       char buf[1024];
+       time_t datestamp;
+       char displayname[128];
+       char nodename[128];
+       char inetaddr[128];
+       char subject[256];
        int nummsgs;
        int maxload = 0;
 
+       int num_summ_alloc = 0;
+
+       if (with_headers) {
+               if (WC->num_summ != 0) {
+                       free(WC->summ);
+                       WC->num_summ = 0;
+               }
+       }
+       num_summ_alloc = 100;
+       WC->num_summ = 0;
+       WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
+
        nummsgs = 0;
        maxload = sizeof(WC->msgarr) / sizeof(long) ;
        serv_puts(servcmd);
@@ -1279,8 +1237,59 @@ int load_msg_ptrs(char *servcmd)
        }
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                if (nummsgs < maxload) {
-                       WC->msgarr[nummsgs] = atol(buf);
+                       WC->msgarr[nummsgs] = extract_long(buf, 0);
+                       datestamp = extract_long(buf, 1);
+                       extract_token(displayname, buf, 2, '|', sizeof displayname);
+                       extract_token(nodename, buf, 3, '|', sizeof nodename);
+                       extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
+                       extract_token(subject, buf, 5, '|', sizeof subject);
                        ++nummsgs;
+
+                       if (with_headers) {
+                               if (nummsgs > num_summ_alloc) {
+                                       num_summ_alloc *= 2;
+                                       WC->summ = realloc(WC->summ, num_summ_alloc * sizeof(struct message_summary));
+                               }
+                               ++WC->num_summ;
+
+                               memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
+                               WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
+                               safestrncpy(WC->summ[nummsgs-1].subj, "(no subject)", sizeof WC->summ[nummsgs-1].subj);
+                               if (strlen(displayname) > 0) {
+                                       safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from);
+                               }
+                               if (strlen(subject) > 0) {
+                               safestrncpy(WC->summ[nummsgs-1].subj, subject,
+                                       sizeof WC->summ[nummsgs-1].subj);
+                               }
+#ifdef HAVE_ICONV
+                               /* Handle subjects with RFC2047 encoding */
+                               utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
+#endif
+                               if (strlen(WC->summ[nummsgs-1].subj) > 75) {
+                                       strcpy(&WC->summ[nummsgs-1].subj[72], "...");
+                               }
+
+                               if (strlen(nodename) > 0) {
+                                       if ( ((WC->room_flags & QR_NETWORK)
+                                          || ((strcasecmp(nodename, serv_info.serv_nodename)
+                                          && (strcasecmp(nodename, serv_info.serv_fqdn)))))
+                                       ) {
+                                               strcat(WC->summ[nummsgs-1].from, " @ ");
+                                               strcat(WC->summ[nummsgs-1].from, nodename);
+                                       }
+                               }
+
+                               WC->summ[nummsgs-1].date = datestamp;
+       
+#ifdef HAVE_ICONV
+                               /* Handle senders with RFC2047 encoding */
+                               utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
+#endif
+                               if (strlen(WC->summ[nummsgs-1].from) > 25) {
+                                       strcpy(&WC->summ[nummsgs-1].from[22], "...");
+                               }
+                       }
                }
        }
        return (nummsgs);
@@ -1355,7 +1364,6 @@ void readloop(char *oper)
        char cmd[SIZ];
        char buf[SIZ];
        char old_msgs[SIZ];
-       int is_new = 0;
        int a, b;
        int nummsgs;
        long startmsg;
@@ -1426,7 +1434,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               strcpy(cmd, "MSGS ALL");
+               strcpy(cmd, "MSGS ALL|||1");    /* fetch header summary */
                startmsg = 1;
                maxmsgs = 9999999;
        }
@@ -1462,7 +1470,7 @@ void readloop(char *oper)
                maxmsgs = 32767;
        }
 
-       nummsgs = load_msg_ptrs(cmd);
+       nummsgs = load_msg_ptrs(cmd, is_summary);
        if (nummsgs == 0) {
 
                if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
@@ -1479,16 +1487,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               if (WC->num_summ != 0) {
-                       WC->num_summ = 0;
-                       free(WC->summ);
-               }
-               WC->num_summ = nummsgs;
-               WC->summ = malloc(WC->num_summ*sizeof(struct message_summary));
                for (a = 0; a < nummsgs; ++a) {
-                       /* Gather summary information */
-                       summarize_message(a, WC->msgarr[a], is_new);
-
                        /* Are you a new message, or an old message? */
                        if (is_summary) {
                                if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {

diff --git a/webcit/summary.c b/webcit/summary.c
index 7dcb4fc79e39b92e14afbf77d5640e9ee8a8d49b..a9cddadf9b35dbf56a7fb794ac9eae06d46c8c96 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -144,7 +144,7 @@ void tasks_section(void) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL");
+               num_msgs = load_msg_ptrs("MSGS ALL", 0);
        }
 
        if (num_msgs < 1) {
@@ -182,7 +182,7 @@ void calendar_section(void) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL");
+               num_msgs = load_msg_ptrs("MSGS ALL", 0);
        }
 
        if (num_msgs < 1) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 1de602a8dbe496e77e19726e9fbf7ac793ac7cd2..03041f2f01892b2feac72b64f00f5dfd201920bc 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -46,7 +46,7 @@
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
 #define CLIENT_VERSION         621             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    640             /* min required Citadel vers */
+#define MINIMUM_CIT_VERSION    655             /* min required Citadel vers */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
@@ -462,7 +462,7 @@ void do_calendar_view(void);
 void do_tasks_view(void);
 void free_calendar_buffer(void);
 void calendar_summary_view(void);
-int load_msg_ptrs(char *servcmd);
+int load_msg_ptrs(char *servcmd, int with_headers);
 void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen);
 int CtdlDecodeBase64(char *dest, const char *source, size_t length);
 void free_attachments(struct wcsession *sess);