Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 13:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Review Changes

Browse source 
renamed some functions and adjusted corresponding calls.
This commit is contained in:
Adam Magness 2017-12-01 21:05:06 -05:00
parent e90b0748aa
commit 9a4e741d1a
9 changed files with 34 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Worker/OnePoll.php
View file

@ -331,7 +331,7 @@ Class OnePoll
$mailbox = Email::constructMailboxName($mailconf);
$password = '';
openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $x['prvkey']);
$mbox = Email::emailConnect($mailbox, $mailconf['user'], $password);
$mbox = Email::connect($mailbox, $mailconf['user'], $password);
unset($password);
logger("Mail: Connect to " . $mailconf['user']);
if ($mbox) {
@ -344,12 +344,12 @@ Class OnePoll
}
if ($mbox) {
$msgs = Email::emailPoll($mbox, $contact['addr']);
$msgs = Email::poll($mbox, $contact['addr']);
if (count($msgs)) {
logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG);
$metas = Email::emailMsgMeta($mbox,implode(',', $msgs));
$metas = Email::messageMeta($mbox, implode(',', $msgs));
if (count($metas) != count($msgs)) {
logger("onepoll: for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
} else {
@ -361,8 +361,7 @@ Class OnePoll
$datarray = array();
$datarray['verb'] = ACTIVITY_POST;
$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
// $meta = Email::emailMsgMeta($mbox, $msg_uid);
// $headers = email_msg_headers($mbox, $msg_uid);
// $meta = Email::messageMeta($mbox, $msg_uid);
$datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
@ -466,7 +465,7 @@ Class OnePoll
$datarray['parent-uri'] = $datarray['uri'];
}
$r = Email::emailGetMsg($mbox, $msg_uid, $reply);
$r = Email::getMessage($mbox, $msg_uid, $reply);
if (!$r) {
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
continue;