slightly better reply wrapping

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

diff --git a/src/compose.php b/src/compose.php
index abb6ceb814b7a389e49fe017289a64b6082ec80d..27a8ccf091690247eda290d1f3292b09e1320f6a 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -666,19 +666,18 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             }
             /* this corrects some wrapping/quoting problems on replies */
             $rewrap_body = explode("\n", $body);
             }
             /* this corrects some wrapping/quoting problems on replies */
             $rewrap_body = explode("\n", $body);

-
-           $from =  (is_array($orig_header->from)) ? 
-                     $orig_header->from[0] : $orig_header->from;
+               $from =  (is_array($orig_header->from)) ? 
+                       $orig_header->from[0] : $orig_header->from;

             $body = getReplyCitation($from->getAddress(false));
             sqUnWordWrap($body);
             $cnt = count($rewrap_body);
             for ($i=0;$i<$cnt;$i++) {
             $body = getReplyCitation($from->getAddress(false));
             sqUnWordWrap($body);
             $cnt = count($rewrap_body);
             for ($i=0;$i<$cnt;$i++) {

-              sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+              sqWordWrap($rewrap_body[$i], ($editor_size));

                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
                     $gt = $matches[1];
                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
                     $gt = $matches[1];

-                    $body .= '>' . str_replace("\n", "\n>$gt ", $rewrap_body[$i]) ."\n";
+                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";

                 } else {
                 } else {

-                    $body .= '> ' . str_replace("\n", "\n> ", $rewrap_body[$i]) . "\n";
+                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";

                 }
                 unset($rewrap_body[$i]);
             }
                 }
                 unset($rewrap_body[$i]);
             }