|
|
@ -65,7 +65,7 @@ static const regex archiveURLSignature (".*(([&?]g=)|([&?]l=/)).*"); |
|
|
|
|
|
|
|
static const string KAZ_PLAIN_HR ("______________________________________________________________________________"); |
|
|
|
static const string KAZ_PLAIN_START ("~~ PJ-KAZ !"); // don't end whith space
|
|
|
|
static const string KAZ_PLAIN_STOP (KAZ_PLAIN_START+" ~~"); |
|
|
|
static const string KAZ_PLAIN_STOP (KAZ_PLAIN_START+" ~~\n\n"); |
|
|
|
static const string KAZ_PLAIN_DONT_TOUCH ("(conservez cette partie intacte dans votre réponse si vous voulez transmettre les documents précédents)"); |
|
|
|
static const string KAZ_PLAIN_WARNING ("Attention : Kaz a dépollué ce message. Les pièces jointes ont été retirées et placées dans un dépôt provisoire. " |
|
|
|
"Elles seront automatiquement supprimées dans 1 mois. " |
|
|
@ -124,7 +124,7 @@ const string MainAttachment::templateHtmlOtherLink ("</ul>"+KAZ_HTML_DOWLOAD_OTH |
|
|
|
const string MainAttachment::templateHtmlAllLink ("</ul><ul>"+LI_ALL+KAZ_HTML_DOWLOAD_ALL+" <a href=\""+TMPL_DOWNLOAD+"\">"+KAZ_HTML_ARCHIVE+"</a>"+LI_END+"\n"); |
|
|
|
const string MainAttachment::templateHtmlFooter ("</ul></p>\n" |
|
|
|
"<p class=\"msg\"><a class=\"kaz\" href=\""+KAZ_WEB_SITE+"\"> "+KAZ_WEB_SITE+" </a></p></div>\n" |
|
|
|
"<hr><p style=\"font-size:10px; color:#969696;\">"+KAZ_PLAIN_STOP+"</p>"+KAZ_HTML_STOP+"\n"); |
|
|
|
"<hr><p style=\"font-size:10px; color:#969696;\">"+KAZ_PLAIN_STOP+"</p>"+KAZ_HTML_STOP+"\n\n"); |
|
|
|
|
|
|
|
const regex MainAttachment::whiteSpaceRegEx ("\\s+"); |
|
|
|
|
|
|
@ -639,7 +639,8 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min |
|
|
|
LOG_BUG (isPlain && isHtml, /**/, "eMailShrinker: bug M6: plain and html: " << attachP->getContentType ()); |
|
|
|
LOG_BUG (! (isPlain || isHtml), /**/, "eMailShrinker: bug M7: not plain or html: " << attachP->getContentType ()); |
|
|
|
LOG ("toUpdate: isPlain: " << isPlain << " isHtml: " << isHtml << " isDisclaimer: " << isDisclaimer); |
|
|
|
copy (mbox, outbox, attachP->beginInParent, attachP->contentPos); |
|
|
|
if (attachP != this) |
|
|
|
copy (mbox, outbox, attachP->beginInParent, attachP->contentPos); |
|
|
|
|
|
|
|
string content = attachP->getContent (mbox); |
|
|
|
if (isHtml) { |
|
|
|