Changeset 503 for branches/1.1dev/lib

Timestamp:

Feb 10, 2015 12:03:25 AM (9 years ago)

Author:

anonymous

Message:

Backported spellcheck fixes

File:

• branches/1.1dev/lib/SpellCheck.inc.php (modified) (17 diffs)

branches/1.1dev/lib/SpellCheck.inc.php

@@ -20 +20 @@
         'highlight_end' => '</strong>',
     );
-    
+
     var $_pspell_cfg_handle;
     var $_pspell_handle;
     var $_use_personal_wordlist = false;
     var $_errors = array();
-    
+
     /**
      * Constructor.
@@ -85 +85 @@
         return $this->_params[$param];
     }
-    
+
     /**
      * Check whether any errors have been triggered.
@@ -103 +103 @@
         $this->_errors = array();
     }
-    
+
     /**
      * Check one word.
@@ -123 +123 @@
         }
     }
-    
+
     /**
      * Suggest the correct spelling for one misspelled word.
@@ -138 +138 @@
         return pspell_suggest($this->_pspell_handle, $word);
     }
-    
+
     /**
      * Add a word to a personal list.
@@ -154 +154 @@
             if (pspell_add_to_personal($this->_pspell_handle, $word)) {
                 logMsg(sprintf('Added "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
-                return true;            
+                return true;
             } else {
                 logMsg(sprintf('Failed adding "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_ERR, __FILE__, __LINE__);
@@ -161 +161 @@
         }
     }
-    
+
     /**
      * Save personal list to file.
@@ -184 +184 @@
         }
     }
-    
+
     /**
      * Returns an array of suggested words for each misspelled word in the given text.
@@ -221 +221 @@
         }
     }
-    
+
     /**
      * Checks all words in a given string.
@@ -255 +255 @@
         }
     }
-    
+
     /**
      * Returns a given string with misspelled words highlighted.
@@ -267 +267 @@
      */
     function getStringHighlighted($string, $show_footnote=false)
-    { 
+    {
         // Split words on punctuation except apostrophes (this regex is used in several places in this class).
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
@@ -279 +279 @@
                     $footnote = $show_footnote ? '<sup style="color:#999;">' . ++$cnt . '</sup>' : '';
                     $words[$i] = $this->getParam('highlight_start') . $word . $this->getParam('highlight_end') . $footnote;
-                    $string = preg_replace("/\b$word\b/", $words[$i], $string);
+                    $string = preg_replace(sprintf('/\b%s\b/', preg_quote($word, '/')), $words[$i], $string);
                 }
             }
         }
         return $string;
-        // return join(' ', $words);
-    }
-    
+    }
+
     /**
      * Prints the HTML for correcting all misspellings found in the text of one $_FORM element.
@@ -302 +301 @@
         <input name="<?php echo $form_name ?>" type="hidden" value="<?php echo oTxt(getFormData($form_name)) ?>" />
         <?php
-        
+
         $form_words = $this->getStringSuggestions(getFormData($form_name));
         if (is_array($form_words) && !empty($form_words)) {
@@ -315 +314 @@
                 <option value="<?php echo $original_word ?>">(<?php echo $original_word ?>)</option>
                 <?php
-                
+
                 foreach ($words as $suggestion) {
                     ?>
@@ -321 +320 @@
                     <?php
                 }
-                
+
                 ?>
                 </select>
@@ -334 +333 @@
         }
     }
-    
+
     /**
      * Tests if any form spelling corrections have been submitted.
@@ -348 +347 @@
         return (false !== getFormData('spelling_suggestions', false)) || (false !== getFormData('spelling_corrections', false));
     }
-    
+
     /**
      * Replace the misspelled words in the text of a specified form with the corrections.