From e64467bb771fefc09198f1eccece34c367352bcf Mon Sep 17 00:00:00 2001
From: scyrma <scyrma>
Date: Fri, 2 May 2008 03:34:00 +0000
Subject: [PATCH] MDL-8592: Get spellchecking to work over https (merge from
 1.9)

---
 lib/editor/htmlarea/htmlarea.class.php | 8 ++++----
 lib/speller/lib.php                    | 6 +++---
 lib/weblib.php                         | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/editor/htmlarea/htmlarea.class.php b/lib/editor/htmlarea/htmlarea.class.php
index db4bd88ee7..f4f288caa8 100644
--- a/lib/editor/htmlarea/htmlarea.class.php
+++ b/lib/editor/htmlarea/htmlarea.class.php
@@ -346,16 +346,16 @@ class htmlarea extends editorObject {
         if (!$usehtmleditor) {
             echo 'function openSpellChecker() {'."\n";
             echo "\tvar speller = new spellChecker();\n";
-            echo "\tspeller.popUpUrl = \"" . $this->cfg->wwwroot ."/lib/speller/spellchecker.html\";\n";
-            echo "\tspeller.spellCheckScript = \"". $this->cfg->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+            echo "\tspeller.popUpUrl = \"" . $this->cfg->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+            echo "\tspeller.spellCheckScript = \"". $this->cfg->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
             echo "\tspeller.spellCheckAll();\n";
             echo '}'."\n";
         } else {
             echo "\n\tfunction spellClickHandler(editor, buttonId) {\n";
             echo "\t\teditor._textArea.value = editor.getHTML();\n";
             echo "\t\tvar speller = new spellChecker( editor._textArea );\n";
-            echo "\t\tspeller.popUpUrl = \"" . $this->cfg->wwwroot ."/lib/speller/spellchecker.html\";\n";
-            echo "\t\tspeller.spellCheckScript = \"". $this->cfg->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+            echo "\t\tspeller.popUpUrl = \"" . $this->cfg->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+            echo "\t\tspeller.spellCheckScript = \"". $this->cfg->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
             echo "\t\tspeller._moogle_edit=1;\n";
             echo "\t\tspeller._editor=editor;\n";
             echo "\t\tspeller.openChecker();\n\t";
diff --git a/lib/speller/lib.php b/lib/speller/lib.php
index 5e8e1d294c..9a655f8646 100644
--- a/lib/speller/lib.php
+++ b/lib/speller/lib.php
@@ -4,8 +4,8 @@ function speller_enable (&$CFG) {
     echo "function spellClickHandler(editor, buttonId) {\n";
     echo "\teditor._textArea.value = editor.getHTML();\n";
     echo "\tvar speller = new spellChecker( editor._textArea );\n";
-    echo "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
-    echo "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php?id=$courseid\";\n";
+    echo "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+    echo "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php?id=$courseid\";\n";
     echo "\tspeller._moogle_edit=1;\n";
     echo "\tspeller._editor=editor;\n";
     echo "\tspeller.openChecker();\n";
@@ -14,4 +14,4 @@ function speller_enable (&$CFG) {
     echo "config.toolbar.push([\"spell-check\"]);\n";
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/weblib.php b/lib/weblib.php
index eb91f0f5d6..16fd139f4f 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -6463,16 +6463,16 @@ function print_speller_code ($usehtmleditor=false, $return=false) {
     if(!$usehtmleditor) {
         $str .= 'function openSpellChecker() {'."\n";
         $str .= "\tvar speller = new spellChecker();\n";
-        $str .= "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
-        $str .= "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+        $str .= "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+        $str .= "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
         $str .= "\tspeller.spellCheckAll();\n";
         $str .= '}'."\n";
     } else {
         $str .= "function spellClickHandler(editor, buttonId) {\n";
         $str .= "\teditor._textArea.value = editor.getHTML();\n";
         $str .= "\tvar speller = new spellChecker( editor._textArea );\n";
-        $str .= "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
-        $str .= "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+        $str .= "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+        $str .= "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
         $str .= "\tspeller._moogle_edit=1;\n";
         $str .= "\tspeller._editor=editor;\n";
         $str .= "\tspeller.openChecker();\n";
-- 
2.39.5