diff options
author | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
commit | 953840cf822718cba66a0727b576c674c6e44875 (patch) | |
tree | a924cf0031d16f6f15b7d84d5f519ca4257042b4 /include/items.php | |
parent | fb817a29a934a68f194a42c29d3ed11da2da558f (diff) | |
parent | 3ee529d095ac7e83ae1e71d86cbe6d443885d54e (diff) | |
download | volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.gz volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.bz2 volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rwxr-xr-x | include/items.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 2eecadad1..9f7eb84d9 100755 --- a/include/items.php +++ b/include/items.php @@ -1090,12 +1090,23 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars = array(); $sent_dfrn_id = hex2bin((string) $res->dfrn_id); $challenge = hex2bin((string) $res->challenge); + $perm = (($res->perm) ? $res->perm : null); $dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0); $rino_allowed = ((intval($res->rino) === 1) ? 1 : 0); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); $final_dfrn_id = ''; + if($perm) { + if((($perm == 'rw') && (! intval($contact['writable']))) + || (($perm == 'r') && (intval($contact['writable'])))) { + q("update contact set writable = %d where id = %d limit 1", + intval(($perm == 'rw') ? 1 : 0), + intval($contact['id']) + ); + $contact['writable'] = (string) 1 - intval($contact['writable']); + } + } if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey'])) |