keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added some explanation, beautified code

Browse source
This commit is contained in:
Michael 2018-04-26 21:16:16 +00:00
parent a785d8c2f9
commit 8c23fea1df
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Worker/Delivery.php
View file

@ -204,12 +204,12 @@ class Delivery {
$msgitems[] = $item; $msgitems[] = $item;
} }
} }
$atom = DFRN::entries($msgitems,$owner); $atom = DFRN::entries($msgitems, $owner);
} }
logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA); logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA);
$basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3));
// perform local delivery if we are on the same site // perform local delivery if we are on the same site
@ -248,6 +248,8 @@ class Delivery {
return; return;
} }
// We don't have a relationship with contacts on a public post.
// Se we transmit with the new method and via Diaspora as a fallback
if ($items[0]['uid'] == 0) { if ($items[0]['uid'] == 0) {
$deliver_status = DFRN::transmit($owner, $contact, $atom); $deliver_status = DFRN::transmit($owner, $contact, $atom);
if ($deliver_status < 200) { if ($deliver_status < 200) {
@ -400,7 +402,7 @@ class Delivery {
} }
} }
} }
if (strncasecmp($subject, 'RE:', 3)) { if (strncasecmp($subject, 'RE:', 3)) {
$subject = 'Re: ' . $subject; $subject = 'Re: ' . $subject;
} }
} }

2
src/Worker/PubSubPublish.php
View file

@ -68,7 +68,7 @@ class PubSubPublish {
$rr['topic']), $rr['topic']),
"X-Hub-Signature: sha1=".$hmac_sig]; "X-Hub-Signature: sha1=".$hmac_sig];
logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DATA);
Network::post($rr['callback_url'], $params, $headers); Network::post($rr['callback_url'], $params, $headers);
$ret = $a->get_curl_code(); $ret = $a->get_curl_code();