jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use iframe for oembed - untrusted content

Browse source
This commit is contained in:
Friendika 2011-10-24 20:10:46 -07:00
parent 790c4a4e1a
commit 1a7badb405
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/bbcode.php
View file

@ -19,8 +19,7 @@ function tryoembed($match){
if ($o->type=="error") return $match[0];
$html = oembed_format_object($o);
return $html;
return oembed_iframe($html,$o->width,$o->height);
}

23
include/oembed.php
View file

@ -1,8 +1,12 @@
<?php
function oembed_replacecb($matches){
logger('oembedcb');
$embedurl=$matches[1];
$j = oembed_fetch_url($embedurl);
return oembed_format_object($j);
$s = oembed_format_object($j);
return oembed_iframe($s,$j->width,$j->height);
}
@ -102,6 +106,23 @@ function oembed_format_object($j){
return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
}
function oembed_iframe($src,$width,$height) {
if(! $width || strstr($width,'%'))
$width = '640';
if(! $height || strstr($height,'%'))
$height = '300';
// try and leave some room for the description line.
$height = intval($height) + 80;
$width = intval($width) + 40;
$s = 'data:text/html;base64,' . base64_encode('<html><body>' . $src . '</body></html>');
return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
}
function oembed_bbcode2html($text){
$stopoembed = get_config("system","no_oembed");
if ($stopoembed == true){