diff options
| author | Mario <mario@mariovavti.com> | 2021-02-19 07:41:29 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-19 07:41:29 +0000 |
| commit | 863d4d83a1708daa5cf9a1466681215f5b101b9d (patch) | |
| tree | 08c7f699dd52d01a9f53442b878ec3ff7db6b9ed | |
| parent | d50381c9c67e097cf3eae73f0311191acca8f0a5 (diff) | |
| download | volse-hubzilla-863d4d83a1708daa5cf9a1466681215f5b101b9d.tar.gz volse-hubzilla-863d4d83a1708daa5cf9a1466681215f5b101b9d.tar.bz2 volse-hubzilla-863d4d83a1708daa5cf9a1466681215f5b101b9d.zip | |
fix recursive shares
| -rw-r--r-- | include/bbcode.php | 5 | ||||
| -rw-r--r-- | include/items.php | 34 |
2 files changed, 20 insertions, 19 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 4580516a5..584f3adb8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1204,9 +1204,12 @@ function bbcode($Text, $options = []) { $Text = preg_replace("/([^\]\='".'"'."\;\/]|^|\#\^)(https?\:\/\/$urlchars+)/ismu", '$1<a href="$2" ' . $target . ' rel="nofollow noopener">$2</a>', $Text); } - if (strpos($Text,'[/share]') !== false) { + $count = 0; + while (strpos($Text,'[/share]') !== false && $count < 10) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_ShareAttributes', $Text); + $count ++; } + if($tryoembed) { if (strpos($Text,'[/url]') !== false) { $Text = preg_replace_callback("/[^\^]\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); diff --git a/include/items.php b/include/items.php index 12b543697..ce1461aba 100644 --- a/include/items.php +++ b/include/items.php @@ -2701,10 +2701,13 @@ function tag_deliver($uid, $item_id) { return; } + /* this should not be required anymore due to the check above if (strpos($item['body'],'[/share]')) { logger('W2W post already shared'); return; } + */ + // group delivery via W2W logger('rewriting W2W post for ' . $u[0]['channel_address']); start_delivery_chain($u[0], $item, $item_id, 0, true, (($item['edited'] != $item['created']) || $item['item_deleted'])); @@ -3274,24 +3277,19 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false $arr['item_wall'] = 1; $arr['item_thread_top'] = 1; - if (strpos($item['body'], "[/share]") !== false) { - $pos = strpos($item['body'], "[share"); - $bb = substr($item['body'], $pos); - } else { - $bb = "[share author='" . urlencode($item['author']['xchan_name']). - "' profile='" . $item['author']['xchan_url'] . - "' portable_id='" . $item['author']['xchan_hash'] . - "' avatar='" . $item['author']['xchan_photo_s'] . - "' link='" . $item['plink'] . - "' auth='" . ((in_array($item['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . - "' posted='" . $item['created'] . - "' message_id='" . $item['mid'] . - "']"; - if($item['title']) - $bb .= '[h3][b]'.$item['title'].'[/b][/h3]'."\r\n"; - $bb .= $item['body']; - $bb .= "[/share]"; - } + $bb = "[share author='" . urlencode($item['author']['xchan_name']). + "' profile='" . $item['author']['xchan_url'] . + "' portable_id='" . $item['author']['xchan_hash'] . + "' avatar='" . $item['author']['xchan_photo_s'] . + "' link='" . $item['plink'] . + "' auth='" . ((in_array($item['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . + "' posted='" . $item['created'] . + "' message_id='" . $item['mid'] . + "']"; + if($item['title']) + $bb .= '[h3][b]'.$item['title'].'[/b][/h3]'."\r\n"; + $bb .= $item['body']; + $bb .= "[/share]"; $arr['body'] = $bb; $arr['term'] = $item['term']; |