* Honor "maxmsgs" even when viewing a mailbox in summary mode

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 57ffb2f4b745862a73dff904eb8929a057e7e7ea..b379b54a60d0c214e50c6eba57ba72597119f0fa 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,7 +1,10 @@
 $Log$
+Revision 521.6  2004/06/15 02:30:21  ajc
+* Honor "maxmsgs" even when viewing a mailbox in summary mode
+
 Revision 521.5  2004/06/12 04:26:38  ajc
 * Fixed some garbled output resulting from turning things that look like
-  links into links.
+  links into links
 
 Revision 521.4  2004/06/11 16:09:36  ajc
 * Moved the room graphic to the left of the room name in the banner, to

diff --git a/webcit/messages.c b/webcit/messages.c
index 265b7657300e2b2965ba8e0d55f8e676e2489420..d1ff288da187a98023c0bb3cdadc1be854fa4f0f 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -977,7 +977,7 @@ void readloop(char *oper)
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
        is_summary = atoi(bstr("summary"));
-       if (maxmsgs == 0) maxmsgs = 20;
+       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
 
        output_headers(1);
 
@@ -992,7 +992,7 @@ void readloop(char *oper)
        if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
                is_summary = 1;
                strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
+               /* maxmsgs = 32767; */
        }
 
        if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index dec7db575ce953a8beac4723cc3a86db26123b78..3aa3e94b3b156f010be5262a7ed89f4a4a1e2350 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -50,6 +50,7 @@
 #define LISTEN_QUEUE_LENGTH    100             /* listen() backlog queue */
 
 #define USERCONFIGROOM         "My Citadel Config"
+#define DEFAULT_MAXMSGS                20
 
 
 /*