From 2eb7943f2aeaec8efc74b16b7bedb56da9913abf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 23 Apr 2010 07:25:37 -0400
Subject: [PATCH] - code cleanup (mostly identation fixes)
---
program/include/rcube_json_output.php | 126 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 46 deletions(-)
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index 802da24..31eaa87 100644
--- a/program/include/rcube_json_output.php
+++ b/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-2010, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -16,7 +16,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: $
+ $Id$
*/
@@ -29,25 +29,26 @@
class rcube_json_output
{
private $config;
- private $charset = 'UTF-8';
+ private $charset = RCMAIL_CHARSET;
private $env = array();
private $texts = array();
private $commands = array();
+ private $callbacks = array();
+ private $message = null;
- public $task = '';
+ public $type = 'js';
public $ajax_call = true;
/**
* Constructor
*/
- public function __construct(&$config, $task)
+ public function __construct($task)
{
- $this->task = $task;
- $this->config = $config;
+ $this->config = rcmail::get_instance()->config;
}
-
-
+
+
/**
* Set environment variable
*
@@ -58,14 +59,19 @@
{
$this->env[$name] = $value;
}
-
+
+
/**
- * @ignore
+ * Issue command to set page title
+ *
+ * @param string New page title
*/
public function set_pagetitle($title)
{
- // ignore
+ $name = $this->config->get('product_name');
+ $this->command('set_pagetitle', empty($name) ? $title : $name.' :: '.$title);
}
+
/**
* @ignore
@@ -99,6 +105,7 @@
// ignore
}
+
/**
* Register a list of template object handlers
*
@@ -109,8 +116,8 @@
{
// ignore
}
-
-
+
+
/**
* Call a client method
*
@@ -119,7 +126,12 @@
*/
public function command()
{
- $this->commands[] = func_get_args();
+ $cmd = func_get_args();
+
+ if (strpos($cmd[0], 'plugin.') === 0)
+ $this->callbacks[] = $cmd;
+ else
+ $this->commands[] = $cmd;
}
@@ -128,12 +140,15 @@
*/
public function add_label()
{
- $arg_list = func_get_args();
- foreach ($arg_list as $i => $name) {
+ $args = func_get_args();
+ if (count($args) == 1 && is_array($args[0]))
+ $args = $args[0];
+
+ foreach ($args as $name) {
$this->texts[$name] = rcube_label($name);
}
}
-
+
/**
* Invoke display_message command
@@ -141,25 +156,44 @@
* @param string Message to display
* @param string Message type [notice|confirm|error]
* @param array Key-value pairs to be replaced in localized text
+ * @param boolean Override last set message
* @uses self::command()
*/
- public function show_message($message, $type='notice', $vars=null)
+ public function show_message($message, $type='notice', $vars=null, $override=true)
{
- $this->command(
- 'display_message',
- rcube_label(array('name' => $message, 'vars' => $vars)),
- $type
- );
+ if ($override || !$this->message) {
+ $this->message = $message;
+ $this->command(
+ 'display_message',
+ rcube_label(array('name' => $message, 'vars' => $vars)),
+ $type
+ );
+ }
}
-
+
+
/**
* Delete all stored env variables and commands
*/
- public public function reset()
+ public function reset()
{
$this->env = array();
$this->texts = array();
$this->commands = array();
+ }
+
+
+ /**
+ * Redirect to a certain url
+ *
+ * @param mixed Either a string with the action or url parameters as key-value pairs
+ * @see rcmail::url()
+ */
+ public function redirect($p = array(), $delay = 1)
+ {
+ $location = rcmail::get_instance()->url($p);
+ $this->remote_response("window.setTimeout(\"location.href='{$location}'\", $delay);");
+ exit;
}
@@ -181,29 +215,38 @@
* @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());
- print '/** ajax response ['.date('d/M/Y h:i:s O')."] **/\n";
+ header('Content-Type: text/plain; charset=' . $this->get_charset());
}
// 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 function calls
+ $response['exec'] = $this->get_js_commands() . $add;
+
+ if (!empty($this->callbacks))
+ $response['callbacks'] = $this->callbacks;
+
+ echo json_serialize($response);
}
-
-
+
+
/**
* Return executable javascript code for all registered commands
*
@@ -212,13 +255,6 @@
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);
@@ -232,9 +268,7 @@
implode(',', $args)
);
}
-
+
return $out;
}
}
-
-
--
Gitblit v1.9.1