Add aspellpath check before printing editor config colde

diff --git a/lib/weblib.php b/lib/weblib.php
index 5ad29a6823001b56ed90fe7f93e3afe27638de08..e0d60315aca14a541e04d5939082536270b74116 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -694,7 +694,7 @@ function format_text_email($text, $format) {
 
         case FORMAT_MOODLE:
         case FORMAT_MARKDOWN:
-        default: 
+        default:
             $text = eregi_replace('(<a [^<]*href=["|\']?([^ "\']*)["|\']?[^>]*>([^<]*)</a>)','\\3 [ \\2 ]', $text);
             return strtr(strip_tags($text), array_flip(get_html_translation_table(HTML_ENTITIES)));
             break;
@@ -748,7 +748,7 @@ function clean_text($text, $format=FORMAT_MOODLE) {
             $text = eregi_replace("([^a-z])language([[:space:]]*)=", "\\1Xlanguage=", $text);
             $text = eregi_replace("([^a-z])on([a-z]+)([[:space:]]*)=", "\\1Xon\\2=", $text);
 
-               /// Clean up embedded scripts and , using kses
+        /// Clean up embedded scripts and , using kses
             $text = cleanAttributes($text);
 
             return $text;
@@ -760,47 +760,47 @@ function cleanAttributes($str){
 ///  This function takes a string and examines it for html tags.
 ///  If tags are detected it passes the string to a helper function cleanAttributes2
 ///  which checks for attributes and filters them for malicious content
-///                    17/08/2004                              ::                      Eamon DOT Costello AT dcu DOT ie
+///         17/08/2004              ::          Eamon DOT Costello AT dcu DOT ie
     $result = preg_replace(
             '%(<[^>]*(>|$)|>)%me', #search for html tags
-            "cleanAttributes2('\\1')", 
+            "cleanAttributes2('\\1')",
             $str
-            );   
+            );
     return  $result;
-} 
+}
+
 
-               
 function cleanAttributes2($htmlTag){
     ///  This function takes a string with an html tag and strips out any unallowed
     ///  protocols e.g. javascript:
     ///  It calls ancillary functions in kses which are prefixed by kses
-    ///                        17/08/2004                              ::                      Eamon DOT Costello AT dcu DOT ie
+    ///         17/08/2004              ::          Eamon DOT Costello AT dcu DOT ie
 
     global $CFG;
-       require_once("$CFG->libdir/kses.php");
+    require_once("$CFG->libdir/kses.php");
 
     $htmlTag = kses_stripslashes($htmlTag);
     if (substr($htmlTag, 0, 1) != '<'){
         return '&gt;';  //a single character ">" detected
     }
     if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $htmlTag, $matches)){
-        return ''; // It's seriously malformed 
-    }  
+        return ''; // It's seriously malformed
+    }
     $slash = trim($matches[1]); //trailing xhtml slash
-    $elem = $matches[2];       //the element name
+    $elem = $matches[2];    //the element name
     $attrlist = $matches[3]; // the list of attributes as a string
 
     $allowed_protocols = array('http', 'https', 'ftp', 'news', 'mailto', 'teamspeak', 'gopher');
     $attrArray =  kses_hair($attrlist, $allowed_protocols) ;
 
-    $attStr = '';  
+    $attStr = '';
     foreach ($attrArray as $arreach)
     {
         $attStr .=  ' '.strtolower($arreach['name']).'="'.strtolower($arreach['value']).'" ';
     }
     $xhtml_slash = '';
     if (preg_match('%/\s*$%', $attrlist)){
-        $xhtml_slash = ' /'; 
+        $xhtml_slash = ' /';
     }
     return "<$slash$elem$attStr$xhtml_slash>";
 }
@@ -1069,7 +1069,7 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
             $menu = "<font size=\"2\"><a target=\"$CFG->framename\" href=\"$wwwroot/login/index.php\">".get_string("login")."</a></font>";
         }
     }
-    
+
     if (isset($SESSION->justloggedin)) {
         unset($SESSION->justloggedin);
         if (!empty($CFG->displayloginfailures)) {
@@ -2558,8 +2558,9 @@ function print_editor_config() {
         $i++;
     }
     echo "};";
-
-    print_speller_code($usehtmleditor=true);
+    if($CFG->editorspelling && !empty($CFG->aspellpath)) {
+        print_speller_code($usehtmleditor=true);
+    }
 }
 
 function print_speller_code ($usehtmleditor=false) {