X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=0b7ba61394f2b720877b6a49cfdec208ffce76e0;hp=22f9c60557d1e3921e90b0f36fd0564ed537492c;hb=631db37eb3dd4a0ca4b3c272f4219d601bda70f5;hpb=247240ed22bcf6b331bc8d968cd34ee5a80ef213 diff --git a/src/download.php b/src/download.php index 22f9c605..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,234 +58,108 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { "
"; } -function viewMessage($imapConnection, $id, $mailbox, $ent_id, $color, $wrap_at) { - global $startMessage; - - - $msg = sqimap_get_message($imapConnection, $id, $mailbox); - $msg = getEntity($msg, $ent_id); - - $header = sqimap_get_ent_header($imapConnection,$id,$mailbox,$ent_id); - $msg->header = $header; - $msg->header->id = $id; - $body = formatBody($imapConnection, $msg, $color, $wrap_at); - $bodyheader = viewHeader($header, $color); - displayPageHeader($color, 'None'); - - echo "
". - "
". _("Viewing a message attachment") . " - "; - - echo "". _("View message") . ""; - - $urlmailbox = urlencode($mailbox); - - echo "
". - _("Download this as a file"). - "

". - "". - "
"; - echo "
". - "
"; - echo "$bodyheader
"; - - echo "
". - "
"; - echo "$body
"; +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; -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; -} - -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; +$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); - /** TEXT STRINGS DEFINITIONS **/ - $echo_more = _("more"); - $echo_less = _("less"); +$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"]; +$message = &$message->getEntity($passed_ent_id); - if (!isset($show_more_cc)) { - $show_more_cc = FALSE; - } - if (!isset($show_more_bcc)) { - $show_more_bcc = FALSE; - } +$header = $message->header; +$charset = $header->charset; +$type0 = $header->type0; +$type1 = $header->type1; +$encoding = strtolower($header->encoding); - $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; - -} -$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, $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. */ -$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); + +$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'; + $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"; + } } - /* * Note: * The following sections display the attachment in different @@ -304,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". @@ -323,10 +199,14 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { } 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 { @@ -334,31 +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': - if ($type1 == 'rfc822' ) { - viewMessage($imapConnection, $passed_id, $mailbox, $passed_ent_id, $color, $wrap_at); - } 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); - } - 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* @@ -366,9 +244,9 @@ 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;