diff options
| author | June McEnroe <june@causal.agency> | 2021-04-21 16:58:29 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-04-21 16:59:50 -0400 |
| commit | 2c5451f8d0ba7ffac3b0c117dd66303909e7ea32 (patch) | |
| tree | d6a8fc4ba69309ac3e0006eb11be3c299214271e | |
| parent | Parse dates in a hopefully more portable fashion (diff) | |
| download | bubger-2c5451f8d0ba7ffac3b0c117dd66303909e7ea32.tar.gz bubger-2c5451f8d0ba7ffac3b0c117dd66303909e7ea32.zip | |
Omit HTML nav from nested messages
We don't output mbox for nested messages, nor do we necessarily have a parent message on the same page.
| -rw-r--r-- | archive.h | 2 | ||||
| -rw-r--r-- | export.c | 4 | ||||
| -rw-r--r-- | html.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/archive.h b/archive.h index 29833e8..5c7dfcf 100644 --- a/archive.h +++ b/archive.h @@ -233,7 +233,7 @@ int atomThreadClose(FILE *file); int atomIndexOpen(FILE *file); int atomIndexClose(FILE *file); -int htmlMessageOpen(FILE *file, const struct Envelope *envelope); +int htmlMessageOpen(FILE *file, const struct Envelope *envelope, bool nested); int htmlInline(FILE *file, const struct BodyPart *part, const char *content); int htmlAttachmentOpen(FILE *file); int htmlAttachment( diff --git a/export.c b/export.c index ef1d526..bebd524 100644 --- a/export.c +++ b/export.c @@ -260,7 +260,7 @@ static int exportHTMLBody( } else if (part->message.structure) { const struct BodyPart *structure = part->message.structure; int error = 0 - || htmlMessageOpen(file, part->message.envelope) + || htmlMessageOpen(file, part->message.envelope, true) || exportHTMLBody(file, envelope, section, structure, body) || htmlMessageClose(file); return error; @@ -284,7 +284,7 @@ static void exportHTML( FILE *file = fopen(path, "w"); if (!file) err(EX_CANTCREAT, "%s", path); - int error = htmlMessageOpen(file, envelope); + int error = htmlMessageOpen(file, envelope, false); if (error) err(EX_IOERR, "%s", path); struct List section = {0}; diff --git a/html.c b/html.c index 34ffb16..c3b47fd 100644 --- a/html.c +++ b/html.c @@ -180,7 +180,7 @@ int htmlMessageNav(FILE *file, const struct Envelope *envelope) { return error; } -int htmlMessageOpen(FILE *file, const struct Envelope *envelope) { +int htmlMessageOpen(FILE *file, const struct Envelope *envelope, bool nested) { char *fragment = htmlFragment(envelope->messageID); char *mailto = htmlMailto(envelope->from); const char *template = Q( @@ -206,7 +206,7 @@ int htmlMessageOpen(FILE *file, const struct Envelope *envelope) { || templateRender(file, template, vars, escapeXML) || htmlAddressList(file, "To", envelope->to) || htmlAddressList(file, "Cc", envelope->cc) - || htmlMessageNav(file, envelope) + || (nested ? 0 : htmlMessageNav(file, envelope)) || templateRender(file, Q(</header>), NULL, NULL); free(fragment); free(mailto); |