TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

correctly set some perms when our follow request was accepted

Browse Source
This commit is contained in:
Mario
2023-04-25 08:36:20 +00:00
parent 8a14e4261d
commit 09fde2f839
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Lib/Activity.php
View File

@@ -1333,7 +1333,8 @@ class Activity {
} }
} }
$x = PermissionRoles::role_perms('personal'); $role = get_pconfig($channel['channel_id'], 'system', 'permissions_role', 'personal');
$x = PermissionRoles::role_perms($role);
$their_perms = Permissions::FilledPerms($x['perms_connect']); $their_perms = Permissions::FilledPerms($x['perms_connect']);
if ($contact && $contact['abook_id']) { if ($contact && $contact['abook_id']) {
@@ -1358,10 +1359,15 @@ class Activity {
return; return;
case 'Accept': case 'Accept':
// They accepted our Follow request.
// Set default permissions except for send_stream and post_wall
// They accepted our Follow request - set default permissions foreach ($their_perms as $k => $v) {
if(in_array($k, ['send_stream', 'post_wall'])) {
set_abconfig($channel['channel_id'], $contact['abook_xchan'], 'system', 'their_perms', $their_perms); $v = 0; // Those will be set once we accept their follow request
}
set_abconfig($channel['channel_id'], $contact['abook_xchan'], 'their_perms', $k, $v);
}
$abook_instance = $contact['abook_instance']; $abook_instance = $contact['abook_instance'];

1
include/photos.php
View File

@@ -64,7 +64,6 @@ function photo_upload($channel, $observer, $args) {
} }
$ac = $acl->get(); $ac = $acl->get();
hz_syslog(print_r($ac,true));
$width = $height = 0; $width = $height = 0;
if ($args['getimagesize']) { if ($args['getimagesize']) {