Merge "Changed Tiny-Mce default spellchecker to aspell"

htdocs/js/tinymce/README.Mahara

@@ -11,3 +11,5 @@ Changes:
  * Added all of the language packs
  * Removed unused plugins/media/ to fix Debian bug #591200
  * Removed the standard spellchecker plugin and replace with the php spellchecker plugin
+ * Edited spellchecker config.php to check if a path for aspell is set
+ * Renamed error function in plugins/spellchecker/includes/general.php to mceError

htdocs/js/tinymce/plugins/spellchecker/config.php

@@ -6,6 +6,14 @@
  */
 	// General settings
 	$config['general.engine'] = 'GoogleSpell';
+
+	define('INTERNAL', 1);
+	require_once(dirname(__FILE__).'/../../../../init.php');
+	$aspellpath = get_config('pathtoaspell');
+	if (file_exists($aspellpath) && is_executable($aspellpath)) {
+		$config['general.engine'] = 'PSpellShell';
+	}
+
 	//$config['general.engine'] = 'PSpell';
 	//$config['general.engine'] = 'PSpellShell';
 	//$config['general.remote_rpc_url'] = 'http://some.other.site/some/url/rpc.php';
@@ -18,7 +26,7 @@
 
 	// PSpellShell settings
 	$config['PSpellShell.mode'] = PSPELL_FAST;
-	$config['PSpellShell.aspell'] = '/usr/bin/aspell';
+	$config['PSpellShell.aspell'] = $aspellpath;
 	$config['PSpellShell.tmp'] = '/tmp';
 
 	// Windows PSpellShell settings

htdocs/js/tinymce/plugins/spellchecker/includes/general.php

@@ -74,7 +74,7 @@ function info($msg) {
 	$log->info(implode(', ', $args));
 }
 
-function error($msg) {
+function mceError($msg) {
 	$args = func_get_args();
 
 	$log = getLogger();
@@ -95,4 +95,4 @@ function fatal($msg) {
 	$log->fatal(implode(', ', $args));
 }
 
-?>
+?>
\ No newline at end of file

htdocs/lib/config-defaults.php

@@ -197,6 +197,7 @@ $cfg->maximageresizememory = 104857600;
 $cfg->pathtogzip = '/bin/gzip';
 $cfg->pathtounzip = '/usr/bin/unzip';
 $cfg->pathtozip   = '/usr/bin/zip';
+$cfg->pathtoaspell = '/usr/bin/aspell';
 $cfg->ziprecursearg = '-r';
 $cfg->unzipdirarg = '-d';
 $cfg->unziplistarg = '-l';

htdocs/lib/web.php

@@ -123,6 +123,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
                 $toolbar_align = 'left';
 
                 if ($check[$key] == 'tinymce') {
+                    $spellchecker_rpc = $jsroot.'tinymce/plugins/spellchecker/rpc.php';
                     $tinymce_config = <<<EOF
     mode: "none",
     theme: "advanced",
@@ -133,6 +134,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
     theme_advanced_toolbar_location : "top",
     theme_advanced_toolbar_align : "{$toolbar_align}",
     fix_list_elements: true,
+    spellchecker_rpc_url : "{$spellchecker_rpc}",
     //width: '512',
 EOF;
                 }