X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=33bc51d03a9fec0c934cc20489cf8eec51acf062;hp=8a67bac689618247127585de46bbbd8cbe7e2263;hb=f95d9e7b53d67bbf15be0894cd25acd1c656f0d7;hpb=6c7fd6caa94f0dcfdc25863bd8e7c21d9cf30d50 diff --git a/src/compose.php b/src/compose.php index 8a67bac6..33bc51d0 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,120 +1,122 @@ 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 - $tmp .= $body_ary[$i]; - $body = "$body$tmp\n"; - $tmp = ""; + $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding); + } else { + $body = ""; } - } - - 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); + if ($message->header->type1 == "html") + $body = strip_tags($body); + + sqUnWordWrap($body); + $body_ary = explode("\n", $body); + $i = count($body_ary) - 1; + while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { + unset($body_ary[$i]); + $i --; } - // 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"); + $body = ""; + for ($i=0; isset($body_ary[$i]); $i++) { + if (! $forward_id) + { + if (ereg('^[\\s>]+', $body_ary[$i])) + { + $body_ary[$i] = '>' . $body_ary[$i]; + } + else + { + $body_ary[$i] = '> ' . $body_ary[$i]; + } } + sqWordWrap($body_ary[$i], $editor_size - 1); + $body .= $body_ary[$i] . "\n"; + unset($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]); - else - $tmp = $body_ary[$i]; - $body = "$body> $tmp\n"; + if ($forward_id) + { + $bodyTop = "-------- " . _("Original Message") . " --------\n"; + $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n"; + $bodyTop .= _("From") . ": " . $orig_header->from . "\n"; + $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n"; + if (count($orig_header->to) > 1) { + for ($x=1; $x < count($orig_header->to); $x++) { + $bodyTop .= " " . $orig_header->to[$x] . "\n"; + } + } + $bodyTop .= "\n"; + $body = $bodyTop . $body; } + + return; } - + 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); $send_to_cc = ereg_replace(";", ",", $send_to_cc); $sendcc = explode(",", $send_to_cc); $send_to_cc = ""; @@ -141,16 +143,60 @@ } } // function newMail() + function getAttachments($message) { + global $mailbox, $attachments, $attachment_dir, $imapConnection, + $ent_num, $forward_id; + + if (!$message) { + sqimap_mailbox_select($imapConnection, $mailbox); + $message = sqimap_get_message($imapConnection, $forward_id, + $mailbox); + } + + if (count($message->entities) == 0) { + if ($message->header->entity_id != $ent_num) { + $filename = decodeHeader($message->header->filename); + + if ($filename == "") + $filename = "untitled-".$message->header->entity_id; + + $localfilename = GenerateRandomString(32, '', 7); + while (file_exists($attachment_dir . $localfilename)) + $localfilename = GenerateRandomString(32, '', 7); + + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $filename; + $newAttachment['type'] = strtolower($message->header->type0 . + '/' . $message->header->type1); + + // Write Attachment to file + $fp = fopen ($attachment_dir.$localfilename, 'w'); + fputs ($fp, decodeBody(mime_fetch_body($imapConnection, + $forward_id, $message->header->entity_id), + $message->header->encoding)); + fclose ($fp); + + $attachments[] = $newAttachment; + } + } else { + for ($i = 0; $i < count($message->entities); $i++) { + getAttachments($message->entities[$i]); + } + } + return; + } + function showInputForm () { global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, - $passed_body, $color, $use_signature, $signature, $editor_size, - $attachments, $subject, $newmail, $use_javascript_addr_book, - $send_to_bcc; + $passed_body, $color, $use_signature, $signature, $prefix_sig, + $editor_size, $attachments, $subject, $newmail, + $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, + $from_htmladdr_search, $location_of_buttons, $attachment_dir; $subject = decodeHeader($subject); $reply_subj = decodeHeader($reply_subj); $forward_subj = decodeHeader($forward_subj); - + if ($use_javascript_addr_book) { echo "\n\n\n"; } - echo "\n
\n"; - echo "\n"; + echo "\n\n"; + if ($reply_id) { + echo "\n"; + } + printf("\n", htmlspecialchars($mailbox)); + echo "
\n"; + + if ($location_of_buttons == 'top') showComposeButtonRow(); + 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\n"; + + if ($location_of_buttons == 'between') showComposeButtonRow(); echo " \n"; - echo " \n"; echo " \n"; - echo " \n"; + + if ($location_of_buttons == 'bottom') + showComposeButtonRow(); + else { + echo " \n"; + } // This code is for attachments echo " \n"; - echo " \n"; - echo " \n"; echo " \n"; - if (isset($attachments) && count($attachments)>0) { - echo "
\n"; + echo " \n"; echo _("To:"); - echo " \n"; - if ($send_to) - echo "
"; - else - echo "
"; + echo " 		\n"; + printf("
\n", + htmlspecialchars($send_to)); echo "
\n"; + echo " \n"; echo _("CC:"); - echo " \n"; - if ($send_to_cc) - echo "
"; - else - echo "
"; + echo " 		\n"; + printf("
\n", + htmlspecialchars($send_to_cc)); echo "
\n"; + echo " \n"; echo _("BCC:"); - echo " \n"; - if ($send_to_bcc) - echo "
"; - else - echo "
"; - echo " 		"; - - if ($use_javascript_addr_book) { - echo "\n"; - } else { - echo ""; - } - + echo " \n"; + printf("
\n", + htmlspecialchars($send_to_bcc)); echo "
\n"; + echo " \n"; echo _("Subject:"); - 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); $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:")) + 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 " "; + printf(" ", + htmlspecialchars($forward_subj)); } else { - echo " "; + printf(" ", + htmlspecialchars($subject)); } - echo ""; - echo ""; - echo "
\n"; - if ($use_signature == true && $newmail == true) - echo "   
"; - else - echo "   
\n"; + echo " 		\n"; + echo "   
\n"; echo "
 
