X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdownload.php;h=710bdb6afac6ef283fca481115ac5f1c94f2a1e2;hb=e1baa507f36dd65abac2ac7b16f54559bfae47b3;hp=ebf4e91b299ee4fb205e567aeafbd6d4b3f9a494;hpb=6fbd125bd6a9b93f4426ded8ec23b4d6986c81bf;p=squirrelmail.git diff --git a/src/download.php b/src/download.php index ebf4e91b..710bdb6a 100644 --- a/src/download.php +++ b/src/download.php @@ -3,7 +3,7 @@ /** * download.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Handles attachment downloads to the users computer. @@ -12,73 +12,63 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/mime.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/mime.php'); header('Pragma: '); header('Cache-Control: cache'); -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); +/* globals */ +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); +sqgetGlobalVar('messages', $messages, SQ_SESSION); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); +sqgetGlobalVar('ent_id', $ent_id, SQ_GET); +sqgetGlobalVar('absolute_dl',$absolute_dl, SQ_GET); +if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) { + $passed_id = (int) $temp; +} -global $messages, $uid_support; +/* end globals */ + +global $uid_support; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); -if (!isset($passed_ent_id)) { - $passed_ent_id = ''; -} $message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"]; +if (!is_object($message)) { + $message = sqimap_get_message($imapConnection,$passed_id, $mailbox); +} $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']; +if ($ent_id) { + $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); } else { - $header = $message->header; - $charset = $header->getParameter('charset'); + /* raw message */ + $type0 = 'message'; + $type1 = 'rfc822'; + $encoding = 'US-ASCII'; + $header = $message->header; } -$type0 = $header->type0; -$type1 = $header->type1; -$encoding = strtolower($header->encoding); -/* -$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; - } -} - - -*/ /* * 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 @@ -93,11 +83,18 @@ if (isset($override_type1)) { } $filename = ''; if (is_object($message->header->disposition)) { - $filename = decodeHeader($header->disposition->getProperty('filename')); + $filename = $header->disposition->getProperty('filename'); if (!$filename) { - $filename = decodeHeader($header->disposition->getProperty('name')); + $filename = $header->disposition->getProperty('name'); } + if (!$filename) { + $filename = $header->getParameter('name'); + } +} else { + $filename = $header->getParameter('name'); } + +$filename = decodeHeader($filename); if (strlen($filename) < 1) { if ($type1 == 'plain' && $type0 == 'text') { $suffix = 'txt'; @@ -116,7 +113,7 @@ if (strlen($filename) < 1) { } if (strlen($filename) < 1) { - $filename = "untitled$ent_id.$suffix"; + $filename = 'untitled'.strip_tags($ent_id).'.'.$suffix; } else { $filename = "$filename.$suffix"; } @@ -137,7 +134,7 @@ if (strlen($filename) < 1) { * viewer (built in to squirrelmail). Otherwise, it sets the * content-type as application/octet-stream */ -if (isset($absolute_dl) && $absolute_dl == 'true') { +if (isset($absolute_dl) && $absolute_dl) { DumpHeaders($type0, $type1, $filename, 1); } else { DumpHeaders($type0, $type1, $filename, 0); @@ -151,8 +148,10 @@ mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding); * version of IE. I don't know if it works with Opera, but it should now. */ function DumpHeaders($type0, $type1, $filename, $force) { - global $HTTP_USER_AGENT, $languages, $squirrelmail_language; - $isIE = 0; + global $languages, $squirrelmail_language; + $isIE = $isIE6 = 0; + + sqgetGlobalVar('HTTP_USER_AGENT', $HTTP_USER_AGENT, SQ_SERVER); if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false && strstr($HTTP_USER_AGENT, 'Opera') === false) { @@ -164,15 +163,16 @@ function DumpHeaders($type0, $type1, $filename, $force) { $isIE6 = 1; } - if (function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { $filename = $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT); } else { - $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename); + $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename); } // A Pox on Microsoft and it's Office! - if (! $force) { + if (!$force) { // Try to show in browser window header("Content-Disposition: inline; filename=\"$filename\""); header("Content-Type: $type0/$type1; name=\"$filename\""); @@ -187,7 +187,7 @@ function DumpHeaders($type0, $type1, $filename, $force) { // // The best thing you can do for IE is to upgrade to the latest // version - if ($isIE && !isset($isIE6)) { + if ($isIE && !$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? @@ -195,7 +195,6 @@ function DumpHeaders($type0, $type1, $filename, $force) { // This combination seems to work mostly. IE 5.5 SP 1 has // known issues (see the Microsoft Knowledge Base) header("Content-Disposition: inline; filename=$filename"); - // This works for most types, but doesn't work with Word files header("Content-Type: application/download; name=\"$filename\"");