* Renamed "dynloader" to "serv_extensions" globally. We don't want people

[citadel.git] / citadel / imap_fetch.c

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index e4697c5838f921e03a78dedb28a21a12959e442b..a17e47da347e1fb65a89669456a6eea06db603be 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -38,7 +38,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -119,7 +119,7 @@ void imap_fetch_rfc822(int msgnum, char *whichfmt, struct CtdlMessage *msg) {
         * Load the message into a temp file for translation and measurement
         */ 
        CtdlRedirectOutput(tmp, -1);
-       CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+       CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
        CtdlRedirectOutput(NULL, -1);
        if (!is_valid_message(msg)) {
                lprintf(1, "WARNING: output clobbered the message!\n");
@@ -462,9 +462,17 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
 
        /* Now figure out what the client wants, and get it */
 
-       if (!strcmp(section, "")) {             /* the whole thing */
+       if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_NONE, 0, 1);
+               CtdlRedirectOutput(NULL, -1);
+       }
+
+       else if (!strcmp(section, "")) {
+               CtdlRedirectOutput(tmp, -1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_ALL, 0, 1);
                CtdlRedirectOutput(NULL, -1);
        }
 
@@ -474,7 +482,8 @@ void imap_fetch_body(long msgnum, char *item, int is_peek,
         */
        else if (!strncasecmp(section, "HEADER", 6)) {
                CtdlRedirectOutput(tmp, -1);
-               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 1, 0, 1);
+               CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+                                               HEADERS_ONLY, 0, 1);
                CtdlRedirectOutput(NULL, -1);
                imap_strip_headers(tmp, section);
        }