Merge pull request #228 from andryyy/patch-1

Aleksander Machniak

2014-10-07 dfa721b5dcdf0c895193b50870c5b3eb853c02c7

 program/include/rcmail.php

@@ -116,11 +116,13 @@
            $_SESSION['task'] = $this->task;
        }

        // init output class
        if (!empty($_REQUEST['_remote']))
        // init output class (not in CLI mode)
        if (!empty($_REQUEST['_remote'])) {
            $GLOBALS['OUTPUT'] = $this->json_init();
        else
        }
        else if ($_SERVER['REMOTE_ADDR']) {
            $GLOBALS['OUTPUT'] = $this->load_gui(!empty($_REQUEST['_framed']));
        }

        // load plugins
        $this->plugins->init($this, $this->task);
@@ -1800,7 +1802,7 @@
            $error = 'errorreadonly';
        }
        else if ($res_code == rcube_storage::OVERQUOTA) {
            $error = 'errorroverquota';
            $error = 'erroroverquota';
        }
        else if ($err_code && ($err_str = $this->storage->get_error_str())) {
            // try to detect access rights problem and display appropriate message