From 89d6ce68463b92641946551b07ec49b023d56d90 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 01 May 2014 05:48:29 -0400
Subject: [PATCH] Update to TinyMCE 4.x
---
program/steps/utils/spell_html.inc | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/program/steps/utils/spell_html.inc b/program/steps/utils/spell_html.inc
index 27b14ac..b31d6ed 100644
--- a/program/steps/utils/spell_html.inc
+++ b/program/steps/utils/spell_html.inc
@@ -19,30 +19,22 @@
+-----------------------------------------------------------------------+
*/
-// read input data
-$data = file_get_contents('php://input');
-// Decode JSON input
-$request = json_decode($data, true);
+$lang = rcube_utils::get_input_value('lang', rcube_utils::INPUT_POST);
+$data = rcube_utils::get_input_value('text', rcube_utils::INPUT_POST);
+$data = html_entity_decode($data, ENT_QUOTES, RCUBE_CHARSET);
$result = array();
-
-$lang = $request['params'][0];
-$data = $request['params'][1];
-$data = implode("\n", (array) $data);
-
-$result['id'] = $request['id'];
$spellchecker = new rcube_spellchecker($lang);
-if ($request['method'] == 'checkWords') {
- $result['result'] = $spellchecker->get_words($data);
-}
-else if ($request['method'] == 'getSuggestions') {
- $result['result'] = $spellchecker->get_suggestions($data);
-}
-else if ($request['method'] == 'learnWord') {
+if ($method == 'learnWord') {
$spellchecker->add_word($data);
$result['result'] = true;
+}
+else if ($data) {
+ if (!$spellchecker->check($data)) {
+ $result['words'] = $spellchecker->get();
+ }
}
if ($error = $spellchecker->error()) {
@@ -51,12 +43,12 @@
'message' => sprintf("Spell check engine error: " . $error)),
true, false);
- echo '{"error":{"errstr":"' . addslashes($error) . '","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}';
+ echo json_encode(array('error' => $error));
exit;
}
// send output
-header("Content-Type: text/xml; charset=".RCUBE_CHARSET);
+header("Content-Type: application/json; charset=".RCUBE_CHARSET);
echo json_encode($result);
exit;
--
Gitblit v1.9.1