Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2015-02-19 50b04366ee7472272e2576d17c609e1d26345221

 plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php

@@ -124,7 +124,7 @@

    private function vacation_rule()
    {
        if ($this->script_name === null || !$this->sieve->load($this->script_name)) {
        if ($this->script_name === false || $this->script_name === null || !$this->sieve->load($this->script_name)) {
            return;
        }

@@ -556,66 +556,78 @@
    protected function save_vacation_script($rule)
    {
        // if script does not exist create a new one
        if ($this->script_name === null) {
        if ($this->script_name === null || $this->script_name === false) {
            $this->script_name = $this->rc->config->get('managesieve_script_name');
            if (empty($this->script_name)) {
                $this->script_name = 'roundcube';
            }

            $this->script = array($rule);
            $script_active = false;
            // use default script contents
            if (!$this->rc->config->get('managesieve_kolab_master')) {
                $script_file = $this->rc->config->get('managesieve_default');
                if ($script_file && is_readable($script_file)) {
                    $content = file_get_contents($script_file);
                }
            }

            // create and load script
            if ($this->sieve->save_script($this->script_name, $content)) {
                $this->sieve->load($this->script_name);
            }
        }
        // if script exists
        else {
            $script_active = in_array($this->script_name, $this->active);

            // re-order rules if needed
            if (isset($rule['after']) && $rule['after'] !== '') {
                // reset original vacation rule
                if (isset($this->vacation['idx'])) {
                    $this->script[$this->vacation['idx']] = null;
                }
        $script_active = in_array($this->script_name, $this->active);

                // add at target position
                if ($rule['after'] >= count($this->script) - 1) {
                    $this->script[] = $rule;
                }
                else {
                    $script = array();

                    foreach ($this->script as $idx => $r) {
                        if ($r) {
                            $script[] = $r;
                        }

                        if ($idx == $rule['after']) {
                            $script[] = $rule;
                        }
                    }

                    $this->script = $script;
                }

                $this->script = array_values(array_filter($this->script));
        // re-order rules if needed
        if (isset($rule['after']) && $rule['after'] !== '') {
            // reset original vacation rule
            if (isset($this->vacation['idx'])) {
                $this->script[$this->vacation['idx']] = null;
            }
            // update original vacation rule if it exists
            else if (isset($this->vacation['idx'])) {
                $this->script[$this->vacation['idx']] = $rule;

            // add at target position
            if ($rule['after'] >= count($this->script) - 1) {
                $this->script[] = $rule;
            }
            // otherwise put vacation rule on top
            else {
                array_unshift($this->script, $rule);
            }
                $script = array();

            // if the script was not active, we need to de-activate
            // all rules except the vacation rule, but only if it is not disabled
            if (!$script_active && !$rule['disabled']) {
                foreach ($this->script as $idx => $r) {
                    if (empty($r['actions']) || $r['actions'][0]['type'] != 'vacation') {
                        $this->script[$idx]['disabled'] = true;
                    if ($r) {
                        $script[] = $r;
                    }

                    if ($idx == $rule['after']) {
                        $script[] = $rule;
                    }
                }

                $this->script = $script;
            }

            $this->script = array_values(array_filter($this->script));
        }
        // update original vacation rule if it exists
        else if (isset($this->vacation['idx'])) {
            $this->script[$this->vacation['idx']] = $rule;
        }
        // otherwise put vacation rule on top
        else {
            array_unshift($this->script, $rule);
        }

        // if the script was not active, we need to de-activate
        // all rules except the vacation rule, but only if it is not disabled
        if (!$script_active && !$rule['disabled']) {
            foreach ($this->script as $idx => $r) {
                if (empty($r['actions']) || $r['actions'][0]['type'] != 'vacation') {
                    $this->script[$idx]['disabled'] = true;
                }
            }
        }

        if (!$this->sieve->script) {
            return false;
        }

        $this->sieve->script->content = $this->script;