From 8448fca1f11f69e29bca568cb0042e83dd6be89e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 03 Jul 2009 09:38:30 -0400
Subject: [PATCH] Let internal 'template_container' hook append to existing content
---
program/include/rcube_json_output.php | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index 2fbf9c0..7bfca0a 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -29,10 +29,11 @@
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';
@@ -122,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;
}
@@ -227,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