X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fsquirrelspell%2Fmodules%2Fcheck_me.mod;h=4ff9485c1e0b871df0f8c1ade091fc9ca22c58af;hb=90ad8cd181bd2d435465b887d2769836ace5d7f0;hp=288ac4f6ca0ba74fbf38557b905acd31e57b48cf;hpb=99f2ece35427027244dd23f85259fcfdc408c1a9;p=squirrelmail.git

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 288ac4f6..4ff9485c 100644
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -4,17 +4,17 @@
  * -------------
  * Squirrelspell module.
  *
- * Copyright (c) 1999-2004 The SquirrelMail development team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This module is the main workhorse of SquirrelSpell. It submits
  * the message to the spell-checker, parses the output, and loads
  * the interface window.
  *
- * $Id$
- *
- * @author Konstantin Riabitsev <icon@duke.edu> ($Author$)
- * @version $Date$
+ * @author Konstantin Riabitsev <icon@duke.edu>
+ * @version $Id$
+ * @package plugins
+ * @subpackage squirrelspell
  */
 
 /**
@@ -36,10 +36,14 @@ function SpellLink($jscode, $title, $link) {
 /**
  * Declaring globals for users with E_ALL set.
  */
-global $SQSPELL_APP, $attachment_dir, $SQSPELL_EREG, $color;
+global $SQSPELL_APP_DEFAULT, $SQSPELL_APP, $attachment_dir, $color;
 
-$sqspell_text = $_POST['sqspell_text'];
-$sqspell_use_app = $_POST['sqspell_use_app'];
+if (! sqgetGlobalVar('sqspell_text',$sqspell_text,SQ_POST)) {
+  $sqspell_text = '';
+}
+if (! sqgetGlobalVar('sqspell_use_app',$sqspell_use_app,SQ_POST)) {
+  $sqspell_use_app = $SQSPELL_APP_DEFAULT;
+}
 
 /**
  * Now we explode the lines for three reasons:
@@ -82,7 +86,7 @@ $sqspell_command=$SQSPELL_APP[$sqspell_use_app];
 /**
  * If you have php >= 4.3.0, we can use proc_open and safe mode
  * and not mess w/ temp files.  Otherwise we will do it the old
- * way, (minus the uneeded call to cat that messes up Wintel 
+ * way, (minus the uneeded call to cat that messes up Wintel
  * boxen.)
  * Thanks Ray Ferguson for providing this patch.
  */
@@ -92,22 +96,37 @@ if( check_php_version ( 4, 3 ) ) {
        1 => array('pipe', 'w'),  // stdout is a pipe that the child will write to
        2 => array('pipe', 'w'), // stderr is a pipe that the child will write to
     );
-    $spell_proc=proc_open($sqspell_command, $descriptorspec, $pipes);
-    fwrite($pipes[0], $sqspell_new_text);
+    $spell_proc = @proc_open($sqspell_command, $descriptorspec, $pipes);
+    if ( ! is_resource ( $spell_proc ) ) {
+        error_box ( _("Could not run the spellchecker command (%s).",
+            htmlspecialchars($sqspell_command) ) , $color );
+    }
+    if ( ! @fwrite($pipes[0], $sqspell_new_text) ) {
+        error_box ( _("Error while writing to pipe.",
+            htmlspecialchars($floc) ) , $color );
+    }
     fclose($pipes[0]);
     $sqspell_output = array();
