X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=0e1238360310b87efc675e453bd0805b8868d944;hb=be40fb8186bc18e3562d780a7153f76ee7d5e90f;hp=26746af51c17e13d637c4c177940abec99dc5489;hpb=7305a273922d92149e07e9563a9839cbceb04da1;p=friendica.git

diff --git a/include/oembed.php b/include/oembed.php
index 26746af51c..0e12383603 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -37,7 +37,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 				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){
@@ -45,31 +44,33 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
 					}
+					$entries = $xpath->query("//link[@type='text/json+oembed']");
+					foreach($entries as $e){
+						$href = $e->getAttributeNode("href")->nodeValue;
+						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
+						break;
+					}
 				}
 			}
 		}
 
 		if ($txt==false || $txt==""){
 			$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 {
+			if ($embedly != "") {
 				// 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);
+				logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
+			}
 		}
 
 		$txt=trim($txt);
-		if ($txt[0]!="{") $txt='{"type":"error"}';
-
-		//save in cache
-		Cache::set($a->videowidth . $embedurl,$txt);
 
+		if ($txt[0]!="{")
+			$txt='{"type":"error"}';
+		else	//save in cache
+			Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
 	}
 
 	$j = json_decode($txt);
@@ -156,7 +157,7 @@ function oembed_format_object($j){
 		case "rich": {
 			// not so safe..
 			if (!get_config("system","no_oembed_rich_content"))
-				$ret.= $jhtml;
+				$ret.= proxy_parse_html($jhtml);
 		}; break;
 	}