X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=018650a6b35707b5957fd1ab6128559ddcd1d49f;hb=9f2215a1f40978a370a7538229ca2f55f55026ee;hp=1f26644b5a5e1549a3797451675a5720c6d41ae3;hpb=78509c544d86d8e4260ec93faed8d2a17362082b;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index 1f26644b..018650a6 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,155 +1,364 @@ - - include("../config/config.php"); - include("../functions/strings.php"); - include("../functions/page_header.php"); - include("../functions/imap.php"); - include("../functions/mailbox.php"); - include("../functions/date.php"); - include("../functions/mime.php"); - - - echo "
\n"; - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); - displayPageHeader($color, "None"); - - 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)) { + $tmp\n"; + } + } + + if (!$send_to) { + $send_to = sqimap_find_email($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] = sqimap_find_email($sendcc[$i]); + $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]); + $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]); + + 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); } } + } // function newMail() - $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"]; - - $tmp = "-------- Original Message ---------\n"; - $body_ary = explode("\n", $body); - $body = ""; - for ($i=0;$i < count($body_ary);$i++) { - if ($type1 == "html") - $tmp .= strip_tags($body_ary[$i]); - else - $tmp .= $body_ary[$i]; - $body = "$body$tmp\n"; - $tmp = ""; + function showInputForm () { + global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, + $passed_body, $color, $use_signature, $signature, $editor_size, + $attachments, $subject, $newmail; + + $subject = decodeHeader($subject); + $reply_subj = decodeHeader($reply_subj); + $forward_subj = decodeHeader($forward_subj); + + echo "\n\n\n"; + + echo "\n"; + } + + function showSentForm () { + echo "