[commits] Horde branch master updated. 2d09788e5b071faedcfa7997507e545d9f3ab196

[Jan Schneider]

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

from: 41c3fa39e5054572a9a522accda65e53e496a77b

06872b1 Style
675e595 Style
b7d8fe3 Use separate templates for personal and public certs.
8f2bc76 More comments to make private vs. public keys clearer.
8dcbcfd Simplify
e822219 Update de translation.
7b9dcb2 Allow to add secondary S/MIME certificate.
10f7edd Use secondary cert for signing if available.
2d09788 [jan] Allow to specify a secondary S/MIME certificate for signatures only.

Summary: http://github.com/horde/horde/compare/41c3fa39e5054572a9a522accda65e53e496a77b...2d09788e5b071faedcfa7997507e545d9f3ab196

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

commit 06872b19baa427fabb177b4bf94bd96a9ed60d7c
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 5 17:31:51 2016 +0100

    Style

 imp/lib/Smime.php | 139 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 93 insertions(+), 46 deletions(-)

http://github.com/horde/horde/commit/06872b19baa427fabb177b4bf94bd96a9ed60d7c

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

commit 675e59577fb2dd20dd157aa2672bfb4bb94c7206
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 5 17:49:07 2016 +0100

    Style

 imp/lib/Prefs/Special/SmimePrivateKey.php    | 81 ++++++++++++++++++++++------
 imp/templates/prefs/smimeprivatekey.html.php |  8 +--
 2 files changed, 68 insertions(+), 21 deletions(-)

http://github.com/horde/horde/commit/675e59577fb2dd20dd157aa2672bfb4bb94c7206

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

commit b7d8fe3843691302b908a3aa6f2c8e141f269c70
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 5 18:01:05 2016 +0100

    Use separate templates for personal and public certs.
    
    We use "public" vs. "private" in the S/MIME stuff like preference names etc. This is very confusing because we don't talk about public vs. private keys, but personal (user's) vs. public (address book's) keys.

 imp/lib/Basic/Smime.php                          | 20 +++++----
 imp/package.xml                                  | 10 +++--
 imp/templates/smime/import_key.html.php          | 52 ------------------------
 imp/templates/smime/import_personal_key.html.php | 33 +++++++++++++++
 imp/templates/smime/import_public_key.html.php   | 31 ++++++++++++++
 5 files changed, 81 insertions(+), 65 deletions(-)
 delete mode 100644 imp/templates/smime/import_key.html.php
 create mode 100644 imp/templates/smime/import_personal_key.html.php
 create mode 100644 imp/templates/smime/import_public_key.html.php

http://github.com/horde/horde/commit/b7d8fe3843691302b908a3aa6f2c8e141f269c70

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

commit 8f2bc76921961b5416b8fd996313046e8527d61e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 5 21:35:36 2016 +0100

    More comments to make private vs. public keys clearer.

 imp/config/prefs.php                     | 12 ++++++------
 imp/lib/Prefs/Special/SmimePublicKey.php |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/8f2bc76921961b5416b8fd996313046e8527d61e

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

commit 8dcbcfd0524b69e54df83507b46b8b2f71334e54
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 5 23:17:19 2016 +0100

    Simplify

 imp/lib/Prefs/Special/SmimePrivateKey.php | 166 +++++++++++++++---------------
 1 file changed, 85 insertions(+), 81 deletions(-)

http://github.com/horde/horde/commit/8dcbcfd0524b69e54df83507b46b8b2f71334e54

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

commit e82221915c7ebafbd177f466f531665b5a879e08
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 6 21:54:22 2016 +0100

    Update de translation.

 imp/locale/de/LC_MESSAGES/imp.mo | Bin 178210 -> 178227 bytes
 imp/locale/de/LC_MESSAGES/imp.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/e82221915c7ebafbd177f466f531665b5a879e08

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

commit 7b9dcb2a212fa304e9bfde600bc73b0f200523cd
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 6 22:32:58 2016 +0100

    Allow to add secondary S/MIME certificate.

 imp/config/prefs.php                             |  12 ++
 imp/lib/Ajax/Application/Handler/Passphrase.php  |   2 +-
 imp/lib/Basic/Smime.php                          |  98 ++++++++++--
 imp/lib/Prefs/Special/SmimePrivateKey.php        | 180 +++++++++++++----------
 imp/lib/Smime.php                                | 114 +++++++++-----
 imp/templates/prefs/smimeprivatekey.html.php     |  42 +++++-
 imp/templates/smime/import_personal_key.html.php |  38 ++++-
 7 files changed, 356 insertions(+), 130 deletions(-)

http://github.com/horde/horde/commit/7b9dcb2a212fa304e9bfde600bc73b0f200523cd

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

commit 10f7eddeecc9ce90f1002b3f18f2100929832246
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 7 12:59:11 2016 +0100

    Use secondary cert for signing if available.

 imp/lib/Smime.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/10f7eddeecc9ce90f1002b3f18f2100929832246

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

commit 2d09788e5b071faedcfa7997507e545d9f3ab196
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 7 12:59:47 2016 +0100

    [jan] Allow to specify a secondary S/MIME certificate for signatures only.

 imp/docs/CHANGES | 1 +
 imp/package.xml  | 2 ++
 2 files changed, 3 insertions(+)

http://github.com/horde/horde/commit/2d09788e5b071faedcfa7997507e545d9f3ab196