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

Aleksander Machniak

2012-05-26 6d3e53d2b8a24e594f7c7fe93a0632a8171cdab3

 program/include/rcube_output_json.php

@@ -17,9 +17,6 @@
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+

 $Id$

*/


@@ -137,7 +134,7 @@
        if ($override || !$this->message) {
            if ($this->app->text_exists($message)) {
                if (!empty($vars)) {
                    $vars = array_map(array('rcube_ui', 'Q'), $vars);
                    $vars = array_map(array('rcmail', 'Q'), $vars);
                }
                $msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
            }
@@ -170,8 +167,9 @@
     */
    public function redirect($p = array(), $delay = 1)
    {
        $location = rcmail::get_instance()->url($p);
        $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);", JS_OBJECT_NAME, $location, $delay));
        $location = $this->app->url($p);
        $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);",
            rcmail::JS_OBJECT_NAME, $location, $delay));
        exit;
    }

@@ -224,7 +222,7 @@
        $rcmail = rcmail::get_instance();
        $response['action'] = $rcmail->action;

        if ($unlock = rcube_ui::get_input_value('_unlock', rcube_ui::INPUT_GPC)) {
        if ($unlock = rcube_utils::get_input_value('_unlock', rcube_utils::INPUT_GPC)) {
            $response['unlock'] = $unlock;
        }