X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=69583167cfedfdf7a8ef03dd6fe1a4ba9582eed9;hb=cbe4e2bf8c7b6fea2e700811a15b427e6141c9dd;hp=d598b41ce31c405275d2d2bf8916c975e713e884;hpb=916b2e7438443ef7d97971cdacee234efc3f3ccf;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index d598b41ce3..69583167cf 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -10,7 +10,9 @@ function oembed_replacecb($matches){
}
-function oembed_fetch_url($embedurl){
+function oembed_fetch_url($embedurl, $no_rich_type = false){
+ $embedurl = trim($embedurl, "'");
+ $embedurl = trim($embedurl, '"');
$a = get_app();
@@ -48,9 +50,18 @@ function oembed_fetch_url($embedurl){
}
if ($txt==false || $txt==""){
- // try oohembed service
- $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
- $txt = fetch_url($ourl);
+ $embedly = get_config("system", "embedly");
+ if ($embedly == "") {
+ // try oohembed service
+ $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
+ $txt = fetch_url($ourl);
+ } else {
+ // try embedly service
+ $ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl);
+ $txt = fetch_url($ourl);
+ }
+
+ logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
}
$txt=trim($txt);
@@ -62,11 +73,50 @@ function oembed_fetch_url($embedurl){
}
$j = json_decode($txt);
+
+ if (!is_object($j))
+ return false;
+
+ // Always embed the SSL version
+ if (isset($j->html))
+ $j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
+ array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
+
$j->embedurl = $embedurl;
+
+ // If fetching information doesn't work, then improve via internal functions
+ if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
+ require_once("mod/parse_url.php");
+ $data = parseurl_getsiteinfo($embedurl, true, false);
+ $j->type = $data["type"];
+
+ if ($j->type == "photo") {
+ $j->url = $data["url"];
+ //$j->width = $data["images"][0]["width"];
+ //$j->height = $data["images"][0]["height"];
+ }
+
+ if (isset($data["title"]))
+ $j->title = $data["title"];
+
+ if (isset($data["text"]))
+ $j->description = $data["text"];
+
+ if (is_array($data["images"])) {
+ $j->thumbnail_url = $data["images"][0]["src"];
+ $j->thumbnail_width = $data["images"][0]["width"];
+ $j->thumbnail_height = $data["images"][0]["height"];
+ }
+ }
+
+ call_hooks('oembed_fetch_url', $embedurl, $j);
+
return $j;
}
function oembed_format_object($j){
+ require_once("mod/proxy.php");
+
$a = get_app();
$embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
@@ -82,7 +132,7 @@ function oembed_format_object($j){
$th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl');
$ret.=replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => $a->get_baseurl(),
'$embedurl'=>$embedurl,
'$escapedhtml'=>base64_encode($jhtml),
'$tw'=>$tw,
@@ -96,8 +146,8 @@ function oembed_format_object($j){
$ret.="
";
}; break;
case "photo": {
- $ret.= "";
- //$ret.= "
";
+ $ret.= "
";
+ //$ret.= "
";
$ret.="
";
}; break;
case "link": {
@@ -105,23 +155,46 @@ function oembed_format_object($j){
}; break;
case "rich": {
// not so safe..
- $ret.= $jhtml;
+ if (!get_config("system","no_oembed_rich_content"))
+ $ret.= $jhtml;
}; break;
}
// add link to source if not present in "rich" type
if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
- if (isset($j->provider_name)) $ret .= $j->provider_name.": ";
- $embedlink = (isset($j->title))?$j->title:$embedurl;
- $ret .= "$embedlink";
- if (isset($j->author_name)) $ret.=" (".$j->author_name.")";
+ $ret .= "