*** mail.c 2001/11/19 18:39:59 1.1 --- mail.c 2001/11/19 18:41:38 *************** *** 218,224 **** printf("

Your message has been sent.

\n"); printf("The following message has been sent to "); ! printf("%s:\n

\n


\n\n", to); printf("
\n"); printf("
From: %s\n", from); --- 218,224 ---- printf("

Your message has been sent.

\n"); printf("The following message has been sent to "); ! printf("%s:\n

\n


\n\n", to); printf("
\n"); printf("
From: %s\n", from); *************** *** 232,238 **** printf("

\n%s\n", body); printf("

\n"); ! printf("

\n


\n"); printf("\n\n"); } else --- 232,238 ---- printf("

\n%s\n", body); printf("

\n"); ! printf("

\n


\n"); printf("\n\n"); } else *** parse.c 2001/11/19 18:39:59 1.1 --- parse.c 2001/11/19 18:41:55 *************** *** 1582,1588 **** * be used. */ bp = addbody(bp, &lp, ! "

attached mail follows:


", BODY_HTMLIZED | bodyflags); bodyflags |= BODY_ATTACHED; /* @@ should it be 1 or 2 ?? should we use another method? */ --- 1582,1588 ---- * be used. */ bp = addbody(bp, &lp, ! "

attached mail follows:


", BODY_HTMLIZED | bodyflags); bodyflags |= BODY_ATTACHED; /* @@ should it be 1 or 2 ?? should we use another method? */ *************** *** 2308,2314 **** trio_snprintf(buffer, sizeof(buffer), "%s\"%s\"\n", ! (set_showhr ? "
\n" : ""), subdir ? subdir->rel_path_to_top : "", &att_dir[strlen(dir) + 1], --- 2308,2314 ---- trio_snprintf(buffer, sizeof(buffer), "%s\"%s\"\n", ! (set_showhr ? "
\n" : ""), subdir ? subdir->rel_path_to_top : "", &att_dir[strlen(dir) + 1], *************** *** 2327,2333 **** trio_snprintf(buffer, sizeof(buffer), "%s\n", ! (set_showhr ? "
\n" : ""), type, lang[MSG_ATTACHMENT], subdir ? subdir->rel_path_to_top : "", --- 2327,2333 ---- trio_snprintf(buffer, sizeof(buffer), "%s\n", ! (set_showhr ? "
\n" : ""), type, lang[MSG_ATTACHMENT], subdir ? subdir->rel_path_to_top : "", *** print.c 2001/11/19 18:39:59 1.1 --- print.c 2001/11/19 18:41:07 *************** *** 400,406 **** #endif /* JK: added a

*/ if (set_showhr) ! fprintf(fp, "


\n"); /* * Printout the Dates for the Starting and Ending messages --- 400,406 ---- #endif /* JK: added a

*/ if (set_showhr) ! fprintf(fp, "


\n"); /* * Printout the Dates for the Starting and Ending messages *************** *** 436,442 **** lang[MSG_ARCHIVED_ON], getlocaltime()); if (set_showhr) ! fprintf(fp, "


\n"); fprintf(fp, "\n"); if (called_from != AUTHOR_INDEX && show_index[dlev][AUTHOR_INDEX] || --- 436,442 ---- lang[MSG_ARCHIVED_ON], getlocaltime()); if (set_showhr) ! fprintf(fp, "
\n"); fprintf(fp, "\n"); if (called_from != AUTHOR_INDEX && show_index[dlev][AUTHOR_INDEX] || *************** *** 874,880 **** /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); printcomment(fp, "body", "start"); if (email->is_deleted && set_delete_level != DELETE_LEAVES_TEXT --- 874,880 ---- /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); printcomment(fp, "body", "start"); if (email->is_deleted && set_delete_level != DELETE_LEAVES_TEXT *************** *** 887,893 **** fprintf(fp, lang[d_index]); printcomment(fp, "body", "end"); if (set_showhr) ! fprintf(fp, "


\n"); return; } --- 887,893 ---- fprintf(fp, lang[d_index]); printcomment(fp, "body", "end"); if (set_showhr) ! fprintf(fp, "
\n"); return; } *************** *** 1129,1135 **** fprintf(fp, "

"); printcomment(fp, "body", "end"); if (set_showhr) ! fprintf(fp, "


\n"); } char * --- 1129,1135 ---- fprintf(fp, "

"); printcomment(fp, "body", "end"); if (set_showhr) ! fprintf(fp, "


\n"); } char * *************** *** 1852,1858 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } /* --- 1852,1858 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } /* *************** *** 1881,1887 **** } else { if (set_showhr) ! fprintf(fp, "


\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, DATE_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); --- 1881,1887 ---- } else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, DATE_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); *************** *** 1949,1955 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } /* --- 1949,1955 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } /* *************** *** 1978,1984 **** } else { if (set_showhr) ! fprintf(fp, "


\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, DATE_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); --- 1978,1984 ---- } else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, DATE_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); *************** *** 2054,2060 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { --- 2054,2060 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { *************** *** 2079,2085 **** } else { if (set_showhr) ! fprintf(fp, "


\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, THREAD_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); --- 2079,2085 ---- } else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, THREAD_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); *************** *** 2198,2204 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added this

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { --- 2198,2204 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added this

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { *************** *** 2229,2235 **** email ? email->subdir : NULL); else { if (set_showhr) ! fprintf(fp, "


\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, SUBJECT_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); --- 2229,2235 ---- email ? email->subdir : NULL); else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, SUBJECT_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); *************** *** 2348,2354 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added the extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { --- 2348,2354 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added the extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } if (set_indextable) { *************** *** 2380,2386 **** email ? email->subdir : NULL); else { if (set_showhr) ! fprintf(fp, "


\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, AUTHOR_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); --- 2380,2386 ---- email ? email->subdir : NULL); else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, AUTHOR_INDEX, set_archives, "", "", PAGE_BOTTOM, email ? email->subdir : NULL); *************** *** 2490,2496 **** fprint_summary(fp1, PAGE_TOP, first_date, last_date, count); if (set_showhr) ! fprintf(fp1, "
\n"); } if (set_indextable) { --- 2490,2496 ---- fprint_summary(fp1, PAGE_TOP, first_date, last_date, count); if (set_showhr) ! fprintf(fp1, "
\n"); } if (set_indextable) { *************** *** 2534,2540 **** print_index_footer_links(fp1, j, last_date, count, NULL); else { if (set_showhr) ! fprintf(fp1, "
\n"); fprint_summary(fp1, PAGE_BOTTOM, first_date, last_date, count); fprint_menu(fp1, j, set_archives, "", "", PAGE_BOTTOM, --- 2534,2540 ---- print_index_footer_links(fp1, j, last_date, count, NULL); else { if (set_showhr) ! fprintf(fp1, "
\n"); fprint_summary(fp1, PAGE_BOTTOM, first_date, last_date, count); fprint_menu(fp1, j, set_archives, "", "", PAGE_BOTTOM, *************** *** 2633,2639 **** fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } fprintf(fp, "\n"); } --- 2633,2639 ---- fprint_summary(fp, PAGE_TOP, firstdatenum, lastdatenum, amountmsgs); /* JK: added an extra

here */ if (set_showhr) ! fprintf(fp, "


\n"); } fprintf(fp, "

\n"); } *************** *** 2695,2701 **** } else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, FOLDERS_INDEX, set_archives, "", "", PAGE_BOTTOM, NULL); } --- 2695,2701 ---- } else { if (set_showhr) ! fprintf(fp, "
\n"); fprint_summary(fp, PAGE_BOTTOM, firstdatenum, lastdatenum, amountmsgs); fprint_menu(fp, FOLDERS_INDEX, set_archives, "", "", PAGE_BOTTOM, NULL); } *** printfile.c 2001/11/19 18:39:59 1.1 --- printfile.c 2001/11/19 18:41:22 *************** *** 264,270 **** free(ptr); #if 0 /* JK: and removed this as it looked a bit strange */ if (!set_usetable) ! fprintf(fp, "
\n

\n"); #endif } } --- 264,270 ---- free(ptr); #if 0 /* JK: and removed this as it looked a bit strange */ if (!set_usetable) ! fprintf(fp, "


\n

\n"); #endif } } *************** *** 303,309 **** dir, NULL, NULL, NULL, NULL, filename); else { if (set_showhr && !set_usetable) ! fprintf(fp, "


\n"); fprintf(fp, "

\n\n\n"); fprintf(fp, "%s ", lang[MSG_ARCHIVE_GENERATED_BY]); fprintf(fp, "%s %s \n", HMURL, PROGNAME, VERSION); --- 303,309 ---- dir, NULL, NULL, NULL, NULL, filename); else { if (set_showhr && !set_usetable) ! fprintf(fp, "


\n"); fprintf(fp, "

\n\n\n"); fprintf(fp, "%s ", lang[MSG_ARCHIVE_GENERATED_BY]); fprintf(fp, "%s %s \n", HMURL, PROGNAME, VERSION);