X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=0b7ba61394f2b720877b6a49cfdec208ffce76e0;hp=d78999d1b11ce6793eac99a6c7cfa08c275753fb;hb=631db37eb3dd4a0ca4b3c272f4219d601bda70f5;hpb=65c3ec94c897fb098598f3843e371020deb2226b diff --git a/src/download.php b/src/download.php index d78999d1..0b7ba613 100644 --- a/src/download.php +++ b/src/download.php @@ -20,12 +20,12 @@ require_once('../functions/date.php'); header('Pragma: '); header('Cache-Control: cache'); -function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { + +function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at, $imapConnection) { global $where, $what, $charset; global $startMessage; displayPageHeader($color, 'None'); - echo "
". "
". _("Viewing a text attachment") . " - "; @@ -46,7 +46,9 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { "
"; if ($type1 == 'html') { - $body = MagicHTML( $body, $id ); + $msg = sqimap_get_message($imapConnection, $id, $mailbox); + $msg = $msg->getEntity($entid); + $body = MagicHTML( $body, $id, $msg ); } else { translateText($body, $wrap_at, $charset); } @@ -56,53 +58,106 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { "
"; } +function get_extract_to_target_list($imapConnection) { + $boxes = sqimap_mailbox_list($imapConnection); + for ($i = 0; $i < count($boxes); $i++) { + if (!in_array('noselect', $boxes[$i]['flags'])) { + $box = $boxes[$i]['unformatted']; + $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']); + if ( $box2 == 'INBOX' ) { + $box2 = _("INBOX"); + } + echo "\n"; + } + } +} +$mailbox = decodeHeader($mailbox); + +global $messages, $uid_support; + + + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -sqimap_mailbox_select($imapConnection, $mailbox); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); + +$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"]; +$message = &$message->getEntity($passed_ent_id); + +$header = $message->header; +$charset = $header->charset; +$type0 = $header->type0; +$type1 = $header->type1; +$encoding = strtolower($header->encoding); + + + /* - * $message contains all information about the message - * including header and body - */ -$message = sqimap_get_message($imapConnection, $passed_id, $mailbox); -$top_header = $message->header; +$extracted = false; +if (isset($extract_message) && $extract_message) { + $cmd = "FETCH $passed_id BODY[$passed_ent_id]"; + $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $message, $uid_support); + $cnt = count($read); + $body = ''; + $length = 0; + for ($i=1;$i<$cnt;$i++) { + $length = $length + strlen($read[$i]); + $body .= $read[$i]; + } + if (isset($targetMailbox) && $length>0) { + sqimap_append ($imapConnection, $targetMailbox, $length); + fputs($imapConnection,$body); + sqimap_append_done ($imapConnection); + $extracted = true; + } +} + +if (isset($showHeaders)) { + $top_header = sqimap_get_message_header ($imapConnection, $passed_id, $mailbox); +} +*/ /* * lets redefine message as this particular entity that we wish to display. * it should hold only the header for this entity. We need to fetch the body * yet before we can display anything. */ -$message = getEntity($message, $passed_ent_id); - -$header = $message->header; -$charset = $header->charset; -$type0 = $header->type0; -$type1 = $header->type1; if (isset($override_type0)) { $type0 = $override_type0; } if (isset($override_type1)) { $type1 = $override_type1; } -$filename = decodeHeader($header->filename); + +$filename = decodeHeader($message->header->filename); + if (!$filename) { - $filename = decodeHeader($header->name); + $filename = decodeHeader($message->header->name); } if (strlen($filename) < 1) { if ($type1 == 'plain' && $type0 == 'text') { $suffix = 'txt'; + $filename = $header->subject . '.txt'; } else if ($type1 == 'richtext' && $type0 == 'text') { $suffix = 'rtf'; + $filename = $header->subject . '.rtf'; } else if ($type1 == 'postscript' && $type0 == 'application') { $suffix = 'ps'; - } else if ($type1 == 'message' && $type0 == 'rfc822') { - $suffix = 'msg'; + $filename = $header->subject . '.ps'; + } else if ($type1 == 'rfc822' && $type0 == 'message') { + $suffix = 'eml'; + $filename = $header->subject . '.msg'; } else { $suffix = $type1; } + if (strlen($filename) < 1) { $filename = "untitled$passed_ent_id.$suffix"; + } else { + $filename = "$filename.$suffix"; + } } /* @@ -125,7 +180,7 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { case 'text': DumpHeaders($type0, $type1, $filename, 1); $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); + $body = decodeBody($body, $encoding); if ($type1 == 'plain' && isset($showHeaders)) { echo _("Subject") . ": " . decodeHeader($top_header->subject) . "\n". " " . _("From") . ": " . decodeHeader($top_header->from) . "\n". @@ -141,12 +196,17 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { "\n" . _("Date"). ':' . getLongDateString($top_header->date). "\n\n
\n"; - } + } echo $body; break; default: DumpHeaders($type0, $type1, $filename, 1); - mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); +// if ($message->decoded_body == '') { +// $message->setBody(mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $encoding)); +// } +// echo $message->decoded_body; + + mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $encoding); break; } } else { @@ -154,27 +214,29 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { case 'text': if ($type1 == 'plain' || $type1 == 'html') { $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); + $body = decodeBody($body, $encoding); + viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at, $imapConnection); } else { DumpHeaders($type0, $type1, $filename, 0); $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); + $body = decodeBody($body, $encoding); echo $body; } break; - case 'message': - $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); - break; default: DumpHeaders($type0, $type1, $filename, 0); - mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); +// if ($message->decoded_body == '') { +// $message->setBody(mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $encoding)); +// +// } +// echo $message->decoded_body; + mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $encoding); break; } } +$message = &$message->getEntity(''); +$messages[$mbx_response['UIDVALIDITY']]["$passed_id"] = &$message; /* * This function is verified to work with Netscape and the *very latest* @@ -182,13 +244,19 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { */ function DumpHeaders($type0, $type1, $filename, $force) { global $HTTP_USER_AGENT; - $isIE = 0; + + if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false && strstr($HTTP_USER_AGENT, 'Opera') === false) { $isIE = 1; } + if (strstr($HTTP_USER_AGENT, 'compatible; MSIE 6') !== false && + strstr($HTTP_USER_AGENT, 'Opera') === false) { + $isIE6 = 1; + } + $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename); // A Pox on Microsoft and it's Office! @@ -207,7 +275,7 @@ function DumpHeaders($type0, $type1, $filename, $force) { // // The best thing you can do for IE is to upgrade to the latest // version - if ($isIE) { + if ($isIE && !isset($isIE6)) { // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp // Do not have quotes around filename, but that applied to // "attachment"... does it apply to inline too?