Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.

1 files changed, 9 insertions, 1 deletions

diff --git a/include/email.php b/include/email.php
index 3e6a8186d..452682260 100755
--- a/include/email.php
+++ b/include/email.php
@@ -79,6 +79,10 @@ function email_get_msg($mbox,$uid) {
 	if(! $struc)
 		return $ret;
 
+	// for testing purposes: Collect imported mails
+	// $file = tempnam("/tmp/friendica2/", "mail-in-");
+	// file_put_contents($file, json_encode($struc));
+
 	if(! $struc->parts) {
 		$ret['body'] = email_get_part($mbox,$uid,$struc,0);
 	}
@@ -99,13 +103,17 @@ function email_get_part($mbox,$uid,$p,$partno) {
     // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
     global $htmlmsg,$plainmsg,$charset,$attachments;
 
-	echo $partno;
+	//echo $partno;
 
     // DECODE DATA
     $data = ($partno)
 		? @imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK)
         : @imap_body($mbox,$uid,FT_UID|FT_PEEK);
 
+	// for testing purposes: Collect imported mails
+	// $file = tempnam("/tmp/friendica2/", "mail-body-");
+	// file_put_contents($file, $data);
+
     // Any part may be encoded, even plain text messages, so check everything.
     if ($p->encoding==4)
         $data = quoted_printable_decode($data);