Skip to content

Handle URL fields with no <p> tags #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abemillett wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle URL fields with no <p> tags #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions TextformatterVideoEmbed.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,12 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul
&& strpos($str, '://www.youtube.com/v/') === false
&& strpos($str, '://youtu.be/') === false) return;

// 1: full URL 2:video id 3: query string (optional)
$regex = '#<p>\s*(https?://(?:www\.)?youtu(?:.be|be.com)+/(?:watch/?\?v=|v/)?([^\s&<\'"]+))(&[-_,.=&;a-zA-Z0-9]*)?.*?</p>#';
// Does the given string contain ONLY a URL? Else, search for a URL contained in a <p>
$regexBase = '(https?://(?:www\.)?youtu(?:.be|be.com)+/(?:watch/?\?v=|v/)?([^\s&<\'"]+))(&[-_,.=&;a-zA-Z0-9]*)?';
$regex = (strpos($str, ' ') === false)
? '#'.$regexBase.'#'
: '#<p>\s*'.$regexBase.'.*?</p>#';

if(!preg_match_all($regex, $str, $matches)) return;

foreach($matches[0] as $key => $line) {
Expand Down Expand Up @@ -196,7 +200,13 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul

if(strpos($str, '://vimeo.com/') === false) return;

if(!preg_match_all('#<p>\s*(https?://vimeo.com/(\d+)).*?</p>#', $str, $matches)) return;
// Does the given string contain ONLY a URL? Else, search for a URL contained in a <p>
$regexBase = '(https?://vimeo.com/(\d+))';
$regex = (strpos($str, ' ') === false)
? '#'.$regexBase.'#'
: '#<p>\s*'.$regexBase.'.*?</p>#';

if(!preg_match_all($regex, $str, $matches)) return;

foreach($matches[0] as $key => $line) {

Expand Down