TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

more fixes for issue #1843

Browse Source
This commit is contained in:
Mario
2024-05-08 14:34:44 +00:00
parent 7a5bb99d87
commit 76ce4705e2
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/bbcode.php
View File

@@ -1745,10 +1745,8 @@ function bbcode($text, $options = []) {
// oembed tag
if (strpos($text,'[/embed]') !== false) {
$text = str_replace(["[/embed]\r", "[/embed]\n"], '[/embed]', $text);
$text = oembed_bbcode2html($text);
// Avoid triple linefeeds through oembed
$text = str_replace("<br style='clear:left'></span><br /><br />", "<br style='clear:left'></span>", $text);
}
// If we found an event earlier, strip out all the event code and replace with a reformatted version.

13
include/oembed.php
View File

@@ -328,7 +328,7 @@ function oembed_format_object($j){
$jhtml = oembed_iframe($j['embedurl'],(isset($j['width']) ? $j['width'] : null), (isset($j['height']) ? $j['height'] : null));
$ret="<span class='oembed " . $j['type'] . "'>";
$ret="<span class='clearfix d-block oembed " . $j['type'] . "'>";
switch ($j['type']) {
case "video": {
if (isset($j['thumbnail_url'])) {
@@ -351,7 +351,6 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
$ret.="<br>";
}; break;
case "photo": {
$ret.= "<img width='".$j['width']."' src='".$j['url']."'>";
@@ -386,15 +385,15 @@ function oembed_format_object($j){
// 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 .= '<br />' . "<a href='$embedurl' rel='oembed'>$embedlink</a>";
$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
$ret .= "<br />";
if (isset($j['author_name'])) $ret .= t(' by ') . $j['author_name'];
if (isset($j['provider_name'])) $ret .= t(' on ') . $j['provider_name'];
} else {
// add <a> for html2bbcode conversion
$ret .= "<br /><a href='$embedurl' rel='oembed'>$embedurl</a>";
$ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
}
$ret.="<br style='clear:left'></span>";
$ret.="</span>";
// mb_convert_encoding() is deprecated
// return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
@@ -414,8 +413,8 @@ function oembed_iframe($src,$width,$height) {
}
// try and leave some room for the description line.
$height = intval($height) + 80;
$width = intval($width) + 40;
$height = intval($height);
$width = intval($width);
$s = z_root() . '/oembed/' . base64url_encode($src);

5
view/tpl/oembed_video.tpl
View File

@@ -1,4 +1 @@
<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url('{{$baseurl}}/images/icons/48/play.png') no-repeat center center;"></div>
</a>
<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin-right: 1em; position: relative;"><img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" /></a>