* Some work on email summary screen

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ecfabe0a8a1bf0417b8dd621103afd438387a618..96a15e77a37cd1b5156673f29806e3bd4a16f3e8 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 323.21  2002/04/20 04:14:29  ajc
+* Some work on email summary screen
+
 Revision 323.20  2002/03/31 05:02:39  ajc
 * Remove "Page another user" link from main menu
 * Add "edit my citadel config room" type link from edit user screen
@@ -775,4 +778,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 37319c34e04b3d6e439cfc6c9b18a9af0990d749..13c4fb97b36f68892b3b964932a79b91d20abca4 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -454,6 +454,9 @@ void readloop(char *oper)
        int lo, hi;
        int lowest_displayed = 0;
        int highest_displayed = 0;
+       long pn_previous = 0L;
+       long pn_current = 0L;
+       long pn_next = 0L;
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
@@ -491,9 +494,15 @@ void readloop(char *oper)
                }
        }
 
-       for (a = 0; ( (a < nummsgs) && (num_displayed < maxmsgs) ) ; ++a) {
-               if (WC->msgarr[a] >= startmsg) {
+       for (a = 0; a < nummsgs; ++a) {
+               if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
+                       /* Learn which msgs "Prev" & "Next" buttons go to */
+                       pn_current = WC->msgarr[a];
+                       if (a > 0) pn_previous = WC->msgarr[a-1];
+                       if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1];
+
+                       /* Display the message */
                        read_message(WC->msgarr[a], is_summary);
                        if (lowest_displayed == 0) lowest_displayed = a;
                        highest_displayed = a;
@@ -510,15 +519,56 @@ void readloop(char *oper)
        ++lowest_displayed;
        ++highest_displayed;
 
+       /* If we're only looking at one message, do a prev/next thing */
+       if (num_displayed == 1) {
+
+               wprintf("<CENTER>"
+                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+                       "Reading #%d of %d messages.</TD>\n"
+                       "<TD ALIGN=RIGHT><FONT SIZE=+1>",
+                       lowest_displayed, nummsgs);
+
+                       if (pn_previous > 0L) {
+                               wprintf("<A HREF=\"/%s"
+                                       "?startmsg=%ld"
+                                       "&maxmsgs=1"
+                                       "&summary=0\">"
+                                       "Previous</A> \n",
+                                               oper,
+                                               pn_previous );
+                       }
+
+                       if (pn_next > 0L) {
+                               wprintf("<A HREF=\"/%s"
+                                       "?startmsg=%ld"
+                                       "&maxmsgs=1"
+                                       "&summary=0\">"
+                                       "Next</A> \n",
+                                               oper,
+                                               pn_next );
+                       }
+
+               wprintf("<A HREF=\"/%s?startmsg=%ld"
+                       "&maxmsgs=999999&summary=1\">"
+                       "Summary"
+                       "</A>",
+                       oper,
+                       WC->msgarr[0]);
+
+               wprintf("</TD></TR></TABLE></CENTER><HR>\n");
+       }
+
+
        /*
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (num_displayed < nummsgs) {
+       /* if (num_displayed < nummsgs) { */
+       if (num_displayed > 1) {
 
                wprintf("<CENTER>"
                        "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
-                       "You are reading #%d-%d of %d messages.</TD>\n"
+                       "Reading #%d-%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
                        lowest_displayed, highest_displayed, nummsgs);
 
@@ -546,9 +596,17 @@ void readloop(char *oper)
                wprintf("<A HREF=\"/%s?startmsg=%ld"
                        "&maxmsgs=999999&summary=%d\">"
                        "ALL"
-                       "</A>&nbsp;&nbsp;&nbsp;",
+                       "</A> ",
                        oper,
                        WC->msgarr[0], is_summary);
+
+               wprintf("<A HREF=\"/%s?startmsg=%ld"
+                       "&maxmsgs=999999&summary=1\">"
+                       "Summary"
+                       "</A>",
+                       oper,
+                       WC->msgarr[0]);
+
                wprintf("</TD></TR></TABLE></CENTER><HR>\n");
        }