X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=6e73f0b155e5654dd4ea3557dcf05aa2d69af318;hp=e13c8a257c156237b34c1a550624c1249c690818;hb=813eba2f5f4695bd30b895cd148658f3b90bf120;hpb=b235d62915dba943446744b725971bd2c47bc347 diff --git a/src/compose.php b/src/compose.php index e13c8a25..6e73f0b1 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,201 +1,314 @@ + /** This code sends a mail. + ** + ** There are 3 modes of operation: + ** - Start new mail + ** - Add an attachment + ** - Send mail + **/ + 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"); + include("../functions/smtp.php"); + include("../functions/display_messages.php"); include("../src/load_prefs.php"); echo "
\n"; - $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); displayPageHeader($color, "None"); - if ($forward_id) { - selectMailbox($imapConnection, $mailbox, $numMessages); - $msg = fetchMessage($imapConnection, $forward_id, $mailbox); + // This function is used when not sending or adding attachments + function newMail () { + global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body, + $reply_id, $send_to, $send_to_cc, $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)) { + if ($forward_id) { + sqimap_mailbox_select($imapConnection, $mailbox); + $msg = sqimap_get_message($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, "msg", "any_type", $ent_num)) { + } else if (containsType($msg, "text", "plain", $ent_num)) { $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]); - } else { - $body = _("No Message"); + } + // 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++) { + if ($type1 == "html") + $tmp .= strip_tags($body_ary[$i]); + else + $tmp .= $body_ary[$i]; + $body = "$body$tmp\n"; + $tmp = ""; } } - - $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 = ""; - } - } - - 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); - } - // add other primary displaying msg types here - else { - // find any type that's displayable - if (containsType($msg, "text", "any_type", $ent_num)) { + + if ($reply_id) { + sqimap_mailbox_select($imapConnection, $mailbox); + $msg = sqimap_get_message($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, "msg", "any_type", $ent_num)) { + } else if (containsType($msg, "text", "plain", $ent_num)) { $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false); - } else { - $body = _("No Message"); + } + // 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++) { + if ($type1 == "html") + $tmp = strip_tags($body_ary[$i]); + else + $tmp = $body_ary[$i]; + $body = "$body> $tmp\n"; + } + } + + $send_to = sqimap_find_displayable_name($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] = sqimap_find_displayable_name($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"]; + function showInputForm () { + global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, + $passed_body, $color, $use_signature, $signature, $editor_size, + $attachments, $subject; - $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"; + echo "\n"; + } - /** 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 = ""; + function showSentForm () { + echo ""; + echo "