X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=899aacaf919a2d293c892d257739539a2f077101;hp=be8ee42ae3c775ca86c5cab940f1d52d9a128291;hb=ff9d4297a3132d46982095ded7975c2bf8d6694b;hpb=0f859719f26e6c43fae96ae07d1f6a4504620f77 diff --git a/src/download.php b/src/download.php index be8ee42a..899aacaf 100644 --- a/src/download.php +++ b/src/download.php @@ -15,112 +15,11 @@ require_once('../src/validate.php'); require_once('../functions/imap.php'); require_once('../functions/mime.php'); -require_once('../functions/date.php'); header('Pragma: '); header('Cache-Control: cache'); -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") . " - "; - if ($where && $what) { - // from a search - echo "". _("View message") . ""; - } else { - echo "". _("View message") . ""; - } - - $urlmailbox = urlencode($mailbox); - echo "
". - _("Download this as a file"). - "

". - "". - "
". - "
". - "
"; - - if ($type1 == 'html') { - $msg = sqimap_get_message($imapConnection, $id, $mailbox); - $body = MagicHTML( $body, $id, $msg ); - } else { - translateText($body, $wrap_at, $charset); - } - - flush(); - echo $body . - "
"; -} - -function viewMessage($imapConnection, $id, $mailbox, $ent_id, $color, $wrap_at, $extracted) { - global $startMessage; - - - $msg = sqimap_get_message($imapConnection, $id, $mailbox); - $msg = getEntity($msg, $ent_id); - - $header = sqimap_get_ent_header($imapConnection,$id,$mailbox,$ent_id); - $header->id = $id; - $msg->header = $header; - - $ent_ar = findDisplayEntity($msg, 0); - $body = ''; - for ($i = 0; $i < count($ent_ar); $i++) { - $body .= formatBody($imapConnection, $msg, $color, $wrap_at, $ent_ar[$i], false); - } - - $bodyheader = viewHeader($header, $color); - displayPageHeader($color, 'None'); - - echo "
"; - if ($extracted) { - echo ''; - } - echo "

Message succesfully extracted

". - "
". _("Viewing a message attachment") . " - "; - - echo "". _("View message") . ""; - - $urlmailbox = urlencode($mailbox); - - echo "
". - _("Download this as a file"). - "

". - "". - "
"; - echo "
". - "
"; - echo "$bodyheader
"; - - echo "
". - "

"; - echo "$body

