tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fix code standards

Browse source
This commit is contained in:
Michael 2022-12-30 21:37:09 +00:00
parent dd4aeba5a1
commit e4c5d9f62d
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Protocol/Delivery.php
View file

@ -33,11 +33,6 @@ use Friendica\Model\GServer;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use Friendica\Protocol\Relay;
use Friendica\Util\Network; use Friendica\Util\Network;
class Delivery class Delivery
@ -54,8 +49,8 @@ class Delivery
{ {
Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]); Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]);
$top_level = false; $top_level = false;
$followup = false; $followup = false;
$public_message = false; $public_message = false;
$items = []; $items = [];
@ -74,7 +69,7 @@ class Delivery
} }
$uid = $target_item['uid']; $uid = $target_item['uid'];
} elseif ($cmd == self::RELOCATION) { } elseif ($cmd == self::RELOCATION) {
$uid = $post_uriid; $uid = $post_uriid;
$target_item = []; $target_item = [];
} else { } else {
$item = Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); $item = Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
@ -86,8 +81,8 @@ class Delivery
$parent_id = intval($item['parent']); $parent_id = intval($item['parent']);
$condition = ['id' => [$target_id, $parent_id], 'visible' => true]; $condition = ['id' => [$target_id, $parent_id], 'visible' => true];
$params = ['order' => ['id']]; $params = ['order' => ['id']];
$itemdata = Post::select(Item::DELIVER_FIELDLIST, $condition, $params); $itemdata = Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
while ($item = Post::fetch($itemdata)) { while ($item = Post::fetch($itemdata)) {
if ($item['verb'] == Activity::ANNOUNCE) { if ($item['verb'] == Activity::ANNOUNCE) {
@ -288,9 +283,9 @@ class Delivery
Logger::info('Deliver ' . ($target_item_id ?? 'relocation') . ' via DFRN to ' . ($contact['addr'] ?? '' ?: $contact['url'])); Logger::info('Deliver ' . ($target_item_id ?? 'relocation') . ' via DFRN to ' . ($contact['addr'] ?? '' ?: $contact['url']));
if ($cmd == self::MAIL) { if ($cmd == self::MAIL) {
$item = $target_item; $item = $target_item;
$item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
$atom = DFRN::mail($item, $owner); $atom = DFRN::mail($item, $owner);
} elseif ($cmd == self::SUGGESTION) { } elseif ($cmd == self::SUGGESTION) {
$item = $target_item; $item = $target_item;
$atom = DFRN::fsuggest($item, $owner); $atom = DFRN::fsuggest($item, $owner);
@ -299,7 +294,7 @@ class Delivery
$atom = DFRN::relocate($owner, $owner['uid']); $atom = DFRN::relocate($owner, $owner['uid']);
} elseif ($followup) { } elseif ($followup) {
$msgitems = [$target_item]; $msgitems = [$target_item];
$atom = DFRN::entries($msgitems, $owner); $atom = DFRN::entries($msgitems, $owner);
} else { } else {
if ($target_item['deleted']) { if ($target_item['deleted']) {
$msgitems = [$target_item]; $msgitems = [$target_item];
@ -309,8 +304,8 @@ class Delivery
// Only add the parent when we don't delete other items. // Only add the parent when we don't delete other items.
if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) { if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
$item['entry:comment-allow'] = true; $item['entry:comment-allow'] = true;
$item['entry:cid'] = ($top_level ? $contact['id'] : 0); $item['entry:cid'] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item; $msgitems[] = $item;
} }
} }
} }
@ -538,14 +533,14 @@ class Delivery
if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) { if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) {
if ($reply_to) { if ($reply_to) {
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n";
$headers .= 'Sender: ' . $local_user['email'] . "\n"; $headers .= 'Sender: ' . $local_user['email'] . "\n";
} else { } else {
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n"; $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
} }
} else { } else {
$sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname()); $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n"; $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
} }
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
@ -562,13 +557,13 @@ class Delivery
if (empty($target_item['title'])) { if (empty($target_item['title'])) {
$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Post::selectFirst(['title'], $condition); $title = Post::selectFirst(['title'], $condition);
if (DBA::isResult($title) && ($title['title'] != '')) { if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title']; $subject = $title['title'];
} else { } else {
$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Post::selectFirst(['title'], $condition); $title = Post::selectFirst(['title'], $condition);
if (DBA::isResult($title) && ($title['title'] != '')) { if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title']; $subject = $title['title'];