aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-21 12:58:52 -0700
committerFriendika <info@friendika.com>2011-10-21 12:58:52 -0700
commit3783d8860c2ceabc846ef915ce8ae5e4784107b2 (patch)
treefe4e80784ea8fbb3d0dea7ab8849a75b2bcb480a /include
parent1a784166312453575cf30d3ad7ec058febae2adf (diff)
parenta06c9768be418dc473f492c043ab6dfd1ae46f47 (diff)
downloadvolse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.tar.gz
volse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.tar.bz2
volse-hubzilla-3783d8860c2ceabc846ef915ce8ae5e4784107b2.zip
Merge branch 'pull'
Diffstat (limited to 'include')
-rw-r--r--include/oembed.php24
1 files changed, 15 insertions, 9 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
+?>