* -------------
* 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
/**
* 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:
/**
* 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.
*/
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"));
+ 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);
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);
/**
* 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.
*/
/**
* 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;
}
if (isset($locations[$sqspell_word])){
$locations[$sqspell_word] .= ', ';
- } else {
+ } else {
$locations[$sqspell_word] = '';
}
$locations[$sqspell_word] .= "$current_line:$sqspell_symb";
$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';
*/
$extrajs="<script type=\"text/javascript\">\n"
. "<!--\n";
-
+
$sqspell_lines = explode("\n", $sqspell_text);
/**
* The javascript array sqspell_lines[] contains all lines of
*/
$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";
/**
$extrajs.= "misses[$i] = \"" . $missed_words[$i] . "\";\n";
}
$extrajs.= "\n\n";
-
+
/**
* Suggestions are (guess what!) suggestions for misspellings
*/
$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?
$extrajs.= "//-->\n"
. "</script>\n"
. "<script src=\"js/check_me.js\" type=\"text/javascript\"></script>\n";
-
+
displayHtmlHeader(_("SquirrelSpell Results"),$extrajs);
<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>
<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">
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>
?>
</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%">
?>
</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>';
* End:
* vim: syntax=php et ts=4
*/
-?>
\ No newline at end of file
+?>
projects / squirrelmail.git / blobdiff