X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fsquirrelspell%2Fmodules%2Fcheck_me.mod;h=bc5aea8852c5026c517dc731ebc43f97ffca5ed4;hb=9eb3fcb302b8e0363760bee586f1c43e7050b365;hp=72fc8d4104382242c810b54cded611f153ed6536;hpb=6ed7bbcbd1ff4f3853925e342e5baec0b90e4a56;p=squirrelmail.git

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 72fc8d41..bc5aea88 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
  */
 
 /**
@@ -66,7 +66,7 @@ for ($i=0; $i<sizeof($sqspell_raw_lines); $i++){
   if(substr($sqspell_raw_lines[$i], 0, 1) != '>'){
     $sqspell_new_lines[$i] = ' ' . $sqspell_raw_lines[$i];
   } else {
-    $sqspell_new_lines[$i] = '';
+    $sqspell_new_lines[$i] = ' ';
   }
 }
 /**
@@ -82,7 +82,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 +92,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);
@@ -120,7 +135,7 @@ if ($sqspell_exitcode){
   $msg= "<div align='center'>"
      . sprintf(_("I tried to execute '%s', but it returned:"),
                $sqspell_command) . "<pre>"
-     . join("\n", htmlspecialchars($sqspell_output)) . "</pre>"
+     . htmlspecialchars(join("\n", $sqspell_output)) . '</pre>'
      . '<form onsubmit="return false">'
      . '<input type="submit" value="  ' . _("Close")
      . '  " onclick="self.close()" /></form></div>';
@@ -176,7 +191,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 +205,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)){
       $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 +233,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 +241,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 +254,7 @@ if ($errors){
     $extrajs.= "misses[$i] = \"" . $missed_words[$i] . "\";\n";
   }
   $extrajs.= "\n\n";
-  
+
   /**
    * Suggestions are (guess what!) suggestions for misspellings
    */
@@ -262,16 +277,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 +295,7 @@ if ($errors){
   $extrajs.= "//-->\n"
     . "</script>\n"
     . "<script src=\"js/check_me.js\" type=\"text/javascript\"></script>\n";
-  
+
 
   displayHtmlHeader(_("SquirrelSpell Results"),$extrajs);
 
@@ -306,7 +321,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 +331,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 +342,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 +351,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 +385,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>
@@ -435,4 +450,4 @@ if ($errors){
  * End:
  * vim: syntax=php et ts=4
  */
-?>
\ No newline at end of file
+?>