kopia lustrzana https://github.com/friendica/friendica
try slightly better detection of html in feeds
rodzic
ae5e5bf1e4
commit
f0b8d01615
|
@ -416,7 +416,7 @@ function get_atom_elements($feed,$item) {
|
||||||
// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
|
// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
|
||||||
// html.
|
// html.
|
||||||
|
|
||||||
if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) {
|
if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
|
||||||
|
|
||||||
$res['body'] = reltoabs($res['body'],$base_url);
|
$res['body'] = reltoabs($res['body'],$base_url);
|
||||||
|
|
||||||
|
@ -429,13 +429,14 @@ function get_atom_elements($feed,$item) {
|
||||||
|
|
||||||
// we shouldn't need a whitelist, because the bbcode converter
|
// we shouldn't need a whitelist, because the bbcode converter
|
||||||
// will strip out any unsupported tags.
|
// will strip out any unsupported tags.
|
||||||
// $config->set('HTML.Allowed', 'p,b,a[href],i');
|
|
||||||
|
|
||||||
$purifier = new HTMLPurifier($config);
|
$purifier = new HTMLPurifier($config);
|
||||||
$res['body'] = $purifier->purify($res['body']);
|
$res['body'] = $purifier->purify($res['body']);
|
||||||
|
|
||||||
$res['body'] = html2bbcode($res['body']);
|
$res['body'] = @html2bbcode($res['body']);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
$res['body'] = escape_tags($res['body']);
|
||||||
|
|
||||||
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
|
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
|
||||||
if($allow && $allow[0]['data'] == 1)
|
if($allow && $allow[0]['data'] == 1)
|
||||||
|
|
Ładowanie…
Reference in New Issue