From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 15 Oct 2005 08:54:25 +0000 (+0000)
Subject: Windows aspell returns \r\n line endings. if \r is not removed, it breaks
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6af7eb01edcea6dabaf31910279c9b5c5c69241a;p=squirrelmail.git

Windows aspell returns \r\n line endings. if \r is not removed, it breaks
javascript and list of suggestions is empty.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10172 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/ChangeLog b/ChangeLog
index b2431edc..76e6ef87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -450,6 +450,8 @@ Version 1.5.1 -- CVS
     sqimap_mailbox_exists() check. Reported by Daniel Watts.
   - Fixed decoding of quoted-printable text in decodeBody function.
     Reported by João Carlos Mendes Luís.
+  - Added CR trimming to SquirrelSpell plugin in order to fix problems on
+    Windows systems.
 
 Version 1.5.0 - 2 February 2004
 -------------------------------
diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 14d4e3c2..37f7fd3f 100644
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -121,7 +121,7 @@ if( check_php_version ( 4, 3 ) ) {
     $sqspell_output = array();
     for($i=1; $i<=2; $i++) {
         while(!feof($pipes[$i])) {
-           array_push($sqspell_output, rtrim(fgetss($pipes[$i],999),"\n"));
+           array_push($sqspell_output, rtrim(fgetss($pipes[$i],999),"\r\n"));
         }
         fclose($pipes[$i]);
     }