-    for($i=1; $i<=2; $i++){
-        while(!feof($pipes[$i]))
-           array_push($sqspell_output, rtrim(fgetss($pipes[$i],999),"\n")); 
-    	fclose($pipes[$i]);
+    for($i=1; $i<=2; $i++) {
+        while(!feof($pipes[$i])) {
+           array_push($sqspell_output, rtrim(fgetss($pipes[$i],999),"\n"));
+        }
+        fclose($pipes[$i]);
     }
     $sqspell_exitcode=proc_close($spell_proc);
 } else {
     do {
       $floc = "$attachment_dir/" . md5($sqspell_new_text . microtime());
     } while (file_exists($floc));
-    $fp=fopen($floc, 'w');
-    fwrite($fp, $sqspell_new_text);
+    $fp = @fopen($floc, 'w');
+    if ( ! is_resource ($fp) ) {
+        error_box ( _("Could not open temporary file '%s'.",
+            htmlspecialchars($floc) ) , $color );
+    }
+    if ( ! @fwrite($fp, $sqspell_new_text) ) {
+        error_box ( _("Error while writing to temporary file '%s'.",
+            htmlspecialchars($floc) ) , $color );
+    }
     fclose($fp);
     exec("$sqspell_command < $floc 2>&1", $sqspell_output, $sqspell_exitcode);
     unlink($floc);
@@ -131,7 +150,7 @@ if ($sqspell_exitcode){
 /**
  * Load the user dictionary.
  */
-$words=sqspell_getLang(sqspell_getWords(), $sqspell_use_app);
+$words=sqspell_getLang($sqspell_use_app);
 /**
  * Define some variables to be used during the processing.
  */
@@ -167,7 +186,7 @@ for ($i=0; $i<sizeof($sqspell_output); $i++){
     /**
      * Check if the word is in user dictionary.
      */
-    if (!$SQSPELL_EREG("\n$sqspell_word\n", $words)){
+    if (! in_array($sqspell_word,$words)){
       $sqspell_symb=intval($tmparray[3])-1;
       if (!isset($misses[$sqspell_word])) {
         $misses[$sqspell_word] = $right;
@@ -176,7 +195,7 @@ for ($i=0; $i<sizeof($sqspell_output); $i++){
       }
       if (isset($locations[$sqspell_word])){
         $locations[$sqspell_word] .= ', ';
-      } else { 
+      } else {
         $locations[$sqspell_word] = '';
       }
       $locations[$sqspell_word] .= "$current_line:$sqspell_symb";
@@ -190,21 +209,21 @@ for ($i=0; $i<sizeof($sqspell_output); $i++){
     $tmparray = explode(" ", $sqspell_output[$i]);
     $sqspell_word=$tmparray[1];
     /**
-     * 
+     *
      * Check if the word is in user dictionary.
      */
-    if (!$SQSPELL_EREG("\n$sqspell_word\n", $words)){
+    if (!in_array($sqspell_word,$words)){
       $sqspell_symb=intval($tmparray[2])-1;
       if (!isset($misses[$sqspell_word])) {
-	    $misses[$sqspell_word] = '_NONE';
-	    $missed_words[$errors] = $sqspell_word;
-	    $errors++;
+          $misses[$sqspell_word] = '_NONE';
+          $missed_words[$errors] = $sqspell_word;
+          $errors++;
       }
       if (isset($locations[$sqspell_word])) {
-	    $locations[$sqspell_word] .= ', ';
+          $locations[$sqspell_word] .= ', ';
       } else {
-	    $locations[$sqspell_word] = '';
-	  }
+          $locations[$sqspell_word] = '';
+      }
       $locations[$sqspell_word] .= "$current_line:$sqspell_symb";
     }
   break;
@@ -218,7 +237,7 @@ if ($errors){
    */
   $extrajs="<script type=\"text/javascript\">\n"
     . "<!--\n";
-  
+
   $sqspell_lines = explode("\n", $sqspell_text);
   /**
    * The javascript array sqspell_lines[] contains all lines of
@@ -226,9 +245,9 @@ if ($errors){
    */
   $extrajs.= "var sqspell_lines=new Array();\n";
   for ($i=0; $i<sizeof($sqspell_lines); $i++){
-    $extrajs.= "sqspell_lines[$i] = \"" 
+    $extrajs.= "sqspell_lines[$i] = \""
       . chop(addslashes($sqspell_lines[$i])) . "\";\n";
-  }  
+  }
   $extrajs.= "\n\n";
 
   /**
@@ -239,7 +258,7 @@ if ($errors){
     $extrajs.= "misses[$i] = \"" . $missed_words[$i] . "\";\n";
   }
   $extrajs.= "\n\n";
-  
+
   /**
    * Suggestions are (guess what!) suggestions for misspellings
    */
@@ -262,16 +281,16 @@ if ($errors){
     $i++;
   }
 
-  /** 
+  /**
    * Add some strings so they can be i18n'd.
    */
   $extrajs.= "var ui_completed = \"" . _("Spellcheck completed. Commit changes?")
     . "\";\n";
   $extrajs.= "var ui_nochange = \"" . _("No changes were made.") . "\";\n";
-  $extrajs.= "var ui_wait = \"" 
+  $extrajs.= "var ui_wait = \""
     . _("Now saving your personal dictionary... Please wait.")
     . "\";\n";
-  
+
 
   /**
    * Did I mention that I hate dots on the end of contcatenated lines?
@@ -280,7 +299,7 @@ if ($errors){
   $extrajs.= "//-->\n"
     . "</script>\n"
     . "<script src=\"js/check_me.js\" type=\"text/javascript\"></script>\n";
-  
+
 
   displayHtmlHeader(_("SquirrelSpell Results"),$extrajs);
 
@@ -292,7 +311,7 @@ if ($errors){
    <tr>
     <td bgcolor="<?php echo $color[9] ?>" align="center">
      <b>
-      <?php printf( _("Found %s errors"), $errors ) ?>
+      <?php printf( ngettext(_("Found %d error"),_("Found %d errors"),$errors), $errors ) ?>
      </b>
     </td>
    </tr>
@@ -306,7 +325,7 @@ if ($errors){
      <form method="post">
       <input type="hidden" name="MOD" value="forget_me_not" />
       <input type="hidden" name="words" value="" />
-      <input type="hidden" name="sqspell_use_app" 
+      <input type="hidden" name="sqspell_use_app"
              value="<?php echo $sqspell_use_app ?>" />
       <table border="0" width="100%">
        <tr align="center">
@@ -316,7 +335,7 @@ if ($errors){
           echo $sptag . _("Line with an error:") . '</span>';
          ?>
          <br />
-         <textarea name="sqspell_line_area" cols="50" rows="3" 
+         <textarea name="sqspell_line_area" cols="50" rows="3"
                    wrap="hard" onfocus="this.blur()"></textarea>
         </td>
        </tr>
@@ -327,7 +346,7 @@ if ($errors){
          ?>
         </td>
         <td align="left" width="25%">
-         <input name="sqspell_error" size="10" value="" 
+         <input name="sqspell_error" size="10" value=""
                 onfocus="this.blur()" />
         </td>
         <td align="right" width="25%">
@@ -336,7 +355,7 @@ if ($errors){
          ?>
         </td>
         <td align="left" width="25%">
-         <select name="sqspell_suggestion" 
+         <select name="sqspell_suggestion"
                  onchange="if (this.options[this.selectedIndex].value != '_NONE') document.forms[0].sqspell_oruse.value=this.options[this.selectedIndex].value">
           <?php
            echo '<option>' . _("Suggestions") . '</option>';
@@ -370,23 +389,23 @@ if ($errors){
        <tr>
         <td colspan="4">
          <table border="0" cellpadding="0" cellspacing="3" width="100%">
-	  <tr align="center" bgcolor="<?php echo $color[9] ?>">
+          <tr align="center" bgcolor="<?php echo $color[9] ?>">
            <?php
-	    SpellLink('sqspellChange()',
-		      _("Change this word"),
-		      _("Change"));
-	    SpellLink('sqspellChangeAll()',
-		      _("Change ALL occurances of this word"),
-		      _("Change All"));
-	    SpellLink('sqspellIgnore()',
-		      _("Ignore this word"),
-		      _("Ignore"));
-	    SpellLink('sqspellIgnoreAll()',
-		      _("Ignore ALL occurances this word"),
-		      _("Ignore All"));
-	    SpellLink('sqspellRemember()',
-		      _("Add this word to your personal dictionary"),
-		      _("Add to Dic"));
+           SpellLink('sqspellChange()',
+                   _("Change this word"),
+                   _("Change"));
+         SpellLink('sqspellChangeAll()',
+                 _("Change ALL occurances of this word"),
+                 _("Change All"));
+         SpellLink('sqspellIgnore()',
+                 _("Ignore this word"),
+                 _("Ignore"));
+         SpellLink('sqspellIgnoreAll()',
+                 _("Ignore ALL occurances this word"),
+                 _("Ignore All"));
+         SpellLink('sqspellRemember()',
+                 _("Add this word to your personal dictionary"),
+                 _("Add to Dic"));
            ?>
           </tr>
          </table>
@@ -399,15 +418,15 @@ if ($errors){
         <td colspan="4" align="center" bgcolor="<?php echo $color[9] ?>">
          <?php
              echo '<input type="button" value="  '
-                . _("Close and Commit")
-                . '  " onclick="if (confirm(\''
-                . _("The spellcheck is not finished. Really close and commit changes?")
-                . '\')) sqspellCommitChanges()" />'
-                . ' <input type="button" value="  '
-                . _("Close and Cancel")
-                . '  " onclick="if (confirm(\''
-                . _("The spellcheck is not finished. Really close and discard changes?")
-                . '\')) self.close()" />';
+                 . _("Close and Commit")
+                 . '  " onclick="if (confirm(\''
+                 . _("The spellcheck is not finished. Really close and commit changes?")
+                 . '\')) sqspellCommitChanges()" />'
+                 . ' <input type="button" value="  '
+                 . _("Close and Cancel")
+                 . '  " onclick="if (confirm(\''
+                 . _("The spellcheck is not finished. Really close and discard changes?")
+                 . '\')) self.close()" />';
          ?>
         </td>
        </tr>
@@ -422,7 +441,7 @@ if ($errors){
   /**
    * AREN'T YOU SUCH A KNOW-IT-ALL!
    */
-  $msg='<form onsubmit="return false"><div align="center">'.
+  $msg='<form onsubmit="return false"><div align="center">' .
        '<input type="submit" value="  ' . _("Close") .
        '  " onclick="self.close()" /></div></form>';
   sqspell_makeWindow(null, _("No errors found"), null, $msg);
@@ -435,4 +454,4 @@ if ($errors){
  * End:
  * vim: syntax=php et ts=4
  */
-?>
+?>
\ No newline at end of file