harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some logic cleanup in feed_get_reshare

Browse Source
This commit is contained in:
zotlabs 2017-06-16 15:28:29 -07:00
parent 327b22d24e
commit b429576349
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/feedutils.php
View File

@ -718,7 +718,7 @@ function feed_get_reshare(&$res,$item) {
if($rawobj) { if($rawobj) {
$rawauthor = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author'); $rawauthor = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['author'];
if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) { if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
$share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']); $share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
@ -751,7 +751,8 @@ function feed_get_reshare(&$res,$item) {
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
$share['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']); $share['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
$rawcreated = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'); $rawcreated = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['published'];
if($rawcreated) if($rawcreated)
$share['created'] = unxmlify($rawcreated[0]['data']); $share['created'] = unxmlify($rawcreated[0]['data']);
else else
@ -771,13 +772,15 @@ function feed_get_reshare(&$res,$item) {
} }
} }
$attach = $rawobj->get_enclosures(); $attach = $share['link'];
if($attach) { if($attach) {
foreach($attach as $att) { foreach($attach as $att) {
$len = intval($att->get_length()); if($att['rel'] !== 'enclosure')
$link = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link())))); continue;
$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title())))); $len = intval($att['length']);
$type = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type())))); $link = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['href']))));
$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['title']))));
$type = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['type']))));
if(strpos($type,';')) if(strpos($type,';'))
$type = substr($type,0,strpos($type,';')); $type = substr($type,0,strpos($type,';'));
if((! $link) || (strpos($link,'http') !== 0)) if((! $link) || (strpos($link,'http') !== 0))
@ -823,6 +826,10 @@ function encode_rel_links($links) {
$l = array(); $l = array();
if($link['attribs']['']['rel']) if($link['attribs']['']['rel'])
$l['rel'] = $link['attribs']['']['rel']; $l['rel'] = $link['attribs']['']['rel'];
if($link['attribs']['']['length'])
$l['length'] = $link['attribs']['']['length'];
if($link['attribs']['']['title'])
$l['title'] = $link['attribs']['']['title'];
if($link['attribs']['']['type']) if($link['attribs']['']['type'])
$l['type'] = $link['attribs']['']['type']; $l['type'] = $link['attribs']['']['type'];
if($link['attribs']['']['href']) if($link['attribs']['']['href'])