X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=69583167cfedfdf7a8ef03dd6fe1a4ba9582eed9;hb=cbe4e2bf8c7b6fea2e700811a15b427e6141c9dd;hp=ee042f8ce97a5869a9cd766d66d6580484102bbe;hpb=c2abf0aeeab6aa15545bea436fc68ad3d997f0bb;p=friendica.git

diff --git a/include/oembed.php b/include/oembed.php
index ee042f8ce9..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);
@@ -66,11 +77,46 @@ function oembed_fetch_url($embedurl){
 	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) );
@@ -100,8 +146,8 @@ function oembed_format_object($j){
 			$ret.="<br>";
 		}; break;
 		case "photo": {
-			$ret.= "<img width='".$j->width."' src='".$j->url."'>";
-			//$ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
+			$ret.= "<img width='".$j->width."' src='".proxy_url($j->url)."'>";
+			//$ret.= "<img width='".$j->width."' height='".$j->height."' src='".proxy_url($j->url)."'>";
 			$ret.="<br>";
 		}; break;
 		case "link": {
@@ -116,6 +162,7 @@ function oembed_format_object($j){
 
 	// add link to source if not present in "rich" type
 	if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+		$ret .= "<h4>";
 		if (isset($j->title)) {
 			if (isset($j->provider_name))
 				$ret .= $j->provider_name.": ";
@@ -135,15 +182,19 @@ function oembed_format_object($j){
 
 				$embedlink .= $j->author_name;
 			}
+			if (trim($embedlink) == "")
+				$embedlink = $embedurl;
+
 			$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
 		}
 		//if (isset($j->author_name)) $ret.=" by ".$j->author_name;
 		//if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
+		$ret .= "</h4>";
 	} else {
 		// add <a> for html2bbcode conversion
-		$ret .= "<a href='$embedurl' rel='oembed'></a>";
+		$ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
+		$ret.="<br style='clear:left'></span>";
 	}
-	$ret.="<br style='clear:left'></span>";
 	return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
 }