**
** $Id$
**/
+
+ if (defined('mime_php'))
+ return;
+ define('mime_php', true);
+ global $debug_mime;
$debug_mime = false;
- $mime_php = true;
-
- if (!isset($i18n_php))
- include "../functions/i18n.php";
- if (!isset($imap_php))
- include "../functions/imap.php";
- if (!isset($config_php))
- include "../config/config.php";
-
+
+ require_once('../functions/imap.php');
/** Setting up the objects that have the structure for the message **/
sqimap_messages_flag ($imap_stream, $header->id, $header->id, "Seen");
$id = $header->id;
- fputs ($imap_stream, "a001 FETCH $id BODYSTRUCTURE\r\n");
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $id BODYSTRUCTURE\r\n");
//
// This should use sqimap_read_data instead of reading it itself
//
+ $sid = sqimap_session_id();
+ $lsid = strlen( $sid );
$read = fgets ($imap_stream, 10000);
- $response = substr($read, 0, 4);
$bodystructure = "";
- while ($response != "a001") {
+ while( substr($read, 0, $lsid) <> $sid && !feof( $imap_stream ) ) {
$bodystructure .= $read;
$read = fgets ($imap_stream, 10000);
- $response = substr($read, 0, 4);
}
$read = $bodystructure;
$msg = mime_get_element ($structure, $msg, $ent_id);
if ($debug_mime) echo "<br>";
}
- return $msg;
if ($debug_mime) echo "<font color=008800><tt> END: mime_parse_structure()</tt></font><br>";
+ return $msg;
}
// Increments the element ID. An element id can look like any of
// that it is the first one. That is usually the case anyway.
if (!$ent_id) $ent_id = 1;
- fputs ($imap_stream, "a010 FETCH $id BODY[$ent_id]\r\n");
- $data = sqimap_read_data ($imap_stream, 'a010', true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $id BODY[$ent_id]\r\n");
+ $data = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
$topline = array_shift($data);
- while (! ereg('\\* [0-9]+ FETCH ', $topline) && data)
+ while (! ereg('\\* [0-9]+ FETCH ', $topline) && $data)
$topline = array_shift($data);
$wholemessage = implode('', $data);
return $regs[1];
}
- $str = "Body retrival error. Please report this bug!\n";
- $str .= "Response: $response\n";
- $str .= "Message: $message\n";
- $str .= "FETCH line: $topline";
- $str .= "---------------\n$wholemessage";
- foreach ($data as $d)
- {
+ $str = "Body retrieval error. Please report this bug!\n" .
+ "Response: $response\n" .
+ "Message: $message\n" .
+ "FETCH line: $topline" .
+ "---------------\n$wholemessage";
+ foreach ($data as $d) {
$str .= htmlspecialchars($d) . "\n";
}
return $str;
-
- return "Body retrival error, please report this bug!\n\nTop line is \"$topline\"\n";
}
function mime_print_body_lines ($imap_stream, $id, $ent_id, $encoding) {
// that it is the first one. That is usually the case anyway.
if (!$ent_id) $ent_id = 1;
- fputs ($imap_stream, "a001 FETCH $id BODY[$ent_id]\r\n");
+ // Don't kill the connection if the browser is over a dialup
+ // and it would take over 30 seconds to download it.
+ set_time_limit(0);
+
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $id BODY[$ent_id]\r\n");
$cnt = 0;
$continue = true;
$read = fgets ($imap_stream,4096);
- while (!ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) {
+ // This could be bad -- if the section has sqimap_session_id() . ' OK'
+ // or similar, it will kill the download.
+ while (!ereg("^" . sqimap_session_id() . " (OK|BAD|NO)(.*)$", $read, $regs)) {
if (trim($read) == ")==") {
$read1 = $read;
$read = fgets ($imap_stream,4096);
- if (ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) {
+ if (ereg("^" . sqimap_session_id() . " (OK|BAD|NO)(.*)$", $read, $regs)) {
return;
} else {
- echo decodeBody($read1, $encoding);
- echo decodeBody($read, $encoding);
+ echo decodeBody($read1, $encoding) .
+ decodeBody($read, $encoding);
}
} else if ($cnt) {
echo decodeBody($read, $encoding);
// figures out what entity to display and returns the $message object
// for that entity.
- function findDisplayEntity ($message, $textOnly = 1, $next = 'none')
+ function findDisplayEntity ($message, $textOnly = 1)
{
global $show_html_default;
if (! $message)
- return;
-
+ return 0;
+
+ if ($message->header->type0 == "multipart" &&
+ $message->header->type1 == "alternative" &&
+ $show_html_default && ! $textOnly) {
+ $entity = findDisplayEntityHTML($message);
+ if ($entity != 0)
+ return $entity;
+ }
+
// Show text/plain or text/html -- the first one we find.
if ($message->header->type0 == 'text' &&
($message->header->type1 == 'plain' ||
- $message->header->type2 == 'html'))
- {
- // If the next part is an HTML version, this will
- // all be true. Show it, if the user so desires.
- // HTML mails this way all have entity_id of 2. 1 = text/plain
- if ($next != 'none' &&
- $textOnly == 0 &&
- $next->header->type0 == "text" &&
- $next->header->type1 == "html" &&
- $next->header->entity_id == 2 &&
- $message->header->type1 == "plain" &&
- isset($show_html_default) &&
- $show_html_default)
- $message = $next;
-
- if (isset($message->header->entity_id))
- return $message->header->entity_id;
- }
- else
- {
- for ($i=0; $message->entities[$i]; $i++)
- {
- $next = 'none';
- if (isset($message->entities[$i + 1]))
- $next = $message->entities[$i + 1];
- $entity = findDisplayEntity($message->entities[$i],
- $textOnly, $next);
- if ($entity != 0)
- return $entity;
- }
- }
+ $message->header->type1 == 'html') &&
+ isset($message->header->entity_id))
+ return $message->header->entity_id;
+
+ for ($i=0; isset($message->entities[$i]); $i++) {
+ $entity = findDisplayEntity($message->entities[$i], $textOnly);
+ if ($entity != 0)
+ return $entity;
+ }
+
+ return 0;
+ }
+
+ // Shows the HTML version
+ function findDisplayEntityHTML ($message) {
+ if ($message->header->type0 == 'text' &&
+ $message->header->type1 == 'html' &&
+ isset($message->header->entity_id))
+ return $message->header->entity_id;
+ for ($i = 0; isset($message->entities[$i]); $i ++) {
+ $entity = findDisplayEntityHTML($message->entities[$i]);
+ if ($entity != 0)
+ return $entity;
+ }
return 0;
}
// this if statement checks for the entity to show as the
// primary message. To add more of them, just put them in the
// order that is their priority.
- global $startMessage, $username, $key, $imapServerAddress, $imapPort;
+ global $startMessage, $username, $key, $imapServerAddress, $imapPort,
+ $show_html_default;
$id = $message->header->id;
$urlmailbox = urlencode($message->header->mailbox);
// If there are other types that shouldn't be formatted, add
// them here
- if ($body_message->header->type1 != "html") {
+ if ($body_message->header->type1 != "html" || ! $show_html_default) {
translateText($body, $wrap_at, $body_message->header->charset);
}
- $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
+ $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox&showHeaders=1\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
/** Display the ATTACHMENTS: message if there's more than one part **/
$body .= "</TD></TR></TABLE>";
if (isset($message->entities[0])) {
$body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
}
+ $body .= "</TD></TR></TABLE>";
} else {
- $body .= formatAttachments ($message, -1, $message->header->mailbox, $id);
+ $body = formatAttachments ($message, -1, $message->header->mailbox, $id);
}
return $body;
}
$body = str_replace("\r\n", "\n", $body);
$encoding = strtolower($encoding);
+ global $show_html_default;
+
if ($encoding == "quoted-printable") {
$body = quoted_printable_decode($body);
} else if ($encoding == "base64") {
$body = base64_decode($body);
}
-
+
// All other encodings are returned raw.
return $body;
}
// be encoded.
function encodeHeader ($string) {
global $default_charset;
-
- // Encode only if the string contains 8-bit characters or =?
- if (ereg("([\200-\377]|=\\?)", $string)) {
-
- // First the special characters
- $string = str_replace("=", "=3D", $string);
- $string = str_replace("?", "=3F", $string);
- $string = str_replace("_", "=5F", $string);
- $string = str_replace(" ", "_", $string);
-
- for ( $ch = 127 ; $ch <= 255 ; $ch++ ) {
- $replace = chr($ch);
- $insert = sprintf("=%02X", $ch);
- $string = str_replace($replace, $insert, $string);
- }
-
- $newstring = "=?$default_charset?Q?".$string."?=";
-
- return $newstring;
- }
-
- return $string;
- }
+
+ // Encode only if the string contains 8-bit characters or =?
+ $j = strlen( $string );
+ $l = FALSE; // Must be encoded ?
+ $ret = '';
+ for( $i=0; $i < $j; ++$i) {
+ switch( $string{$i} ) {
+ case '=':
+ $ret .= '=3D';
+ break;
+ case '?':
+ $l = TRUE;
+ $ret .= '=3F';
+ break;
+ case '_':
+ $ret .= '=5F';
+ break;
+ case ' ':
+ $ret .= '_';
+ break;
+ default:
+ $k = ord( $string{$i} );
+ if( $k > 126 ) {
+ $ret .= sprintf("=%02X", $k);
+ $l = TRUE;
+ } else
+ $ret .= $string{$i};
+ }
+ }
+
+ if( $l )
+ $string = "=?$default_charset?Q?$ret?=";
+
+ return( $string );
+ }
?>
projects / squirrelmail.git / blobdiff