diff options
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index cbe0e970d..e238280fc 100644 --- a/include/items.php +++ b/include/items.php @@ -756,7 +756,7 @@ function get_item_contact($item,$contacts) { } -function dfrn_deliver($owner,$contact,$atom) { +function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $a = get_app(); @@ -827,6 +827,8 @@ function dfrn_deliver($owner,$contact,$atom) { $postvars['dfrn_id'] = $idtosend; $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; + if($dissolve) + $postvars['dissolve'] = '1'; if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) { $postvars['data'] = $atom; @@ -838,7 +840,7 @@ function dfrn_deliver($owner,$contact,$atom) { $postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom); } - if($rino && $rino_allowed) { + if($rino && $rino_allowed && (! $dissolve)) { $key = substr(random_string(),0,16); $data = bin2hex(aes_encrypt($postvars['data'],$key)); $postvars['data'] = $data; @@ -1155,6 +1157,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { continue; } $datarray = get_atom_elements($feed,$item); + if($contact['network'] === 'stat') { if(strlen($datarray['title'])) unset($datarray['title']); @@ -1165,7 +1168,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { ); $datarray['last-child'] = 1; } - if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) { + + if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) { // one way feed - no remote comment ability $datarray['last-child'] = 0; } @@ -1221,7 +1225,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { $datarray['last-child'] = 1; } - if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) { + if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) { // one way feed - no remote comment ability $datarray['last-child'] = 0; } |