Changeset 5d2b7fd in github

Timestamp:

Aug 15, 2008 6:35:09 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

d4c01ca

Parents:

ac5d15d

Message:

Added pspell support patch by Kris Steinhoff (#1483960)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (2 diffs)
• program/steps/mail/spell.inc (modified) (2 diffs)
• program/steps/mail/spell_googie.inc (added)
• program/steps/mail/spell_pspell.inc (added)

CHANGELOG

@@ -2 +2 @@
 ---------------------------
 
-2008/08/14 (thomasb)
+2008/08/15 (thomasb)
 ----------
 - Use current mailbox name in template (#1485256)
 - Better fix for skipping untagged responses (#1485261)
+- Added pspell support patch by Kris Steinhoff (#1483960)
 
 2008/08/09 (alec)

config/main.inc.php.dist

@@ -190 +190 @@
 $rcmail_config['enable_spellcheck'] = TRUE;
 
+// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
+// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
+$rcmail_config['spellcheck_engine'] = 'googie';
+
 // For a locally installed Nox Spell Server, please specify the URI to call it.
 // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
@@ -198 +202 @@
 // These languages can be selected for spell checking.
 // Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
-// Leave empty for default set of Google spell check languages
+// Leave empty for default set of Google spell check languages, should be defined
+// when using local Pspell extension
 $rcmail_config['spellcheck_languages'] = NULL;
 

program/steps/mail/spell.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Submit request to Google's spell checking engine                    |
- |                                                                       |
- | CREDITS:                                                              |
- |   Script from GoogieSpell by amix.dk                                  |
+ |   Invoke the configured or default spell checking engine.             |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Kris Steinhoff <steinhof@umich.edu>                           |
  +-----------------------------------------------------------------------+
 
@@ -23 +19 @@
 */
 
-$REMOTE_REQUEST = TRUE;
+if ($spell_engine = $RCMAIL->config->get('spellcheck_engine', 'googie')) {
+    include('spell_'.$spell_engine.'.inc');
+}
 
-// default settings
-$host = "ssl://www.google.com";
-$port = 443;
-$lang = get_input_value('lang', RCUBE_INPUT_GET);
-$path = "/tbproxy/spell?lang=$lang";
-
-// spell check uri is configured
-if (!empty($CONFIG['spellcheck_uri']))
-  {
-  $a_uri = parse_url($CONFIG['spellcheck_uri']);
-  $ssl = ($a_uri['scheme']=='https' || $a_uri['scheme']=='ssl');
-  $port = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
-  $host = ($ssl ? 'ssl://' : '') . $a_uri['host'];
-  $path = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $lang;
-  }
-
-$data = file_get_contents('php://input');
-$store = "";
-
-if ($fp = fsockopen($host, $port, $errno, $errstr, 30))
-  {
-  $out = "POST $path HTTP/1.0\r\n";
-  $out .= "Host: $host\r\n";
-  $out .= "Content-Length: " . strlen($data) . "\r\n";
-  $out .= "Content-type: application/x-www-form-urlencoded\r\n";
-  $out .= "Connection: Close\r\n\r\n";
-  $out .= $data;
-  fwrite($fp, $out);
-  
-  while (!feof($fp))
-    $store .= fgets($fp, 128);
-  fclose($fp);
-  }
-
-print $store;  
+header('HTTP/1.1 404 Not Found');
 exit;