X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=d0a6cc312b29d3016bad8294d923fc26513adaec;hb=c7d242417af3cb34be16ea6a4605fa99bce504d5;hp=f2383bfbf5d648723036f95ab2df080002c447b5;hpb=31f3d7c03a7c155d48a955b4beb15105ba154086;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index f2383bfb..d0a6cc31 100644 --- a/src/compose.php +++ b/src/compose.php @@ -5,35 +5,99 @@ include("../functions/imap.php"); include("../functions/mailbox.php"); include("../functions/date.php"); + include("../functions/mime.php"); - echo "\n"; + include("../src/load_prefs.php"); + + echo "\n"; $imapConnection = loginToImapServer($username, $key, $imapServerAddress); - displayPageHeader($mailbox); - selectMailbox($imapConnection, $mailbox, $numMessages); + displayPageHeader($color, "None"); - if ($reply_id) { - $body_ary = fetchBody($imapConnection, $reply_id); + if ($forward_id) { + selectMailbox($imapConnection, $mailbox, $numMessages); + $msg = fetchMessage($imapConnection, $forward_id, $mailbox); + + 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, $mailbox); + + 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); } - } else if ($forward_id) { - $body_ary = fetchBody($imapConnection, $forward_id); + // 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); + echo "
\n"; - echo "
"; - echo "\n"; + echo "
\n"; echo " \n"; - echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; + echo " \n"; - echo " \n"; echo " \n"; + echo " \n"; + echo " "; + echo " \n"; echo "
\n"; + echo " \n"; echo " To: \n"; - echo " \n"; + echo " \n"; if ($send_to) echo "
"; else @@ -41,35 +105,52 @@ echo "
\n"; + echo " \n"; echo " CC:\n"; - echo " \n"; + echo " \n"; echo "
"; echo "
\n"; + echo " \n"; echo " BCC:\n"; - echo " \n"; + echo " \n"; echo "
"; echo "
\n"; + echo " \n"; echo " Subject:\n"; - echo " \n"; - if ($reply_subj) - echo "
"; - else if ($forward_subj) - echo "
"; - else - echo "
"; + echo " 		\n"; + if ($reply_subj) { + $reply_subj = str_replace("\"", "'", $reply_subj); + $reply_subj = stripslashes($reply_subj); + $reply_subj = trim($reply_subj); + if (substr(strtolower($reply_subj), 0, 3) != "re:") + $reply_subj = "Re: $reply_subj"; + echo " "; + } else if ($forward_subj) { + $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 " "; + } else { + echo " "; + } + echo "  
"; echo "
\n"; + echo "   
"; + echo "
\n"; - - echo "
"; - echo ""; - echo "
"; + echo "
"; echo "
"; ?> \ No newline at end of file