Merge branch 'w36_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Sep 2011 09:23:44 +0000 (11:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Sep 2011 09:23:44 +0000 (11:23 +0200)
lib/editor/tinymce/tiny_mce/3.4.5/plugins/spellchecker/classes/GoogleSpell.php
lib/editor/tinymce/tiny_mce/3.4.5/plugins/spellchecker/config.php

index e0aa5f1..29f7f08 100644 (file)
@@ -79,6 +79,12 @@ class GoogleSpell extends SpellChecker {
                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $header);
                        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+                       if (!empty($this->_config['GoogleSpell.proxy'])) {
+                               curl_setopt($ch, CURLOPT_PROXY, $this->_config['GoogleSpell.proxy']);
+                               if (!empty($this->_config['GoogleSpell.proxyport'])) {
+                                       curl_setopt($ch, CURLOPT_PROXYPORT, $this->_config['GoogleSpell.proxyport']);
+                               }
+                       }
                        $xml = curl_exec($ch);
                        curl_close($ch);
                } else {
index be64e8d..42e373c 100644 (file)
@@ -14,6 +14,10 @@ require_once(dirname(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__F
        //$config['general.engine'] = 'PSpellShell';
        //$config['general.remote_rpc_url'] = 'http://some.other.site/some/url/rpc.php';
 
+       // GoogleSpell settings
+       $config['GoogleSpell.proxy'] = isset($CFG->proxyhost) ? $CFG->proxyhost : '';
+    $config['GoogleSpell.proxyport'] = isset($CFG->proxyport) ? $CFG->proxyport : '';
+
     if ($config['general.engine'] === 'PSpell' or $config['general.engine'] === 'PSpellShell') {
         // PSpell settings
         $config['PSpell.mode'] = PSPELL_FAST;