added "reply-to" capabilities

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 38ca42159b3da54f6d78631bc3eb6e55875e777b..83cb45bd5e4ece6f2f237173b077bfd1c892461c 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -12,17 +12,14 @@
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
    displayPageHeader("None");
 
-   if ($reply_id) {
+   if ($reply_id || $forward_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]);
-         $tmp = substr($tmp, 0, strlen($tmp) -1);
-         $body = "$body> $tmp";
-      }
-   } else if ($forward_id) {
-      selectMailbox($imapConnection, $mailbox, $numMessages);
-      $body_ary = fetchBody($imapConnection, $forward_id);
+      if ($reply_id)
+         $msg = fetchMessage($imapConnection, $reply_id);
+      else
+         $msg = fetchMessage($imapConnection, $forward_id);
+
+      $body_ary = formatBody($msg);
       for ($i=0;$i < count($body_ary);$i++) {
          $tmp = strip_tags($body_ary[$i]);
          $tmp = substr($tmp, 0, strlen($tmp) -1);
@@ -31,11 +28,11 @@
    }
 
    echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
-   echo "<TABLE COLS=2 WIDTH=100% ALIGN=CENTER CELLSPACING=0>\n";
+   echo "<TABLE COLS=2 WIDTH=50 ALIGN=CENTER CELLSPACING=0 BORDER=0>\n";
    echo "   <TR>\n";
-   echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
+   echo "      <TD WIDTH=50 BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">To: </FONT>\n";
-   echo "      </TD><TD WIDTH=85% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
+   echo "      </TD><TD WIDTH=% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
    if ($send_to)
       echo "         <INPUT TYPE=TEXT NAME=passed_to VALUE=\"$send_to\" SIZE=60><BR>";
    else
@@ -43,31 +40,40 @@
    echo "      </TD>\n";
    echo "   </TR>\n";
    echo "   <TR>\n";
-   echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
+   echo "      <TD WIDTH=50 BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">CC:</FONT>\n";
-   echo "      </TD><TD WIDTH=85% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
+   echo "      </TD><TD WIDTH=% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
    echo "         <INPUT TYPE=TEXT NAME=passed_cc SIZE=60><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
    echo "   <TR>\n";
-   echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
+   echo "      <TD WIDTH=50 BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">BCC:</FONT>\n";
-   echo "      </TD><TD WIDTH=85% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
+   echo "      </TD><TD WIDTH=% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
    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 "      <TD WIDTH=50 BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
-   echo "      </TD><TD WIDTH=85% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
+   echo "      </TD><TD WIDTH=% BGCOLOR=FFFFFF ALIGN=LEFT>\n";
    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>";
+      $reply_subj = trim($reply_subj);
+      if (substr(strtolower($reply_subj), 0, 3) != "re:")
+         $reply_subj = "Re: $reply_subj";
+      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"$reply_subj\">";
    } else if ($forward_subj) {
-      $forward_subj = stripquotes($forward_subj);
-      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"[Fwd: $forward_subj]\"><BR>";
+      $forward_subj = str_replace("\"", "'", $forward_subj);
+      $forward_subj = stripslashes($forward_subj);
+      $forward_subj = trim($forward_subj);
+      if ((substr(strtolower($forward_subj), 0, 4) != "fwd:") &&
+          (substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
+          (substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
+         $forward_subj = "[Fwd: $forward_subj]";
+      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"$forward_subj\">";
    } else {
       echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60>";
    }
@@ -75,10 +81,8 @@
    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 BGCOLOR=FFFFFF COLSPAN=2>\n";
+   echo "         &nbsp;&nbsp;<TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
    echo "      </TD>";
    echo "   </TR>\n";
    echo "</TABLE>\n";