- #1485809: use local copy of jQuery lib (1.3.2)

alecpl

2009-04-20 fa1a15c01e0fa758b93185faa72a9598e6e25ca9

 program/include/rcube_json_output.php

@@ -5,7 +5,7 @@
 | program/include/rcube_json_output.php                                 |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2008, RoundCube Dev. - Switzerland                      |
 | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -34,6 +34,7 @@
    private $texts = array();
    private $commands = array();

    public $type = 'js';
    public $ajax_call = true;
    
    
@@ -195,26 +196,33 @@
     * @return void
     * @deprecated
     */
    public function remote_response($add='', $flush=false)
    public function remote_response($add='')
    {
        static $s_header_sent = false;

        if (!$s_header_sent) {
            $s_header_sent = true;
            send_nocacheing_headers();
            header('Content-Type: application/x-javascript; charset=' . $this->get_charset());
            header('Content-Type: text/plain; charset=' . $this->get_charset());
            print '/** ajax response ['.date('d/M/Y h:i:s O')."] **/\n";
        }

        // unset default env vars
        unset($this->env['task'], $this->env['action'], $this->env['comm_path']);

        // send response code
        echo $this->get_js_commands() . $add;
        $rcmail = rcmail::get_instance();
        $response = array('action' => $rcmail->action, 'unlock' => (bool)$_REQUEST['_unlock']);
        
        if (!empty($this->env))
          $response['env'] = $this->env;
          
        if (!empty($this->texts))
          $response['texts'] = $this->texts;

        // flush the output buffer
        if ($flush)
            flush();
        // send response code
        $response['exec'] = $this->get_js_commands() . $add;

        echo json_serialize($response);
    }
    
    
@@ -226,14 +234,7 @@
    private function get_js_commands()
    {
        $out = '';
	
   if (sizeof($this->env))
       $out .= 'this.set_env('.json_serialize($this->env).");\n";
        
        foreach($this->texts as $name => $text) {
            $out .= sprintf("this.add_label('%s', '%s');\n", $name, JQ($text));
        }

        foreach ($this->commands as $i => $args) {
            $method = array_shift($args);
            foreach ($args as $i => $arg) {