aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-10-21 16:26:29 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-10-21 16:26:29 +0200
commit6769436f3b43074d7d5895b36927eddf37b0ba8d (patch)
treef13fda79c9b55009672bdd8b3cff0746bf8788a2
parent01164c8c2f802f0b4c2f0f7c4a83ed826768ae1a (diff)
downloadvolse-hubzilla-6769436f3b43074d7d5895b36927eddf37b0ba8d.tar.gz
volse-hubzilla-6769436f3b43074d7d5895b36927eddf37b0ba8d.tar.bz2
volse-hubzilla-6769436f3b43074d7d5895b36927eddf37b0ba8d.zip
oembed. fix html2bbcode when oembed html contains span and utf8 chars
-rw-r--r--include/oembed.php24
-rw-r--r--library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js17
2 files changed, 26 insertions, 15 deletions
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
+?>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 789e75c39..9e680e104 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -53,19 +53,24 @@
/* oembed */
function _h2b_cb(match) {
- text = bin2hex(match);
function s_h2b(data) {
match = data;
- }
- $.ajax({
- url: 'oembed/h2b?text=' + text,
+ }
+ $.ajax({
+ type:"POST",
+ url: 'oembed/h2b',
+ data: {text: match},
async: false,
success: s_h2b,
dataType: 'html'
});
return match;
}
- s = s.replace(/<span class=\"oembed(.*?)<\/span>/gi, _h2b_cb);
+ if (s.indexOf('class="oembed')>=0){
+ //alert("request oembed html2bbcode");
+ s = _h2b_cb(s);
+ }
+
/* /oembed */
@@ -154,4 +159,4 @@
// Register plugin
tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
-})(); \ No newline at end of file
+})();