From 45f56c1c400ad5b21ddcd4d490f6f6c4ffe0d9fc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 29 May 2008 12:10:42 -0400
Subject: [PATCH] Replace our crappy html sanitization with the dom-based washtml script + fix inline message parts + remove old code + add some doc comments
---
program/include/rcube_message.php | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 174b1f3..7dc74ab 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -21,9 +21,8 @@
/**
- * Interface class for accessing an IMAP server
- *
- * This is a wrapper that implements the Iloha IMAP Library (IIL)
+ * Logical representation of a mail message with all its data
+ * and related functions
*
* @package Mail
* @author Thomas Bruederli <roundcube@gmail.com>
@@ -65,8 +64,8 @@
);
if ($this->structure = $this->imap->get_structure($uid)) {
- $this->parse_structure($this->structure);
$this->get_mime_numbers($this->structure);
+ $this->parse_structure($this->structure);
}
else {
$this->body = $this->imap->get_body($uid);
@@ -356,18 +355,18 @@
}
// if this was a related part try to resolve references
- if ($message_ctype_secondary == 'related' && sizeof($this->inline_objects)) {
+ if ($message_ctype_secondary == 'related' && sizeof($this->inline_parts)) {
$a_replaces = array();
foreach ($this->inline_parts as $inline_object) {
- $a_replaces['cid:'.$inline_object->content_id] = htmlspecialchars(sprintf($this->opt['get_url'], $inline_object->mime_id));
+ $a_replaces['cid:'.$inline_object->content_id] = $this->get_part_url($inline_object->mime_id);
}
// add replace array to each content part
// (will be applied later when part body is available)
- for ($i=0; $i<count($a_return_parts); $i++) {
- if ($a_return_parts[$i]->type=='content')
- $a_return_parts[$i]->replaces = $a_replaces;
+ foreach ($this->parts as $i => $part) {
+ if ($part->type == 'content')
+ $this->parts[$i]->replaces = $a_replaces;
}
}
}
--
Gitblit v1.9.1