fixes

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 451a5a506b2d1fb352dd52e3f8859fb4fb1d5665..f3d500889be7823c5235397fb3b4cff84b4d18ab 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -128,6 +128,11 @@ function replyAllString($header) {
    $url_replytoallcc = '';
    foreach( $url_replytoall_ar as $email => $personal) {
       if ($personal) {
+         // if personal name contains address separator then surround
+         // the personal name with double quotes.
+         if (strpos($personal,',') !== false) {
+             $personal = '"'.$personal.'"';
+         }
          $url_replytoallcc .= ", $personal <$email>";
       } else {
          $url_replytoallcc .= ', '. $email;
@@ -373,7 +378,7 @@ if ($send) {
             showInputForm($session);
             exit();
         }
-       unset($compose_messages[$session]);
+        unset($compose_messages[$session]);
         if ( isset($delete_draft)) {
             Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ).
                    "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes");
@@ -385,7 +390,7 @@ if ($send) {
         }
         else {
             Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
-                   "&startMessage=$startMessage");
+                   "&startMessage=$startMessage&mail_sent=yes");
         }
     } else {
         if ($compose_new_win == '1') {
@@ -541,6 +546,15 @@ exit();
 
 /**************** Only function definitions go below *************/
 
+function getforwardSubject($subject)
+{
+    if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+        (substr(strtolower($subject), 0, 5) != '[fwd:') &&
+        (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
+        $subject = '[Fwd: ' . $subject . ']';
+    }
+    return $subject;
+}
 
 /* This function is used when not sending or adding attachments */
 function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
@@ -596,7 +610,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             $bodypart = decodeBody($unencoded_bodypart,
             $body_part_entity->header->encoding);
             if ($type1 == 'html') {
-                $bodypart = str_replace(array('&nbsp;','&gt','&lt'),array(' ','<','>'),$bodypart);
+                $bodypart = str_replace(array('&nbsp;','&gt;','&lt;'),array(' ','<','>'),$bodypart);
                 $bodypart = strip_tags($bodypart);
             }
             if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
@@ -678,18 +692,14 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             break;
         case ('forward'):
             $send_to = '';
-            $subject = decodeHeader($orig_header->subject,false,true);
-            if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
-                (substr(strtolower($subject), 0, 5) != '[fwd:') &&
-                (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
-                $subject = '[Fwd: ' . $subject . ']';
-            }
+            $subject = getforwardSubject(decodeHeader($orig_header->subject,false,true));
             $body = getforwardHeader($orig_header) . $body;
             sqUnWordWrap($body);
             $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
             $body = "\n" . $body;
             break;
         case ('forward_as_attachment'):
+            $subject = getforwardSubject(decodeHeader($orig_header->subject,false,true));
             $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
             $body = '';
             break;
@@ -722,18 +732,20 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             /* 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;
-            sqUnWordWrap($body);
+            sqUnWordWrap($body);       // unwrap and then reset it?!
             $body = '';
-            $cnt = count($rewrap_body);
-            for ($i=0;$i<$cnt;$i++) {
-              sqWordWrap($rewrap_body[$i], ($editor_size));
-                if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+            $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
+            foreach ($rewrap_body as $line) {
+                if ($strip_sigs && substr($line,0,3) == '-- ') {
+                       break;
+                }
+                sqWordWrap($line, ($editor_size));
+                if (preg_match("/^(>+)/", $line, $matches)) {
                     $gt = $matches[1];
-                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
+                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n";
                 } else {
-                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
+                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n";
                 }
-                unset($rewrap_body[$i]);
             }
             $body = getReplyCitation($from) . $body;
             $composeMessage->reply_rfc822_header = $orig_header;
@@ -767,10 +779,11 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
            switch ($message->type0) {
            case 'message':
                 if ($message->type1 == 'rfc822') {
-                    $filename = $message->rfc822_header->subject.'.eml';
+                    $filename = $message->rfc822_header->subject;
                     if ($filename == "") {
-                        $filename = "untitled-".$message->entity_id.'.eml';
+                        $filename = "untitled-".$message->entity_id;
                     }
+                    $filename .= '.msg';
                  } else {
                    $filename = $message->getFilename();
                  }
@@ -782,7 +795,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
              $filename = $message->getFilename();
              break;
            }
-           $filename = decodeHeader($filename);
+           $filename = str_replace('&nbsp;', ' ', decodeHeader($filename));
            if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
                function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
                 $filename =  $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
@@ -840,7 +853,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
         $fp = fopen($full_localfilename, 'w');
         fwrite ($fp, $body);
         fclose($fp);
-        $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+        $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
                          $full_localfilename);
     }
     return $composeMessage;
@@ -910,7 +923,7 @@ function showInputForm ($session, $values=false) {
         echo '<BR><CENTER><B>'. _("Draft Saved").'</CENTER></B>';
     }
     if ($mail_sent == 'yes') {
-        echo '<BR><CENTER><B>'. _("Your Message has been sent").'</CENTER></B>';
+        echo '<BR><CENTER><B>'. _("Your Message has been sent.").'</CENTER></B>';
     }
     echo '<table align="center" cellspacing="0" border="0">' . "\n";
     if ($compose_new_win == '1') {
@@ -982,13 +995,13 @@ function showInputForm ($session, $values=false) {
     if ($compose_new_win == '1') {
         echo '   <TR>' . "\n" .
              '      <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
-             '         <TEXTAREA NAME=body ROWS=20 COLS="' .
+             '         <TEXTAREA NAME=body ID=body ROWS=20 COLS="' .
                        $editor_size . '" WRAP="VIRTUAL">';
     }
     else {
         echo '   <TR>' . "\n" .
             '      <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
-            '         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS="' .
+            '         &nbsp;&nbsp;<TEXTAREA NAME=body ID=body ROWS=20 COLS="' .
                       $editor_size . '" WRAP="VIRTUAL">';
     }
 
@@ -1501,7 +1514,7 @@ function deliverMessage($composeMessage, $draft=false) {
         ClearAttachments($composeMessage);
         if ($action == 'reply' || $action == 'reply_all') {
             sqimap_mailbox_select ($imap_stream, $mailbox);
-            sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', true);
+            sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false);
         }
             sqimap_logout($imap_stream);
     }