X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=e0a7ca74c0041f3a295689ce90cfd09658a7aa23;hp=6e73f0b155e5654dd4ea3557dcf05aa2d69af318;hb=8d8ab69aaf81e9fdd15396c783f0e40e698e839f;hpb=813eba2f5f4695bd30b895cd148658f3b90bf120 diff --git a/src/compose.php b/src/compose.php index 6e73f0b1..e0a7ca74 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,5 +1,11 @@ -\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); - displayPageHeader($color, "None"); + include("../src/load_prefs.php"); // 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; + $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc; - if ($forward_id) { + $send_to = decodeHeader($send_to); + $send_to_cc = decodeHeader($send_to_cc); + + if ($forward_id) + $id = $forward_id; + else if ($reply_id) + $id = $reply_id; + + + if ($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, "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"); - } + $message = sqimap_get_message($imapConnection, $id, $mailbox); + $orig_header = $message->header; + if ($ent_num) + $message = getEntity($message, $ent_num); + + if ($message->header->type0 == "text" || $message->header->type1 == "message") { + if ($ent_num) + $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding); + else + $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding); + } else { + $body = ""; } - $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"]; - - $tmp = _("-------- Original Message ---------\n"); + if ($message->header->type1 == "html") + $body = strip_tags($body); + $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); + for ($i=0; $i < count($body_ary); $i++) { + if ($i==0 && $forward_id) { + $tmp = _("-------- Original Message ---------\n"); + $tmp .= _("Subject") . ": " . $orig_header->subject . "\n"; + $tmp .= " " . _("From") . ": " . $orig_header->from . "\n"; + $tmp .= " " . _("To") . ": " . $orig_header->to[0] . "\n"; + if (count($orig_header->to) > 1) { + for ($x=1; $x < count($orig_header->to); $x++) { + $tmp .= " " . $orig_header->to[$x] . "\n"; + } + } + $tmp .= "\n" . $body_ary[$i]; } else { - $body = _("No Message"); + $tmp = $body_ary[$i]; } - } - - $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]); + if ($forward_id) + $body = "$body$tmp\n"; else - $tmp = $body_ary[$i]; - $body = "$body> $tmp\n"; + $body = "$body> $tmp\n"; } + return $body; } - - $send_to = sqimap_find_displayable_name($send_to); - - $send_to = strtolower($send_to); - $send_to = ereg_replace("\"", "", $send_to); + + 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" **/ @@ -114,7 +112,7 @@ if ($sendcc[$i] == "") continue; - $sendcc[$i] = sqimap_find_displayable_name($sendcc[$i]); + $sendcc[$i] = sqimap_find_email($sendcc[$i]); $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]); $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]); @@ -134,56 +132,66 @@ function showInputForm () { global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, $passed_body, $color, $use_signature, $signature, $editor_size, - $attachments, $subject; + $attachments, $subject, $newmail, $use_javascript_addr_book, + $send_to_bcc, $reply_id, $mailbox; + + $subject = decodeHeader($subject); + $reply_subj = decodeHeader($reply_subj); + $forward_subj = decodeHeader($forward_subj); - echo "\n
\n"; - echo "\n"; + if ($use_javascript_addr_book) { + echo "\n\n\n"; + } + + echo "\n\n"; + if ($reply_id) { + echo "\n"; + } + printf("\n", htmlspecialchars($mailbox)); + echo "
\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo _("BCC:"); + echo " \n"; + echo " \n"; echo " \n"; - echo " \n"; + echo "\n\n"; + + echo " \n"; + echo " \n\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 "
\n"; - echo " "; echo _("To:"); - echo " \n"; - echo " \n"; - if ($send_to) - echo "
"; - else - echo "
"; + echo " 		\n"; + printf("
\n", + htmlspecialchars($send_to)); echo "
\n"; - echo " "._("CC").":\n"; - echo " \n"; - if ($send_to_cc) - echo "
"; - else - echo "
"; + echo _("CC:"); + echo " 		\n"; + printf("
\n", + htmlspecialchars($send_to_cc)); echo "
\n"; - echo " BCC:\n"; - echo " \n"; - if ($send_to_bcc) - echo "
"; - else - echo "
"; - echo "
\n"; + printf("
\n", + htmlspecialchars($send_to_bcc)); + echo "
\n"; - echo " "; echo _("Subject:"); - echo " \n"; - echo " \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 " "; + printf(" ", + htmlspecialchars($reply_subj)); } else if ($forward_subj) { $forward_subj = str_replace("\"", "'", $forward_subj); $forward_subj = stripslashes($forward_subj); @@ -192,44 +200,60 @@ (substr(strtolower($forward_subj), 0, 5) != "[fwd:") && (substr(strtolower($forward_subj), 0, 6) != "[ fwd:")) $forward_subj = "[Fwd: $forward_subj]"; - echo " "; + printf(" ", + htmlspecialchars($forward_subj)); } else { - echo " "; + printf(" ", + htmlspecialchars($subject)); } - echo "  "; - echo "
\n \n"; + if ($use_javascript_addr_book) { + echo " \n"; + } else { + echo " "; + } + echo "\n \n"; + echo "
\n"; - if ($use_signature == true) - echo "   
"; - else - echo "   
\n"; + echo " 		\n"; + echo "   
\n"; echo "
\n"; - echo " "; - echo "
"._("Attach:")."\n"; - echo " 		\n"; + echo "
"._("Attach:"); + echo " 		\n"; // echo " \n"; echo " \n"; echo "   \n"; echo "
\n"; echo " "; - echo ""; + echo ""; while (list($localname, $remotename) = each($attachments)) { echo "\n"; echo "$remotename
\n"; @@ -245,37 +269,78 @@ } function showSentForm () { - echo ""; echo "


