From 193fb42fa1315548351b877044aca30f6f9afa3d Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Sat, 15 Nov 2008 10:33:26 -0500
Subject: [PATCH] * added docblock for ctr
---
program/include/rcube_message.php | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 329c390..9aff68b 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -45,7 +45,20 @@
public $sender = null;
public $is_safe = false;
-
+
+ /**
+ * __construct
+ *
+ * Provide a uid, and parse message structure.
+ *
+ * @param string $uid The message UID.
+ *
+ * @uses rcmail::get_instance()
+ * @uses rcube_imap::decode_mime_string()
+ * @uses self::set_safe()
+ *
+ * @see self::$app, self::$imap, self::$opt, self::$structure
+ */
function __construct($uid)
{
$this->app = rcmail::get_instance();
@@ -63,7 +76,7 @@
'prefer_html' => $this->app->config->get('prefer_html'),
'get_url' => rcmail_url('get', array('_mbox' => $this->imap->get_mailbox_name(), '_uid' => $uid))
);
-
+
if ($this->structure = $this->imap->get_structure($uid)) {
$this->get_mime_numbers($this->structure);
$this->parse_structure($this->structure);
@@ -117,12 +130,13 @@
* Get content of a specific part of this message
*
* @param string Part MIME-ID
+ * @param resource File pointer to save the message part
* @return string Part content
*/
- public function get_part_content($mime_id)
+ public function get_part_content($mime_id, $fp=NULL)
{
if ($part = $this->mime_parts[$mime_id])
- return $this->imap->get_message_part($this->uid, $mime_id, $part);
+ return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
else
return null;
}
@@ -227,6 +241,11 @@
// print body if message doesn't have multiple parts
if ($message_ctype_primary == 'text' && !$recursive) {
+ $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;
}
@@ -339,6 +358,10 @@
// part message/*
else if ($primary_type=='message') {
$this->parse_structure($mail_part, true);
+
+ // list as attachment as well (mostly .eml)
+ if (!empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
}
// ignore "virtual" protocol parts
else if ($primary_type == 'protocol')
--
Gitblit v1.9.1