From 072e4146369ae8ec10af961b7e1b25dc491e8f07 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 22 May 2011 23:03:34 +0200 Subject: [PATCH] Fix missing wrapping span on bbcode to html, split embed data fetch and rappresentation in two functions. Prettier video embed. --- addon/oembed/oembed.php | 2 +- include/oembed.php | 137 +++++++++++++++++++++++++--------------- 2 files changed, 88 insertions(+), 51 deletions(-) diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index 45f533cc5..caf4f5837 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -47,7 +47,7 @@ function oembed_init(&$a) { if ($a->argv[1]=='b2h'){ $url = array( "", trim(hex2bin($_GET['url']))); - echo "".oembed_replacecb($url).""; + echo oembed_replacecb($url); } if ($a->argv[1]=='h2b'){ diff --git a/include/oembed.php b/include/oembed.php index 10d458ff3..06a37d8e4 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,55 +1,92 @@ type."'>"; - switch ($j->type) { - case "video": { - if (isset($j->thumbnail_url)) { - /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; - $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/ - $tw=150; $th=120; - $ret = ""; - $ret.= ""; - $ret.= ""; - } else { - $ret=$j->html; - } - $ret.="
"; - }; break; - case "photo": { - $ret = ""; - $ret.="
"; - }; break; - case "link": { - //$ret = "".$j->title.""; - }; break; - case "rich": { - // not so safe.. - $ret = "
".$j->html."
"; - }; break; - } - - $embedlink = (isset($j->title))?$j->title:$embedurl; - $ret .= "$embedlink"; - if (isset($j->author_name)) $ret.=" by ".$j->author_name; - if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; - $ret.="
"; - return $ret; + $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'", + dbesc($embedurl)); + + if(count($r)){ + $txt = $r[0]['v']; + } 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); + $txt = fetch_url($ourl); + } + + $txt=trim($txt); + if ($txt[0]!="{") $txt='{"type":"error"}'; + + //save in cache + /*q("INSERT INTO `cache` VALUES ('%s','%s','%s')", + dbesc($embedurl), + dbesc($txt), + dbesc(datetime_convert()));*/ + } + + $j = json_decode($txt); + $j->embedurl = $embedurl; + return $j; +} + +function oembed_format_object($j){ + $embedurl = $j->embedurl; + $ret=""; + switch ($j->type) { + case "video": { + if (isset($j->thumbnail_url)) { + /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; + $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/ + $tw=150; $th=120; + $ret.= ""; + $ret.= ""; + $ret.= ""; + } else { + $ret=$j->html; + } + $ret.="
"; + }; break; + case "photo": { + $ret.= ""; + $ret.="
"; + }; break; + case "link": { + //$ret = "".$j->title.""; + }; break; + case "rich": { + // not so safe.. + $ret.= "
".$j->html."
"; + }; break; + } + + $embedlink = (isset($j->title))?$j->title:$embedurl; + $ret .= "$embedlink"; + if (isset($j->author_name)) $ret.=" by ".$j->author_name; + if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; + $ret.="
"; + return $ret; } function oembed_bbcode2html($text){