From 6769436f3b43074d7d5895b36927eddf37b0ba8d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 21 Oct 2011 16:26:29 +0200
Subject: oembed. fix html2bbcode when oembed html contains span and utf8 chars

---
 include/oembed.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/oembed.php b/include/oembed.php
index 06f71a3b3..a8f6636ff 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -81,16 +81,22 @@ function oembed_format_object($j){
 		}; break;  
 		case "rich": {
 			// not so safe.. 
-			$ret.= "<blockquote>".$j->html."</blockquote>";
+			$ret.= $j->html;
 		}; 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($ret,$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_bbcode2html($text){
@@ -136,8 +142,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 +154,4 @@ function oembed_html2bbcode($text) {
 	} 
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3