Merge remote-tracking branch 'alecpl/bugfix'

changelog.txt

@@ -1,3 +1,7 @@
+Version 2.0.6 (2011-??-??)
+	Fixed handling of mispelled words with no suggestions in PSpellShell engine.
+	Fixed PSpellShell command on Windows.
+	Fixed bug where Javascript error is produced when enchant_dict_suggest() returns unexpected result.
 Version 2.0.5 (2011-03-24)
 	Merged with the latest TinyMCE spellchecker version.
 Version 2.0.4 (2010-12-20)

classes/EnchantSpell.php

@@ -48,16 +48,20 @@ function &checkWords($lang, $words) {
 	 */
 	function &getSuggestions($lang, $word) {
 		$r = enchant_broker_init();
-		$suggs = array();
 
 		if (enchant_broker_dict_exists($r,$lang)) {
 			$d = enchant_broker_request_dict($r, $lang);
 			$suggs = enchant_dict_suggest($d, $word);
 
+			// enchant_dict_suggest() sometimes returns NULL
+			if (!is_array($suggs))
+				$suggs = array();
+
 			enchant_broker_free_dict($d);
 		} else {
-
+			$suggs = array();
 		}
+
 		enchant_broker_free($r);
 
 		return $suggs;

classes/PSpellShell.php

@@ -38,13 +38,13 @@ function &checkWords($lang, $words) {
 			$matches = array();
 
 			// Skip this line.
-			if (strpos($dstr, "@") === 0)
+			if ($dstr[0] == "@")
 				continue;
 
-			preg_match("/\& ([^ ]+) .*/i", $dstr, $matches);
+			preg_match("/(\&|#) ([^ ]+) .*/i", $dstr, $matches);
 
-			if (!empty($matches[1]))
-				$returnData[] = utf8_encode(trim($matches[1]));
+			if (!empty($matches[2]))
+				$returnData[] = utf8_encode(trim($matches[2]));
 		}
 
 		return $returnData;
@@ -82,7 +82,7 @@ function &getSuggestions($lang, $word) {
 			$matches = array();
 
 			// Skip this line.
-			if (strpos($dstr, "@") === 0)
+			if ($dstr[0] == "@")
 				continue;
 
 			preg_match("/\&[^:]+:(.*)/i", $dstr, $matches);
@@ -103,10 +103,14 @@ function &getSuggestions($lang, $word) {
 	function _getCMD($lang) {
 		$this->_tmpfile = tempnam($this->_config['PSpellShell.tmp'], "tinyspell");
 
-		if(preg_match("#win#i", php_uname()))
-			return $this->_config['PSpellShell.aspell'] . " -a --lang=". escapeshellarg($lang) . " --encoding=utf-8 -H < " . $this->_tmpfile . " 2>&1";
+		$file = $this->_tmpfile;
+		$lang = preg_replace("/[^-_a-z]/", "", strtolower($lang));
+		$bin  = $this->_config['PSpellShell.aspell'];
 
-		return "cat ". $this->_tmpfile ." | " . $this->_config['PSpellShell.aspell'] . " -a --encoding=utf-8 -H --lang=". escapeshellarg($lang);
+		if (preg_match("#win#i", php_uname()))
+			return "$bin -a --lang=$lang --encoding=utf-8 -H < $file 2>&1";
+
+		return "cat $file | $bin -a --lang=$lang --encoding=utf-8 -H");
 	}
 }