clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Michael Vogel 2012-12-19 15:58:38 +01:00
parent cb3586a280
commit a86baa372a
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -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"];

27
include/onepoll.php
View File

@ -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",

4
view/theme/vier/style.css
View File

@ -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;