Quotes detection in motd

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index ce9e3c6fe8626d36cc6f1d2088b500616c35383b..27823af6e58f6366830072ccbe46f597023eec17 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -390,27 +390,32 @@ function newMail () {
         sqimap_mailbox_select($imapConnection, $mailbox);
         $message = sqimap_get_message($imapConnection, $id, $mailbox);
         $orig_header = $message->header;
+       $body = '';
         if ($ent_num) {
-            $message = getEntity($message, $ent_num);
-        }
-        if ($message->header->type0 == 'text' ||
-            $message->header->type1 == 'message') {
-            if ($ent_num) {
-                $body = decodeBody(
-                    mime_fetch_body($imapConnection, $id, $ent_num),
-                    $message->header->encoding);
-            } else {
-                $body = decodeBody(
-                    mime_fetch_body($imapConnection, $id, 1),
-                    $message->header->encoding);
-            }
-        } else {
-            $body = '';
-        }
-
-        if ($message->header->type1 == 'html') {
-            $body = strip_tags($body);
-        }
+           $ent_ar = preg_split('/_/',$ent_num);
+           foreach($ent_ar as $ent_num) {
+               $message = getEntity($message, $ent_num);
+               if ($message->header->type0 == 'text' ||
+                   $message->header->type1 == 'message') {
+                   $bodypart = decodeBody(
+                       mime_fetch_body($imapConnection, $id, $ent_num),
+                           $message->header->encoding);
+                       if ($message->header->type1 == 'html') {
+                           $bodypart = strip_tags($bodypart);
+                       }
+                       $body .= $bodypart;
+               }
+           }
+        } else if ($message->header->type0 == 'text' ||
+                   $message->header->type1 == 'message') {
+                       $body .= decodeBody(
+                       mime_fetch_body($imapConnection, $id, 1),
+                       $message->header->encoding);
+                       if ($message->header->type1 == 'html') {
+                           $body = strip_tags($body);
+                       }
+                       
+        } 
 
         sqUnWordWrap($body);
         
@@ -583,6 +588,7 @@ function showInputForm ($session) {
            $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
            $saved_draft, $mail_sent, $sig_first, $edit_as_new;
 
+    $file_uploads = ini_get('file_uploads');
     $subject = decodeHeader($subject, false);
     $reply_subj = decodeHeader($reply_subj, false);
     $forward_subj = decodeHeader($forward_subj, false);
@@ -598,8 +604,10 @@ function showInputForm ($session) {
              '// --></SCRIPT>' . "\n\n";
     }
 
-    echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
-         'ENCTYPE="multipart/form-data"';
+    echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ';
+    if ($file_uploads) {
+        echo 'ENCTYPE="multipart/form-data"';
+    }
     do_hook("compose_form");
 
     
@@ -752,36 +760,38 @@ function showInputForm ($session) {
     }
 
     /* This code is for attachments */
-    echo '   <TR>' . "\n" .
-         '     <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
-                _("Attach:") .
-         '      </TD>' . "\n" .
-         '      <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
-         '      <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
-         '      &nbsp;&nbsp;<input type="submit" name="attach"' .
-         ' value="' . _("Add") .'">' . "\n" .
-         '     </TD>' . "\n" .
-         '   </TR>' . "\n";
+    if ($file_uploads) {
+        echo '   <TR>' . "\n" .
+             '     <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
+                    _("Attach:") .
+             '      </TD>' . "\n" .
+             '      <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+             '      <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
+             '      &nbsp;&nbsp;<input type="submit" name="attach"' .
+             ' value="' . _("Add") .'">' . "\n" .
+             '     </TD>' . "\n" .
+             '   </TR>' . "\n";
 
-    if (count($attachments)) {
-        $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-        echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\n" .
-             '&nbsp;' .
-             '</td><td align=left bgcolor="' . $color[0] . '">';
-        foreach ($attachments as $key => $info) {
-           if ($info['session'] == $session) { 
-               $attached_file = "$hashed_attachment_dir/$info[localfilename]";
-               echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
-                        $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
-                        show_readable_size( filesize( $attached_file ) ) . ")<br>\n";
-           }
-        }
-
-        echo '<input type="submit" name="do_delete" value="' .
-             _("Delete selected attachments") . "\">\n" .
-             '</td></tr>';
-    }
-    /* End of attachment code */
+        if (count($attachments)) {
+            $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+            echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\n" .
+                 '&nbsp;' .
+                 '</td><td align=left bgcolor="' . $color[0] . '">';
+            foreach ($attachments as $key => $info) {
+                if ($info['session'] == $session) {
+                    $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+                    echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
+                            $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
+                            show_readable_size( filesize( $attached_file ) ) . ")<br>\n";
+                }
+            }
+
+            echo '<input type="submit" name="do_delete" value="' .
+                 _("Delete selected attachments") . "\">\n" .
+                 '</td></tr>';
+        }
+        /* End of attachment code */
+    }
     if ($compose_new_win == '1') {
         echo '</TABLE>'."\n";
     }
@@ -825,7 +835,7 @@ function showComposeButtonRow() {
         }
     }
 
-    echo "   <TR><td>\n   </td><td>\n";
+    echo "   </td></tr>\n   <TR><td>\n   </td><td>\n";
     echo "\n    <INPUT TYPE=SUBMIT NAME=\"sigappend\" VALUE=\"". _("Signature") . "\">\n";
     if ($use_javascript_addr_book) {
         echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"".