Added BASIC mime support.

[squirrelmail.git] / src / compose.php
diff --git a/src/compose.php b/src/compose.php

index f2383bfbf5d648723036f95ab2df080002c447b5..38ca42159b3da54f6d78631bc3eb6e55875e777b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -5,13 +5,15 @@
     include("../functions/imap.php");
     include("../functions/mailbox.php");
     include("../functions/date.php");
+   include("../functions/mime.php");
+
  
     echo "<HTML><BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">\n";
     $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-   displayPageHeader($mailbox);
-   selectMailbox($imapConnection, $mailbox, $numMessages);
+   displayPageHeader("None");
  
     if ($reply_id) {
+      selectMailbox($imapConnection, $mailbox, $numMessages);
        $body_ary = fetchBody($imapConnection, $reply_id);
        for ($i=0;$i < count($body_ary);$i++) {
           $tmp = strip_tags($body_ary[$i]);
@@ -19,6 +21,7 @@
           $body = "$body> $tmp";
        }
     } else if ($forward_id) {
+      selectMailbox($imapConnection, $mailbox, $numMessages);
        $body_ary = fetchBody($imapConnection, $forward_id);
        for ($i=0;$i < count($body_ary);$i++) {
           $tmp = strip_tags($body_ary[$i]);
@@ -28,8 +31,7 @@
     }
  
     echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
-   echo "<CENTER>";
-   echo "<TABLE COLS=2 WIDTH=100% ALIGN=CENTER>\n";
+   echo "<TABLE COLS=2 WIDTH=100% ALIGN=CENTER CELLSPACING=0>\n";
     echo "   <TR>\n";
     echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
     echo "         <FONT FACE=\"Arial,Helvetica\">To: </FONT>\n";
@@ -54,22 +56,32 @@
     echo "         <INPUT TYPE=TEXT NAME=passed_bcc SIZE=60><BR>";
     echo "      </TD>\n";
     echo "   </TR>\n";
+
     echo "   <TR>\n";
     echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
     echo "         <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
     echo "      </TD><TD WIDTH=85% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
-   if ($reply_subj)
+   if ($reply_subj) {
+      $reply_subj = str_replace("\"", "'", $reply_subj);
+      $reply_subj = stripslashes($reply_subj);
        echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"Re: $reply_subj\"><BR>";
-   else if ($forward_subj)
-      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"Fwd: $forward_subj\"><BR>";
-   else
-      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60><BR>";
+   } else if ($forward_subj) {
+      $forward_subj = stripquotes($forward_subj);
+      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"[Fwd: $forward_subj]\"><BR>";
+   } else {
+      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60>";
+   }
+   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"Send\"><BR>";
     echo "      </TD>\n";
     echo "   </TR>\n";
+   echo "   <TR>\n";
+   echo "      <TD BGCOLOR=FFFFFF ALIGN=RIGHT VALIGN=TOP>\n";
+   echo "      </TD>";
+   echo "      <TD BGCOLOR=FFFFFF>\n";
+   echo "         <TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
+   echo "      </TD>";
+   echo "   </TR>\n";
     echo "</TABLE>\n";
-
-   echo "<TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
-   echo "<INPUT TYPE=SUBMIT VALUE=\"Send\">";
-   echo "</CENTER>";
+   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Send\"></CENTER>";
     echo "</FORM>";
  ?>
 \ No newline at end of file