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

Revert "More checks on note decoding"

Browse Source 
This reverts commit 20199f7aee34dbc7a8aebcd459ef6cb84cdb5bd7
This commit is contained in:
Max Kostikov
2021-03-09 11:05:43 +00:00
committed by Mario
parent 0932d2a0a6
commit bdae290ec4
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/text.php
View File

@@ -1542,39 +1542,46 @@ function unobscure_mail(&$item) {
function theme_attachments(&$item) {
$s = '';
$arr = json_decode($item['attach'],true);
if(is_array($arr) && count($arr)) {
$attaches = array();
$attaches = [];
foreach($arr as $r) {
$icon = getIconFromType($r['type']);
if(isset($r['type']))
$icon = getIconFromType($r['type']);
if($r['title'])
if(isset($r['title']))
$label = urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8'));
if(! $label && $r['href'])
if(! $label && isset($r['href']))
$label = basename($r['href']);
//some feeds provide an attachment where title an empty space
if(! $label || $label == ' ')
$label = t('Unknown Attachment');
$title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown'));
$title = t('Size') . ' ' . (isset($r['length']) ? userReadableSize($r['length']) : t('unknown'));
require_once('include/channel.php');
if(is_foreigner($item['author_xchan']))
$url = $r['href'];
else
$url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&bdest=' . bin2hex($r['href'] . '/' . $r['revision']);
if (isset($r['href'])) {
if(is_foreigner($item['author_xchan']))
$url = $r['href'];
else
$url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&bdest=' . bin2hex($r['href'] . '/' . $r['revision']);
}
//$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>';
$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);
if (isset($label) && isset($url) && isset($icon) && isset($title))
$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);
}
$s = replace_macros(get_markup_template('item_attach.tpl'), array(
'$attaches' => $attaches
));
if (count($attaches) > 0)
$s = replace_macros(get_markup_template('item_attach.tpl'), [
'$attaches' => $attaches
]);
}
return $s;
@@ -1612,8 +1619,8 @@ function format_categories(&$item,$writeable) {
*/
function format_hashtags(&$item) {
$s = '';
$s = '';
$terms = get_terms_oftype($item['term'], array(TERM_HASHTAG,TERM_COMMUNITYTAG));
if($terms) {
foreach($terms as $t) {
@@ -1635,13 +1642,14 @@ function format_hashtags(&$item) {
}
function format_mentions(&$item) {
$s = '';
$s = '';
$terms = get_terms_oftype($item['term'],TERM_MENTION);
if($terms) {
foreach($terms as $t) {
if(! isset($t['term']))
continue;
$term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ;
if(! trim($term))
continue;