X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=54d9314cccfbb729aa02053411b3029df34abb75;hp=cc89c7aec5391058cf32c2c87cc7363162091601;hb=29d08a525118c05b2239f7bdca480a7422ef9190;hpb=fa276b145d16378cd130cd074f8efd6b90a7d178 diff --git a/src/compose.php b/src/compose.php index cc89c7ae..54d9314c 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,194 +1,366 @@ \n"; - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); - displayPageHeader($color, "None"); + // 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 ($forward_id) { - selectMailbox($imapConnection, $mailbox, $numMessages); - $msg = fetchMessage($imapConnection, $forward_id, $mailbox); + $send_to = decodeHeader($send_to); + $send_to_cc = decodeHeader($send_to_cc); - 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 = ""; } } + + 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, "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++) { + if ($type1 == "html") + $tmp = strip_tags($body_ary[$i]); + else + $tmp = $body_ary[$i]; + $body = "$body> $tmp\n"; + } + } + + if (!$send_to) { + $send_to = sqimap_find_email($send_to); + } - $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 = ""; + $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() + + function showInputForm () { + global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, + $passed_body, $color, $use_signature, $signature, $editor_size, + $attachments, $subject, $newmail, $PHPSESSID; + + $subject = decodeHeader($subject); + $reply_subj = decodeHeader($reply_subj); + $forward_subj = decodeHeader($forward_subj); - if ($reply_id) { - selectMailbox($imapConnection, $mailbox, $numMessages); - $msg = fetchMessage($imapConnection, $reply_id, $mailbox); + echo "\n\n\n"; - 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); + echo "\n
\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 " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + + // This code is for attachments + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + if (isset($attachments) && count($attachments)>0) { + echo ""; } + // End of attachment code - $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"; - } + echo "
\n"; + echo _("To:"); + echo " \n"; + if ($send_to) + echo "
"; + else + echo "
"; + echo "
\n"; + echo _("CC:"); + echo " \n"; + if ($send_to_cc) + echo "
"; + else + echo "
"; + echo "
\n"; + echo _("BCC:"); + echo " \n"; + if ($send_to_bcc) + echo "
"; + else + echo "
"; + echo "
\n"; + echo _("Subject:"); + 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 " "; } - // 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"; + echo "  "; + echo "
\n"; + if ($use_signature == true && $newmail == true) + echo "   
"; + else + echo "   
\n"; + echo "
\n"; + echo "
"._("Attach:"); + echo "
\n"; + // echo " \n"; + echo " \n"; + echo "   \n"; + echo "
\n"; + echo " "; + echo ""; + while (list($localname, $remotename) = each($attachments)) { + echo "\n"; + echo "$remotename
\n"; } + + echo "\n"; + echo "
\n"; + echo "
"; } - // Add some decoding information - $send_to = encodeEmailAddr($send_to); - // parses the field and returns only the email address - $send_to = decodeEmailAddr($send_to); + function showSentForm () { + global $PHPSESSID; - $send_to = strtolower($send_to); - $send_to = ereg_replace("\"", "", $send_to); - $send_to = stripslashes($send_to); + echo "


Message Sent!

"; + echo "You will be automatically forwarded.
If not, click here"; + echo "
"; + } - /** 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 checkInput ($show) { + /** I implemented the $show variable because the error messages + were getting sent before the page header. So, I check once + using $show=false, and then when i'm ready to display the + error message, show=true **/ + global $body, $send_to, $subject, $color; - for ($i = 0; $i < count($sendcc); $i++) { - $sendcc[$i] = trim($sendcc[$i]); - if ($sendcc[$i] == "") - continue; + if ($body == "") { + if ($show) + plain_error_message(_("You have not entered a message body."), $color); + return false; + } else if ($send_to == "") { + if ($show) + plain_error_message(_("You have not filled in the \"To:\" field."), $color); + return false; + } else if ($subject == "") { + if ($show) + plain_error_message(_("You have not entered a subject."), $color); + return false; + } + return true; + } // function checkInput() - $sendcc[$i] = encodeEmailAddr($sendcc[$i]); - $sendcc[$i] = decodeEmailAddr($sendcc[$i]); + if(isset($send)) { + if (checkInput(false)) { + sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body); + header ("Location: right_main.php?PHPSESSID=$PHPSESSID"); + } else { + echo "\n"; + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, "None"); + checkInput(true); + + showInputForm(); + } + } else if (isset($attach)) { + echo "\n"; + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, "None"); - $whofrom = encodeEmailAddr($msg["HEADER"]["FROM"]); - $whofrom = decodeEmailAddr($whofrom); + $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy"); + $localfilename = $localfilename; + + // Put the file in a better place + error_reporting(0); // Rename will produce error output if it fails + if (!rename($attachfile, $attachment_dir.$localfilename)) { + if (!copy($attachfile, $attachment_dir.$localfilename)) { + plain_error_message(_("Could not move/copy file. File not attached")); + $failed = true; + } + } + // If it still exists, PHP will remove the original file - $whoreplyto = encodeEmailAddr($msg["HEADER"]["REPLYTO"]); - $whoreplyto = decodeEmailAddr($whoreplyto); + if (!$failed) { + // Write information about the file + $fp = fopen ($attachment_dir.$localfilename.".info", "w"); + fputs ($fp, "$attachfile_type\n$attachfile_name\n"); + fclose ($fp); - if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) && - (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) && - (trim($sendcc[$i]) != "")) { - $send_to_cc .= trim($sendcc[$i]) . ", "; - } + $attachments[$localfilename] = $attachfile_name; } - $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); + + showInputForm(); + } else if (isset($do_delete)) { + echo "\n"; + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, "None"); + + while (list($key, $localname) = each($delete)) { + array_splice ($attachments, $key, 1); + unlink ($attachment_dir.$localname); + unlink ($attachment_dir.$localname.".info"); } - } - 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 " To: \n"; - echo " \n"; - if ($send_to) - echo "
"; - else - echo "
"; - echo "
\n"; - echo " CC:\n"; - echo " \n"; - if ($send_to_cc) - echo "
"; - else - echo "
"; - echo "
\n"; - echo " BCC:\n"; - echo " \n"; - echo "
"; - echo "
\n"; - echo " Subject:\n"; - 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 " "; + showInputForm(); } else { - echo " "; + echo "\n"; + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, "None"); + + $newmail = true; + newMail(); + showInputForm(); } - echo "  
"; - echo "
\n"; - if ($use_signature == true) - echo "   
"; - else - echo "   
"; - echo "
\n"; - echo "
"; - echo "
"; -?> \ No newline at end of file +?>