From: Michael Vogel <icarus@dabo.de>
Date: Wed, 19 Dec 2012 14:58:38 +0000 (+0100)
Subject: Mailimport is now realized like a wall-to-wall-post
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a86baa372a2de75d08ac6c08d2df973404392ef9;p=friendica.git

Mailimport is now realized like a wall-to-wall-post
---

diff --git a/include/items.php b/include/items.php
index 5bd4423cfa..b5e6062b23 100755
--- a/include/items.php
+++ b/include/items.php
@@ -806,7 +806,7 @@ function get_atom_elements($feed,$item) {
 		$avatar = $avatar["href"];
 
 		if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-			logger('get_atom_elements: fixing sender of repeated message. '.print_r($child, true));
+			logger('get_atom_elements: fixing sender of repeated message.');
 
 			/*$res["owner-name"] = $res["author-name"];
 			$res["owner-link"] = $res["author-link"];
diff --git a/include/onepoll.php b/include/onepoll.php
index 7b2eba70d1..2abd41b789 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -437,7 +437,29 @@ function onepoll_run(&$argv, &$argc){
 								else
 									$fromdecoded .= $frompart->text;
 
-							$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
+							$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;
+							else
+								$fromname = $frommail;
+
+							//$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'];
+
+							$datarray['owner-name'] = $contact['name'];
+							$datarray['owner-link'] = "mailto:".$contact['addr'];
+							$datarray['owner-avatar'] = $contact['photo'];
+
+						} else {
+							$datarray['author-name'] = $contact['name'];
+							$datarray['author-link'] = 'mailbox';
+							$datarray['author-avatar'] = $contact['photo'];
 						}
 
 						$datarray['uid'] = $importer_uid;
@@ -448,9 +470,6 @@ function onepoll_run(&$argv, &$argc){
 							$datarray['private'] = 1;
 							$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 						}
-						$datarray['author-name'] = $contact['name'];
-						$datarray['author-link'] = 'mailbox';
-						$datarray['author-avatar'] = $contact['photo'];
 
 						$stored_item = item_store($datarray);
 						q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 91680f41cb..b6aaae51d5 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -313,6 +313,10 @@
 	cursor: url('lock.cur'), pointer;
 }
 
+#birthday-title, #event-title {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
 
 div.pager, .birthday-notice {
   text-align: center;