From 8eefbb2158c43b51a8c33e6c480cbe61539b9535 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 27 Aug 2012 04:16:04 -0400
Subject: [PATCH] Add option to enable HTML editor on forwarding (#1488517)
---
program/include/rcube_output_json.php | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/program/include/rcube_output_json.php b/program/include/rcube_output_json.php
index 73cf767..eb1a938 100644
--- a/program/include/rcube_output_json.php
+++ b/program/include/rcube_output_json.php
@@ -17,9 +17,6 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
@@ -37,18 +34,6 @@
public $type = 'js';
public $ajax_call = true;
-
-
- /**
- * Set environment variable
- *
- * @param string $name Property name
- * @param mixed $value Property value
- */
- public function set_env($name, $value)
- {
- $this->env[$name] = $value;
- }
/**
@@ -137,7 +122,7 @@
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));
}
@@ -170,8 +155,9 @@
*/
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));
+ $location = $this->app->url($p);
+ $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);",
+ rcmail::JS_OBJECT_NAME, $location, $delay));
exit;
}
@@ -224,7 +210,7 @@
$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;
}
--
Gitblit v1.9.1