Merge pull request #1044 from annando/master

[friendica.git] / include / email.php

diff --git a/include/email.php b/include/email.php
index b43ae0dc1c200614a94e4beef83a04b543f65b99..dec8c93db7aa519dcfae0711b2bccb0b5f744593 100644 (file)
--- a/include/email.php
+++ b/include/email.php
@@ -48,8 +48,8 @@ function construct_mailbox_name($mailacct) {
 
 
 function email_msg_meta($mbox,$uid) {
-       $ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array()));
-       return ((count($ret)) ? $ret[0] : array());
+       $ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
+       return ((count($ret)) ? $ret : array());
 }
 
 function email_msg_headers($mbox,$uid) {
@@ -82,10 +82,6 @@ function email_get_msg($mbox,$uid, $reply) {
        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, 'html');
                $html = $ret['body'];
@@ -138,10 +134,6 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
                ? @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);