strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10346 from MrPetovan/bug/notices

Browse source 
Fix several notices
This commit is contained in:
Michael Vogel 2021-05-31 22:18:05 +02:00 committed by GitHub
parent f5da6f4ae3 52cf924558
commit 8fa791073b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/enotify.php
View file

@ -184,9 +184,9 @@ function notification($params)
// First go for the general message // First go for the general message
// "George Bull's post" // "George Bull's post"
if ($params['activity']['origin_comment']) { if (!empty($params['activity']['origin_comment'])) {
$message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s'); $message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
} elseif ($params['activity']['explicit_tagged']) { } elseif (!empty($params['activity']['explicit_tagged'])) {
$message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s'); $message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
} else { } else {
$message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s'); $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
@ -197,10 +197,10 @@ function notification($params)
// Then look for the special cases // Then look for the special cases
// "your post" // "your post"
if ($params['activity']['origin_thread']) { if (!empty($params['activity']['origin_thread'])) {
if ($params['activity']['origin_comment']) { if (!empty($params['activity']['origin_comment'])) {
$message = $l10n->t('%1$s replied to you on your %2$s %3$s'); $message = $l10n->t('%1$s replied to you on your %2$s %3$s');
} elseif ($params['activity']['explicit_tagged']) { } elseif (!empty($params['activity']['explicit_tagged'])) {
$message = $l10n->t('%1$s tagged you on your %2$s %3$s'); $message = $l10n->t('%1$s tagged you on your %2$s %3$s');
} else { } else {
$message = $l10n->t('%1$s commented on your %2$s %3$s'); $message = $l10n->t('%1$s commented on your %2$s %3$s');
@ -209,9 +209,9 @@ function notification($params)
$dest_str = sprintf($message, $params['source_name'], $item_post_type, $title); $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
// "their post" // "their post"
} elseif ($item['author-link'] == $params['source_link']) { } elseif ($item['author-link'] == $params['source_link']) {
if ($params['activity']['origin_comment']) { if (!empty($params['activity']['origin_comment'])) {
$message = $l10n->t('%1$s replied to you on their %2$s %3$s'); $message = $l10n->t('%1$s replied to you on their %2$s %3$s');
} elseif ($params['activity']['explicit_tagged']) { } elseif (!empty($params['activity']['explicit_tagged'])) {
$message = $l10n->t('%1$s tagged you on their %2$s %3$s'); $message = $l10n->t('%1$s tagged you on their %2$s %3$s');
} else { } else {
$message = $l10n->t('%1$s commented on their %2$s %3$s'); $message = $l10n->t('%1$s commented on their %2$s %3$s');
@ -224,7 +224,7 @@ function notification($params)
// So, we cannot have different subjects for notifications of the same thread. // So, we cannot have different subjects for notifications of the same thread.
// Before this we have the name of the replier on the subject rendering // Before this we have the name of the replier on the subject rendering
// different subjects for messages on the same thread. // different subjects for messages on the same thread.
if ($params['activity']['explicit_tagged']) { if (!empty($params['activity']['explicit_tagged'])) {
$subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']); $subject = $l10n->t('%s %s tagged you', $subjectPrefix, $params['source_name']);
$preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename); $preamble = $l10n->t('%1$s tagged you at %2$s', $params['source_name'], $sitename);

31
mod/item.php
View file

@ -410,21 +410,22 @@ function item_post(App $a) {
} }
} }
$success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network); if ($success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network)) {
if ($success['replaced']) { if ($success['replaced']) {
$tagged[] = $tag; $tagged[] = $tag;
} }
// When the forum is private or the forum is addressed with a "!" make the post private // When the forum is private or the forum is addressed with a "!" make the post private
if (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) { if (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) {
$private_forum = $success['contact']['prv']; $private_forum = $success['contact']['prv'];
$only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]); $only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]);
$private_id = $success['contact']['id']; $private_id = $success['contact']['id'];
$forum_contact = $success['contact']; $forum_contact = $success['contact'];
} elseif (!empty($success['contact']['forum']) && ($str_contact_allow == '<' . $success['contact']['id'] . '>')) { } elseif (!empty($success['contact']['forum']) && ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
$private_forum = false; $private_forum = false;
$only_to_forum = true; $only_to_forum = true;
$private_id = $success['contact']['id']; $private_id = $success['contact']['id'];
$forum_contact = $success['contact']; $forum_contact = $success['contact'];
}
} }
} }

12
mod/tagrm.php
View file

@ -81,25 +81,27 @@ function tagrm_content(App $a)
{ {
$o = ''; $o = '';
$photo_return = $_SESSION['photo_return'] ?? '';
if (!local_user()) { if (!local_user()) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($photo_return);
// NOTREACHED // NOTREACHED
} }
if ($a->argc == 3) { if ($a->argc == 3) {
update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]); update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]);
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($photo_return);
} }
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) { if (!$item_id) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($photo_return);
// NOTREACHED // NOTREACHED
} }
$item = Post::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]); $item = Post::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($photo_return);
} }
$tag_text = Tag::getCSVByURIId($item['uri-id']); $tag_text = Tag::getCSVByURIId($item['uri-id']);
@ -107,7 +109,7 @@ function tagrm_content(App $a)
$arr = explode(',', $tag_text); $arr = explode(',', $tag_text);
if (empty($arr)) { if (empty($arr)) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($photo_return);
} }
$o .= '<h3>' . DI::l10n()->t('Remove Item Tag') . '</h3>'; $o .= '<h3>' . DI::l10n()->t('Remove Item Tag') . '</h3>';

10
src/Content/Item.php
View file

@ -127,16 +127,6 @@ class Item
$tag_type = substr($tag, 0, 1); $tag_type = substr($tag, 0, 1);
//is it already replaced? //is it already replaced?
if (strpos($tag, '[url=')) { if (strpos($tag, '[url=')) {
// Checking for the alias that is used for OStatus
$pattern = '/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism';
if (preg_match($pattern, $tag, $matches)) {
$data = Contact::getByURL($matches[1], false, ['alias', 'nick']);
if ($data['alias'] != '') {
$newtag = '@[url=' . $data['alias'] . ']' . $data['nick'] . '[/url]';
}
}
return $replaced; return $replaced;
} }

4
src/Content/Text/BBCode.php
View file

@ -2196,9 +2196,7 @@ class BBCode
} }
} }
$success = Item::replaceTag($body, $inform, $profile_uid, $tag, $network); if (($success = Item::replaceTag($body, $inform, $profile_uid, $tag, $network)) && $success['replaced']) {
if ($success['replaced']) {
$tagged[] = $tag; $tagged[] = $tag;
} }
} }

2
src/Model/Item.php
View file

@ -2864,7 +2864,7 @@ class Item
'mime' => $attachment['mimetype'], 'mime' => $attachment['mimetype'],
], ],
]); ]);
if ($item['post-type'] == Item::PT_VIDEO) { if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
$leading .= $media; $leading .= $media;
} else { } else {
$trailing .= $media; $trailing .= $media;

2
update.php
View file

@ -835,7 +835,7 @@ function update_1404()
while ($task = DBA::fetch($tasks)) { while ($task = DBA::fetch($tasks)) {
$parameters = json_decode($task['parameter'], true); $parameters = json_decode($task['parameter'], true);
if (in_array($parameters[0], [Delivery::MAIL, Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION])) { if (is_array($parameters) && count($parameters) && in_array($parameters[0], [Delivery::MAIL, Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION])) {
continue; continue;
} }