X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdownload.php;h=f6235fab658b2418a3e32700ae317b541c09aebe;hb=6316707656c195f1d33e54a065a0b4aff3f4636e;hp=d78999d1b11ce6793eac99a6c7cfa08c275753fb;hpb=65c3ec94c897fb098598f3843e371020deb2226b;p=squirrelmail.git diff --git a/src/download.php b/src/download.php index d78999d1..f6235fab 100644 --- a/src/download.php +++ b/src/download.php @@ -56,6 +56,183 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { ""; } +function viewMessage($imapConnection, $id, $mailbox, $ent_id, $msg, $color, $wrap_at) { + global $startMessage; + $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 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; + + /** 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; + +} + + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); @@ -64,6 +241,7 @@ sqimap_mailbox_select($imapConnection, $mailbox); * including header and body */ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $top_header = $message->header; /* @@ -96,8 +274,8 @@ if (strlen($filename) < 1) { $suffix = 'rtf'; } else if ($type1 == 'postscript' && $type0 == 'application') { $suffix = 'ps'; - } else if ($type1 == 'message' && $type0 == 'rfc822') { - $suffix = 'msg'; + } else if ($type1 == 'rfc822' && $type0 == 'message') { + $suffix = 'eml'; } else { $suffix = $type1; } @@ -105,6 +283,7 @@ if (strlen($filename) < 1) { $filename = "untitled$passed_ent_id.$suffix"; } + /* * Note: * The following sections display the attachment in different @@ -141,9 +320,10 @@ 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); @@ -164,9 +344,13 @@ if (isset($absolute_dl) && $absolute_dl == 'true') { } 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); + if ($type1 == 'rfc822' ) { + viewMessage($imapConnection, $passed_id, $mailbox, $passed_ent_id, $message, $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); @@ -184,11 +368,17 @@ 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 +397,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?