Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 150 insertions, 0 deletions

diff --git a/plugins/enigma/lib/enigma_key.php b/plugins/enigma/lib/enigma_key.php
new file mode 100644
index 000000000..8c61cbd99
--- /dev/null
+++ b/plugins/enigma/lib/enigma_key.php
@@ -0,0 +1,150 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Key class for the Enigma Plugin                                         |
+ |                                                                         |
+ | Copyright (C) 2010-2015 The Roundcube Dev Team                          |
+ |                                                                         |
+ | Licensed under the GNU General Public License version 3 or              |
+ | any later version with exceptions for skins & plugins.                  |
+ | See the README file for a full license statement.                       |
+ |                                                                         |
+ +-------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                              |
+ +-------------------------------------------------------------------------+
+*/
+
+class enigma_key
+{
+    public $id;
+    public $name;
+    public $users   = array();
+    public $subkeys = array();
+
+    const TYPE_UNKNOWN = 0;
+    const TYPE_KEYPAIR = 1;
+    const TYPE_PUBLIC  = 2;
+
+    const CAN_SIGN    = 1;
+    const CAN_ENCRYPT = 2;
+
+    /**
+     * Keys list sorting callback for usort()
+     */
+    static function cmp($a, $b)
+    {
+        return strcmp($a->name, $b->name);
+    }
+
+    /**
+     * Returns key type
+     */
+    function get_type()
+    {
+        if ($this->subkeys[0]->has_private)
+            return enigma_key::TYPE_KEYPAIR;
+        else if (!empty($this->subkeys[0]))
+            return enigma_key::TYPE_PUBLIC;
+
+        return enigma_key::TYPE_UNKNOWN;
+    }
+
+    /**
+     * Returns true if all user IDs are revoked
+     */
+    function is_revoked()
+    {
+        foreach ($this->subkeys as $subkey)
+            if (!$subkey->revoked)
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns true if any user ID is valid
+     */
+    function is_valid()
+    {
+        foreach ($this->users as $user)
+            if ($user->valid)
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Returns true if any of subkeys is not expired
+     */
+    function is_expired()
+    {
+        $now = time();
+
+        foreach ($this->subkeys as $subkey)
+            if (!$subkey->expires || $subkey->expires > $now)
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Get key ID by user email
+     */
+    function find_subkey($email, $mode)
+    {
+        $now = time();
+
+        foreach ($this->users as $user) {
+            if ($user->email === $email && $user->valid && !$user->revoked) {
+                foreach ($this->subkeys as $subkey) {
+                    if (!$subkey->revoked && (!$subkey->expires || $subkey->expires > $now)) {
+                        if (($mode == self::CAN_ENCRYPT && $subkey->can_encrypt)
+                            || ($mode == self::CAN_SIGN && $subkey->has_private)
+                        ) {
+                            return $subkey;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Converts long ID or Fingerprint to short ID
+     * Crypt_GPG uses internal, but e.g. Thunderbird's Enigmail displays short ID
+     *
+     * @param string Key ID or fingerprint
+     * @return string Key short ID
+     */
+    static function format_id($id)
+    {
+        // E.g. 04622F2089E037A5 => 89E037A5
+
+        return substr($id, -8);
+    }
+
+    /**
+     * Formats fingerprint string
+     *
+     * @param string Key fingerprint
+     *
+     * @return string Formatted fingerprint (with spaces)
+     */
+    static function format_fingerprint($fingerprint)
+    {
+        if (!$fingerprint) {
+            return '';
+        }
+
+        $result = '';
+        for ($i=0; $i<40; $i++) {
+            if ($i % 4 == 0) {
+                $result .= ' ';
+            }
+            $result .= $fingerprint[$i];
+        }
+
+        return $result;
+    }
+
+}