Added support for Nox Spell Server; plus small bugfixes

git-svn-id: https://svn.roundcube.net/trunk@321 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 16 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/mail/spell.inc b/roundcubemail/program/steps/mail/spell.inc
index d60e691f6..bd03bfd3e 100644
--- a/roundcubemail/program/steps/mail/spell.inc
+++ b/roundcubemail/program/steps/mail/spell.inc
@@ -24,17 +24,29 @@
 
 $REMOTE_REQUEST = TRUE;
 
-$google = "ssl://www.google.com";
+// default settings
+$host = "ssl://www.google.com";
 $port = 443;
-$lang = $_GET['lang'];
+$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($google, $port, $errno, $errstr, 30))
+if ($fp = fsockopen($host, $port, $errno, $errstr, 30))
   {
   $out = "POST $path HTTP/1.0\r\n";
-  $out .= "Host: $google\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";