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

Fix missing wrapping span on bbcode to html, split embed data fetch and rappresentation in two functions. Prettier video embed.

This commit is contained in:
fabrixxm 2011-05-22 23:03:34 +02:00 committed by Fabio Comuni
parent 866940ab5d
commit 072e414636
2 changed files with 88 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/oembed/oembed.php
View File

@ -47,7 +47,7 @@ function oembed_init(&$a) {
if ($a->argv[1]=='b2h'){ if ($a->argv[1]=='b2h'){
$url = array( "", trim(hex2bin($_GET['url']))); $url = array( "", trim(hex2bin($_GET['url'])));
echo "<span class='oembed'>".oembed_replacecb($url)."</span>"; echo oembed_replacecb($url);
} }
if ($a->argv[1]=='h2b'){ if ($a->argv[1]=='h2b'){

47
include/oembed.php
View File

@ -1,21 +1,58 @@
<?php <?php
function oembed_replacecb($matches){ function oembed_replacecb($matches){
$embedurl=$matches[1]; $embedurl=$matches[1];
$j = oembed_fetch_url($embedurl);
return oembed_format_object($j);
}
function oembed_fetch_url($embedurl){
$r = q("SELECT v FROM `cache` WHERE k='%s'", $r = q("SELECT v FROM `cache` WHERE k='%s'",
dbesc($embedurl)); dbesc($embedurl));
if(count($r)){ if(count($r)){
$txt = $r[0]['v']; $txt = $r[0]['v'];
} else { } else {
$txt = "";
// try oembed autodiscovery
$html_text = fetch_url($embedurl);
$dom = @DOMDocument::loadHTML($html_text);
if ($dom){
$xpath = new DOMXPath($dom);
$attr = "oembed";
$xattr = oe_build_xpath("class","oembed");
$entries = $xpath->query("//link[@type='application/json+oembed']");
foreach($entries as $e){
$href = $e->getAttributeNode("href")->nodeValue;
$txt = fetch_url($href);
}
}
if ($txt==false || $txt==""){
// try oohembed service
$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl); $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);
$txt = fetch_url($ourl); $txt = fetch_url($ourl);
}
$txt=trim($txt);
if ($txt[0]!="{") $txt='{"type":"error"}';
//save in cache //save in cache
q("INSERT INTO `cache` VALUES ('%s','%s','%s')", /*q("INSERT INTO `cache` VALUES ('%s','%s','%s')",
dbesc($embedurl), dbesc($embedurl),
dbesc($txt), dbesc($txt),
dbesc(datetime_convert())); dbesc(datetime_convert()));*/
} }
$j = json_decode($txt); $j = json_decode($txt);
$j->embedurl = $embedurl;
return $j;
}
function oembed_format_object($j){
$embedurl = $j->embedurl;
$ret="<span class='oembed ".$j->type."'>"; $ret="<span class='oembed ".$j->type."'>";
switch ($j->type) { switch ($j->type) {
case "video": { case "video": {
@ -23,7 +60,7 @@ function oembed_replacecb($matches){
/*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
$th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/ $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/
$tw=150; $th=120; $tw=150; $th=120;
$ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' style='float:left; margin: 1em; '>"; $ret.= "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' style='float:left; margin: 1em; '>";
$ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>"; $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
$ret.= "</a>"; $ret.= "</a>";
} else { } else {
@ -32,7 +69,7 @@ function oembed_replacecb($matches){
$ret.="<br>"; $ret.="<br>";
}; break; }; break;
case "photo": { case "photo": {
$ret = "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>"; $ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
$ret.="<br>"; $ret.="<br>";
}; break; }; break;
case "link": { case "link": {
@ -40,7 +77,7 @@ function oembed_replacecb($matches){
}; break; }; break;
case "rich": { case "rich": {
// not so safe.. // not so safe..
$ret = "<blockquote>".$j->html."</blockquote>"; $ret.= "<blockquote>".$j->html."</blockquote>";
}; break; }; break;
} }