From: Hypolite Petovan Date: Thu, 12 Dec 2019 15:00:54 +0000 (-0500) Subject: Merge pull request #7935 from annando/issue-7651 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d150edb295cfceef27b0406f5a980c15a2836c0;hp=9d626516d8525eca9a0ed9b3a65e9e7e9b1137a7;p=friendica.git Merge pull request #7935 from annando/issue-7651 Issue 7651: Added basic support for more complicated "video" elements --- diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 29b4f47eb7..fcce795810 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -354,6 +354,9 @@ class BBCode extends BaseObject $post['url'] = $links[0][1]; } + // Simplify "video" element + $post['text'] = preg_replace('(\[video.*?\ssrc\s?=\s?([^\s\]]+).*?\].*?\[/video\])ism', '[video]$1[/video]', $post['text']); + // Now count the number of external media links preg_match_all("(\[vimeo\](.*?)\[\/vimeo\])ism", $post['text'], $links1, PREG_SET_ORDER); preg_match_all("(\[youtube\\](.*?)\[\/youtube\\])ism", $post['text'], $links2, PREG_SET_ORDER); @@ -1606,6 +1609,9 @@ class BBCode extends BaseObject $text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $text); //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $Text); + // Simplify "video" element + $text = preg_replace('(\[video.*?\ssrc\s?=\s?([^\s\]]+).*?\].*?\[/video\])ism', '[video]$1[/video]', $text); + // Try to Oembed if ($try_oembed) { $text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4).*?)\[\/video\]/ism", '', $text);