Merge branch 'attach-pgp-key' of https://github.com/guitarmanusa/roundcubem...

Aleksander Machniak

2016-04-02 ede293946c2ae49a7868e4513dd8c1325b3f898d

 plugins/enigma/lib/enigma_engine.php

@@ -921,6 +921,38 @@
        return $result;
    }

    function get_gpg_pubkey_for_attach($email)
    {
        $this->load_pgp_driver();
        $result = $this->pgp_driver->pubkey_for_attach($email);

        if ($result instanceof enigma_error) {
            rcube::raise_error(array(
                'code' => 600, 'type' => 'php',
                'file' => __FILE__, 'line' => __LINE__,
                'message' => "Enigma plugin: " . $result->getMessage()
                ), true, false);
        }

        return $result;
    }

    function get_keyID($email)
    {
        $this->load_pgp_driver();
        $result = $this->pgp_driver->get_keyID($email);

        if ($result instanceof enigma_error) {
            rcube::raise_error(array(
                'code' => 600, 'type' => 'php',
                'file' => __FILE__, 'line' => __LINE__,
                'message' => "Enigma plugin: " . $result->getMessage()
                ), true, false);
        }

        return $result;
    }

    /**
     * Find PGP private/public key
     *