Changeset b4edf78 in github

Timestamp:

May 30, 2011 11:08:26 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1d5779b

Parents:

55150f8

Message:

• Provided rcube_spellchecker class, simplified code in utils task (less spell* files)

Location:

program

Files:

• include/rcube_spellchecker.php (added)
• js/editor.js (modified) (1 diff)
• steps/utils/spell.inc (modified) (2 diffs)
• steps/utils/spell_googie.inc (deleted)
• steps/utils/spell_html.inc (added)
• steps/utils/spell_html_googie.inc (deleted)
• steps/utils/spell_html_pspell.inc (deleted)
• steps/utils/spell_pspell.inc (deleted)

program/js/editor.js

@@ -48 +48 @@
       theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo',
       spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
-      spellchecker_rpc_url: '?_task=utils&_action=spell&tiny=1',
+      spellchecker_rpc_url: '?_task=utils&_action=spell_html',
       accessibility_focus: false,
       oninit: 'rcmail_editor_callback'

program/steps/utils/spell.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -19 +20 @@
 */
 
-// max. number of suggestions for one word
-define('MAX_SUGGESTIONS', 10);
+// read input
+$lang = get_input_value('lang', RCUBE_INPUT_GET);
+$data = file_get_contents('php://input');
 
-$tiny = !empty($_GET['tiny']) ? 'html_' : '';
+// Get data string
+$left = strpos($data, '<text>');
+$right = strrpos($data, '</text>');
+$data = substr($data, $left+6, $right-($left+6));
+$data = html_entity_decode($data, ENT_QUOTES, RCMAIL_CHARSET);
 
-if ($spell_engine = $RCMAIL->config->get('spellcheck_engine', 'googie')) {
-    include('spell_'.$tiny.$spell_engine.'.inc');
-}
+$spellchecker = new rcube_spellchecker($lang);
+$spellchecker->check($data);
+$result = $spellchecker->get_xml();
 
-header('HTTP/1.1 404 Not Found');
+// set response length
+header("Content-Length: " . strlen($result));
+
+// Don't use server's default Content-Type charset (#1486406)
+header("Content-Type: text/xml; charset=" . RCMAIL_CHARSET);
+print $result;
 exit;
-