Merge pull request #277 from jobisoft/master

Aleksander Machniak

2015-06-06 ed5a7b48c0e8ab9fccc28c35ba3a34296d69cd03

 program/include/rcmail_output_json.php

@@ -23,7 +23,7 @@
/**
 * View class to produce JSON responses
 *
 * @package    Core
 * @package Webmail
 * @subpackage View
 */
class rcmail_output_json extends rcmail_output
@@ -181,6 +181,11 @@
     */
    public function raise_error($code, $message)
    {
        if ($code == 403) {
            header('HTTP/1.1 403 Forbidden');
            die("Invalid Request");
        }

        $this->show_message("Application Error ($code): $message", 'error');
        $this->remote_response();
        exit;
@@ -227,6 +232,13 @@
        if (!empty($this->callbacks))
            $response['callbacks'] = $this->callbacks;

        // trigger generic hook where plugins can put additional content to the response
        $hook = $this->app->plugins->exec_hook("render_response", array('response' => $response));

        // save some memory
        $response = $hook['response'];
        unset($hook['response']);

        echo self::json_serialize($response);
    }