"; - echo '
'. - "
". - '
'. - "". - "". - "". - "". - "". - _("Save to:") . - ' '.' '. - ''. - ''. - '
'. - '
'; - -} - 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'])) { @@ -133,160 +32,36 @@ function get_extract_to_target_list($imapConnection) { } } } +$mailbox = decodeHeader($mailbox); +global $messages, $uid_support; -function viewHeader($header,$color) { - - $bodyheader = ''; - - /** FORMAT THE FROM STRING **/ - $from_name = decodeHeader(htmlspecialchars($header->from)); - if(isset($from_name) && $from_name !='') { - $bodyheader .= makeTableEntry($from_name,_("From"), $color); - } - - $subject_string = decodeHeader(htmlspecialchars($header->subject)); - if(isset($subject_string) && $subject_string !='') { - $bodyheader .= makeTableEntry($subject_string,_("Subject:"), $color); - } - /** FORMAT THE TO STRING **/ - $to = formatRecipientString($header->to, "to"); - $to_string = $to['str']; - $url_to_string = $to['url_str']; - if(isset($to_string) && $to_string !='') { - $bodyheader .= makeTableEntry($to_string,_("To:"), $color); - } - - /** FORMAT THE DATE STRING **/ - $dateString = getLongDateString($header->date); - if(isset($dateString) && $dateString !='') { - $bodyheader .= makeTableEntry($dateString,_("Date:"), $color); - } - - /** FORMAT THE CC STRING **/ - $cc = formatRecipientString($header->cc, "cc"); - $cc_string = $cc['str']; - $url_cc_string = $cc['url_str']; - if(isset($cc_string) && $cc_string !='') { - $bodyheader .= makeTableEntry($cc_string,_("Cc:"), $color); - } - - /** FORMAT THE BCC STRING **/ - $bcc = formatRecipientString($header->bcc, "bcc"); - $bcc_string = $bcc['str']; - $url_bcc_string = $bcc['url_str']; - if(isset($bcc_string) && $bcc_string !='') { - $bodyheader .= makeTableEntry($bcc_string,_("Bcc:"), $color); - } - - return $bodyheader; -} - -function makeTableEntry($str, $str_name, $color) { - $entry = ''."$str_name".''."$str".' '."\n"; - return $entry; +$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); +if (!isset($passed_ent_id)) { + $passed_ent_id = ''; } -function formatRecipientString($recipients, $item ) { - global $base_uri, $passed_id, $startMessage, $show_more_cc, $show_more, $show_more_bcc, $passed_ent_id; - global $where, $what, $mailbox, $sort; - - /** TEXT STRINGS DEFINITIONS **/ - $echo_more = _("more"); - $echo_less = _("less"); - - if (!isset($show_more_cc)) { - $show_more_cc = FALSE; - } - if (!isset($show_more_bcc)) { - $show_more_bcc = FALSE; - } - - - $urlMailbox = urlencode($mailbox); - $i = 0; - $url_string = ''; - - if (isset ($recipients[0]) && trim($recipients[0])) { - $string = ''; - $ary = explode(",",$recipients[0]); - - switch ($item) { - case 'to': - $show = "&show_more=1&show_more_cc=$show_more_cc&show_more_bcc=$show_more_bcc"; - $show_n = "&show_more=0&show_more_cc=$show_more_cc&show_more_bcc=$show_more_bcc"; - break; - case 'cc': - $show = "&show_more=$show_more&show_more_cc=1&show_more_bcc=$show_more_bcc"; - $show_n = "&show_more=$show_more&show_more_cc=0&show_more_bcc=$show_more_bcc"; - $show_more = $show_more_cc; - break; - case 'bcc': - $show = "&show_more=$show_more&show_more_cc=$show_more_cc&show_more_bcc=1"; - $show_n = "&show_more=$show_more&show_more_cc=$show_more_cc&show_more_bcc=0"; - $show_more = $show_more_bcc; - break; - default: - $break; - } - - while ($i < count($ary)) { - $ary[$i] = htmlspecialchars(decodeHeader($ary[$i])); - $url_string .= $ary[$i]; - if ($string) { - $string = "$string
$ary[$i]"; - } else { - $string = "$ary[$i]"; - } - - $i++; - if (count($ary) > 1) { - if ($show_more == false) { - if ($i == 1) { - - $string .= ' ($echo_more)"; - } else { - $string .= "sort=$sort&startMessage=$startMessage"."&passed_ent_id=$passed_ent_id$show\">$echo_more)"; - } - $i = count($ary); - } - } else if ($i == 1) { - - $string .= ' ($echo_less)"; - } else { - $string .= "sort=$sort&startMessage=$startMessage"."&passed_ent_id=$passed_ent_id$show_n\">$echo_less)"; - } - } - } - - } - } - else { - $string = ''; - } - $url_string = urlencode($url_string); - $result = array(); - $result['str'] = $string; - $result['url_str'] = $url_string; - return $result; - +$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"]; +$subject = $message->rfc822_header->subject; +$message = &$message->getEntity($ent_id); +$header = $message->header; +if ($message->rfc822_header) { + $subject = $message->rfc822_header->subject; + $charset = $header->content_type->properties['charset']; +} else { + $header = $message->header; + $charset = $header->getParameter('charset'); } +$type0 = $header->type0; +$type1 = $header->type1; +$encoding = strtolower($header->encoding); - -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -sqimap_mailbox_select($imapConnection, $mailbox); - +/* $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); + $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $message, $uid_support); $cnt = count($read); $body = ''; $length = 0; @@ -302,50 +77,51 @@ if (isset($extract_message) && $extract_message) { } } -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. */ -$header = sqimap_get_mime_ent_header ($imapConnection, $passed_id, $mailbox, $passed_ent_id); -$header->entity_id = $passed_ent_id; -$header->mailbox = $mailbox; - -$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); -if (!$filename) { - $filename = decodeHeader($header->name); +$filename = ''; +if (is_object($message->header->disposition)) { + $filename = decodeHeader($header->disposition->getProperty('filename')); + if (!$filename) { + $filename = decodeHeader($header->disposition->getProperty('name')); + } } - if (strlen($filename) < 1) { if ($type1 == 'plain' && $type0 == 'text') { $suffix = 'txt'; + $filename = $subject . '.txt'; } else if ($type1 == 'richtext' && $type0 == 'text') { $suffix = 'rtf'; + $filename = $subject . '.rtf'; } else if ($type1 == 'postscript' && $type0 == 'application') { $suffix = 'ps'; + $filename = $subject . '.ps'; } else if ($type1 == 'rfc822' && $type0 == 'message') { $suffix = 'eml'; + $filename = $subject . '.msg'; } else { $suffix = $type1; } - $filename = "untitled$passed_ent_id.$suffix"; + if (strlen($filename) < 1) { + $filename = "untitled$ent_id.$suffix"; + } else { + $filename = "$filename.$suffix"; + } } - /* * Note: * The following sections display the attachment in different @@ -362,65 +138,16 @@ if (strlen($filename) < 1) { * content-type as application/octet-stream */ if (isset($absolute_dl) && $absolute_dl == 'true') { - switch($type0) { - case 'text': - DumpHeaders($type0, $type1, $filename, 1); - $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); - if ($type1 == 'plain' && isset($showHeaders)) { - echo _("Subject") . ": " . decodeHeader($top_header->subject) . "\n". - " " . _("From") . ": " . decodeHeader($top_header->from) . "\n". - " " . _("To") . ": " . decodeHeader(getLineOfAddrs($top_header->to)) . "\n". - " " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n"; - } elseif ($type1 == 'html' && isset($showHeaders)) { - echo '\n\n\n\n
' . _("Subject"). - ':' . decodeHeader($top_header->subject). - "
" . _("From"). - ':' . decodeHeader($top_header->from). - "
" . _("To"). - ':' . decodeHeader(getLineOfAddrs($top_header->to)). - "
" . _("Date"). - ':' . getLongDateString($top_header->date). - "
\n
\n"; - } - echo $body; - break; - - default: - DumpHeaders($type0, $type1, $filename, 1); - mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); - break; - } + DumpHeaders($type0, $type1, $filename, 1); } else { - switch ($type0) { - 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, $imapConnection); - } else { - DumpHeaders($type0, $type1, $filename, 0); - $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $header->encoding); - echo $body; - } - break; - case 'message': - if ($type1 == 'rfc822' ) { - viewMessage($imapConnection, $passed_id, $mailbox, $passed_ent_id, $color, $wrap_at, $extracted); - } else { - $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); - $body = decodeBody($body, $msgheader->encoding); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at, $imapConnection); - } - break; - default: - DumpHeaders($type0, $type1, $filename, 0); - mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); - break; - } + DumpHeaders($type0, $type1, $filename, 0); } +/* be aware that any warning caused by download.php will corrupt the + * attachment in case of ERROR reporting = E_ALL and the output is the screen */ +mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding); +$message = &$message->getEntity(''); +$messages[$mbx_response['UIDVALIDITY']]["$passed_id"] = &$message; /* * This function is verified to work with Netscape and the *very latest* @@ -428,7 +155,6 @@ 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 &&