clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optional parameter for parseurl to only fetch data from meta information

This commit is contained in:
Michael Vogel 2013-12-02 20:24:41 +01:00
parent 70e017745a
commit 4f38969148
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
include/oembed.php
View File

@ -21,21 +21,21 @@ function oembed_fetch_url($embedurl){
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
if(is_null($txt)){ if(is_null($txt)){
$txt = ""; $txt = "";
if (!in_array($ext, $noexts)){ if (!in_array($ext, $noexts)){
// try oembed autodiscovery // try oembed autodiscovery
$redirects = 0; $redirects = 0;
$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); $html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
if($html_text){ if($html_text){
$dom = @DOMDocument::loadHTML($html_text); $dom = @DOMDocument::loadHTML($html_text);
if ($dom){ if ($dom){
$xpath = new DOMXPath($dom); $xpath = new DOMXPath($dom);
$attr = "oembed"; $attr = "oembed";
$xattr = oe_build_xpath("class","oembed"); $xattr = oe_build_xpath("class","oembed");
$entries = $xpath->query("//link[@type='application/json+oembed']"); $entries = $xpath->query("//link[@type='application/json+oembed']");
foreach($entries as $e){ foreach($entries as $e){
@ -46,29 +46,29 @@ function oembed_fetch_url($embedurl){
} }
} }
} }
if ($txt==false || $txt==""){ if ($txt==false || $txt==""){
// try oohembed service // try oohembed service
$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth; $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
$txt = fetch_url($ourl); $txt = fetch_url($ourl);
} }
$txt=trim($txt); $txt=trim($txt);
if ($txt[0]!="{") $txt='{"type":"error"}'; if ($txt[0]!="{") $txt='{"type":"error"}';
//save in cache //save in cache
Cache::set($a->videowidth . $embedurl,$txt); Cache::set($a->videowidth . $embedurl,$txt);
} }
$j = json_decode($txt); $j = json_decode($txt);
$j->embedurl = $embedurl; $j->embedurl = $embedurl;
return $j; return $j;
} }
function oembed_format_object($j){ function oembed_format_object($j){
$a = get_app(); $a = get_app();
$embedurl = $j->embedurl; $embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) ); $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
$ret="<span class='oembed ".$j->type."'>"; $ret="<span class='oembed ".$j->type."'>";
switch ($j->type) { switch ($j->type) {
@ -78,7 +78,7 @@ function oembed_format_object($j){
$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180; $th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
// make sure we don't attempt divide by zero, fallback is a 1:1 ratio // make sure we don't attempt divide by zero, fallback is a 1:1 ratio
$tr = (($th) ? $tw/$th : 1); $tr = (($th) ? $tw/$th : 1);
$th=120; $tw = $th*$tr; $th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl'); $tpl=get_markup_template('oembed_video.tpl');
$ret.=replace_macros($tpl, array( $ret.=replace_macros($tpl, array(
@ -89,7 +89,7 @@ function oembed_format_object($j){
'$th'=>$th, '$th'=>$th,
'$turl'=>$j->thumbnail_url, '$turl'=>$j->thumbnail_url,
)); ));
} else { } else {
$ret=$jhtml; $ret=$jhtml;
} }
@ -99,22 +99,24 @@ function oembed_format_object($j){
$ret.= "<img width='".$j->width."' src='".$j->url."'>"; $ret.= "<img width='".$j->width."' src='".$j->url."'>";
//$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": {
//$ret = "<a href='".$embedurl."'>".$j->title."</a>"; //$ret = "<a href='".$embedurl."'>".$j->title."</a>";
}; break; }; break;
case "rich": { case "rich": {
// not so safe.. // not so safe..
$ret.= $jhtml; $ret.= $jhtml;
}; break; }; break;
} }
// add link to source if not present in "rich" type // add link to source if not present in "rich" type
if ( $j->type!='rich' || !strpos($j->html,$embedurl) ){ if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
if (isset($j->provider_name)) $ret .= $j->provider_name.": ";
$embedlink = (isset($j->title))?$j->title:$embedurl; $embedlink = (isset($j->title))?$j->title:$embedurl;
$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>"; $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
if (isset($j->author_name)) $ret.=" by ".$j->author_name; if (isset($j->author_name)) $ret.=" (".$j->author_name.")";
if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; //if (isset($j->author_name)) $ret.=" by ".$j->author_name;
//if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
} else { } else {
// add <a> for html2bbcode conversion // add <a> for html2bbcode conversion
$ret .= "<a href='$embedurl' rel='oembed'></a>"; $ret .= "<a href='$embedurl' rel='oembed'></a>";
@ -128,14 +130,14 @@ function oembed_iframe($src,$width,$height) {
$width = '640'; $width = '640';
if(! $height || strstr($height,'%')) if(! $height || strstr($height,'%'))
$height = '300'; $height = '300';
// try and leave some room for the description line. // try and leave some room for the description line.
$height = intval($height) + 80; $height = intval($height) + 80;
$width = intval($width) + 40; $width = intval($width) + 40;
$a = get_app(); $a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src); $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>';
} }
@ -162,7 +164,7 @@ function oe_get_inner_html( $node ) {
$innerHTML .= $child->ownerDocument->saveXML( $child ); $innerHTML .= $child->ownerDocument->saveXML( $child );
} }
return $innerHTML; return $innerHTML;
} }
/** /**
* Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span> * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span>
@ -171,17 +173,17 @@ function oe_get_inner_html( $node ) {
function oembed_html2bbcode($text) { function oembed_html2bbcode($text) {
// start parser only if 'oembed' is in text // start parser only if 'oembed' is in text
if (strpos($text, "oembed")){ if (strpos($text, "oembed")){
// convert non ascii chars to html entities // convert non ascii chars to html entities
$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
// If it doesn't parse at all, just return the text. // If it doesn't parse at all, just return the text.
$dom = @DOMDocument::loadHTML($html_text); $dom = @DOMDocument::loadHTML($html_text);
if(! $dom) if(! $dom)
return $text; return $text;
$xpath = new DOMXPath($dom); $xpath = new DOMXPath($dom);
$attr = "oembed"; $attr = "oembed";
$xattr = oe_build_xpath("class","oembed"); $xattr = oe_build_xpath("class","oembed");
$entries = $xpath->query("//span[$xattr]"); $entries = $xpath->query("//span[$xattr]");
@ -193,8 +195,5 @@ function oembed_html2bbcode($text) {
return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
} else { } else {
return $text; return $text;
} }
} }

6
mod/parse_url.php
View File

@ -50,7 +50,7 @@ function completeurl($url, $scheme) {
return($complete); return($complete);
} }
function parseurl_getsiteinfo($url) { function parseurl_getsiteinfo($url, $no_guessing = false) {
$siteinfo = array(); $siteinfo = array();
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_URL, $url);
@ -184,7 +184,7 @@ function parseurl_getsiteinfo($url) {
} }
} }
if (@$siteinfo["image"] == "") { if ((@$siteinfo["image"] == "") AND !$no_guessing) {
$list = $xpath->query("//img[@src]"); $list = $xpath->query("//img[@src]");
foreach ($list as $node) { foreach ($list as $node) {
$attr = array(); $attr = array();
@ -223,7 +223,7 @@ function parseurl_getsiteinfo($url) {
"height"=>$photodata[1]); "height"=>$photodata[1]);
} }
if (@$siteinfo["text"] == "") { if ((@$siteinfo["text"] == "") AND (@$siteinfo["title"] != "") AND !$no_guessing) {
$text = ""; $text = "";
$list = $xpath->query("//div[@class='article']"); $list = $xpath->query("//div[@class='article']");