harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oembed issues

Browse Source
This commit is contained in:
friendica 2014-10-08 20:37:46 -07:00
parent 6d0fbba7b4
commit 9ac12d6f32
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/oembed.php
View File

@ -92,7 +92,8 @@ function oembed_fetch_url($embedurl){
function oembed_format_object($j){ function oembed_format_object($j){
$a = get_app(); $a = get_app();
$embedurl = $j->embedurl; $embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null));
$ret="<span class='oembed ".$j->type."'>"; $ret="<span class='oembed ".$j->type."'>";
switch ($j->type) { switch ($j->type) {
@ -127,7 +128,6 @@ function oembed_format_object($j){
}; break; }; break;
case "photo": { case "photo": {
$ret.= "<img width='".$j->width."' src='".$j->url."'>"; $ret.= "<img width='".$j->width."' src='".$j->url."'>";
//$ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
$ret.="<br>"; $ret.="<br>";
}; break; }; break;
case "link": { case "link": {
@ -163,13 +163,12 @@ function oembed_iframe($src,$width,$height) {
$height = intval($height) + 80; $height = intval($height) + 80;
$width = intval($width) + 40; $width = intval($width) + 40;
$a = get_app(); $s = z_root() . '/oembed/' . base64url_encode($src);
$sandbox = ((strpos($src,get_app()->get_hostname())) ? ' sandbox="allow-scripts" ' : ''); // Make sure any children are sandboxed within their own iframe.
$s = $a->get_baseurl()."/oembed/".base64url_encode($src); return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >'
. t('Embedded content') . '</iframe>';
return '<iframe ' . $sandbox . ' height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
} }

5
mod/oembed.php
View File

@ -19,9 +19,10 @@ function oembed_init(&$a){
else { else {
echo "<html><body>"; echo "<html><body>";
$j = oembed_fetch_url(base64url_decode(argv(1))); $src = base64url_decode(argv(1));
$j = oembed_fetch_url($src);
echo $j->html; echo $j->html;
// logger('mod-oembed ' . $j->html, LOGGER_ALL); // logger('mod-oembed ' . $h, LOGGER_ALL);
echo "</body></html>"; echo "</body></html>";
} }
} }