[commits] Horde branch imp_6_2 updated. eebf1b64bda27bee12f05b153842247b0ff1f26f

[Michael M Slusarz]

The branch "imp_6_2" has been updated.
The following is a summary of the commits.

from: df54668e6c94fb1581b0f0a211d0e237e823a3e2

fb40888 Make sure we have a valid object
1ef63fd [mms] Move determination whether to scan plaintext messages for PGP data from preferences to MIME viewer configuration.
aeb151b Pass stream into parsePGPData()
eebf1b6 [mms] Strip PGP armor text when replying to a message.

Summary: http://github.com/horde/horde/compare/df54668e6c94fb1581b0f0a211d0e237e823a3e2...eebf1b64bda27bee12f05b153842247b0ff1f26f

-----------------------------------------------------------------------

commit fb4088836ef2b5d4bec3df3239321f954f449097
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Nov 6 21:58:45 2013 -0700

    Make sure we have a valid object

 imp/lib/Factory/Imap.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/fb4088836ef2b5d4bec3df3239321f954f449097
http://git.horde.org/horde-git/-/commit/fb4088836ef2b5d4bec3df3239321f954f449097

-----------------------------------------------------------------------

commit 1ef63fd23fe712745eb95a94a0bc3f5879a57922
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Nov 7 00:16:03 2013 -0700

    [mms] Move determination whether to scan plaintext messages for PGP data from preferences to MIME viewer configuration.

 imp/config/mime_drivers.php   |    5 +++++
 imp/config/prefs.php          |   12 ++----------
 imp/docs/CHANGES              |    2 ++
 imp/docs/UPGRADING            |   10 ++++++++++
 imp/lib/Mime/Viewer/Plain.php |   24 ++++++++++--------------
 imp/locale/en/help.xml        |    7 -------
 imp/package.xml               |    1 +
 7 files changed, 30 insertions(+), 31 deletions(-)

http://github.com/horde/horde/commit/1ef63fd23fe712745eb95a94a0bc3f5879a57922
http://git.horde.org/horde-git/-/commit/1ef63fd23fe712745eb95a94a0bc3f5879a57922

-----------------------------------------------------------------------

commit aeb151b99b5920ea6fbb956e51612fa73110ba5d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Nov 7 00:16:20 2013 -0700

    Pass stream into parsePGPData()

 imp/lib/Mime/Viewer/Plain.php |    8 ++++++--
 imp/package.xml               |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/aeb151b99b5920ea6fbb956e51612fa73110ba5d
http://git.horde.org/horde-git/-/commit/aeb151b99b5920ea6fbb956e51612fa73110ba5d

-----------------------------------------------------------------------

commit eebf1b64bda27bee12f05b153842247b0ff1f26f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Nov 7 00:48:32 2013 -0700

    [mms] Strip PGP armor text when replying to a message.

 imp/docs/CHANGES              |    1 +
 imp/lib/Compose.php           |   12 +++++
 imp/lib/Crypt/Pgp.php         |   92 ++++++++++++++++++++++++++++++++++++++++
 imp/lib/Mime/Viewer/Plain.php |   93 +++--------------------------------------
 imp/package.xml               |    1 +
 5 files changed, 112 insertions(+), 87 deletions(-)

http://github.com/horde/horde/commit/eebf1b64bda27bee12f05b153842247b0ff1f26f
http://git.horde.org/horde-git/-/commit/eebf1b64bda27bee12f05b153842247b0ff1f26f