X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=c362ab45e6516fd31c9a0078a9067a6f5c12f6f0;hb=014fc5dccbf24a6473e0e2e9bdca810103d8b202;hp=19bdc474f545aa4b14e690970e0bf7b7a9042f2a;hpb=52e33d50ad790e5f7e2653ecb49d1c725b499afc;p=friendica.git

diff --git a/include/oembed.php b/include/oembed.php
index 19bdc474f5..c362ab45e6 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,23 +1,25 @@
 <?php
 function oembed_replacecb($matches){
-//	logger('oembedcb');
 	$embedurl=$matches[1];
 	$j = oembed_fetch_url($embedurl);
 	$s =  oembed_format_object($j);
-	return $s;//oembed_iframe($s,$j->width,$j->height);
-
-
+	return $s;
 }
 
 
 function oembed_fetch_url($embedurl, $no_rich_type = false){
-
 	$embedurl = trim($embedurl, "'");
 	$embedurl = trim($embedurl, '"');
 
 	$a = get_app();
 
-	$txt = Cache::get($a->videowidth . $embedurl);
+	$r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
+		dbesc(normalise_link($embedurl)));
+
+	if ($r)
+		$txt = $r[0]["content"];
+	else
+		$txt = Cache::get($a->videowidth . $embedurl);
 
 	// These media files should now be caught in bbcode.php
 	// left here as a fallback in case this is called from another source
@@ -38,7 +40,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){
@@ -46,31 +47,42 @@ 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
+			$j = json_decode($txt);
+			if ($j->type != "error")
+				q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
+					ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+					dbesc(normalise_link($embedurl)),
+					dbesc($txt), dbesc(datetime_convert()),
+					dbesc($txt), dbesc(datetime_convert()));
+
+			Cache::set($a->videowidth.$embedurl,$txt, CACHE_DAY);
+		}
 	}
 
 	$j = json_decode($txt);
@@ -88,7 +100,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	// 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);
+		$data = parseurl_getsiteinfo_cached($embedurl, true, false);
 		$j->type = $data["type"];
 
 		if ($j->type == "photo") {
@@ -144,20 +156,17 @@ function oembed_format_object($j){
 			} else {
 				$ret=$jhtml;
 			}
-			$ret.="<br>";
+			//$ret.="<br>";
 		}; break;
 		case "photo": {
 			$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": {
-			//$ret = "<a href='".$embedurl."'>".$j->title."</a>";
 		}; break;
 		case "rich": {
 			// not so safe..
 			if (!get_config("system","no_oembed_rich_content"))
-				$ret.= $jhtml;
+				$ret.= proxy_parse_html($jhtml);
 		}; break;
 	}
 
@@ -194,16 +203,22 @@ function oembed_format_object($j){
 	} else {
 		// add <a> for html2bbcode conversion
 		$ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
-		$ret.="<br style='clear:left'></span>";
 	}
-	return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+	$ret.="</span>";
+	$ret = str_replace("\n","",$ret);
+	return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
 }
 
 function oembed_iframe($src,$width,$height) {
+
 	if(! $width || strstr($width,'%'))
 		$width = '640';
-	if(! $height || strstr($height,'%'))
+	if(! $height || strstr($height,'%')) {
 		$height = '300';
+		$resize = 'onload="resizeIframe(this);"';
+	} else
+		$resize = '';
+
 	// try and leave some room for the description line.
 	$height = intval($height) + 80;
 	$width  = intval($width) + 40;
@@ -211,7 +226,7 @@ function oembed_iframe($src,$width,$height) {
 	$a = get_app();
 
 	$s = $a->get_baseurl()."/oembed/".base64url_encode($src);
-	return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
+	return '<iframe '.$resize.' class="embed_rich" height="'.$height.'" width="'.$width.'" src="'.$s.'" frameborder="no">'.t('Embedded content').'</iframe>';
 
 }