Message Sent!

"; echo "You will be automatically forwarded.
If not, click here"; - echo "
"; + echo ""; } - function checkInput () { - global $body, $send_to, $subject; + 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; - if ($body == "") { - plain_error_message(_("You have not entered a message body."), $color); + if ($body == "" && $subject == "") { + if ($show) + plain_error_message(_("You have not entered a message body or a subject."), $color); return false; } else if ($send_to == "") { - displayPageHeader($color, "None"); - plain_error_message(_("You have not filled in the \"To:\" field."), $color); - return false; - } else if ($subject == "") { - plain_error_message(_("You have not entered a subject."), $color); + if ($show) + plain_error_message(_("You have not filled in the \"To:\" field."), $color); return false; } return true; } // function checkInput() + + if (($mailbox == "") || ($mailbox == "None")) + $mailbox = "INBOX"; + if(isset($send)) { - if (checkInput()) { - sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body); - showSentForm(); + if (checkInput(false)) { + $urlMailbox = urlencode ($mailbox); + sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id); + header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1"); } else { + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, $mailbox); + checkInput(true); + showInputForm(); + sqimap_logout($imapConnection); + } + } else if ($html_addr_search_done) { + is_logged_in(); + displayPageHeader($color, $mailbox); + + $body = stripslashes($body); + $send_to = stripslashes($send_to); + $send_to_cc = stripslashes($send_to_cc); + $send_to_bcc = stripslashes($send_to_bcc); + $subject = stripslashes($subject); + + for ($i=0; $i < count($send_to_search); $i++) { + if ($send_to) + $send_to .= ", "; + $send_to .= $send_to_search[$i]; } + + for ($i=0; $i < count($send_to_cc_search); $i++) { + if ($send_to_cc) + $send_to_cc .= ", "; + $send_to_cc .= $send_to_cc_search[$i]; + } + + showInputForm(); + } else if ($html_addr_search) { + // I am using an include so as to elminiate an extra unnecessary click. If you + // can think of a better way, please implement it. + include ("addrbook_search_html.php"); } else if (isset($attach)) { + is_logged_in(); + displayPageHeader($color, $mailbox); + $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy"); $localfilename = $localfilename; @@ -300,15 +365,23 @@ showInputForm(); } else if (isset($do_delete)) { + is_logged_in(); + displayPageHeader($color, $mailbox); + while (list($key, $localname) = each($delete)) { - array_splice ($attachments, $localname, 1); + array_splice ($attachments, $key, 1); unlink ($attachment_dir.$localname); unlink ($attachment_dir.$localname.".info"); } showInputForm(); } else { - Newmail(); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, $mailbox); + + $newmail = true; + newMail(); showInputForm(); + sqimap_logout($imapConnection); } ?>