Aleksander Machniak
2014-09-08 6e6f9ce6a7d50ddff5d8485b7f76a51ae8f79d16
Fix compatybility with contextmenu plugin
2 files modified
13 ■■■■■ changed files
plugins/managesieve/managesieve.js 2 ●●● patch | view | raw | blame | history
plugins/managesieve/managesieve.php 11 ●●●●● patch | view | raw | blame | history
plugins/managesieve/managesieve.js
@@ -930,7 +930,7 @@
rcube_webmail.prototype.managesieve_create = function(force)
{
  if (!force && this.env.action != 'show' && !$('#'+this.env.contentframe).is(':visible')) {
  if (!force && this.env.action != 'show') {
    var uid = this.message_list.get_single_selection(),
      lock = this.set_busy(true, 'loading');
plugins/managesieve/managesieve.php
@@ -51,7 +51,9 @@
        }
        else if ($this->rc->task == 'mail') {
            // register message hook
            $this->add_hook('message_headers_output', array($this, 'mail_headers'));
            if ($this->rc->action == 'show') {
                $this->add_hook('message_headers_output', array($this, 'mail_headers'));
            }
            // inject Create Filter popup stuff
            if (empty($this->rc->action) || $this->rc->action == 'show'
@@ -192,9 +194,10 @@
    function managesieve_actions()
    {
        // handle fetching email headers for the new filter form
        if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC)) {
            $mailbox = $this->rc->get_storage()->get_folder();
            $message = new rcube_message($uid, $mailbox);
        if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) {
            $uids    = rcmail::get_uids();
            $mailbox = key($uids);
            $message = new rcube_message($uids[$mailbox][0], $mailbox);
            $headers = $this->parse_headers($message->headers);
            $this->rc->output->set_env('sieve_headers', $headers);