Changeset 1751 in subversion

Timestamp:

Sep 6, 2008 12:41:43 PM (5 years ago)

Author:

thomasb

Message:

Don't wrap worwarded text; better wrap reply message text

Location:

trunk/roundcubemail/program/steps/mail

Files:

• compose.inc (modified) (3 diffs)
• func.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -33 +33 @@
   {
     @unlink($_SESSION['compose']['attachments'][$id]['path']);
-    $_SESSION['compose']['attachments'][$id] = NULL;
+    unset($_SESSION['compose']['attachments'][$id]);
     $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
     $OUTPUT->send();
@@ -479 +479 @@
   {
     // soft-wrap message first
-    $body = wordwrap($body, 75);
+    $body = rcmail_wrap_quoted($body, 75);
   
     // split body into single lines
@@ -527 +527 @@
   if (!$bodyIsHtml)
   {
-    // soft-wrap message first
-    $body = wordwrap($body, 80);
-
     $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
       $MESSAGE->subject,

trunk/roundcubemail/program/steps/mail/func.inc

@@ -643 +643 @@
   $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return ".JS_OBJECT_NAME.".command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";
   
-//    if ($part->ctype_parameters['format'] != 'flowed')
-//      $body = wordwrap(trim($body), 80);
-
   // search for patterns like links and e-mail addresses
   $body = preg_replace($convert_patterns, $convert_replaces, $body);
@@ -1014 +1011 @@
 
 
+/**
+ * Wrap text to a given number of characters per line
+ * but respect the mail quotation of replies messages (>)
+ *
+ * @param string Text to wrap
+ * @param int The line width
+ * @return string The wrapped text
+ */
+function rcmail_wrap_quoted($text, $max = 76)
+{
+  // Rebuild the message body with a maximum of $max chars, while keeping quoted message.
+  $lines = preg_split('/\r?\n/', trim($text));
+  $out = '';
+
+  foreach ($lines as $line) {
+    if (strlen($line) > $max) {
+      if (preg_match('/^([>\s]+)/', $line, $regs)) {
+        $length = strlen($regs[0]);
+        $prefix = substr($line, 0, $length);
+
+        // Remove '> ' from the line, then wordwrap() the line
+        $line = wordwrap(substr($line, $length), $max - $length);
+
+        // Rebuild the line with '> ' at the beginning of each 'subline'
+        $newline = '';
+        foreach (explode("\n", $line) as $l) {
+          $newline .= $prefix . $l . "\n";
+        }
+
+        // Remove the righest newline char
+        $line = rtrim($newline);
+      }
+      else {
+        $line = wordwrap($line, $max);
+      }
+    }
+
+    // Append the line
+    $out .= $line . "\n";
+  }
+  
+  return $out;
+}
+
+
 function rcmail_message_part_controls()
   {