X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=91f517bdebe9c223d7e3a907a011cac423fa8532;hb=dbb5df7f7d65e4f94add3f0684d9bff40e5f8167;hp=28afca28a5ab3a0e21c40497eb986c0ba5068a2a;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 28afca28a5..91f517bdeb 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -328,7 +328,7 @@ function onepoll_run(&$argv, &$argc){
 		unlink($cookiejar);
 	} elseif ($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
 
-		logger("Mail: Fetching", LOGGER_DEBUG);
+		logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);
 
 		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 		if ($mail_disabled)
@@ -363,10 +363,10 @@ function onepoll_run(&$argv, &$argc){
 		}
 		if ($mbox) {
 
-			$msgs = email_poll($mbox,$contact['addr']);
+			$msgs = email_poll($mbox, $contact['addr']);
 
 			if (count($msgs)) {
-				logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
+				logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf[0]['user'], LOGGER_DEBUG);
 
 				$metas = email_msg_meta($mbox,implode(',',$msgs));
 				if (count($metas) != count($msgs)) {
@@ -498,46 +498,36 @@ function onepoll_run(&$argv, &$argc){
 
 						logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
 
-						// some mailing lists have the original author as 'from' - add this sender info to msg body.
 						/// @TODO Adding a gravatar for the original author would be cool
 
-						if (! stristr($meta->from,$contact['addr'])) {
-							$from = imap_mime_header_decode($meta->from);
-							$fromdecoded = "";
-							foreach ($from as $frompart) {
-								if ($frompart->charset != "default") {
-									$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-								} else {
-									$fromdecoded .= $frompart->text;
-								}
-							}
-
-							$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
-
-							$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
-
-							if (isset($fromarr[0]->personal)) {
-								$fromname = $fromarr[0]->personal;
+						$from = imap_mime_header_decode($meta->from);
+						$fromdecoded = "";
+						foreach ($from as $frompart) {
+							if ($frompart->charset != "default") {
+								$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
 							} else {
-								$fromname = $frommail;
+								$fromdecoded .= $frompart->text;
 							}
+						}
 
-							//$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
-
-							$datarray['author-name'] = $fromname;
-							$datarray['author-link'] = "mailto:".$frommail;
-							$datarray['author-avatar'] = $contact['photo'];
+						$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
 
-							$datarray['owner-name'] = $contact['name'];
-							$datarray['owner-link'] = "mailto:".$contact['addr'];
-							$datarray['owner-avatar'] = $contact['photo'];
+						$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
 
+						if (isset($fromarr[0]->personal)) {
+							$fromname = $fromarr[0]->personal;
 						} else {
-							$datarray['author-name'] = $contact['name'];
-							$datarray['author-link'] = 'mailbox';
-							$datarray['author-avatar'] = $contact['photo'];
+							$fromname = $frommail;
 						}
 
+						$datarray['author-name'] = $fromname;
+						$datarray['author-link'] = "mailto:".$frommail;
+						$datarray['author-avatar'] = $contact['photo'];
+
+						$datarray['owner-name'] = $contact['name'];
+						$datarray['owner-link'] = "mailto:".$contact['addr'];
+						$datarray['owner-avatar'] = $contact['photo'];
+
 						$datarray['uid'] = $importer_uid;
 						$datarray['contact-id'] = $contact['id'];
 						if ($datarray['parent-uri'] === $datarray['uri'])