\n"; + echo " \n"; echo "
"._("Attach:"); - echo " 		\n"; - // echo " \n"; - echo " \n"; - echo "   \n"; + echo " \n"; + echo " \n"; + echo "   \n"; echo "
\n"; + if (count($attachments)) + { + echo "
\n"; echo " "; - echo ""; - while (list($localname, $remotename) = each($attachments)) { - echo "\n"; - echo "$remotename
\n"; + echo "		"; + foreach ($attachments as $key => $info) { + echo "\n"; + echo $info['remotefilename'] . " - " . $info['type'] . " ("; + echo show_readable_size(filesize($attachment_dir . + $info['localfilename'])) . ")
\n"; } echo "\n"; @@ -276,12 +319,28 @@ echo "
\n"; echo "
"; + do_hook("compose_bottom"); } + + function showComposeButtonRow() { + global $use_javascript_addr_book; + + echo " \n \n"; + if ($use_javascript_addr_book) { + echo " \n"; + } else { + echo " "; + } + echo "\n \n"; + + do_hook("compose_button_row"); - function showSentForm () { - echo "


Message Sent!

"; - echo "You will be automatically forwarded.
If not, click here"; - echo "
"; + echo " \n"; + echo " \n\n"; } function checkInput ($show) { @@ -291,114 +350,191 @@ error message, show=true **/ global $body, $send_to, $subject, $color; - if ($body == "") { - if ($show) - plain_error_message(_("You have not entered a message body."), $color); - return false; - } else if ($send_to == "") { + 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() + // True if FAILURE + function saveAttachedFiles() { + global $HTTP_POST_FILES, $attachment_dir, $attachments; + + $localfilename = GenerateRandomString(32, '', 7); + while (file_exists($attachment_dir . $localfilename)) + $localfilename = GenerateRandomString(32, '', 7); + if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) { + if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) { + return true; + } + } + + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name']; + $newAttachment['type'] = + strtolower($HTTP_POST_FILES['attachfile']['type']); + + $attachments[] = $newAttachment; + } + + function SqConvertRussianCharsets(){ + // + // This function is here because Russian Apache is a bastard when it comes to + // attachments. The solution is to turn off attachment recoding for multipart + // forms and do it manually. + // See graf@relhum.org for support. + // + global $CHARSET, $SOURCE_CHARSET, $send_to, $send_to_cc, $send_to_bcc, $subject, $body; + $charset_ary = array("koi8-r" => "k", + "windows-1251" => "w", + "ibm866" => "a", + "ISO-8859-5" => "i"); + $body = convert_cyr_string($body, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]); + $send_to = convert_cyr_string($send_to, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]); + $send_to_cc = convert_cyr_string($send_to_cc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]); + $send_to_bcc = convert_cyr_string($send_to_bcc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]); + $subject = convert_cyr_string($subject, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]); + } // end SqConvertRussianCharsets() + + // Russian Apache sets $CHARSET. See if this is Russian Apache. + // If so, check if the source charset (koi8-r) is different from the + // one submitted by the browser. If so, recode the parts of the form + // to the needed format so SM can proceed and not mangle the cyrillic + // input. + // See graf@relhum.org for support. + // + if (isset($CHARSET) && $CHARSET != $SOURCE_CHARSET) SqConvertRussianCharsets(); + + if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None")) + $mailbox = "INBOX"; + if (isset($send)) { + if (isset($HTTP_POST_FILES['attachfile']) && + $HTTP_POST_FILES['attachfile']['tmp_name'] && + $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') + $AttachFailure = saveAttachedFiles(); + if (checkInput(false) && !isset($AttachFailure)) { + $urlMailbox = urlencode (trim($mailbox)); + if (! isset($reply_id)) + $reply_id = 0; + // Set $default_charset to correspond with the user's selection + // of language interface. + set_my_charset(); + do_hook("compose_send"); - - if(isset($send)) { - if (checkInput(false)) { - sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body); - header ("Location: right_main.php"); + if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) { + showInputForm(); + exit(); + } + Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1"); } else { - echo "\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - displayPageHeader($color, "None"); + //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + displayPageHeader($color, $mailbox); + + if ($AttachFailure) + plain_error_message(_("Could not move/copy file. File not attached"), $color); + checkInput(true); showInputForm(); + //sqimap_logout($imapConnection); } - } else if ($html_addr_search_done) { - echo "\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - displayPageHeader($color, "None"); - - $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]; + } else if (isset($html_addr_search_done)) { + displayPageHeader($color, $mailbox); + + if (isset($send_to_search) && is_array($send_to_search)) + { + 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]; + if (isset($send_to_cc_search) && is_array($send_to_cc_search)) + { + 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)) { - echo "\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - displayPageHeader($color, "None"); - - $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 (isset($send_to_bcc_search) && is_array($send_to_bcc_search)) + { + for ($i=0; $i < count($send_to_bcc_search); $i++) { + if ($send_to_bcc) + $send_to_bcc .= ", "; + $send_to_bcc .= $send_to_bcc_search[$i]; } } - // If it still exists, PHP will remove the original file - - if (!$failed) { - // Write information about the file - $fp = fopen ($attachment_dir.$localfilename.".info", "w"); - fputs ($fp, "$attachfile_type\n$attachfile_name\n"); - fclose ($fp); - - $attachments[$localfilename] = $attachfile_name; - } + showInputForm(); + } else if (isset($html_addr_search)) { + if (isset($HTTP_POST_FILES['attachfile']) && + $HTTP_POST_FILES['attachfile']['tmp_name'] && + $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') + { + if (saveAttachedFiles()) + plain_error_message(_("Could not move/copy file. File not attached"), $color); + } + // 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)) { + if (saveAttachedFiles()) + plain_error_message(_("Could not move/copy file. File not attached"), $color); + displayPageHeader($color, $mailbox); 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"); + displayPageHeader($color, $mailbox); + + if (isset($delete) && is_array($delete)) + { + foreach($delete as $index) + { + unlink ($attachment_dir.$attachments[$index]['localfilename']); + unset ($attachments[$index]); + } } showInputForm(); } else { - echo "\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); - displayPageHeader($color, "None"); + // This handles the default case as well as the error case + // (they had the same code) --> if (isset($smtpErrors)) + $imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); + displayPageHeader($color, $mailbox); $newmail = true; + + ClearAttachments(); + + if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num) + getAttachments(0); + newMail(); showInputForm(); + sqimap_logout($imapConnection); + } + + + + + function ClearAttachments() { + global $attachments, $attachment_dir; + + foreach ($attachments as $info) { + if (file_exists($attachment_dir . $info['localfilename'])) { + unlink($attachment_dir . $info['localfilename']); + } + } + + $attachments = array(); } + ?>