From cf17773654e1e3f2b09a8aee1058bda4ada3bed1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 12 Sep 2008 10:01:52 -0400
Subject: [PATCH] Fix rcmail::url(), don't use comm_path
---
program/include/rcube_message.php | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index d810ef3..c18db4b 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -42,6 +42,7 @@
public $mime_parts = array();
public $attachments = array();
public $subject = '';
+ public $sender = null;
public $is_safe = false;
@@ -53,9 +54,9 @@
$this->uid = $uid;
$this->headers = $this->imap->get_headers($uid);
$this->subject = rcube_imap::decode_mime_string($this->headers->subject, $this->headers->charset);
+ list(, $this->sender) = each($this->imap->decode_address_list($this->headers->from));
- $this->is_safe = (intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]) ? true : false;
- $_SESSION['safe_messages'][$uid] = $this->is_safe;
+ $this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]));
$this->opt = array(
'safe' => $this->is_safe,
@@ -229,6 +230,11 @@
$structure->type = 'content';
$this->parts[] = &$structure;
}
+ // the same for pgp signed messages
+ else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
+ $structure->type = 'content';
+ $this->parts[] = &$structure;
+ }
// message contains alternative parts
else if ($message_ctype_primary == 'multipart' && ($message_ctype_secondary == 'alternative') && is_array($structure->parts)) {
// get html/plaintext parts
@@ -278,7 +284,7 @@
$this->parts[] = $print_part;
}
// show plaintext warning
- else if ($html_part !== nullL && empty($this->parts)) {
+ else if ($html_part !== null && empty($this->parts)) {
$c = new stdClass;
$c->type = 'content';
$c->body = rcube_label('htmlmessage');
@@ -355,6 +361,10 @@
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
$this->inline_parts[] = $mail_part;
}
+ else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {
+ $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+ $this->inline_parts[] = $mail_part;
+ }
// is regular attachment
else {
if (!$mail_part->filename)
@@ -369,7 +379,11 @@
$a_replaces = array();
foreach ($this->inline_parts as $inline_object) {
- $a_replaces['cid:'.$inline_object->content_id] = $this->get_part_url($inline_object->mime_id);
+ $part_url = $this->get_part_url($inline_object->mime_id);
+ if ($inline_object->content_id)
+ $a_replaces['cid:'.$inline_object->content_id] = $part_url;
+ if ($inline_object->content_location)
+ $a_replaces[$inline_object->content_location] = $part_url;
}
// add replace array to each content part
--
Gitblit v1.9.1