aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-10 18:38:55 -0700
committerFriendika <info@friendika.com>2011-04-10 18:38:55 -0700
commit940d216395406744f23fe4144f2a503688624b45 (patch)
treee96cb4ea1eee0ad7b6b8412fcbcf86116b40a43b /include/items.php
parent12bc4a44cf051dda665fc4fa43624c47484b1864 (diff)
downloadvolse-hubzilla-940d216395406744f23fe4144f2a503688624b45.tar.gz
volse-hubzilla-940d216395406744f23fe4144f2a503688624b45.tar.bz2
volse-hubzilla-940d216395406744f23fe4144f2a503688624b45.zip
initial dfrn update to pass perms
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php
index 596946681..d7644fb42 100644
--- a/include/items.php
+++ b/include/items.php
@@ -867,14 +867,14 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if($dissolve)
$postvars['dissolve'] = '1';
- if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) {
- $postvars['data'] = $atom;
- }
- elseif($owner['page-flags'] == PAGE_COMMUNITY) {
+
+ if((($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
$postvars['data'] = $atom;
+ $postvars['perm'] = 'rw';
}
else {
$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
+ $postvars['perm'] = 'r';
}
if($rino && $rino_allowed && (! $dissolve)) {
@@ -916,7 +916,6 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if((! $curl_stat) || (! strlen($xml)))
return(-1); // timed out
-
if(strpos($xml,'<?xml') === false) {
logger('dfrn_deliver: phase 2: no valid XML returned');
logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
@@ -925,8 +924,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
$res = parse_xml_string($xml);
- return $res->status;
-
+ return $res->status;
}