if (!isset($mailbox)) {
$mailbox = '';
}
-
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
$AttachFailure = saveAttachedFiles($session);
}
if (checkInput(false) && !isset($AttachFailure)) {
+ if ($mailbox == "All Folders") {
+ /* We entered compose via the search results page */
+ $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+ }
$urlMailbox = urlencode (trim($mailbox));
if (! isset($passed_id)) {
$passed_id = 0;
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
- if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (function_exists("move_uploaded_file")) {
- if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
- return true;
- }
- } else {
- if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- return true;
- }
- }
+ if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
+ return true;
}
+
$message = $compose_messages[$session];
$type = strtolower($_FILES['attachfile']['type']);
$name = $_FILES['attachfile']['name'];
$succes = $deliver->finalizeStream($stream);
}
if (!$succes) {
- $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ $msg = $deliver->dlv_msg . '<br>' .
+ _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $deliver->dlv_server_msg;
plain_error_message($msg, $color);
} else {
unset ($deliver);