X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Femail.php;h=b3bd52a6682e9649a0fbd2cc92a12e593b85a33c;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=42f80c24273e2c6d4aaf1c894259504ab0fbf49b;hpb=61a01141d7e897c30b5931b66675cbb09d6368b8;p=friendica.git

diff --git a/include/email.php b/include/email.php
index 42f80c2427..b3bd52a668 100644
--- a/include/email.php
+++ b/include/email.php
@@ -4,7 +4,7 @@ require_once('include/msgclean.php');
 require_once('include/quoteconvert.php');
 
 function email_connect($mailbox,$username,$password) {
-	if(! function_exists('imap_open'))
+	if (! function_exists('imap_open'))
 		return false;
 
 	$mbox = @imap_open($mailbox,$username,$password);
@@ -14,26 +14,31 @@ function email_connect($mailbox,$username,$password) {
 
 function email_poll($mbox,$email_addr) {
 
-	if(! ($mbox && $email_addr))
+	if (! ($mbox && $email_addr))
 		return array();
 
 	$search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-	if(! $search1)
+	if (!$search1) {
 		$search1 = array();
+	} else {
+		logger("Found mails from ".$email_addr, LOGGER_DEBUG);
+	}
 
 	$search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID);
-	if(! $search2)
+	if (!$search2) {
 		$search2 = array();
+	} else {
+		logger("Found mails to ".$email_addr, LOGGER_DEBUG);
+	}
 
 	$search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID);
-	if(! $search3)
+	if (!$search3) {
 		$search3 = array();
+	} else {
+		logger("Found mails cc ".$email_addr, LOGGER_DEBUG);
+	}
 
-	$search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID);
-	if(! $search4)
-		$search4 = array();
-
-	$res = array_unique(array_merge($search1,$search2,$search3,$search4));
+	$res = array_unique(array_merge($search1, $search2, $search3));
 
 	return $res;
 }
@@ -57,8 +62,8 @@ function email_msg_headers($mbox,$uid) {
 	$raw_header = str_replace("\r",'',$raw_header);
 	$ret = array();
 	$h = explode("\n",$raw_header);
-	if(count($h))
-	foreach($h as $line ) {
+	if (count($h))
+	foreach ($h as $line ) {
 	    if (preg_match("/^[a-zA-Z]/", $line)) {
 			$key = substr($line,0,strpos($line,':'));
 			$value = substr($line,strpos($line,':')+1);
@@ -79,10 +84,10 @@ function email_get_msg($mbox,$uid, $reply) {
 
 	$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null);
 
-	if(! $struc)
+	if (! $struc)
 		return $ret;
 
-	if(! $struc->parts) {
+	if (! $struc->parts) {
 		$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
 		$html = $ret['body'];
 
@@ -94,7 +99,7 @@ function email_get_msg($mbox,$uid, $reply) {
 	else {
 		$text = '';
 		$html = '';
-		foreach($struc->parts as $ptop => $p) {
+		foreach ($struc->parts as $ptop => $p) {
 			$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
 			if ($x) {
 				$text .= $x;
@@ -152,7 +157,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 	if ($p->parameters)
 		foreach ($p->parameters as $x)
 			$params[strtolower($x->attribute)] = $x->value;
-	if (isset($p->dparameters) and $p->dparameters)
+	if (isset($p->dparameters) && $p->dparameters)
 		foreach ($p->dparameters as $x)
 			$params[strtolower($x->attribute)] = $x->value;
 
@@ -160,7 +165,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 	// Any part with a filename is an attachment,
 	// so an attached text file (type 0) is not mistaken as the message.
 
-	if ((isset($params['filename']) and $params['filename']) || (isset($params['name']) and $params['name'])) {
+	if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
 		// filename may be given as 'Filename' or 'Name' or both
 		$filename = ($params['filename'])? $params['filename'] : $params['name'];
 		// filename may be encoded, so see imap_mime_header_decode()
@@ -191,7 +196,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 //	}
 
 	// SUBPART RECURSION
-	if (isset($p->parts) and $p->parts) {
+	if (isset($p->parts) && $p->parts) {
 		$x = "";
 		foreach ($p->parts as $partno0=>$p2) {
 			$x .=  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.
@@ -206,16 +211,16 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 
 
 function email_header_encode($in_str, $charset) {
-    $out_str = $in_str;
+	$out_str = $in_str;
 	$need_to_convert = false;
 
-	for($x = 0; $x < strlen($in_str); $x ++) {
-		if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) {
+	for ($x = 0; $x < strlen($in_str); $x ++) {
+		if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) {
 			$need_to_convert = true;
 		}
 	}
 
-	if(! $need_to_convert)
+	if (! $need_to_convert)
 		return $in_str;
 
     if ($out_str && $charset) {