diff --git a/src/cpp/MainAttachment.cpp b/src/cpp/MainAttachment.cpp index 878bd2b..5338138 100644 --- a/src/cpp/MainAttachment.cpp +++ b/src/cpp/MainAttachment.cpp @@ -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+" ~~\n\n"); +static const string KAZ_PLAIN_STOP (KAZ_PLAIN_START+" ~~"); static const string KAZ_PLAIN_DONT_TOUCH ("(conservez cette partie intacte dans votre réponse si vous voulez transmettre les documents précédents (version "+LAST_VERSION_NUM+"))"); 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. " @@ -272,7 +272,7 @@ MainAttachment::getDisclaim (string &plain, string &html) const { html += allHtmlLinks; } html += templateHtmlFooter+"\n"; - plain += "\n\n"+KAZ_WEB_SITE+"\n\n"+KAZ_PLAIN_WARNING+"\n"+KAZ_PLAIN_HR+"\n"+KAZ_PLAIN_STOP+"\n"; + plain += "\n\n"+KAZ_WEB_SITE+"\n\n"+KAZ_PLAIN_WARNING+"\n"+KAZ_PLAIN_HR+"\n"+KAZ_PLAIN_STOP+"\n\n\n"; // & => & done LOG ("plain: " << plain); LOG ("html: " << html); diff --git a/src/cpp/eMailShrinker.cpp b/src/cpp/eMailShrinker.cpp index 29c7204..1af815e 100644 --- a/src/cpp/eMailShrinker.cpp +++ b/src/cpp/eMailShrinker.cpp @@ -33,8 +33,8 @@ //////////////////////////////////////////////////////////////////////////// #include "version.hpp" -const std::string kaz::LAST_VERSION_NUM ("2.6"); -const std::string kaz::LAST_VERSION_DATE ("2022-12-17"); +const std::string kaz::LAST_VERSION_NUM ("2.7"); +const std::string kaz::LAST_VERSION_DATE ("2022-12-19"); const std::string kaz::LAST_VERSION (LAST_VERSION_NUM+" "+LAST_VERSION_DATE+" eMailShrinker"); #include