From: <lar...@us...> - 2011-09-22 08:04:39
|
Revision: 103 http://macros4outlook.svn.sourceforge.net/macros4outlook/?rev=103&view=rev Author: larsen255 Date: 2011-09-22 08:04:30 +0000 (Thu, 22 Sep 2011) Log Message: ----------- bugfix: When a mail was signed or encrypted with PGP, the reformatting would yield incorrect results Modified Paths: -------------- quotefixmacro/trunk/QuoteFixMacro.bas Modified: quotefixmacro/trunk/QuoteFixMacro.bas =================================================================== --- quotefixmacro/trunk/QuoteFixMacro.bas 2011-07-04 09:50:35 UTC (rev 102) +++ quotefixmacro/trunk/QuoteFixMacro.bas 2011-09-22 08:04:30 UTC (rev 103) @@ -98,7 +98,7 @@ ' * Added LoadConfiguration() so you can store personal settings in the registry. These won\xB4t get lost when updating the macro '$Revision$ - not released -' * <no changes until now> +' * bugfix: When a mail was signed or encrypted with PGP, the reformatting would yield incorrect results ' 'Ideas were taken from ' * Daniele Bochicchio @@ -213,6 +213,7 @@ 'Private Const OUTLOOK_PLAIN_ORIGINALMESSAGE = "-----Urspr\xFCngliche Nachricht-----" 'Private Const OUTLOOK_PLAIN_ORIGINALMESSAGE = "-----Original Message-----" Private Const OUTLOOK_ORIGINALMESSAGE As String = "> " & OUTLOOK_PLAIN_ORIGINALMESSAGE +Private Const PGP_MARKER As String = "-----BEGIN PGP" Private Const OUTLOOK_HEADERFINISH As String = "> " Private Const SIGNATURE_SEPARATOR As String = "> --" @@ -620,7 +621,9 @@ End If If CONDENSE_EMBEDDED_QUOTED_OUTLOOK_HEADERS Then - If Left(curLine, Len(OUTLOOK_PLAIN_ORIGINALMESSAGE)) = OUTLOOK_PLAIN_ORIGINALMESSAGE Then + If Left(curLine, Len(OUTLOOK_PLAIN_ORIGINALMESSAGE)) = OUTLOOK_PLAIN_ORIGINALMESSAGE _ + And Not Left(curLine, Len(PGP_MARKER)) = PGP_MARKER _ + Then 'We found a header Dim posColon As Integer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |