Enigma: Enable encryption features on message print page

Aleksander Machniak

2015-09-16 392ededc71d9555f243104e7ec821ed6dd1f7af4

Enigma: Enable encryption features on message print page

 plugins/enigma/enigma.php

@@ -50,7 +50,7 @@
            $enabled = $this->rc->config->get('enigma_encryption', true);

            // message displaying
            if ($this->rc->action == 'show' || $this->rc->action == 'preview') {
            if ($this->rc->action == 'show' || $this->rc->action == 'preview' || $this->rc->action == 'print') {
                $this->add_hook('message_load', array($this, 'message_load'));
                $this->add_hook('template_object_messagebody', array($this, 'message_output'));
            }

 plugins/enigma/lib/enigma_engine.php

@@ -444,14 +444,16 @@
     */
    private function parse_plain_signed(&$p, $body)
    {
        if (!$this->rc->config->get('enigma_signatures', true)) {
            return;
        }

        $this->load_pgp_driver();
        $part = $p['structure'];

        // Verify signature
        if ($this->rc->action == 'show' || $this->rc->action == 'preview') {
            if ($this->rc->config->get('enigma_signatures', true)) {
        if ($this->rc->action == 'show' || $this->rc->action == 'preview' || $this->rc->action == 'print') {
                $sig = $this->pgp_verify($body);
            }
        }

        // @TODO: Handle big bodies using (temp) files
@@ -505,7 +507,7 @@
            return;
        }

        if ($this->rc->action != 'show' && $this->rc->action != 'preview') {
        if ($this->rc->action != 'show' && $this->rc->action != 'preview' && $this->rc->action != 'print') {
            return;
        }

@@ -552,7 +554,7 @@
        }

        // Verify signature
        if ($this->rc->action == 'show' || $this->rc->action == 'preview') {
        if ($this->rc->action == 'show' || $this->rc->action == 'preview' || $this->rc->action == 'print') {
            $this->load_smime_driver();

            $struct   = $p['structure'];