read text body from mail message and display

danielfh · Nov 8, 2012 · 348e564 · 348e564
1 parent 3d226d6
commit 348e564
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/mail/js/mail.js b/mail/js/mail.js
@@ -67,6 +67,7 @@ Mail = {
                 clone.removeClass('template');
 
                 clone.data('message_id', message.id);
+                clone.attr('data-message-id', message.id);
                 if (message.flags['unseen']) {
                     clone.addClass('unseen');
                 }
@@ -112,7 +113,7 @@ Mail = {
                     Mail.UI.closeMessage();
 
                     // Find the correct message
-                    message = $('#mail_messages tr[data-message_id="' + message_id + '"]');
+                    message = $('#mail_messages tr[data-message-id="' + message_id + '"]');
                     message.after(jsondata.data);
 
                     // Set current Message as active

diff --git a/mail/lib/message.php b/mail/lib/message.php
@@ -92,7 +92,7 @@ private function getmsg() {
 		$fetch_query = new \Horde_Imap_Client_Fetch_Query();
 		$fetch_query->envelope();
 //		$fetch_query->fullText();
-		$fetch_query->bodyText();
+//		$fetch_query->bodyText();
 		//$fetch_query->bodyPart(1);
 		$fetch_query->structure();
 		$fetch_query->flags();
@@ -118,8 +118,31 @@ private function getmsg() {
 		$headers = $this->conn->fetch($this->folder_id, $fetch_query, array('ids' => $ids));
 		$this->fetch = $headers[$this->message_id];
 
-		//$headers[$this->message_id]->get
-		$this->plainmsg = $headers[$this->message_id]->getBodyText();
+		// stupid: return all
+//		$this->plainmsg = $headers[$this->message_id]->getBodyText();
+
+		// analyse the body part
+		$structure = $this->fetch->getStructure();
+		//
+		// TODO: handle nulls
+		//
+		if ($structure->findBody() != null) {
+			// get the body from the server
+			$partId = $structure->findBody();
+			$fetch_query->bodyPart($partId);
+			$headers = $this->conn->fetch($this->folder_id, $fetch_query, array('ids' => $ids));
+			$this->fetch = $headers[$this->message_id];
+
+			$structure = $this->fetch->getStructure();
+			$this->plainmsg = $structure->getPart($structure->findBody())->getContents();
+			$this->plainmsg = $this->fetch->getBodyPart($partId);
+		}
+
+		// debugging below
+		$structure_type = $structure->getType();
+
+
+//		if ($structure->)
 //
 //		// HEADER
 //		$this->header = $this->conn->fetchHeader($this->folder_id, $this->message_id);

diff --git a/mail/templates/index.php b/mail/templates/index.php
@@ -13,7 +13,7 @@
 </div>
 <div id="rightcontent" class="rightcontent">
 <table id="mail_messages">
-	<tr class="template mail_message_summary">
+	<tr class="template mail_message_summary" data-message-id="0">
 		<td class="mail_message_summary_from"></td>
 		<td class="mail_message_summary_subject"></td>
 		<td class="mail_message_summary_date"></td>