From 7477973d931ffb816b2cbbad9c5bc06e3ef2ecd8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 16 Jul 2009 04:59:01 -0400
Subject: [PATCH] Make 2nd argument optinal (#1485976)
---
program/include/rcube_json_output.php | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index a14f4ae..7bfca0a 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -29,10 +29,12 @@
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 $type = 'js';
public $ajax_call = true;
@@ -121,7 +123,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;
}
@@ -130,8 +137,11 @@
*/
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);
}
}
@@ -143,15 +153,19 @@
* @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
+ );
+ }
}
/**
@@ -219,8 +233,11 @@
if (!empty($this->texts))
$response['texts'] = $this->texts;
- // send response code
+ // send function calls
$response['exec'] = $this->get_js_commands() . $add;
+
+ if (!empty($this->callbacks))
+ $response['callbacks'] = $this->callbacks;
echo json_serialize($response);
}
--
Gitblit v1.9.1