diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_json_output.php | 13 | ||||
| -rwxr-xr-x | program/include/rcube_template.php | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php index 2fbf9c0c5..cedc6bf6c 100644 --- a/program/include/rcube_json_output.php +++ b/program/include/rcube_json_output.php @@ -33,6 +33,7 @@ class rcube_json_output private $env = array(); private $texts = array(); private $commands = array(); + private $callbacks = array(); private $message = null; public $type = 'js'; @@ -122,7 +123,12 @@ class rcube_json_output */ 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 @@ class rcube_json_output 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); } diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php index 42b642a25..a358d0cfe 100755 --- a/program/include/rcube_template.php +++ b/program/include/rcube_template.php @@ -201,7 +201,9 @@ class rcube_template extends rcube_html_page */ public function command() { - $this->js_commands[] = func_get_args(); + $cmd = func_get_args(); + if (strpos($cmd[0], 'plugin.') === false) + $this->js_commands[] = $cmd; } |