Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fix spell-checking stuff in a few areas (thanks to K@ for the report)

Signed-off-by: Michael Eshom <[email protected]>
Michael Eshom 10 years ago
parent
abe8a3b1c1
commit
514cbf614c
3 changed files with 8 additions and 18 deletions
Split View Show Diff Stats
  1. 1 1
      Sources/Display.php
  2. 1 1
      Sources/Profile-Modify.php
  3. 6 16
      Sources/Search.php

+ 1 - 1
Sources/Display.php
View File 

@@ -350,7 +350,7 @@ function Display()
 
 	$context['previous_next'] = $modSettings['enablePreviousNext'] ? '<a href="' . $scripturl . '?topic=' . $topic . '.0;prev_next=prev#new">' . $txt['previous_next_back'] . '</a> - <a href="' . $scripturl . '?topic=' . $topic . '.0;prev_next=next#new">' . $txt['previous_next_forward'] . '</a>' : '';
 
 
 	// Check if spellchecking is both enabled and actually working. (for quick reply.)
 
-	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 
+	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
 
 	// Do we need to show the visual verification image?
 
 	$context['require_verification'] = !$user_info['is_mod'] && !$user_info['is_admin'] && !empty($modSettings['posts_require_captcha']) && ($user_info['posts'] < $modSettings['posts_require_captcha'] || ($user_info['is_guest'] && $modSettings['posts_require_captcha'] == -1));

+ 1 - 1
Sources/Profile-Modify.php
View File 

@@ -2717,7 +2717,7 @@ function profileLoadSignatureData()
 
 	elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height'])
 
 		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
 
 
-	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 
+	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
 
 	if (empty($context['do_preview']))
 
 		$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);

+ 6 - 16
Sources/Search.php
View File 

@@ -799,27 +799,17 @@ function PlushSearch2()
 
 	}
 
 
 	// *** Spell checking
 
-	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 
+	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
 	if ($context['show_spellchecking'])
 
 	{
 
-		// Windows fix.
 
-		ob_start();
 
-		$old = error_reporting(0);
 
-
 
-		pspell_new('en');
 
-		$pspell_link = pspell_new($txt['lang_dictionary'], $txt['lang_spelling'], '', strtr($txt['lang_character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
-
 
-		if (!$pspell_link)
 
-			$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
-
 
-		error_reporting($old);
 
-		ob_end_clean();
 
+		// Don't hardcode spellchecking functions!
 
+		$link = spell_init();
 
 
 		$did_you_mean = array('search' => array(), 'display' => array());
 
 		$found_misspelling = false;
 
 		foreach ($searchArray as $word)
 
 		{
 
-			if (empty($pspell_link))
 
+			if (empty($link))
 
 				continue;
 
 
 			// Don't check phrases.
 
@@ -836,14 +826,14 @@ function PlushSearch2()
 
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
 
 				continue;
 
 			}
 
-			elseif (pspell_check($pspell_link, $word))
 
+			elseif (spell_check($link, $word))
 
 			{
 
 				$did_you_mean['search'][] = $word;
 
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
 
 				continue;
 
 			}
 
 
-			$suggestions = pspell_suggest($pspell_link, $word);
 
+			$suggestions = spell_suggest($link, $word);
 
 			foreach ($suggestions as $i => $s)
 
 			{
 
 				// Search is case insensitive.