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

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

diff --git a/lib/editor/htmlarea/htmlarea.class.php b/lib/editor/htmlarea/htmlarea.class.php
index 1f336204023..f29e43bd144 100644
--- a/lib/editor/htmlarea/htmlarea.class.php
+++ b/lib/editor/htmlarea/htmlarea.class.php
@@ -344,8 +344,8 @@ class htmlarea extends editorObject {
             echo "\n".'<script language="javascript" type="text/javascript">'."\n";
             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";
             echo '</script>'."\n";
@@ -353,8 +353,8 @@ class htmlarea extends editorObject {
             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";
@@ -363,4 +363,4 @@ class htmlarea extends editorObject {
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/speller/lib.php b/lib/speller/lib.php
index 5e8e1d294c6..9a655f8646d 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 d4a60dde0d8..1bd5d01b5ab 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -5129,8 +5129,8 @@ function print_speller_code ($usehtmleditor=false, $return=false) {
         $str .= "\n".'<script language="javascript" type="text/javascript">'."\n";
         $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";
         $str .= '</script>'."\n";
@@ -5138,8 +5138,8 @@ function print_speller_code ($usehtmleditor=false, $return=false) {
         $str .= "\nfunction 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";