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

pending flag not being reset when using autoperms from custom role

Browse Source
This commit is contained in:
redmatrix 2016-08-12 18:17:39 -07:00
parent 5365e9b3a5
commit 165f442d70
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/zot.php
View File

@ -457,11 +457,13 @@ function zot_refresh($them, $channel = null, $force = false) {
// new connection // new connection
$my_perms = null; $my_perms = null;
$automatic = false;
$role = get_pconfig($channel['channel_id'],'system','permissions_role'); $role = get_pconfig($channel['channel_id'],'system','permissions_role');
if($role) { if($role) {
$xx = \Zotlabs\Access\PermissionRoles::role_perms($role); $xx = \Zotlabs\Access\PermissionRoles::role_perms($role);
if($xx['perms_auto']) { if($xx['perms_auto']) {
$automatic = true;
$default_perms = $xx['perms_connect']; $default_perms = $xx['perms_connect'];
$my_perms = \Zotlabs\Access\Permissions::FilledPerms($default_perms); $my_perms = \Zotlabs\Access\Permissions::FilledPerms($default_perms);
} }
@ -470,6 +472,7 @@ function zot_refresh($them, $channel = null, $force = false) {
if(! $my_perms) { if(! $my_perms) {
$m = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']); $m = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']);
if($m) { if($m) {
$automatic = true;
$my_perms = $m; $my_perms = $m;
} }
} }
@ -496,7 +499,7 @@ function zot_refresh($them, $channel = null, $force = false) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($next_birthday), dbesc($next_birthday),
intval(($default_perms) ? 0 : 1) intval(($automatic) ? 0 : 1)
); );
if($y) { if($y) {