X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Femail.php;h=42f80c24273e2c6d4aaf1c894259504ab0fbf49b;hb=2952e2b3e47d0d16e89c6ff81353a9059bfe474c;hp=46feb4582b4ffe797d44d8962c8b9bd52031bfb7;hpb=a620d5d9f314774505f9731dd2cc94356e731bb6;p=friendica.git

diff --git a/include/email.php b/include/email.php
index 46feb4582b..42f80c2427 100644
--- a/include/email.php
+++ b/include/email.php
@@ -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'];
@@ -100,15 +96,20 @@ function email_get_msg($mbox,$uid, $reply) {
 		$html = '';
 		foreach($struc->parts as $ptop => $p) {
 			$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
-			if($x)	$text .= $x;
+			if ($x) {
+				$text .= $x;
+			}
 
 			$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
-			if($x)	$html .= $x;
+			if ($x) {
+				$html .= $x;
+			}
 		}
-		if (trim($html) != '')
+		if (trim($html) != '') {
 			$ret['body'] = html2bbcode($html);
-		else
+		} else {
 			$ret['body'] = $text;
+		}
 	}
 
 	$ret['body'] = removegpg($ret['body']);
@@ -116,8 +117,9 @@ function email_get_msg($mbox,$uid, $reply) {
 	$ret['body'] = $msg['body'];
 	$ret['body'] = convertquote($ret['body'], $reply);
 
-	if (trim($html) != '')
+	if (trim($html) != '') {
 		$ret['body'] = removelinebreak($ret['body']);
+	}
 
 	$ret['body'] = unifyattributionline($ret['body']);
 
@@ -138,10 +140,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);
@@ -197,8 +195,9 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 		$x = "";
 		foreach ($p->parts as $partno0=>$p2) {
 			$x .=  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.
-			//if($x)
+			//if ($x) {
 			//	return $x;
+			//}
 		}
 		return $x;
 	}
@@ -257,6 +256,12 @@ function email_header_encode($in_str, $charset) {
     return $out_str;
 }
 
+/**
+ * email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
+ * (not to notify the user, but to send items to email contacts)
+ *
+ * @todo This could be changed to use the Emailer class
+ */
 function email_send($addr, $subject, $headers, $item) {
 	//$headers .= 'MIME-Version: 1.0' . "\n";
 	//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";