MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

oembed: replace base64 url for iframe with url site/oembed/url_encoded

Browse source 
fix http://bugs.friendika.com/view.php?id=191
This commit is contained in:
Fabio Comuni 2011-11-11 17:33:32 +01:00
parent 25b972bee2
commit 1ff8cddeb6
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/oembed.php
View file

@ -56,7 +56,7 @@ function oembed_fetch_url($embedurl){
function oembed_format_object($j){ function oembed_format_object($j){
$embedurl = $j->embedurl; $embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->html,$j->width,$j->height ); $jhtml = oembed_iframe($j->embedurl,$j->width,$j->height );
$ret="<span class='oembed ".$j->type."'>"; $ret="<span class='oembed ".$j->type."'>";
switch ($j->type) { switch ($j->type) {
case "video": { case "video": {
@ -116,7 +116,9 @@ function oembed_iframe($src,$width,$height) {
$height = intval($height) + 80; $height = intval($height) + 80;
$width = intval($width) + 40; $width = intval($width) + 40;
$s = 'data:text/html;base64,' . base64_encode('<html><body>' . $src . '</body></html>'); $a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src);
return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
} }

13
mod/oembed.php Normal file
View file

@ -0,0 +1,13 @@
<?php
require_once("include/oembed.php");
function oembed_content(&$a){
if ($a->argc == 2){
echo "<html><body>";
$url = base64url_decode($a->argv[1]);
$j = oembed_fetch_url($url);
echo $j->html;
echo "</body></html>";
}
killme();
}