Changeset 1652 in subversion

Timestamp:

Aug 15, 2008 6:00:33 PM (5 years ago)

Author:

thomasb

Message:

Respect spellcheck_uri in tinyMCE spellchecker (#1484196)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php (modified) (3 diffs)
• program/js/tiny_mce/plugins/spellchecker/config.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -8 +8 @@
 - Added pspell support patch by Kris Steinhoff (#1483960)
 - Enable spellchecker for HTML editor (#1485114)
+- Respect spellcheck_uri in tinyMCE spellchecker (#1484196)
 
 2008/08/09 (alec)

trunk/roundcubemail/program/js/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php

@@ -54 +54 @@
                 $port = 443;
                 $path = "/tbproxy/spell?lang=" . $lang . "&hl=en";
-                $host = "www.google.com";
-                $url = "https://" . $server;
+                $ssl = true;
+                
+                // spell check uri is configured (added by RoundCube)
+                if (!empty($this->_config['rpc_uri'])) {
+                        $a_uri = parse_url($this->_config['rpc_uri']);
+                        $ssl = ($a_uri['scheme']=='https' || $a_uri['scheme']=='ssl');
+                        $port = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
+                        $server = $a_uri['host'];
+                        $path = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $lang;
+                }
 
                 // Setup XML request
@@ -75 +83 @@
                         // Use curl
                         $ch = curl_init();
-                        curl_setopt($ch, CURLOPT_URL,$url);
+                        curl_setopt($ch, CURLOPT_URL, ($ssl ? "https://" : "http://") . $server);
                         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $header);
@@ -83 +91 @@
                 } else {
                         // Use raw sockets
-                        $fp = fsockopen("ssl://" . $server, $port, $errno, $errstr, 30);
+                        $fp = fsockopen(($ssl ? "ssl://" : "") . $server, $port, $errno, $errstr, 30);
                         if ($fp) {
                                 // Send request

trunk/roundcubemail/program/js/tiny_mce/plugins/spellchecker/config.php

@@ -8 +8 @@
         $rcmail_config = new rcube_config();
         $config['general.engine'] = $rcmail_config->get('spellcheck_engine') == 'pspell' ? 'PSpell' : 'GoogleSpell';
+        $config['GoogleSpell.rpc_uri'] = $rcmail_config->get('spellcheck_uri');
         
         /** end RoundCube specific code */