summaryrefslogtreecommitdiff
path: root/program/include/rcube_output_json.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-16 11:02:21 +0000
committeralecpl <alec@alec.pl>2012-04-16 11:02:21 +0000
commit1aceb9cec82639250a603aa0806f0399f7bae68d (patch)
tree1fbeab49d53b6dccbc4230d73155e83e5547b264 /program/include/rcube_output_json.php
parent4372e9278011452ec8723fa4434e1d3ade726213 (diff)
- Framework refactoring (I hope it's the last one):
rcube,rcmail,rcube_ui -> rcube,rcmail,rcube_utils renamed main.inc into rcube_bc.inc
Diffstat (limited to 'program/include/rcube_output_json.php')
-rw-r--r--program/include/rcube_output_json.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/program/include/rcube_output_json.php b/program/include/rcube_output_json.php
index 73cf76795..1d9d6edf6 100644
--- a/program/include/rcube_output_json.php
+++ b/program/include/rcube_output_json.php
@@ -137,7 +137,7 @@ class rcube_output_json extends rcube_output
if ($override || !$this->message) {
if ($this->app->text_exists($message)) {
if (!empty($vars)) {
- $vars = array_map(array('rcube_ui', 'Q'), $vars);
+ $vars = array_map(array('rcmail', 'Q'), $vars);
}
$msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
}
@@ -171,7 +171,8 @@ class rcube_output_json extends rcube_output
public function redirect($p = array(), $delay = 1)
{
$location = rcmail::get_instance()->url($p);
- $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);", JS_OBJECT_NAME, $location, $delay));
+ $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);",
+ rcmail::JS_OBJECT_NAME, $location, $delay));
exit;
}
@@ -224,7 +225,7 @@ class rcube_output_json extends rcube_output
$rcmail = rcmail::get_instance();
$response['action'] = $rcmail->action;
- if ($unlock = rcube_ui::get_input_value('_unlock', rcube_ui::INPUT_GPC)) {
+ if ($unlock = rcube_utils::get_input_value('_unlock', rcube_utils::INPUT_GPC)) {
$response['unlock'] = $unlock;
}