projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
workaround for php3 dealing with optional arguments to function loginToImapServer
[squirrelmail.git] / src / compose.php
diff --git a/src/compose.php b/src/compose.php
index ac450160b701413147ae849554d098e0100c2628..e13c8a257c156237b34c1a550624c1249c690818 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -7,45 +7,130 @@
    include("../functions/date.php");
    include("../functions/mime.php");
 
+   include("../src/load_prefs.php");
 
    echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+   $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
    displayPageHeader($color, "None");
 
    if ($forward_id) {
       selectMailbox($imapConnection, $mailbox, $numMessages);
-      $msg = fetchMessage($imapConnection, $forward_id);
+      $msg = fetchMessage($imapConnection, $forward_id, $mailbox);
 
-      $body_ary = formatBody($msg);
-      $tmp = "-------- Original Message ---------\n";
+      if (containsType($msg, "text", "html", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+      } else if (containsType($msg, "text", "plain", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+      }
+      // add other primary displaying msg types here
+      else {
+         // find any type that's displayable
+         if (containsType($msg, "text", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+         } else if (containsType($msg, "msg", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+         } else {
+            $body = _("No Message");
+         }
+      }
+
+      $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
+
+      $tmp = _("-------- Original Message ---------\n");
+      $body_ary = explode("\n", $body);
+      $body = "";
       for ($i=0;$i < count($body_ary);$i++) {
-         $tmp .= strip_tags($body_ary[$i]);
-         $tmp = substr($tmp, 0, strlen($tmp) -1);
-         $body = "$body$tmp";
+         if ($type1 == "html")
+            $tmp .= strip_tags($body_ary[$i]);
+         else
+            $tmp .= $body_ary[$i];
+         $body = "$body$tmp\n";
          $tmp = "";
       }
    }
 
    if ($reply_id) {
       selectMailbox($imapConnection, $mailbox, $numMessages);
-      $msg = fetchMessage($imapConnection, $reply_id);
+      $msg = fetchMessage($imapConnection, $reply_id, $mailbox);
 
-      $body_ary = formatBody($msg);
+      if (containsType($msg, "text", "html", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+      } else if (containsType($msg, "text", "plain", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+      }
+      // add other primary displaying msg types here
+      else {
+         // find any type that's displayable
+         if (containsType($msg, "text", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+         } else if (containsType($msg, "msg", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+         } else {
+            $body = _("No Message");
+         }
+      }
+
+      $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
+
+      $body_ary = explode("\n", $body);
+      $body = "";
       for ($i=0;$i < count($body_ary);$i++) {
-         $tmp = strip_tags($body_ary[$i]);
-         $tmp = substr($tmp, 0, strlen($tmp) -1);
-         $body = "$body> $tmp";
+         if ($type1 == "html")
+            $tmp = strip_tags($body_ary[$i]);
+         else
+            $tmp = $body_ary[$i];
+         $body = "$body> $tmp\n";
       }
    }
 
+   // Add some decoding information
+   $send_to = encodeEmailAddr($send_to);
+   // parses the field and returns only the email address
+   $send_to = decodeEmailAddr($send_to);
+
+   $send_to = strtolower($send_to);
    $send_to = ereg_replace("\"", "", $send_to);
    $send_to = stripslashes($send_to);
 
+   /** This formats a CC string if they hit "reply all" **/
+   if ($send_to_cc != "") {
+      $send_to_cc = ereg_replace(";", ",", $send_to_cc);
+      $sendcc = explode(",", $send_to_cc);
+      $send_to_cc = "";
+
+      for ($i = 0; $i < count($sendcc); $i++) {
+         $sendcc[$i] = trim($sendcc[$i]);
+         if ($sendcc[$i] == "")
+            continue;
+
+         $sendcc[$i] = encodeEmailAddr($sendcc[$i]);
+         $sendcc[$i] = decodeEmailAddr($sendcc[$i]);
+
+         $whofrom = encodeEmailAddr($msg["HEADER"]["FROM"]);
+         $whofrom = decodeEmailAddr($whofrom);
+
+         $whoreplyto = encodeEmailAddr($msg["HEADER"]["REPLYTO"]);
+         $whoreplyto = decodeEmailAddr($whoreplyto);
+
+         if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
+             (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
+             (trim($sendcc[$i]) != "")) {
+            $send_to_cc .= trim($sendcc[$i]) . ", ";
+         }
+      }
+      $send_to_cc = trim($send_to_cc);
+      if (substr($send_to_cc, -1) == ",") {
+         $send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1);
+      }
+   }
+
    echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
    echo "<TABLE COLS=2 WIDTH=50 ALIGN=CENTER CELLSPACING=0 BORDER=0>\n";
    echo "   <TR>\n";
    echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-   echo "         <FONT FACE=\"Arial,Helvetica\">To: </FONT>\n";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo _("To:");
+   echo " </FONT>\n";
    echo "      </TD><TD WIDTH=% \"$color[4]\" ALIGN=LEFT>\n";
    if ($send_to)
       echo "         <INPUT TYPE=TEXT NAME=passed_to VALUE=\"$send_to\" SIZE=60><BR>";
@@ -57,7 +142,10 @@
    echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">CC:</FONT>\n";
    echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
-   echo "         <INPUT TYPE=TEXT NAME=passed_cc SIZE=60><BR>";
+   if ($send_to_cc)
+      echo "         <INPUT TYPE=TEXT NAME=passed_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
+   else
+      echo "         <INPUT TYPE=TEXT NAME=passed_cc SIZE=60><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
    echo "   <TR>\n";
@@ -67,10 +155,11 @@
    echo "         <INPUT TYPE=TEXT NAME=passed_bcc SIZE=60><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
-
    echo "   <TR>\n";
    echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-   echo "         <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo _("Subject:");
+   echo " </FONT>\n";
    echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
    if ($reply_subj) {
       $reply_subj = str_replace("\"", "'", $reply_subj);
@@ -91,15 +180,22 @@
    } else {
       echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60>";
    }
-   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"Send\"><BR>";
+   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"";
+   echo _("Send");
+   echo "\"><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
    echo "   <TR>\n";
    echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
-   echo "         &nbsp;&nbsp;<TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
+   if ($use_signature == true)
+      echo "         &nbsp;&nbsp;<TEXTAREA NAME=passed_body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>$body\n\n$signature</TEXTAREA><BR>";
+   else
+      echo "         &nbsp;&nbsp;<TEXTAREA NAME=passed_body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>$body</TEXTAREA><BR>";
    echo "      </TD>";
    echo "   </TR>\n";
    echo "</TABLE>\n";
-   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Send\"></CENTER>";
+   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"";
+   echo _("Send");
+   echo "\"></CENTER>";
    echo "</FORM>";
-?>
\ No newline at end of file
+?>
Unnamed repository; edit this file 'description' to name the repository.