1 files changed, 70 insertions, 39 deletions

diff --git a/include/oembed.php b/include/oembed.php
index 06f71a3b3..3e86627e4 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,36 +1,37 @@
 <?php
 function oembed_replacecb($matches){
+	logger('oembedcb');
 	$embedurl=$matches[1];
 	$j = oembed_fetch_url($embedurl);
-	return oembed_format_object($j);
+	$s =  oembed_format_object($j);
+	return $s;//oembed_iframe($s,$j->width,$j->height);
+
+
 }
 
 
 function oembed_fetch_url($embedurl){
-
-	$r = q("SELECT v FROM `cache` WHERE k='%s'",
-				dbesc($embedurl));
+	
+	$txt = Cache::get($embedurl);
 				
-	if(count($r)){
-		$txt = $r[0]['v'];
-	} else {
+	if(is_null($txt)){
 		$txt = "";
 		
 		// try oembed autodiscovery
 		$redirects = 0;
 		$html_text = fetch_url($embedurl, false, $redirects, 15);
-		if(! $html_text)
-			return;
-		$dom = @DOMDocument::loadHTML($html_text);
-		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){
-				$href = $e->getAttributeNode("href")->nodeValue;
-				$txt = fetch_url($href);
+		if($html_text){
+			$dom = @DOMDocument::loadHTML($html_text);
+			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){
+					$href = $e->getAttributeNode("href")->nodeValue;
+					$txt = fetch_url($href);
+				}
 			}
 		}
 		
@@ -44,10 +45,8 @@ function oembed_fetch_url($embedurl){
 		if ($txt[0]!="{") $txt='{"type":"error"}';
 	
 		//save in cache
-		/*q("INSERT INTO `cache` VALUES ('%s','%s','%s')",
-			dbesc($embedurl),
-			dbesc($txt),
-			dbesc(datetime_convert()));*/
+		Cache::set($embedurl,$txt);
+
 	}
 	
 	$j = json_decode($txt);
@@ -57,18 +56,27 @@ function oembed_fetch_url($embedurl){
 	
 function oembed_format_object($j){
 	$embedurl = $j->embedurl;
+	$jhtml = oembed_iframe($j->html,$j->width,$j->height );
 	$ret="<span class='oembed ".$j->type."'>";
 	switch ($j->type) {
 		case "video": {
 			if (isset($j->thumbnail_url)) {
-				/*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
-				$th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/
-				$tw=150; $th=120; 
-				$ret.= "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' style='float:left; margin: 1em; '>";
-				$ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
-				$ret.= "</a>";
+				$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+				$th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
+				$tr = $tw/$th;
+				
+				$th=120; $tw = $th*$tr;
+				$tpl=get_markup_template('oembed_video.tpl');
+				$ret.=replace_macros($tpl, array(
+					'$embedurl'=>$embedurl,
+					'$escapedhtml'=>base64_encode($jhtml),
+					'$tw'=>$tw,
+					'$th'=>$th,
+					'$turl'=>$j->thumbnail_url,
+				));
+				
 			} else {
-				$ret=$j->html;
+				$ret=$jhtml;
 			}
 			$ret.="<br>";
 		}; break;
@@ -81,18 +89,40 @@ function oembed_format_object($j){
 		}; break;  
 		case "rich": {
 			// not so safe.. 
-			$ret.= "<blockquote>".$j->html."</blockquote>";
+			$ret.= $jhtml;
 		}; break;
 	}
 
-	$embedlink = (isset($j->title))?$j->title:$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;
+	// add link to source if not present in "rich" type
+	if (  $j->type!='rich' || !strpos($j->html,$embedurl) ){
+		$embedlink = (isset($j->title))?$j->title:$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;
+	} else {
+		// add <a> for html2bbcode conversion
+		$ret .= "<a href='$embedurl' rel='oembed'/>";
+	}
 	$ret.="<br style='clear:left'></span>";
-	return $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,'%'))
+		$height = '300';
+	// try and leave some room for the description line. 
+	$height = intval($height) + 80;
+	$width  = intval($width) + 40;
+
+	$s = 'data:text/html;base64,' . base64_encode('<html><body>' . $src . '</body></html>');
+	return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; 
+
 }
 
+
+
 function oembed_bbcode2html($text){
 	$stopoembed = get_config("system","no_oembed");
 	if ($stopoembed == true){
@@ -136,8 +166,8 @@ function oembed_html2bbcode($text) {
 		
 		$xattr = oe_build_xpath("class","oembed");
 		$entries = $xpath->query("//span[$xattr]");
-		
-		$xattr = oe_build_xpath("rel","oembed");
+
+		$xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
 		foreach($entries as $e) {
 			$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
 			if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
@@ -148,4 +178,5 @@ function oembed_html2bbcode($text) {
 	} 
 }
 
-?>
\ No newline at end of file
+
+