friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active

This commit is contained in:
Michael Vogel 2014-12-14 12:47:16 +01:00
parent 3d26e1d233
commit bc5c470cac
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/oembed.php
View File

@ -78,6 +78,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
if (!is_object($j)) if (!is_object($j))
return false; return false;
// Always embed the SSL version
if (isset($j->html))
$j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
$j->embedurl = $embedurl; $j->embedurl = $embedurl;
// If fetching information doesn't work, then improve via internal functions // If fetching information doesn't work, then improve via internal functions

5
mod/oembed.php
View File

@ -9,17 +9,18 @@ function oembed_content(&$a){
echo oembed_replacecb($url); echo oembed_replacecb($url);
killme(); killme();
} }
if ($a->argv[1]=='h2b'){ if ($a->argv[1]=='h2b'){
$text = trim(hex2bin($_REQUEST['text'])); $text = trim(hex2bin($_REQUEST['text']));
echo oembed_html2bbcode($text); echo oembed_html2bbcode($text);
killme(); killme();
} }
if ($a->argc == 2){ if ($a->argc == 2){
echo "<html><body>"; echo "<html><body>";
$url = base64url_decode($a->argv[1]); $url = base64url_decode($a->argv[1]);
$j = oembed_fetch_url($url); $j = oembed_fetch_url($url);
echo $j->html; echo $j->html;
// logger('mod-oembed ' . $j->html, LOGGER_ALL); // logger('mod-oembed ' . $j->html, LOGGER_ALL);
echo "</body></html>"; echo "</body></html>";