MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases 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
commit 9a4e741d1a
9 changed files with 34 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Worker/Delivery.php
View file

@ -418,19 +418,19 @@ class Delivery {
if ($r1 && $r1[0]['reply_to'])
$reply_to = $r1[0]['reply_to'];
$subject = (($it['title']) ? Email::emailHeaderEncode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
$subject = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
// only expose our real email address to true friends
if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) {
if ($reply_to) {
$headers = 'From: '.Email::emailHeaderEncode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
$headers .= 'Sender: '.$local_user[0]['email']."\n";
} else {
$headers = 'From: '.Email::emailHeaderEncode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
}
} else {
$headers = 'From: '. Email::emailHeaderEncode($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
$headers = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
}
//if ($reply_to)
@ -469,7 +469,7 @@ class Delivery {
if (strncasecmp($subject,'RE:',3))
$subject = 'Re: '.$subject;
}
Email::emailSend($addr, $subject, $headers, $it);
Email::send($addr, $subject, $headers, $it);
}
break;

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;