diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-24 17:28:28 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-24 17:28:28 +0200 |
| commit | 75d4f332335e66375815b339526252e8ab34be32 (patch) | |
| tree | 4cd53acf672c88ca3aef4560707868489dbbd41b | |
| parent | 718a9009be697ab8873a9ca41571f1d9701c97e7 (diff) | |
| download | volse-hubzilla-75d4f332335e66375815b339526252e8ab34be32.tar.gz volse-hubzilla-75d4f332335e66375815b339526252e8ab34be32.tar.bz2 volse-hubzilla-75d4f332335e66375815b339526252e8ab34be32.zip | |
move html for oembeded videos in template. fix oembed discovery
| -rw-r--r-- | include/oembed.php | 38 | ||||
| -rw-r--r-- | view/oembed_video.tpl | 4 |
2 files changed, 26 insertions, 16 deletions
diff --git a/include/oembed.php b/include/oembed.php index d40ceb3fd..2933252b3 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -7,7 +7,7 @@ function oembed_replacecb($matches){ function oembed_fetch_url($embedurl){ - + $txt = Cache::get($embedurl); if(is_null($txt)){ @@ -16,18 +16,18 @@ function oembed_fetch_url($embedurl){ // try oembed autodiscovery $redirects = 0; $html_text = fetch_url($embedurl, false, $redirects, 15); - if(! $html_text) - return; - $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($html_text){ + $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); + } } } @@ -59,9 +59,15 @@ function oembed_format_object($j){ /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/ $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.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>"; - $ret.= "</a>"; + $tpl=get_markup_template('oembed_video.tpl'); + $ret.=replace_macros($tpl, array( + '$embedurl'=>$embedurl, + '$escapedhtml'=>urlencode($j->html), + '$tw'=>$tw, + '$th'=>$th, + '$turl'=>$j->thumbnail_url, + )); + } else { $ret=$j->html; } diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl new file mode 100644 index 000000000..29b5149ba --- /dev/null +++ b/view/oembed_video.tpl @@ -0,0 +1,4 @@ +<a href='$embedurl' onclick='this.innerHTML=unescape("$escapedhtml").replace(/\+/g," "); return false;' style='float:left; margin: 1em; position: relative;'> + <img width='$tw' height='$th' src='$turl' > + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> +</a> |